27 files changed, 16917 insertions, 12738 deletions
diff --git a/ChangeLog b/ChangeLog
index 10313a34..e687b045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-03-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* configure.in: Bumped version number to 1.0.4.
+
 1999-03-23  Martin Baulig  <martin@home-of-linux.org>
 
 	* configure.in (WINDOW_MANAGER): Use gnome-wm instead of icewm
diff --git a/ChangeLog-20020212 b/ChangeLog-20020212
index 10313a34..e687b045 100644
--- a/ChangeLog-20020212
+++ b/ChangeLog-20020212
@@ -1,3 +1,7 @@
+1999-03-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* configure.in: Bumped version number to 1.0.4.
+
 1999-03-23  Martin Baulig  <martin@home-of-linux.org>
 
 	* configure.in (WINDOW_MANAGER): Use gnome-wm instead of icewm
diff --git a/configure.in b/configure.in
index 5f9f7095..e475653b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(panel)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gnome-core, 1.0.3) 
+AM_INIT_AUTOMAKE(gnome-core, 1.0.4)
 
 AM_MAINTAINER_MODE
 
@@ -177,6 +177,7 @@ panel/Makefile
 applets/Makefile
 applets/applet-dirs/Makefile
 applets/asclock/Makefile
+applets/asclock/default_theme/Makefile
 applets/asclock/themes/Makefile
 applets/asclock/themes/Orb/Makefile
 applets/asclock/themes/Freeamp/Makefile
diff --git a/po/ca.po b/po/ca.po
index 2dcb011e..8528e8ab 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-core 0.99.3\n"
-"POT-Creation-Date: 1999-02-14 15:35+0100\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: 1999-02-27 17:48+01:00\n"
 "Last-Translator: Ivan Vilata i Balaguer <al011097@alumail.uji.es>\n"
 "Language-Team: linux-ca@chanae.alphanet.ch\n"
@@ -10,258 +10,323 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "From: Ivan Vilata i Balaguer <al011097@alumail.uji.es>\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "A prop�sit de"
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:477
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
-#: applets/gen_util/clock.c:282 applets/gen_util/mailcheck.c:705
-#: applets/gen_util/printer.c:411 applets/gkb/gkb.c:491
-#: applets/gnome-pager/gnomepager_applet.c:1465 applets/gticker/gticker.c:61
-#: applets/icewm-pager/wmpager_applet.c:90
+#: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
+#: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
-#: applets/modemlights/modemlights.c:750 applets/multiload/cpuload.c:62
-#: applets/multiload/memload.c:58 applets/multiload/swapload.c:58
+#: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
+#: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:378 panel/launcher.c:278
-#: panel/menu.c:3319
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "Propietats..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr "Complement Rellotge d'AfterStep"
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "Rellotge"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr "Qui ha dit que NeXT era mort?"
 
-#: applets/asclock/dialogs.c:112
-msgid "Timezone"
-msgstr "Zona hor�ria"
-
-#: applets/batmon/batmon.c:106
-msgid "Can't open /proc/apm; can't get data."
-msgstr "No es pot obrir /proc/apm; no es pot obtenir-ne dades."
-
-#: applets/batmon/batmon.c:112
-msgid "Something wrong with /proc/apm; can't get data."
-msgstr "Quelcom d'erroni amb /proc/apm; no es pot obtenir-ne dades."
-
-#: applets/batmon/batmon.c:155
-msgid "Can't open /dev/apm; can't get data."
-msgstr "No es pot obrir /dev/apm; no es pot obtenir-ne dades."
-
-#: applets/batmon/batmon.c:161 applets/battery/read-battery.c:135
-msgid "ioctl failed on /dev/apm."
-msgstr "ioctl ha fallat amb /dev/apm"
-
-#: applets/batmon/batmon.c:211
-msgid "There is no battery?!?"
-msgstr "No hi ha bateria?!?"
-
-# El que deia Teo...  es refereix a la bateria o al nivell?
-# �s clar, la bateria no �s alta, ni el nivell es carrega,
-# aix� que tant se val!
-#: applets/batmon/batmon.c:214
-msgid "High and charging."
-msgstr "Alta i carregant-se."
-
-#: applets/batmon/batmon.c:217
-msgid "High."
-msgstr "Alta."
-
-#: applets/batmon/batmon.c:220
-msgid "Low and charging."
-msgstr "Baixa i carregant-se."
-
-#: applets/batmon/batmon.c:223
-msgid "Low."
-msgstr "Baixa."
-
-#: applets/batmon/batmon.c:226
-msgid "Critical and charging."
-msgstr "Cr�tica i carregant-se."
-
-#: applets/batmon/batmon.c:229
-msgid "Critical!!"
-msgstr "Cr�tica!!"
-
-#: applets/batmon/batmon.c:232
-msgid "Charging."
-msgstr "Carregant-se."
-
-#: applets/batmon/batmon.c:240
-msgid "unknown minutes of battery."
-msgstr "minuts de bateria desconeguts."
-
-#: applets/batmon/batmon.c:243
-msgid "unknown minutes of battery (%d%%)"
-msgstr "minuts de bateria desconeguts (%d%%)"
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
 
-#: applets/batmon/batmon.c:249
-#, c-format
-msgid "%d minutes of battery"
-msgstr "%d minuts de bateria"
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "T�tol de la p�gina"
 
-#: applets/batmon/batmon.c:251
-msgid "%d minutes of battery (%d%%)"
-msgstr "%d minuts de bateria (%d%%)"
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr "Mostrar hora en format 12 hores (AM/PM)"
 
-#. would have to be an error
-#: applets/batmon/batmon.c:255
-msgid "More than 100,000,000 minutes of battery life?!?"
-msgstr "�!�La bateria t� m�s de 100.000.000 minuts de vida?!?"
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
 
-#: applets/batmon/batmon.c:338
-msgid "APM Stats"
-msgstr "Estat de l'APM"
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr "General"
 
-#: applets/batmon/batmon.c:356
-msgid "Linux APM Driver Version:"
-msgstr "Versi� del controlador APM de Linux:"
+#: applets/asclock/dialogs.c:336
+msgid "Timezone"
+msgstr "Zona hor�ria"
 
-#: applets/batmon/batmon.c:368
-msgid "APM BIOS Version:"
-msgstr "Versi� d'APM del BIOS:"
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
 
-#: applets/batmon/batmon.c:385
-msgid "Battery Status:"
-msgstr "Estat de la bateria:"
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
 
-#: applets/batmon/batmon.c:409 applets/gnome-pager/gnomepager_applet.c:2453
-#: panel/launcher.c:43
-msgid "Close"
-msgstr "Tancar"
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
 
-#: applets/battery/battery.c:357
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr "Error intern: el mode en battery_set_mode no �s v�lid"
 
-#: applets/battery/battery.c:402 applets/freshapp/freshapp.c:38
-#: applets/gen_util/clock.c:255 applets/gen_util/mailcheck.c:672
-#: applets/gen_util/printer.c:386 applets/netload/netload.c:321
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
+#: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
+#: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "No es pot crear el complement!\n"
 
-#: applets/battery/battery.c:622
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "A prop�sit de..."
+
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
+msgstr "Complement Teclat de GNOME"
+
+#: applets/battery/battery.c:838
+#, fuzzy
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr "(c) 1998 Free Software Foundation"
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr "No s'ha pogut reservar espai pels valors del gr�fic"
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "Propietats del Monitor de Bateria"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "Propietats generals"
-
-#: applets/battery/properties.c:48 applets/cpuload/properties.c:149
-#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
-#: applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
 msgstr "Altura del complement"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
 msgstr "Ampl�ria del complement"
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Update interval
+#: applets/battery/properties.c:102
+#, fuzzy
+msgid "Update Interval (seconds):"
+msgstr "Actualitzar en x segons:"
+
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
+msgstr ""
+
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
 msgstr "Mode del complement"
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr "Gr�fic"
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr "Llegir"
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr "Color de bat. amb AC actiu:"
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr "Color de bat. amb AC inactiu:"
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
-msgstr "Interval del gr�fic:"
+#: applets/battery/properties.c:202
+#, fuzzy
+msgid "Low Battery Color:"
+msgstr "Color de bat. amb AC actiu:"
+
+#: applets/battery/properties.c:262
+#, fuzzy
+msgid "Graph Battery Low Color:"
+msgstr "Color de bat. amb AC actiu:"
+
+#: applets/battery/properties.c:268
+#, fuzzy
+msgid "Graph Tick Color:"
+msgstr "Direcci� del gr�fic:"
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr "Direcci� del gr�fic:"
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr "D'esquerra a dreta"
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr "De dreta a esquerra"
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
-msgstr "No es pot obrir /proc/apm!  Assegureu-vos que el nucli t� suport per APM.\n"
+msgstr ""
+"No es pot obrir /proc/apm!  Assegureu-vos que el nucli t� suport per APM.\n"
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr "No s'ha pogut dup()licar el descriptor del fitxer d'APM: %s\n"
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "No es pot obrir /dev/apm; no es pot obtenir-ne dades."
 
-#: applets/battery/read-battery.c:146
-msgid "APM is disabled!  Cannot read battery charge information."
-msgstr "L'APM no �s habilitat!  No es pot llegir informaci� sobre la c�rrega de la bateria."
-
-#: applets/bussign/bussign.c:72 applets/charpick/charpick.c:338
-#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
-#: applets/drivemount/drivemount.c:483
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:712
-#: applets/gkb/gkb.c:483 applets/gnome-pager/gnomepager_applet.c:1459
-#: applets/gticker/gticker.c:67 applets/icewm-pager/wmpager_applet.c:82
-#: applets/jbc/jbc.c:167 applets/modemlights/modemlights.c:756
-#: applets/netload/netload.c:339 applets/slashapp/slashapp.c:636
-#: applets/webcontrol/webcontrol.c:307 panel/menu.c:2354
-msgid "About..."
-msgstr "A prop�sit de..."
-
-#: applets/bussign/bussign.c:80
-msgid "Refresh Image"
-msgstr "Actualitzar imatge"
-
-#: applets/bussign/bussign.c:244
-msgid "The Bus Sign Applet"
-msgstr "El complement Bus Sign"
-
-#: applets/bussign/bussign.c:245 applets/gen_util/mailcheck.c:632
-msgid "(c) 1998 the Free Software Foundation"
-msgstr "(c) 1998 Free Software Foundation"
+#: applets/battery/read-battery.c:167
+msgid "ioctl failed on /dev/apm."
+msgstr "ioctl ha fallat amb /dev/apm"
 
-#: applets/bussign/bussign.c:247
-msgid ""
-"This applet is a total waste of time. Get back to work!\n"
-"\n"
-"To fill in the sign please see:\n"
-"\n"
-"http://people.netscape.com/mtoy/sign/index.html"
+#: applets/battery/read-battery.c:178
+msgid "APM is disabled!  Cannot read battery charge information."
 msgstr ""
-"Aquest complement �s una p�rdua total de temps. Torna al treball!\n"
-"\n"
-"Per emplenar el senyal visita:\n"
-"\n"
-"http://people.netscape.com/mtoy/sign/index.html"
+"L'APM no �s habilitat!  No es pot llegir informaci� sobre la c�rrega de la "
+"bateria."
 
 #: applets/cdplayer/cdplayer.c:318
 msgid "Run gtcd..."
@@ -283,16 +348,17 @@ msgstr "Copyright (C) 1998"
 msgid ""
 "Gnome Panel applet for selecting strange characters that are not on my "
 "keyboard. Released under GNU General Public Licence."
-msgstr "Complement del Plaf� de GNOME per triar car�cters estranys que no s�n al meu teclat.  Lliurat sota la Llic�ncia P�blica General GNU."
+msgstr ""
+"Complement del Plaf� de GNOME per triar car�cters estranys que no s�n al meu "
+"teclat.  Lliurat sota la Llic�ncia P�blica General GNU."
 
-#: applets/clockmail/clockmail.c:47 applets/gticker/gticker.c:230
-#: applets/jbc/jbc.c:63 applets/slashapp/slashapp.c:563
+#: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
 msgstr "%d.%d.%d"
 
 # �s que li deuen agafar el gustet al _(...)
-#: applets/clockmail/clockmail.c:52 applets/gticker/gticker.c:234
+#: applets/clockmail/clockmail.c:52
 msgid "John Ellis <johne@bellatlantic.net>"
 msgstr "John Ellis <johne@bellatlantic.net>"
 
@@ -312,7 +378,9 @@ msgid ""
 "arrives."
 msgstr ""
 "Lliurat sota la llic�ncia p�blica general GNU.\n"
-"Rellotge digital b�sic amb la data a una pista.  Visor horari 12/24 hores. El parpelleig del correu pot ser per qualsevol correu no llegit, o breument quan arriba nou correu."
+"Rellotge digital b�sic amb la data a una pista.  Visor horari 12/24 hores. "
+"El parpelleig del correu pot ser per qualsevol correu no llegit, o breument "
+"quan arriba nou correu."
 
 #: applets/clockmail/clockmail.c:128
 msgid " (GMT)"
@@ -328,15 +396,11 @@ msgstr " (GMT %+d)"
 msgid "None (default)"
 msgstr "Cap (per defecte)"
 
-#: applets/clockmail/properties.c:286 applets/gen_util/clock.c:428
+#: applets/clockmail/properties.c:286 applets/gen_util/clock.c:502
 #: applets/mini-commander/src/preferences.c:438
 msgid "Clock"
 msgstr "Rellotge"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr "Mostrar hora en format 12 hores (AM/PM)"
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr "Mostrar hora respecte GMT (Hora del Meridi� de Greenwich):"
@@ -361,17 +425,6 @@ msgstr "Quan arribe nou correu, executar:"
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr "Quantitat de correu per considerar plena la b�stia (Koctets):"
 
-#. ---
-#: applets/clockmail/properties.c:388 applets/cpuload/properties.c:231
-#: applets/diskusage/properties.c:344 applets/drivemount/properties.c:210
-#: applets/fvwm-pager/properties.c:246 applets/gticker/properties.c:328
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:887
-#: panel/panel_config_global.c:301
-msgid "General"
-msgstr "General"
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr "Fitxer de tema (directori):"
@@ -380,29 +433,6 @@ msgstr "Fitxer de tema (directori):"
 msgid "Theme"
 msgstr "Tema"
 
-#: applets/cpuload/properties.c:137
-msgid "User Load"
-msgstr "C�rrega d'usuari"
-
-#: applets/cpuload/properties.c:143
-msgid "System Load"
-msgstr "C�rrega de sistema"
-
-#: applets/cpuload/properties.c:155 applets/diskusage/properties.c:238
-#: applets/fvwm-pager/properties.c:184 applets/netload/properties.c:147
-#: panel/swallow.c:248
-msgid "Width"
-msgstr "Ampl�ria"
-
-#: applets/cpuload/properties.c:170 applets/diskusage/properties.c:259
-#: applets/netload/properties.c:170
-msgid "Update Frequency"
-msgstr "Freq��ncia d'actualitzaci�"
-
-#: applets/cpuload/properties.c:228
-msgid "CPULoad Settings"
-msgstr "Propietats de C�rrega d'UPC"
-
 #: applets/dialer/dialer.c:46
 msgid "PPP Dialer Applet"
 msgstr "Complement Marcador PPP"
@@ -412,7 +442,7 @@ msgstr "Complement Marcador PPP"
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr "Un macador PPP amigable.  Com no se li havia ocorregut a ning� abans?!"
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3142
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr "Tallat"
 
@@ -432,16 +462,30 @@ msgstr "Color del text"
 msgid "Backgroundcolor"
 msgstr "Color del fons"
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr "Altura del complement"
+
+#: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
+#: applets/netload/properties.c:147 panel/swallow.c:246
+msgid "Width"
+msgstr "Ampl�ria"
+
+#: applets/diskusage/properties.c:259 applets/netload/properties.c:170
+msgid "Update Frequency"
+msgstr "Freq��ncia d'actualitzaci�"
+
 #: applets/diskusage/properties.c:334
 msgid "Diskusage Settings"
 msgstr "Propietats de l'�s de Disc"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr "Complement Muntador d'Unitats"
 
 # Iepaa!  Ac� se'ls ha escapat un punt!
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
@@ -449,21 +493,21 @@ msgstr ""
 "Lliurat sota la llic�ncia p�blica general GNU.\n"
 "Munta i desmunta unitats."
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr " muntada"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr " no muntada"
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr "\", amb missatge:\n"
 
 # Fa refer�ncia a mount o a drivemount?
 #
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
@@ -471,7 +515,7 @@ msgstr ""
 "Ha fallat la comanda de muntatge\n"
 "\""
 
-#: applets/drivemount/drivemount.c:490
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "Treure"
 
@@ -512,13 +556,13 @@ msgid "Use automount friendly status test"
 msgstr "Usar el test amigable d'estat d'automount"
 
 #: applets/esd-manager/esdmanager_applet.c:29
-msgid "Copyright (C)1998 Red Hat Software"
-msgstr "Copyright (C) 1998 Red Hat Software"
-
-#: applets/esd-manager/esdmanager_applet.c:29
 msgid "Esound MAnager Applet"
 msgstr "Complement Gestor d'Esound"
 
+#: applets/esd-manager/esdmanager_applet.c:29
+msgid "Copyright (C)1998 Red Hat Software"
+msgstr "Copyright (C) 1998 Red Hat Software"
+
 #: applets/esd-manager/esdmanager_applet.c:31
 msgid "This does nothing useful"
 msgstr "A�� no fa res d'�til"
@@ -577,9 +621,9 @@ msgstr "Nom del teu Peix de GNOME:"
 msgid "The Animation Filename:"
 msgstr "Nom del fitxer d'animaci�:"
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1015
-#: panel/menu.c:3260 panel/panel-util.c:77 panel/panel-util.c:115
-#: panel/panel-util.c:153 panel/panel_config.c:728 panel/swallow.c:238
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr "Fullejar"
 
@@ -609,7 +653,11 @@ msgid ""
 "compilation time, and if loaded it also takes up precious panel space and "
 "memory. If anyone is found using this applet, he should be promptly sent for "
 "a psychiatric evaluation."
-msgstr "Aquest complement no t� cap utilitat.  Nom�s ocupa espai al disc i al temps de compilaci�, i carregat tamb� un preci�s espai al plaf� i a la mem�ria.  Si alg� queda corpr�s amb aquest complement, hauria de ser sotm�s a avaluaci� psiqui�trica el m�s aviat possible."
+msgstr ""
+"Aquest complement no t� cap utilitat.  Nom�s ocupa espai al disc i al temps "
+"de compilaci�, i carregat tamb� un preci�s espai al plaf� i a la mem�ria.  "
+"Si alg� queda corpr�s amb aquest complement, hauria de ser sotm�s a "
+"avaluaci� psiqui�trica el m�s aviat possible."
 
 #: applets/fvwm-pager/fvwm-pager.c:154
 msgid "Fvwm Pager Applet"
@@ -628,7 +676,7 @@ msgstr "Escriptori %d"
 msgid "About\t"
 msgstr "A prop�sit de\t"
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr "Propietats"
 
@@ -656,7 +704,7 @@ msgstr "Propietats del Paginador Fvwm"
 #. This format string is used, to display the actual day,
 #. when showing a vertical panel.  For an explanation of
 #. this format string type 'man strftime'.
-#: applets/gen_util/clock.c:114
+#: applets/gen_util/clock.c:126
 msgid ""
 "%a\n"
 "%b %d"
@@ -666,11 +714,11 @@ msgstr ""
 
 #. This format string is used, to display the actual day,
 #. when showing a horizontal panel.
-#: applets/gen_util/clock.c:119
+#: applets/gen_util/clock.c:131
 msgid "%a %b %d"
 msgstr "%d, %b de %a"
 
-#: applets/gen_util/clock.c:134
+#: applets/gen_util/clock.c:154
 msgid ""
 "%I:%M\n"
 "%p"
@@ -678,87 +726,100 @@ msgstr ""
 "%I:%M\n"
 "%p"
 
-#: applets/gen_util/clock.c:137
+#: applets/gen_util/clock.c:157
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. This format string is used, to display the actual time in
 #. 24 hour format.
-#: applets/gen_util/clock.c:143 applets/mini-commander/src/message.c:104
+#: applets/gen_util/clock.c:163 applets/mini-commander/src/message.c:104
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: applets/gen_util/clock.c:354
+#: applets/gen_util/clock.c:405
 msgid "Clock properties"
 msgstr "Propietats del Rellotge"
 
-#: applets/gen_util/clock.c:358
+#: applets/gen_util/clock.c:409
 msgid "Time Format"
 msgstr "Format de l'hora"
 
-#: applets/gen_util/clock.c:370
+#: applets/gen_util/clock.c:421
 msgid "12 hour"
 msgstr "12 hores"
 
-#: applets/gen_util/clock.c:379
+#: applets/gen_util/clock.c:430
 msgid "24 hour"
 msgstr "24 hores"
 
 #. show date check box
-#: applets/gen_util/clock.c:410 applets/mini-commander/src/preferences.c:459
+#: applets/gen_util/clock.c:465 applets/mini-commander/src/preferences.c:459
 msgid "Show date"
 msgstr "Mostrar la data"
 
-#: applets/gen_util/mailcheck.c:249
+#: applets/gen_util/clock.c:479
+#, fuzzy
+msgid "Unix time"
+msgstr "Preguntar el seg�ent cop"
+
+#: applets/gen_util/mailcheck.c:267
 msgid "You have new mail."
 msgstr "Tens correu nou."
 
-#: applets/gen_util/mailcheck.c:251
+#: applets/gen_util/mailcheck.c:269
 msgid "You have mail."
 msgstr "Tens correu."
 
-#: applets/gen_util/mailcheck.c:253
+#: applets/gen_util/mailcheck.c:271
 msgid "No mail."
 msgstr "No tens correu."
 
-#: applets/gen_util/mailcheck.c:511
+#: applets/gen_util/mailcheck.c:557 applets/gen_util/mailcheck.c:578
 msgid "Execute"
 msgstr "Executar"
 
-#: applets/gen_util/mailcheck.c:523
+#: applets/gen_util/mailcheck.c:569
 msgid "before each update"
 msgstr "abans de cada actualitzaci�"
 
-#: applets/gen_util/mailcheck.c:531
+#: applets/gen_util/mailcheck.c:591
+msgid "when clicked."
+msgstr ""
+
+#: applets/gen_util/mailcheck.c:600
 msgid "Check for mail every"
 msgstr "Mirar si hi ha correu cada"
 
 # Uuuuffff!
-#: applets/gen_util/mailcheck.c:544
+#: applets/gen_util/mailcheck.c:613
 msgid "s"
 msgstr "s"
 
-#: applets/gen_util/mailcheck.c:552
+#: applets/gen_util/mailcheck.c:621
 msgid "Select animation"
 msgstr "Seleccioneu una animaci�"
 
-#: applets/gen_util/mailcheck.c:580
+#: applets/gen_util/mailcheck.c:649
 msgid "Mail check properties"
 msgstr "Propietats del Comprovador de correu"
 
-#: applets/gen_util/mailcheck.c:585
+#: applets/gen_util/mailcheck.c:654
 msgid "Mail check"
 msgstr "Comprovador de Correu"
 
-#: applets/gen_util/mailcheck.c:631
+#: applets/gen_util/mailcheck.c:704
 msgid "Mail check Applet"
 msgstr "Complement Comprovador de Correu"
 
-#: applets/gen_util/mailcheck.c:634
+#: applets/gen_util/mailcheck.c:705
+msgid "(c) 1998 the Free Software Foundation"
+msgstr "(c) 1998 Free Software Foundation"
+
+#: applets/gen_util/mailcheck.c:707
 msgid "Mail check notifies you when new mail is on your mailbox"
 msgstr "El comprovador de correu vos avisa quan hi ha correu nou a la b�stia"
 
-#: applets/gen_util/mailcheck.c:693
+#: applets/gen_util/mailcheck.c:772
 msgid "Text only"
 msgstr "Nom�s text"
 
@@ -778,132 +839,185 @@ msgstr "Comanda d'impressi�:"
 msgid "Printer"
 msgstr "Impressora"
 
-#: applets/gkb/gkb.c:177
+#: applets/gkb/gkb.c:187
 msgid "GKB settings"
 msgstr "Propietats de GKB"
 
-#: applets/gkb/gkb.c:190
+#: applets/gkb/gkb.c:200
 msgid "Flag One"
 msgstr "Bandera u"
 
-#: applets/gkb/gkb.c:223
+#: applets/gkb/gkb.c:233
 msgid "Flag Two"
 msgstr "Bandera dos"
 
-#: applets/gkb/gkb.c:252
+#: applets/gkb/gkb.c:262
 msgid "Program"
 msgstr "Programa"
 
-#: applets/gkb/gkb.c:262
+#: applets/gkb/gkb.c:272
 msgid "Xkb"
 msgstr "Xkb"
 
-#: applets/gkb/gkb.c:266
+#: applets/gkb/gkb.c:276
 msgid "Xmodmap"
 msgstr "Xmodmap"
 
-#: applets/gkb/gkb.c:277 panel/menu.c:1672 panel/menu.c:1732 panel/menu.c:2935
-#: panel/menu.c:3273
+#: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr "Men�"
 
-#: applets/gkb/gkb.c:413
-msgid "The GNOME KB Applet"
+#: applets/gkb/gkb.c:426
+#, fuzzy
+msgid "The GNOME KeyBoard Applet"
 msgstr "Complement Teclat de GNOME"
 
-#: applets/gkb/gkb.c:414
-msgid "1.0pre1"
-msgstr "1.0pre1"
+#: applets/gkb/gkb.c:427
+#, fuzzy
+msgid "1.0.1"
+msgstr "1.0"
 
-#: applets/gkb/gkb.c:415
-msgid "(C) 1998 LSC - Linux Supporting Center"
+#: applets/gkb/gkb.c:428
+#, fuzzy
+msgid "(C) 1998-99 LSC - Linux Supporting Center"
 msgstr "(C) 1998 LSC - Linux Supporting Center"
 
-#: applets/gkb/gkb.c:417
+#: applets/gkb/gkb.c:430
+#, fuzzy
 msgid ""
-"This applet used to switch between keyboard maps. No more. It uses "
-"setxkbmap, or xmodmap. The main site of this app moved tempolary to URL "
+"This applet switches between keyboard maps. Not more. It uses setxkbmap, or "
+"xmodmap. The main site of this app moved temporarily to URL "
 "http://lsc.kva.hu/gkb.Mail me your flag, please (60x40 size),I will put it "
-"to CVS.So long, and thanks for all the fish."
-msgstr "Aquest complement solia canviar taules de teclat.  Mai m�s.  Ara usa setxkbmap o xmodmap.  El lloc principal d'aquesta aplicai� s'ha traslladat temporalment a la URL http://lsc.kva.hu/gkb.  Envieu-me la vostra bandera, per favor (tamany 60x40), i la posar� al CVS.  Fins prompte, i gr�cies per tots els peixos."
+"to CVS.So long, and thanks for all the fish.\n"
+"Thanks for Balazs Nagy (Kevin)<julian7@kva.hu> for minor help."
+msgstr ""
+"Aquest complement solia canviar taules de teclat.  Mai m�s.  Ara usa "
+"setxkbmap o xmodmap.  El lloc principal d'aquesta aplicai� s'ha traslladat "
+"temporalment a la URL http://lsc.kva.hu/gkb.  Envieu-me la vostra bandera, "
+"per favor (tamany 60x40), i la posar� al CVS.  Fins prompte, i gr�cies per "
+"tots els peixos."
 
-#: applets/gkb/gkb.c:426
+#: applets/gkb/gkb.c:441
 msgid "gkb.xpm"
 msgstr "gkb.xpm"
 
-#: applets/gnome-pager/gnomepager_applet.c:106
-msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
-msgstr "Copyright (C) 1998, 1999 Red Hat Software, Free Software Foundation"
-
-#: applets/gnome-pager/gnomepager_applet.c:106
-#: applets/icewm-pager/wmpager_applet.c:218
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr "Complement Paginador de l'Escriptori"
 
+#: applets/gnome-pager/gnomepager_applet.c:130
+msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
+msgstr "Copyright (C) 1998, 1999 Red Hat Software, Free Software Foundation"
+
 # Hehe, fa un temps llegia a una revista anglesa un discussi� increible sobre
 # unitats de CD �XA compliant� i �XA compatible�, que pel que es veu no �s
 # el mateix...  Per�, tant se val!
-#: applets/gnome-pager/gnomepager_applet.c:108
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr "Paginador per gestors de finestres compatibles amb GNOME"
 
-#: applets/gnome-pager/gnomepager_applet.c:332
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr "Propietats del Paginador de GNOME"
 
-#: applets/gnome-pager/gnomepager_applet.c:336
-#: applets/gticker/properties.c:399 applets/slashapp/properties.c:422
-msgid "Display"
-msgstr "Pantalla"
-
-#: applets/gnome-pager/gnomepager_applet.c:337
-msgid "Show all tasks on all desktops"
-msgstr "Mostrar totes les tasques de tots els escriptoris"
-
-#: applets/gnome-pager/gnomepager_applet.c:345
-msgid "Show tasks"
-msgstr "Mostrar tasques"
+#: applets/gnome-pager/gnomepager_applet.c:220
+#, fuzzy
+msgid "Pager"
+msgstr "Imatge"
 
-#: applets/gnome-pager/gnomepager_applet.c:353
+#: applets/gnome-pager/gnomepager_applet.c:222
 msgid "Show pager"
 msgstr "Mostrar paginador"
 
-#: applets/gnome-pager/gnomepager_applet.c:361
+#: applets/gnome-pager/gnomepager_applet.c:229
 msgid "Use small pagers"
 msgstr "Usar paginadors menuts"
 
-#: applets/gnome-pager/gnomepager_applet.c:369
-msgid "Show icons in tasks"
-msgstr "Mostrar icones a les tasques"
+# Em sembla que l'original tampoc no est� b�...
+#: applets/gnome-pager/gnomepager_applet.c:241
+#, fuzzy
+msgid "Rows of pagers"
+msgstr "Nombre de files dels paginadors"
+
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
+msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:377
+#: applets/gnome-pager/gnomepager_applet.c:261
 msgid "Show task list button"
 msgstr "Mostrar bot� llista de tasques"
 
-#: applets/gnome-pager/gnomepager_applet.c:392
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
+msgstr "Mostrar tasques"
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "Mostrar ... botons"
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Mostrar tasques"
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+#, fuzzy
+msgid "Show normal tasks only"
+msgstr "Mostrar totes les tasques de tots els escriptoris"
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+#, fuzzy
+msgid "Show minimized tasks only"
+msgstr "Mostrar icones a les tasques"
+
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr "Mostrar totes les tasques de tots els escriptoris"
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+#, fuzzy
+msgid "Show minimized tasks on all desktops"
+msgstr "Mostrar totes les tasques de tots els escriptoris"
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+#, fuzzy
+msgid "Geometry"
+msgstr "Geometria de la finestra"
+
+#: applets/gnome-pager/gnomepager_applet.c:343
+msgid "Tasklist always maximum size"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr "Ampl�ria m�xima de la llista de tasques horitzontal"
 
-#: applets/gnome-pager/gnomepager_applet.c:405
+#: applets/gnome-pager/gnomepager_applet.c:368
+#, fuzzy
+msgid "Maximum width of vertical task list"
+msgstr "Ampl�ria m�xima de la llista de tasques horitzontal"
+
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr "Nombre de files horitzontals de tasques"
 
-#: applets/gnome-pager/gnomepager_applet.c:418
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr "Nombre de columnes verticals de tasques"
 
-# Em sembla que l'original tampoc no est� b�...
-#: applets/gnome-pager/gnomepager_applet.c:431
-#, fuzzy
-msgid "Number rows of pagers"
-msgstr "Nombre de files dels paginadors"
-
-#: applets/gnome-pager/gnomepager_applet.c:1380
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr "Error del Paginador de GNOME"
 
 # WMaker tamb�!
-#: applets/gnome-pager/gnomepager_applet.c:1381
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -917,197 +1031,36 @@ msgstr ""
 "Enlightenment (DR-0.15)\n"
 "I aleshores executeu aquest complement altra volta.\n"
 
+#. XXX: a hackish way to bind events on these buttons so that
+#. we will recieve the right click and such events over them to
+#. display menus and allow dragging over them
+#: applets/gnome-pager/gnomepager_applet.c:1464
+msgid "?"
+msgstr ""
+
 # El paginador? La finestra?
-#: applets/gnome-pager/gnomepager_applet.c:1828
+#: applets/gnome-pager/gnomepager_applet.c:1953
 #, fuzzy
 msgid "Sticky"
 msgstr "Apegat"
 
-#: applets/gnome-pager/gnomepager_applet.c:2429
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr "Mostrar / Amagar"
 
-#: applets/gnome-pager/gnomepager_applet.c:2441
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr "Enrotllar / Desenrotllar"
 
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
+msgid "Close"
+msgstr "Tancar"
+
 # Uack!
-#: applets/gnome-pager/gnomepager_applet.c:2465
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr "Rebentar"
 
-#: applets/gticker/gticker.c:53
-msgid "Loading headlines..."
-msgstr "Carregant titulars..."
-
-#: applets/gticker/gticker.c:72
-msgid "Show Article Listing"
-msgstr "Mostrar llistat d'articles"
-
-#: applets/gticker/gticker.c:77
-msgid "Refresh Articles"
-msgstr "Actualitzar articles"
-
-#: applets/gticker/gticker.c:233 applets/slashapp/slashapp.c:566
-msgid "Justin Maurer <justin@openprojects.net>"
-msgstr "Justin Maurer <justin@openprojects.net>"
-
-#: applets/gticker/gticker.c:236 applets/jbc/jbc.c:72
-#: applets/slashapp/slashapp.c:573
-msgid "(C) 1998"
-msgstr "(C) 1998"
-
-#: applets/gticker/gticker.c:236
-msgid "GTicker"
-msgstr "GTicker"
-
-#: applets/gticker/gticker.c:237
-msgid "Ticker for the GNOME Project\n"
-msgstr "Marcador pel Projecte GNOME\n"
-
-#: applets/gticker/gticker.c:250
-msgid "GTicker Article List"
-msgstr "Llista d'articles de GTicker"
-
-#: applets/gticker/gticker.c:355 applets/slashapp/slashapp.c:152
-msgid "No articles"
-msgstr "No hi ha articles"
-
-#: applets/gticker/gticker.c:412 applets/slashapp/slashapp.c:255
-#: gmenu/utils.c:91
-#, c-format
-msgid "creating user directory: %s\n"
-msgstr "creant el directori d'usuari: %s\n"
-
-#: applets/gticker/gticker.c:415
-#, c-format
-msgid ""
-"unable to create user directory: \n"
-"\t\t\t\t\t    %s\n"
-msgstr ""
-"no es pot crear el directori d'usuari: \n"
-"\t\t\t\t\t    %s\n"
-
-#: applets/gticker/properties.c:184 applets/slashapp/properties.c:199
-msgid "Articles"
-msgstr "Articles"
-
-#: applets/gticker/properties.c:193 applets/slashapp/properties.c:208
-msgid "Show topic images"
-msgstr "Mostrar images del tema"
-
-#: applets/gticker/properties.c:199 applets/slashapp/properties.c:214
-msgid "Show department"
-msgstr "Mostrar secci�"
-
-#: applets/gticker/properties.c:205 applets/slashapp/properties.c:220
-msgid "Show extra information (Time, Author, Comments)"
-msgstr "Mostrar informaci� extra (data, autor, comentaris)"
-
-#: applets/gticker/properties.c:215 applets/slashapp/properties.c:230
-msgid "Delay between articles (10 = 1 sec):"
-msgstr "Retard entre articles (10 = 1s):"
-
-#: applets/gticker/properties.c:227 applets/slashapp/properties.c:244
-msgid "(These settings do not take effect until a refresh)"
-msgstr "(Aquestes propietats no tindran cap efecte fins una actualitzaci�)"
-
-#: applets/gticker/properties.c:231
-#: applets/mini-commander/src/mini-commander_applet.c:184
-#: applets/slashapp/properties.c:249
-msgid "Browser"
-msgstr "Visor"
-
-#: applets/gticker/properties.c:240 applets/slashapp/properties.c:258
-msgid "Open new window"
-msgstr "Obrir una nova finestra"
-
-#. -- not implemented yet --
-#: applets/gticker/properties.c:248
-msgid "Ticker Information (unimplemented)"
-msgstr "Informaci� del marcador (no implementat)"
-
-#. create the widget we are going to put on the applet
-#: applets/gticker/properties.c:261 applets/webcontrol/webcontrol.c:117
-msgid "Url:"
-msgstr "Url:"
-
-#: applets/gticker/properties.c:278
-msgid "Article index file:"
-msgstr "Fitxer �ndex d'articles:"
-
-#: applets/gticker/properties.c:295
-msgid "Image Server Url:"
-msgstr "URL del servidor d'imatges:"
-
-#: applets/gticker/properties.c:312
-msgid "Image path:"
-msgstr "Ruta de les imatges:"
-
-#: applets/gticker/properties.c:337 applets/slashapp/properties.c:356
-#: gnome-terminal/gnome-terminal.c:1094
-msgid "Scrolling"
-msgstr "Despla�ament"
-
-#: applets/gticker/properties.c:346 applets/slashapp/properties.c:365
-msgid "Smooth scroll"
-msgstr "Despla�ament suau"
-
-# Es refereix a fonts amb antidentat?
-#: applets/gticker/properties.c:352 applets/slashapp/properties.c:371
-#, fuzzy
-msgid "Smooth type"
-msgstr "Tipus suavitzat"
-
-#: applets/gticker/properties.c:358 applets/slashapp/properties.c:377
-msgid "Speed"
-msgstr "Velocitat"
-
-#: applets/gticker/properties.c:371 applets/slashapp/properties.c:390
-msgid "Delay when wrapping text:"
-msgstr "Retard en ajustar el text:"
-
-#: applets/gticker/properties.c:387 applets/slashapp/properties.c:408
-msgid "Scroll speed between lines (Smooth scroll):"
-msgstr "Velocitat de despla�ament entre l�nies (despl. suau):"
-
-#. FIXME: This should check to make sure icewm (or equiv) is running.
-#. Not sure if it is working though...
-#: applets/icewm-pager/wmpager_applet.c:53
-msgid ""
-"This applet requires you to run a window manager with the XA_ extensions.\n"
-msgstr ""
-"Aquest complement requereix que uses un gestor de finestres amb les "
-"extensions XA_.\n"
-
-#: applets/icewm-pager/wmpager_applet.c:219
-msgid "Copyright (C)1998 M.Watson"
-msgstr "Copyright (C) 1998 M.Watson"
-
-#: applets/icewm-pager/wmpager_applet.c:275
-msgid "Failed to retrieve workspace property."
-msgstr "No s'ha pogut obtenir una propietat de l'espai de treball."
-
-#: applets/jbc/jbc.c:67
-msgid "Jon Anhold <jon@snoopy.net>"
-msgstr "Jon Anhold <jon@snoopy.net>"
-
-#: applets/jbc/jbc.c:68
-msgid "Roger Gulbranson <rlg@qual.net>"
-msgstr "Roger Gulbranson <rlg@qual.net>"
-
-#: applets/jbc/jbc.c:71
-msgid "Jon's Binary Clock"
-msgstr "El Rellotge Binari de Jon"
-
-#: applets/jbc/jbc.c:74
-msgid ""
-"A binary clock for your panel\n"
-"http://snoopy.net/~jon/jbc/\n"
-msgstr ""
-"Un rellotge binari pel vostre plaf�\n"
-"http://snoopy.net/~jon/jbc/\n"
-
 #: applets/mini-commander/src/about.c:32
 msgid "Mini-Commander Applet"
 msgstr "Complement Mini-Comandant"
@@ -1184,13 +1137,18 @@ msgstr "%d-%b"
 msgid "orient. changed"
 msgstr "l'orientaci� ha canviat"
 
+#: applets/mini-commander/src/mini-commander_applet.c:184
+#: applets/slashapp/properties.c:249
+msgid "Browser"
+msgstr "Visor"
+
 #: applets/mini-commander/src/mini-commander_applet.c:197
-#: help-browser/window.c:201
+#: help-browser/window.c:202
 msgid "History"
 msgstr "Hist�ric"
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: help-browser/window.c:206
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "Ajuda"
 
@@ -1261,7 +1219,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:172 gnome-terminal/gnome-terminal.c:1047
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr "Colors"
 
@@ -1291,15 +1249,15 @@ msgstr "   Macro %.2d:"
 msgid "Macros"
 msgstr "Macros"
 
-#: applets/mixer/mixer.c:579
+#: applets/mixer/mixer.c:582
 msgid "Run gmix..."
 msgstr "Executar gmix..."
 
-#: applets/modemlights/modemlights.c:117
+#: applets/modemlights/modemlights.c:119
 msgid "Modem Lights Applet"
 msgstr "Complement Llums de M�dem"
 
-#: applets/modemlights/modemlights.c:120
+#: applets/modemlights/modemlights.c:122
 msgid ""
 "Released under the GNU general public license.\n"
 "A modem status indicator and dialer.Lights in order from the top or left are "
@@ -1309,7 +1267,7 @@ msgstr ""
 "Un marcador i indicador d'estat del m�dem.  Les llums en ordre des de dalt o "
 "l'esquerra s�n RX i TX"
 
-#: applets/modemlights/modemlights.c:344
+#: applets/modemlights/modemlights.c:360
 msgid ""
 "You are currently connected.\n"
 "Do you want to disconnect?"
@@ -1317,11 +1275,11 @@ msgstr ""
 "Ara esteu connectat.\n"
 "Voleu desconnectar-vos?"
 
-#: applets/modemlights/modemlights.c:355
+#: applets/modemlights/modemlights.c:371
 msgid "Do you want to connect?"
 msgstr "Voleu connectar-vos?"
 
-#: applets/modemlights/modemlights.c:374
+#: applets/modemlights/modemlights.c:390
 msgid "not connected"
 msgstr "no connectat"
 
@@ -1374,21 +1332,21 @@ msgstr "C�rrega d'UPC"
 msgid "Load Graph"
 msgstr "Gr�fic de c�rrega"
 
-#: applets/multiload/load-graph.c:160
-msgid "Height:"
-msgstr "Altura:"
-
-#: applets/multiload/load-graph.c:160
+#: applets/multiload/load-graph.c:180
 msgid "Speed:"
 msgstr "Velocitat:"
 
-#: applets/multiload/load-graph.c:160
+#: applets/multiload/load-graph.c:180
 msgid "Width:"
 msgstr "Ampl�ria:"
 
+#: applets/multiload/load-graph.c:180
+msgid "Height:"
+msgstr "Altura:"
+
 #: applets/multiload/main.c:27
-msgid "Idle"
-msgstr "Oci�s"
+msgid "User"
+msgstr "Usuari"
 
 #: applets/multiload/main.c:27
 #, fuzzy
@@ -1400,8 +1358,16 @@ msgid "System"
 msgstr "Sistema"
 
 #: applets/multiload/main.c:27
-msgid "User"
-msgstr "Usuari"
+msgid "Idle"
+msgstr "Oci�s"
+
+#: applets/multiload/main.c:31
+msgid "Other"
+msgstr "Altra"
+
+#: applets/multiload/main.c:31
+msgid "Shared"
+msgstr "Compartida"
 
 #: applets/multiload/main.c:31
 #, fuzzy
@@ -1412,14 +1378,6 @@ msgstr "Buffers"
 msgid "Free"
 msgstr "Lliure"
 
-#: applets/multiload/main.c:31
-msgid "Other"
-msgstr "Altra"
-
-#: applets/multiload/main.c:31
-msgid "Shared"
-msgstr "Compartida"
-
 #: applets/multiload/main.c:35
 msgid "Used"
 msgstr "Usada"
@@ -1484,11 +1442,78 @@ msgstr "Propietats de la C�rrega de Xarxa"
 msgid "Device"
 msgstr "Dispositiu"
 
+#: applets/slashapp/properties.c:199
+msgid "Articles"
+msgstr "Articles"
+
+#: applets/slashapp/properties.c:208
+msgid "Show topic images"
+msgstr "Mostrar images del tema"
+
+#: applets/slashapp/properties.c:214
+msgid "Show department"
+msgstr "Mostrar secci�"
+
+#: applets/slashapp/properties.c:220
+msgid "Show extra information (Time, Author, Comments)"
+msgstr "Mostrar informaci� extra (data, autor, comentaris)"
+
+#: applets/slashapp/properties.c:230
+msgid "Delay between articles (10 = 1 sec):"
+msgstr "Retard entre articles (10 = 1s):"
+
+#: applets/slashapp/properties.c:244
+msgid "(These settings do not take effect until a refresh)"
+msgstr "(Aquestes propietats no tindran cap efecte fins una actualitzaci�)"
+
+#: applets/slashapp/properties.c:258
+msgid "Open new window"
+msgstr "Obrir una nova finestra"
+
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
+msgid "Scrolling"
+msgstr "Despla�ament"
+
+#: applets/slashapp/properties.c:365
+msgid "Smooth scroll"
+msgstr "Despla�ament suau"
+
+# Es refereix a fonts amb antidentat?
+#: applets/slashapp/properties.c:371
+#, fuzzy
+msgid "Smooth type"
+msgstr "Tipus suavitzat"
+
+#: applets/slashapp/properties.c:377
+msgid "Speed"
+msgstr "Velocitat"
+
+#: applets/slashapp/properties.c:390
+msgid "Delay when wrapping text:"
+msgstr "Retard en ajustar el text:"
+
+#: applets/slashapp/properties.c:408
+msgid "Scroll speed between lines (Smooth scroll):"
+msgstr "Velocitat de despla�ament entre l�nies (despl. suau):"
+
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr "Pantalla"
+
+#: applets/slashapp/slashapp.c:152
+msgid "No articles"
+msgstr "No hi ha articles"
+
 #: applets/slashapp/slashapp.c:169
 msgid "Slashapp article list"
 msgstr "Llista d'articles Slashapp"
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
+#, c-format
+msgid "creating user directory: %s\n"
+msgstr "creant el directori d'usuari: %s\n"
+
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr "no es pot crear el directori d'usuari: %s\n"
@@ -1497,6 +1522,10 @@ msgstr "no es pot crear el directori d'usuari: %s\n"
 msgid "No articles found"
 msgstr "No s'ha trobat cap article"
 
+#: applets/slashapp/slashapp.c:566
+msgid "Justin Maurer <justin@openprojects.net>"
+msgstr "Justin Maurer <justin@openprojects.net>"
+
 #: applets/slashapp/slashapp.c:567
 msgid "Craig Small <csmall@eye-net.com.au>"
 msgstr "Craig Small <csmall@eye-net.com.au>"
@@ -1513,6 +1542,10 @@ msgstr "Frederic Devernay <devernay@istar.fr>"
 msgid "SlashApp"
 msgstr "SlashApp"
 
+#: applets/slashapp/slashapp.c:573
+msgid "(C) 1998"
+msgstr "(C) 1998"
+
 #: applets/slashapp/slashapp.c:575
 msgid "A ticker to display Slashdot headlines\n"
 msgstr "Un marcador per mostrar els titulars d'Slashdot\n"
@@ -1542,6 +1575,11 @@ msgstr ""
 "interf�cie -remote.  Esperem que altres navegadors ser�n suportats m�s "
 "endavant."
 
+#. create the widget we are going to put on the applet
+#: applets/webcontrol/webcontrol.c:117
+msgid "Url:"
+msgstr "Url:"
+
 # Esborrar / buidar
 #: applets/webcontrol/webcontrol.c:120
 #, fuzzy
@@ -1568,249 +1606,124 @@ msgstr "Mostrar l'opci� \"nova finestra\""
 msgid "Look"
 msgstr "Mirar"
 
-#: gemvt/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: l'opci� �%s� �s amb�gua\n"
-
-#: gemvt/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: l'opci� �--%s� no admet arguments\n"
-
-#: gemvt/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: l'opci� �%c%s� no admet arguments\n"
-
-#: gemvt/getopt.c:715 gemvt/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: l'opci� �%s� necessita un argument\n"
-
-#. --option
-#: gemvt/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: no es reconeix l'opci� �--%s�\n"
-
-#. +option or -option
-#: gemvt/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: no es reconeix l'opci� �%c%s�\n"
-
-#. 1003.2 specifies the format of this message.
-#: gemvt/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: l'opci� no �s permesa -- %c\n"
-
-#: gemvt/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: l'opci� no �s v�lida -- %c\n"
-
-#. 1003.2 specifies the format of this message.
-#: gemvt/getopt.c:807 gemvt/getopt.c:937
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: l'opci� necessita un argument -- %c\n"
-
-#: gemvt/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: l'opci� �-W %s� �s amb�gua\n"
-
-#: gemvt/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: l'opci� �-W %s� no admet arguments\n"
-
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr "Submen�:"
-
-#: gmenu/desktop.c:194 gmenu/order.c:63
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr "No s'ha pogut crear el fitxer: %s\n"
-
-#: gmenu/desktop.c:213 gmenu/order.c:82
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr "No s'ha pogut eliminar el fitxer .order: %s\n"
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr "El fitxer existeix."
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr "No s'ha pogut crear el fitxer."
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-"No podeu afegir una entrada a aqueix submen�!\n"
-"No teniu els permissos adequats."
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr "Nou submen�"
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr "Crear submen�:"
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr "Primer heu de seleccionar quelcom."
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr "No es pot esborrar un submen� del nivell superior."
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-"No podeu esborrar aqueix fitxer.\n"
-"No teniu els permissos nadequats."
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr "Esborrar aquest �tem del men�?"
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
-msgstr "Esborrar el submen� buit?"
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr "Esteu segur de voler esborrar aquest submen� i els seus continguts?"
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-"Aquest canvi provoca un conflicte amb un �tem de men� existent.\n"
-"Dos �tems de men� a un submen� no poden tenir el mateix nom."
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-"No podeu moure aqueix fitxer all�.\n"
-"No teniu els pernissos adequats"
+#: gmenu/desktop.c:80
+msgid " Folder"
+msgstr " Carpeta"
 
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr "Guardar"
 
-#: gmenu/edit.c:231
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr "Revertir"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr "Nou"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
+msgstr "Men�s de l'usuari"
 
-#: gmenu/gmenu.c:52
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr "Men�s del sistema"
+
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr "_Nou submen�..."
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr "Crea un nou submen�"
 
 # Qu� passa si accentue la i??
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr "Nou _item..."
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr "Crea un nou �tem de men�"
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr "_Esborrar..."
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr "_Ordenar submen�"
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr "Ordenar submen� _recursivament"
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr "_Fitxer"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: gmenu/gmenu.c:100
-msgid "Create a new item"
-msgstr "Crea un nou �tem"
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr "Nou submen�"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr "Nou �tem"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:102
+msgid "Create a new item"
+msgstr "Crea un nou �tem"
+
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr "Esborrar"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr "Esborra l'element seleccionat del men�"
 
-#: gmenu/gmenu.c:107
-msgid "Move selected menu up"
-msgstr "Mou el men� seleccionat cap amunt"
-
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr "Moure amunt"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:110 gmenu/main.c:140
+msgid "Move selected menu up"
+msgstr "Mou el men� seleccionat cap amunt"
+
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr "Moure avall"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr "Mou el men� seleccionat cap avall"
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr "Editar les propietats de l'element seleccionat del men�"
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr "Ordenar submen�"
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr "Ordena el submen� seleccionat"
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+#, fuzzy
+msgid "Sort _Recursive"
+msgstr "Ordenar submen� _recursivament"
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr "Editor de Men�s de GNOME"
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
@@ -1818,70 +1731,111 @@ msgstr ""
 "Lliurat sota els termes de la Llic�ncia P�blica GNU.\n"
 "Editor de Men�s de GNOME."
 
-#: gmenu/order.c:126 gmenu/order.c:140
-msgid " Folder"
-msgstr " Carpeta"
-
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr "Cal que l'�tem del men� tinga nom"
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr "L'entrada de men� ha de tenir nom de fitxer"
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr "Voleu guardar els canvis?"
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr "Aquest canvi provoca un conflicte amb un �tem de men� existent"
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr "Voleu sobreescriure l'entrada de men� existent?"
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+"Aquest canvi provoca un conflicte amb un �tem de men� existent.\n"
+"Dos �tems de men� a un submen� no poden tenir el mateix nom."
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr "Un moment, s'estan llegint els men�s..."
 
-#: gmenu/tree.c:418
-msgid "GNOME"
-msgstr "GNOME"
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "Men� de l'usuari"
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr "Arrel dels men�s de l'usuari"
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr "Men� del sistema"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr "Arrel dels men�s del sistema"
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "Men� de l'usuari"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
+msgstr "No es pot esborrar un submen� del nivell superior."
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
-msgstr "Arrel dels men�s de l'usuari"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr "Esborrar aquest �tem del men�?"
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr "Esborrar el submen� buit?"
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr "Esteu segur de voler esborrar aquest submen� i els seus continguts?"
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+"No podeu afegir una entrada a aqueix submen�!\n"
+"No teniu els permissos adequats."
+
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+#, fuzzy
+msgid "New Folder"
+msgstr " Carpeta"
+
+#: gmenu/treenew.c:63
+#, fuzzy
+msgid "Failed to create directory"
+msgstr "No s'ha pogut crear el fitxer."
 
-#: gnome-terminal/gnome-terminal.c:138
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr " muntada"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr "Terminal GNOME"
 
-#: gnome-terminal/gnome-terminal.c:141
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr "L'emulador GNOME de terminal."
 
-#: gnome-terminal/gnome-terminal.c:420 gnome-terminal/gnome-terminal.c:926
-#: gnome-terminal/gnome-terminal.c:936
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr "Per defecte"
 
-#: gnome-terminal/gnome-terminal.c:591
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
@@ -1891,308 +1845,351 @@ msgstr ""
 "reconfigurar-la la per que s'adeq�e als par�metres\n"
 "per defecte de la nova classe?"
 
-#: gnome-terminal/gnome-terminal.c:749
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr "Consola Linux"
 
-#: gnome-terminal/gnome-terminal.c:750
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr "Xterm en color"
 
-#: gnome-terminal/gnome-terminal.c:751
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr "rxvt"
 
-#: gnome-terminal/gnome-terminal.c:756
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr "Blanc sobre negre"
 
-#: gnome-terminal/gnome-terminal.c:757
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr "Negre sobre blanc"
 
-#: gnome-terminal/gnome-terminal.c:758
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr "Verd sobre negre"
 
-#: gnome-terminal/gnome-terminal.c:759
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr "Negre sobre groc clar"
 
-#: gnome-terminal/gnome-terminal.c:760
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr "Colors personalitzats"
 
-#: gnome-terminal/gnome-terminal.c:765 panel/panel_config.c:309
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "Esquerra"
 
-#: gnome-terminal/gnome-terminal.c:766 panel/panel_config.c:320
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "Dreta"
 
-#: gnome-terminal/gnome-terminal.c:767
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr "Amagada"
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:890
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr "Font:"
 
-#: gnome-terminal/gnome-terminal.c:910
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr "Fullejar..."
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:918
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr "Classe del terminal"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:946
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr "Cursor intermitent"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:955
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr "Amagar barra de men�s"
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:964
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr "Silenciar el xiulet del terminal"
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:973
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr "Intercanviar Supr/Retroc�s"
 
 # Malament, segur!
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:982
+#: gnome-terminal/gnome-terminal.c:1028
 #, fuzzy
 msgid "Select-by-word characters"
 msgstr "Car�cters per seleccionar paraules"
 
-#: gnome-terminal/gnome-terminal.c:999
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr "Imatge"
 
-#. Background Pixmap checkbox
-#: gnome-terminal/gnome-terminal.c:1003
+#: gnome-terminal/gnome-terminal.c:1048
+#, fuzzy
+msgid "Background type"
+msgstr "Fons"
+
+#: gnome-terminal/gnome-terminal.c:1058
+msgid "None"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr "Pixmap de fons"
 
-#. Background pixmap filename
-#: gnome-terminal/gnome-terminal.c:1012
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr "Fitxer de pixmap:"
 
-#. Transparency
-#: gnome-terminal/gnome-terminal.c:1027
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr "Transparent"
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1036
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr "Fons transl�cid (lent)"
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1050
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr "Paleta de colors:"
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1060
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr "Color del text:"
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr "Color del fons:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1081
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr "Colors:"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1097
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "Posici� de la barra de despla�ament"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1108
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr "L�nies de despla�ament enrere"
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr "Despla�ar amb el tecleig"
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1129
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr "Despla�ar amb l'eixida"
 
-#: gnome-terminal/gnome-terminal.c:1166
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr "Selector de colors"
 
-#: gnome-terminal/gnome-terminal.c:1202 gnome-terminal/gnome-terminal.c:1212
-#: gnome-terminal/gnome-terminal.c:1219
-msgid "Creates a new terminal window"
-msgstr "Crea una nova finestra de terminal"
-
-#: gnome-terminal/gnome-terminal.c:1202 gnome-terminal/gnome-terminal.c:1212
-#: gnome-terminal/gnome-terminal.c:1219
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr "_Nou terminal"
 
-#: gnome-terminal/gnome-terminal.c:1204 gnome-terminal/gnome-terminal.c:1214
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
+msgid "Creates a new terminal window"
+msgstr "Crea una nova finestra de terminal"
+
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr "_Amagar barra de men�s"
 
-#: gnome-terminal/gnome-terminal.c:1206
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr "_Tancar terminal"
 
-#: gnome-terminal/gnome-terminal.c:1221
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "_Tancar terminal"
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr "_Mostrar barra de men�s"
 
-#: gnome-terminal/gnome-terminal.c:1233
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr "Selector de _Colors"
 
-#: gnome-terminal/gnome-terminal.c:1871
-msgid "CLASS"
-msgstr "CLASSE"
-
-#: gnome-terminal/gnome-terminal.c:1871
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr "Nom de la classe del terminal"
 
-#: gnome-terminal/gnome-terminal.c:1874
-msgid "FONT"
-msgstr "FONT"
+#: gnome-terminal/gnome-terminal.c:1988
+#, fuzzy
+msgid "TCLASS"
+msgstr "CLASSE"
 
-#: gnome-terminal/gnome-terminal.c:1874
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr "Especifica el nom de la font"
 
+#: gnome-terminal/gnome-terminal.c:1991
+msgid "FONT"
+msgstr "FONT"
+
 # �Login�??
 #
-#: gnome-terminal/gnome-terminal.c:1877
+#: gnome-terminal/gnome-terminal.c:1994
 #, fuzzy
 msgid "Do not start up shells as logins shells"
 msgstr "No llan�ar int�rprets de login"
 
-#: gnome-terminal/gnome-terminal.c:1880
+#: gnome-terminal/gnome-terminal.c:1997
 #, fuzzy
 msgid "Start up shells as logins shells"
 msgstr "Llan�ar int�rprets de login"
 
-#: gnome-terminal/gnome-terminal.c:1883 gsm/session-properties.c:256
-msgid "GEOMETRY"
-msgstr "GEOMETRIA"
-
-#: gnome-terminal/gnome-terminal.c:1883
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr "Especifica la geometria de la finestra principal"
 
-#: gnome-terminal/gnome-terminal.c:1886
-msgid "COMMAND"
-msgstr "COMANDA"
+#: gnome-terminal/gnome-terminal.c:2000
+msgid "GEOMETRY"
+msgstr "GEOMETRIA"
 
-#: gnome-terminal/gnome-terminal.c:1886
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr "Executa aquesta comanda en comptes d'un int�rpret"
 
-#: gnome-terminal/gnome-terminal.c:1889 gnome-terminal/gnome-terminal.c:1892
-msgid "COLOR"
-msgstr "COLOR"
+#: gnome-terminal/gnome-terminal.c:2003
+msgid "COMMAND"
+msgstr "COMANDA"
 
-#: gnome-terminal/gnome-terminal.c:1889
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr "Color del text"
 
-#: gnome-terminal/gnome-terminal.c:1892 panel/panel_config.c:754
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
+msgid "COLOR"
+msgstr "COLOR"
+
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr "Color de fons"
 
-#: gnome-terminal/gnome-terminal.c:1895
-msgid "UTMP"
-msgstr "UTMP"
-
-#: gnome-terminal/gnome-terminal.c:1895
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr "Actualitzar entrada a utmp"
 
-#: gnome-terminal/gnome-terminal.c:1898
+#: gnome-terminal/gnome-terminal.c:2012
+msgid "UTMP"
+msgstr "UTMP"
+
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr "No actualitzar entrada a utmp"
 
-#: gnome-terminal/gnome-terminal.c:1898
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr "NOUTMP"
 
-#: gnome-terminal/gnome-terminal.c:1901
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr "Actualitzar entrada a wtmp"
 
-#: gnome-terminal/gnome-terminal.c:1901
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr "WTMP"
 
-#: gnome-terminal/gnome-terminal.c:1904
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr "No actualitzar entrada a wtmp"
 
-#: gnome-terminal/gnome-terminal.c:1904
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr "NOWTMP"
 
-#: gnome-terminal/gnome-terminal.c:1907
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr "Establir nom de la finestra"
 
-#: gnome-terminal/gnome-terminal.c:1907
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr "T�TOL"
 
-#: gsm/main.c:45
-msgid "Enable gsm debugging"
-msgstr "Habilitar depuraci� de gsm"
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
 
-#: gsm/main.c:46
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
-msgstr "Per�ode d'espera d'enregistrament de clients en milisegons (0=indefinidament)"
+msgstr ""
+"Per�ode d'espera d'enregistrament de clients en milisegons (0=indefinidament)"
 
-#: gsm/manager.c:895
-msgid "A session shutdown is in progress."
-msgstr "Hi ha un tancat de sessi� en progr�s."
+#: gsm/main.c:60
+#, fuzzy
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+"Per�ode d'espera d'enregistrament de clients en milisegons (0=indefinidament)"
 
-#: gsm/manager.c:1027
+#: gsm/main.c:61
+#, fuzzy
+msgid "Millisecond period spent waiting for clients to die (0=forever)"
+msgstr ""
+"Per�ode d'espera d'enregistrament de clients en milisegons (0=indefinidament)"
+
+#: gsm/manager.c:374
+msgid "Wait abandoned due to conflict."
+msgstr ""
+
+#: gsm/manager.c:816
 #, c-format
-msgid ""
-"The Gnome Session Manager unexpectedly\n"
-"lost contact with program \"%s\"."
+msgid "No response to the %s command."
 msgstr ""
-"El Gestor de Sessions de GNOME ha perdut\n"
-"inesperadament el contacte amb el programa \"%s\"."
 
-#: gsm/manager.c:1032
-msgid ""
-"The Gnome Session Manager unexpectedly\n"
-"lost contact with an unnamed program."
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
 msgstr ""
-"El Gestor de Sessions de GNOME ha perdut\n"
-"inesperadament el contacte amb un programa sense nom."
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
+msgid "Respawn abandoned due to failures."
+msgstr ""
+
+#: gsm/manager.c:1513
+msgid "A session shutdown is in progress."
+msgstr "Hi ha un tancat de sessi� en progr�s."
 
 #: gsm/save-session.c:33
 msgid "Kill session"
@@ -2202,32 +2199,50 @@ msgstr "Matar sessi�"
 msgid "save-session: couldn't connect to session manager\n"
 msgstr "save-session: no es pot connectar amb el gestor de sessions\n"
 
-#: gsm/session-properties.c:97
-msgid "Gnome Session Properties"
-msgstr "Propietats de la Sessi� GNOME"
-
-#: gsm/session-properties.c:106
-msgid "Startup Programs"
-msgstr "Programes d'inici"
-
-#. label for the exec entry
-#: gsm/session-properties.c:110
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr "Programa:"
 
-#. add/remove buttons
-#: gsm/session-properties.c:137
-msgid "Add"
-msgstr "Afegir"
+#. buttons
+#: gsm/session-properties.c:158
+msgid "Try"
+msgstr ""
 
-#. Buttons
-#: gsm/session-properties.c:147 help-browser/bookmarks.c:240
-msgid "Remove"
-msgstr "Llevar"
+#: gsm/session-properties.c:164
+msgid "OK"
+msgstr ""
 
-#: gsm/session-properties.c:256
-msgid "Geometry of window"
-msgstr "Geometria de la finestra"
+#: gsm/session-properties.c:167
+#, fuzzy
+msgid "Cancel"
+msgstr "Plaf�"
+
+#: gsm/session-properties.c:258
+#, fuzzy
+msgid "Session"
+msgstr "Matar sessi�"
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+msgid "Cancel Login"
+msgstr ""
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "Propietats generals de les icones"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
 
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
@@ -2241,43 +2256,48 @@ msgstr "T�tol de la p�gina"
 msgid "Gnome Help Bookmarks"
 msgstr "Marcadors de l'Ajuda de GNOME"
 
-#: help-browser/gnome-help-browser.c:121
-msgid "X"
-msgstr "X"
+#. Buttons
+#: help-browser/bookmarks.c:240
+msgid "Remove"
+msgstr "Llevar"
 
 #: help-browser/gnome-help-browser.c:121
 msgid "X position of window"
 msgstr "Posici� X de la finestra"
 
-#: help-browser/gnome-help-browser.c:122
-msgid "Y"
-msgstr "Y"
+#: help-browser/gnome-help-browser.c:121
+msgid "X"
+msgstr "X"
 
 #: help-browser/gnome-help-browser.c:122
 msgid "Y position of window"
 msgstr "Posici� Y de la finestra"
 
-#: help-browser/gnome-help-browser.c:123
-msgid "WIDTH"
-msgstr "AMPL�RIA"
+#: help-browser/gnome-help-browser.c:122
+msgid "Y"
+msgstr "Y"
 
 #: help-browser/gnome-help-browser.c:123
 msgid "Width of window"
 msgstr "Ampl�ria de la finestra"
 
-#: help-browser/gnome-help-browser.c:124
-msgid "HEIGHT"
-msgstr "ALTURA"
+#: help-browser/gnome-help-browser.c:123
+msgid "WIDTH"
+msgstr "AMPL�RIA"
 
 #: help-browser/gnome-help-browser.c:124
 msgid "Height of window"
 msgstr "Altura de la finestra"
 
+#: help-browser/gnome-help-browser.c:124
+msgid "HEIGHT"
+msgstr "ALTURA"
+
 #: help-browser/gnome-help-browser.c:125
 msgid "Debug level"
 msgstr "Nivell de depuraci�"
 
-#: help-browser/gnome-help-browser.c:336 help-browser/window.c:689
+#: help-browser/gnome-help-browser.c:336 help-browser/window.c:690
 msgid "Gnome Help Browser"
 msgstr "Lector d'Ajuda de GNOME"
 
@@ -2343,16 +2363,16 @@ msgid "<body><h2>Error: file not found</h2></body>"
 msgstr "<body><h2>Error: no s'ha trobat el fitxer</h2></body>"
 
 #: help-browser/history.c:257
-msgid "Count"
-msgstr "Total"
+msgid "URL"
+msgstr "URL"
 
 #: help-browser/history.c:257
 msgid "Last"
 msgstr "�ltim"
 
 #: help-browser/history.c:257
-msgid "URL"
-msgstr "URL"
+msgid "Count"
+msgstr "Total"
 
 #: help-browser/history.c:270
 msgid "Gnome Help History"
@@ -2384,7 +2404,7 @@ msgstr "Jocs"
 
 #. Miscellaneous frame
 #: help-browser/toc-man.c:25 help-browser/toc2-man.c:27
-#: panel/panel_config_global.c:507 panel/panel_config_global.c:620
+#: panel/panel_config_global.c:503 panel/panel_config_global.c:632
 msgid "Miscellaneous"
 msgstr "Miscel�l�nia"
 
@@ -2500,89 +2520,90 @@ msgstr "<br><B>No s'ha trobat cap coincid�ncia</B>\n"
 
 #: help-browser/visit.c:84
 msgid "<BODY>Could not load default TOC page</BODY>"
-msgstr "<BODY>No s'ha pogut carregar la p�gina amb la Taula de Continguts</BODY>"
+msgstr ""
+"<BODY>No s'ha pogut carregar la p�gina amb la Taula de Continguts</BODY>"
 
 #: help-browser/visit.c:102
 msgid "<BODY>Unknown TOC argument</BODY>"
 msgstr "<BODY>Argument desconegut a la Taula de Continguts</BODY>"
 
-#: help-browser/window.c:128
+#: help-browser/window.c:129
 msgid "_New Window"
 msgstr "_Nova finestra"
 
-#: help-browser/window.c:129
+#: help-browser/window.c:130
 msgid "Open new browser window"
 msgstr "Obri una nova finestra del lector"
 
-#: help-browser/window.c:135
-msgid "Add bookmark"
-msgstr "Afig un nou marcador"
-
-#: help-browser/window.c:135
+#: help-browser/window.c:136
 msgid "_Add Bookmark"
 msgstr "_Afegir marcador"
 
-#: help-browser/window.c:160 help-browser/window.c:201
-msgid "Show History Window"
-msgstr "Mostra la finestra d'hist�ric"
+#: help-browser/window.c:136
+msgid "Add bookmark"
+msgstr "Afig un nou marcador"
 
-#: help-browser/window.c:160
+#: help-browser/window.c:161
 msgid "_History"
 msgstr "_Hist�ric"
 
-#: help-browser/window.c:165 help-browser/window.c:203
-msgid "Show Bookmarks Window"
-msgstr "Mostra la finestra de marcadors"
+#: help-browser/window.c:161 help-browser/window.c:202
+msgid "Show History Window"
+msgstr "Mostra la finestra d'hist�ric"
 
-#: help-browser/window.c:165
+#: help-browser/window.c:166
 msgid "_Bookmarks"
 msgstr "_Marcadors"
 
-#: help-browser/window.c:179
+#: help-browser/window.c:166 help-browser/window.c:204
+msgid "Show Bookmarks Window"
+msgstr "Mostra la finestra de marcadors"
+
+#: help-browser/window.c:180
 msgid "_Window"
 msgstr "_Finestra"
 
-#: help-browser/window.c:188
+#: help-browser/window.c:189
 msgid "Back"
 msgstr "Enrere"
 
-#: help-browser/window.c:189
+#: help-browser/window.c:190
 msgid "Go to the previous location in the history list"
 msgstr "Va a la localitzaci� pr�via a la llista-hist�ric"
 
-#: help-browser/window.c:191
+#: help-browser/window.c:192
 msgid "Forward"
 msgstr "Avant"
 
-#: help-browser/window.c:192
+#: help-browser/window.c:193
 msgid "Go to the next location in the history list"
 msgstr "Va a la localitzaci� seg�ent a la llista-hist�ric"
 
-#: help-browser/window.c:195
+#: help-browser/window.c:196
 msgid "Reload"
 msgstr "Rellegir"
 
-#: help-browser/window.c:198
+#: help-browser/window.c:199
 msgid "Index"
 msgstr "�ndex"
 
-#: help-browser/window.c:198
+#: help-browser/window.c:199
 msgid "Show Documentation Index"
 msgstr "Mostra l'�ndex de Documentaci�"
 
-#: help-browser/window.c:203
+#: help-browser/window.c:204
 msgid "BMarks"
 msgstr "Marcadors"
 
-#: help-browser/window.c:206
+#: help-browser/window.c:207
 msgid "Help on Help"
 msgstr "Ajuda sobre l'ajuda"
 
-#: help-browser/window.c:449
+#: help-browser/window.c:450
 msgid "Location: "
 msgstr "Localitzaci�:"
 
-#: help-browser/window.c:814
+#: help-browser/window.c:819
 #, c-format
 msgid ""
 "Error loading document:\n"
@@ -2593,523 +2614,542 @@ msgstr ""
 "\n"
 "%s"
 
-#: help-browser/window.c:817
+#: help-browser/window.c:822
 msgid "Ok"
 msgstr "Val"
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr "???"
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "Llevar del plaf�"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr "Moure complement"
 
-#: panel/drawer.c:117
+#: panel/drawer.c:112
 msgid "Tooltip/Name"
 msgstr "Pista/Nom"
 
-#: panel/drawer.c:121
+#: panel/drawer.c:116
 msgid "Icon"
 msgstr "Icona"
 
-#: panel/drawer.c:125
+#: panel/drawer.c:120
 msgid "Applet appearance"
 msgstr "Aparen�a del complement"
 
-#: panel/drawer.c:132
+#: panel/drawer.c:127
 msgid "Drawer handle"
 msgstr "Ansa del calaix"
 
 #. we store this in w for later use!, so don't use w as temp from now
 #. on
-#: panel/drawer.c:136
+#: panel/drawer.c:132
 msgid "Enable hidebutton"
 msgstr "Habilitar bot� d'amagat"
 
-#: panel/drawer.c:146
+#: panel/drawer.c:141
 msgid "Enable hidebutton arrow"
 msgstr "Habilitar fletxa del bot� d'amagat"
 
-#: panel/drawer.c:166 panel/drawer.c:244
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "Calaix"
 
-#: panel/launcher.c:40
+#: panel/launcher.c:41
 msgid "This launch icon does not specify a program to run"
 msgstr "Aquesta icona no especifica cap programa per executar"
 
-#: panel/launcher.c:129
+#: panel/launcher.c:171
 msgid "App"
 msgstr "Aplicaci�"
 
-#: panel/launcher.c:215
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "Propietats del Llan�ador"
 
-#: panel/launcher.c:301
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr "Crear complement llan�ador"
 
-#: panel/logout.c:31 panel/menu.c:2073 panel/menu.c:2378
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "Eixir"
 
-#: panel/logout.c:33
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr "Eixir de GNOME"
 
-#: panel/menu.c:538
+#: panel/main.c:121
+msgid ""
+"I've detected a panel already running.\n"
+"Start another panel as well?\n"
+"(The new panel will not be restarted.)"
+msgstr ""
+
+#: panel/menu.c:539
 msgid "The GNOME Panel"
 msgstr "El Plaf� GNOME"
 
-#: panel/menu.c:541
+#: panel/menu.c:542
 msgid ""
 "This program is responsible for launching other applications, embedding "
 "small applets within itself, world peace, and random X crashes."
-msgstr "Aquest programa s'encarrega de llan�ar altres aplicacions, incorporar complements menuts a ell mateix, la pau al m�n i alguna petada de les X."
+msgstr ""
+"Aquest programa s'encarrega de llan�ar altres aplicacions, incorporar "
+"complements menuts a ell mateix, la pau al m�n i alguna petada de les X."
 
-#: panel/menu.c:564 panel/menu.c:1307
+#: panel/menu.c:565 panel/menu.c:1314
 msgid "Can't load entry"
 msgstr "No es pot carregar l'entrada"
 
-#: panel/menu.c:750 panel/menu.c:784
+#: panel/menu.c:755 panel/menu.c:789
 msgid "Desktop entry properties"
 msgstr "Propietats de l'entrada d'escriptori"
 
-#: panel/menu.c:850
+#: panel/menu.c:855
 msgid "Add this launcher to panel"
 msgstr "Afegir aquest llan�ador al plaf�"
 
-#: panel/menu.c:857 panel/menu.c:883
+#: panel/menu.c:862 panel/menu.c:888
 msgid "Add this to personal menu"
 msgstr "Afegir a�� al men� personal"
 
-#: panel/menu.c:868
+#: panel/menu.c:873
 msgid "Add this as drawer to panel"
 msgstr "Afegir a�� com a calaix al plaf�"
 
-#: panel/menu.c:876
+#: panel/menu.c:881
 msgid "Add this as menu to panel"
 msgstr "Afegir a�� com a men� al plaf�"
 
-#: panel/menu.c:911
+#: panel/menu.c:916
 msgid "Properties ..."
 msgstr "Propietats ..."
 
-#: panel/menu.c:1106 panel/menu.c:1178
+#: panel/menu.c:1113 panel/menu.c:1185
 msgid "..."
 msgstr "..."
 
-#: panel/menu.c:1315
+#: panel/menu.c:1322
 msgid "Can't get goad_id from desktop entry!"
 msgstr "No es pot obtenir el goad_id de l'entrada d'escriptori!"
 
-#: panel/menu.c:1556
+#: panel/menu.c:1607
 msgid "Can't get goad_id for applet, ignoring it"
 msgstr "No es pot obtenir el goad_id pel complement; es descarta"
 
-#: panel/menu.c:1812
+#: panel/menu.c:1769
+msgid " (empty)"
+msgstr ""
+
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr "Complements"
 
-#: panel/menu.c:1939 panel/panel_config.c:870
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr "Plaf� a un costat"
 
-#: panel/menu.c:1946 panel/panel_config.c:876
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr "Plaf� a un cant�"
 
-#: panel/menu.c:1965 panel/menu.c:1969 panel/menu.c:2013 panel/menu.c:2771
-msgid "System menus"
-msgstr "Men�s del sistema"
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
+#, fuzzy
+msgid "Debian menus"
+msgstr "Men� principal"
 
-#: panel/menu.c:2022 panel/menu.c:2024 panel/menu.c:2748 panel/menu.c:2782
-#: panel/menu.c:2785
-msgid "User menus"
-msgstr "Men�s de l'usuari"
+#: panel/menu.c:2092
+#, fuzzy
+msgid "No Debian menus found!"
+msgstr "No s'ha trobat cap article"
 
-# ??? $$$???
-#: panel/menu.c:2032 panel/menu.c:2034 panel/menu.c:2714 panel/menu.c:2755
-#: panel/menu.c:2797 panel/menu.c:2807
-msgid "Red Hat menus"
-msgstr "Men�s de Red Hat"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2058
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr "Llevar aquest plaf�"
 
-#: panel/menu.c:2205
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr "Afegir complement"
 
-#: panel/menu.c:2214
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr "Afegir nou plaf�"
 
-#: panel/menu.c:2222
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr "Convertir en plaf� a un cant�"
 
-#: panel/menu.c:2230
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr "Convertir en plaf� a un costat"
 
-#: panel/menu.c:2249
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr "Afegir men� principal"
 
-#: panel/menu.c:2257
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr "Afegir calaix"
 
-#: panel/menu.c:2266
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr "Afegir bot� d'eixida"
 
-#: panel/menu.c:2275
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr "Afegir aplicaci� incorporada"
 
-#: panel/menu.c:2282
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr "Afegir nou llan�ador"
 
-#: panel/menu.c:2294
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr "Propietats d'aquest plaf�..."
 
-#: panel/menu.c:2304
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "Propietats globals..."
 
-#: panel/menu.c:2338
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr "Plaf�"
 
-#: panel/menu.c:2345
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr "Blocar pantalla"
 
-#: panel/menu.c:2366
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr "A prop�sit de GNOME..."
 
 # De veres aquesta gent parla aix�?
-#: panel/menu.c:3025
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr "No es pot obrir el directori; s'usar� el men� principal!"
 
-#: panel/menu.c:3154
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr "A un submen�"
 
-#: panel/menu.c:3166
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr "Al men� principal"
 
-#: panel/menu.c:3190
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr "Propietats del men�"
 
-#: panel/menu.c:3197
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr "Tipus del men�"
 
-#: panel/menu.c:3204 panel/menu.c:3224
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr "Men� principal"
 
-#: panel/menu.c:3215 panel/menu.c:3247
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr "Men� normal"
 
-#: panel/menu.c:3235
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr "Men� del sistema:"
 
-#: panel/menu.c:3239
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr "Men� de l'usuari:"
 
-#: panel/menu.c:3243
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+#, fuzzy
+msgid "AnotherLevel menu (if found): "
+msgstr "Men� de Red Hat (si l'hi ha):"
+
+#: panel/menu.c:3378
+#, fuzzy
+msgid "Debian menu (if found): "
 msgstr "Men� de Red Hat (si l'hi ha):"
 
-#: panel/menu.c:3257
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr "Ruta del men�"
 
 #. Position frame
-#: panel/panel_config.c:274 panel/panel_config.c:446
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "Posici�"
 
 #. Top Position
-#: panel/panel_config.c:287
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "Dalt"
 
-#: panel/panel_config.c:298
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "Baix"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:348
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr "Opcions de minimitzaci�"
 
 #. Auto-hide
-#: panel/panel_config.c:359
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr "Amagar autom�ticament"
 
 #. Hidebuttons enable
-#: panel/panel_config.c:370 panel/panel_config.c:571
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr "Habilitar botons d'amagat"
 
 #. Arrow enable
-#: panel/panel_config.c:381 panel/panel_config.c:582
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr "Habilitar fletxa als botons d'amagat"
 
 #. North East Position
-#: panel/panel_config.c:459
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr "nord-est"
 
-#: panel/panel_config.c:470
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr "sud-oest"
 
-#: panel/panel_config.c:481
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr "nord-oest"
 
-#: panel/panel_config.c:492
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr "sud-est"
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr "Orientaci�"
 
 #. Horizontal
-#: panel/panel_config.c:535
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "Horitzontal"
 
-#: panel/panel_config.c:548
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "Vertical"
 
-#. Hidebuttons frame
-#: panel/panel_config.c:559
-msgid "Hidebutton options"
-msgstr "Opcions dels botons d'amagat"
-
 #. selector frame
-#: panel/panel_config.c:679 panel/panel_config.c:889
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr "Fons"
 
 #. standard background
-#: panel/panel_config.c:689
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr "Est�ndard"
 
-#: panel/panel_config.c:697
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr "Pixmap"
 
-#: panel/panel_config.c:705
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr "Color"
 
 #. image frame
-#: panel/panel_config.c:711
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr "Fitxer d'imatge"
 
-#: panel/panel_config.c:740
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr "Escalar imatge per ajustar-la al plaf�"
 
-#: panel/panel_config.c:859
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "Propietats del Plaf�"
 
 #. Animation enable
-#: panel/panel_config_global.c:196
+#: panel/panel_config_global.c:199
 msgid "Enable animations"
 msgstr "Habilitar animacions"
 
-#. AutoHide Animation step_size scale frame
 #: panel/panel_config_global.c:204
+#, fuzzy
+msgid "Constant speed animations"
+msgstr "Habilitar animacions"
+
+#. AutoHide Animation step_size scale frame
+#: panel/panel_config_global.c:218
 msgid "Auto-hide animation speed"
 msgstr "Velocitat de l'amagat autom�tic"
 
 #. ExplicitHide Animation step_size scale frame
-#: panel/panel_config_global.c:215
+#: panel/panel_config_global.c:228
 msgid "Explicit-hide animation speed"
 msgstr "Velocitat de l'amagat expl�cit"
 
 #. DrawerHide Animation step_size scale frame
-#: panel/panel_config_global.c:226
+#: panel/panel_config_global.c:238
 msgid "Drawer animation speed"
 msgstr "Velocitat d'animaci� del calaix"
 
 #. Minimize Delay scale frame
-#: panel/panel_config_global.c:237
+#: panel/panel_config_global.c:248
 msgid "Auto-hide minimize delay (ms)"
 msgstr "Retard d'amagat autom�tic del plaf� (ms)"
 
 #. Minimized size scale frame
-#: panel/panel_config_global.c:244
+#: panel/panel_config_global.c:254
 msgid "Auto-hide minimized size (pixels)"
 msgstr "Tamany del plaf� amagat (p�xels)"
 
 #. Enable tiles frame
-#: panel/panel_config_global.c:312 panel/panel_config_global.c:340
+#: panel/panel_config_global.c:320 panel/panel_config_global.c:347
 msgid "Tiles enabled"
 msgstr "Taulells habilitats"
 
 #. Image frame
-#: panel/panel_config_global.c:350
+#: panel/panel_config_global.c:356
 msgid "Image files"
 msgstr "Fitxers d'imatge"
 
-#: panel/panel_config_global.c:363
+#: panel/panel_config_global.c:368
 msgid "Tile filename (up)"
 msgstr "Fitxer taulell (dalt)"
 
-#: panel/panel_config_global.c:367
+#: panel/panel_config_global.c:372
 msgid "Tile filename (down)"
 msgstr "Fitxer taulell (baix)"
 
 #. Minimized size scale frame
-#: panel/panel_config_global.c:374
+#: panel/panel_config_global.c:379
 msgid "Border width (tile only)"
 msgstr "Ampl�ria de la vora (sols pel taulell)"
 
 #. Minimized size scale frame
-#: panel/panel_config_global.c:382
+#: panel/panel_config_global.c:386
 msgid "Depth (displacement when pressed)"
 msgstr "Profunditat (despla�ament quan �s pres)"
 
 #. Tooltips frame
-#: panel/panel_config_global.c:405
+#: panel/panel_config_global.c:408
 msgid "Tooltips"
 msgstr "Pistes"
 
 #. Tooltips enable
-#: panel/panel_config_global.c:416
+#: panel/panel_config_global.c:418
 msgid "Tooltips enabled"
 msgstr "Pistes habilitades"
 
 #. Menu frame
-#: panel/panel_config_global.c:426
+#: panel/panel_config_global.c:427
 msgid "Menus"
 msgstr "Men�s"
 
 #. Small Icons
-#: panel/panel_config_global.c:438
+#: panel/panel_config_global.c:437
 msgid "Show small icons"
 msgstr "Mostrar icones menudes"
 
 #. Dot Buttons
-#: panel/panel_config_global.c:447
+#: panel/panel_config_global.c:446
 msgid "Show ... buttons"
 msgstr "Mostrar ... botons"
 
 #. Off Panel Popup menus
-#: panel/panel_config_global.c:456
+#: panel/panel_config_global.c:455
 msgid "Show popup menus outside of panels"
 msgstr "Mostrar men�s emergents fora dels plafons"
 
 #. Hungry Menus
-#: panel/panel_config_global.c:465
+#: panel/panel_config_global.c:464
 msgid "Keep menus in memory"
 msgstr "Mantenir els men�s en mem�ria"
 
 #. Movement frame
-#: panel/panel_config_global.c:474
+#: panel/panel_config_global.c:473
 msgid "Movement"
 msgstr "Moviment"
 
 #. Switched
-#: panel/panel_config_global.c:485
+#: panel/panel_config_global.c:483
 msgid "Switched movement"
 msgstr "Moviment discret"
 
-#: panel/panel_config_global.c:497
+#: panel/panel_config_global.c:494
 msgid "Free movement (doesn't disturb other applets)"
 msgstr "Moviment lliure (no destorba altres complements)"
 
 #. Prompt before log out
-#: panel/panel_config_global.c:518
+#: panel/panel_config_global.c:513
 msgid "Prompt before logout"
 msgstr "Preguntar abans d'eixir"
 
 #. Autoraise
-#: panel/panel_config_global.c:528
+#: panel/panel_config_global.c:522
 msgid "Raise panels on mouse-over (non GNOME compliant window managers only)"
-msgstr "Apujar plafons en posar a sobre el punter (sols gestors incompatibles amb GNOME)"
+msgstr ""
+"Apujar plafons en posar a sobre el punter (sols gestors incompatibles amb "
+"GNOME)"
 
 #. Keep on bottom
-#: panel/panel_config_global.c:538
+#: panel/panel_config_global.c:531
 msgid "Keep panel below windows (GNOME compliant window managers only)"
-msgstr "Mantenir plaf� per sota de les finestres (sols gestors compatibles amb GNOME)"
+msgstr ""
+"Mantenir plaf� per sota de les finestres (sols gestors compatibles amb GNOME)"
+
+#. Drawer/launcher auto close
+#: panel/panel_config_global.c:540
+msgid "Close drawer if a launcher inside it is pressed"
+msgstr ""
 
 #. Minimize Delay scale frame
-#: panel/panel_config_global.c:548
+#: panel/panel_config_global.c:549
 msgid "Applet padding"
 msgstr "Separaci� entre complements"
 
-#: panel/panel_config_global.c:565
+#: panel/panel_config_global.c:577
 msgid "Launcher icon"
 msgstr "Icona del llan�ador"
 
-#: panel/panel_config_global.c:566
+#: panel/panel_config_global.c:578
 msgid "Drawer icon"
 msgstr "Icona del calaix"
 
-#: panel/panel_config_global.c:567
+#: panel/panel_config_global.c:579
 msgid "Menu icon"
 msgstr "Icona del men�"
 
-#: panel/panel_config_global.c:568
+#: panel/panel_config_global.c:580
 msgid "Logout icon"
 msgstr "Icona d'eixida"
 
-#: panel/panel_config_global.c:592
+#: panel/panel_config_global.c:604
 msgid "Global panel configuration"
 msgstr "Configuraci� global dels plafons"
 
-#: panel/panel_config_global.c:600
+#: panel/panel_config_global.c:612
 msgid "Animation"
 msgstr "Animaci�"
 
-#: panel/panel_config_global.c:606
+#: panel/panel_config_global.c:618
 msgid "General icon settings"
 msgstr "Propietats generals de les icones"
 
-#: panel/session.c:712
-msgid "Really log out?"
-msgstr "De veres voleu eixir?"
-
-#: panel/session.c:729
-msgid "Ask next time"
-msgstr "Preguntar el seg�ent cop"
-
-#: panel/swallow.c:210
+#: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr "Crear complement incorporat"
 
@@ -3117,25 +3157,304 @@ msgstr "Crear complement incorporat"
 msgid "Title of application to swallow"
 msgstr "T�tol de l'aplicaci� incorporada"
 
-#: panel/swallow.c:236
+#: panel/swallow.c:235
 msgid "Command (optional)"
 msgstr "Comanda (opcional)"
 
-#: panel/swallow.c:260
+#: panel/swallow.c:258
 msgid "Height"
 msgstr "Altura"
 
-msgid "_Close"
-msgstr "_Tancar"
+#, fuzzy
+#~ msgid "Low Battery Warning"
+#~ msgstr "Baixa i carregant-se."
+
+#~ msgid "Afterstep Clock Applet"
+#~ msgstr "Complement Rellotge d'AfterStep"
+
+#~ msgid "Can't open /proc/apm; can't get data."
+#~ msgstr "No es pot obrir /proc/apm; no es pot obtenir-ne dades."
+
+#~ msgid "Something wrong with /proc/apm; can't get data."
+#~ msgstr "Quelcom d'erroni amb /proc/apm; no es pot obtenir-ne dades."
+
+#~ msgid "Can't open /dev/apm; can't get data."
+#~ msgstr "No es pot obrir /dev/apm; no es pot obtenir-ne dades."
+
+#~ msgid "There is no battery?!?"
+#~ msgstr "No hi ha bateria?!?"
+
+# El que deia Teo...  es refereix a la bateria o al nivell?
+# �s clar, la bateria no �s alta, ni el nivell es carrega,
+# aix� que tant se val!
+#~ msgid "High and charging."
+#~ msgstr "Alta i carregant-se."
+
+#~ msgid "High."
+#~ msgstr "Alta."
+
+#~ msgid "Low."
+#~ msgstr "Baixa."
+
+#~ msgid "Critical and charging."
+#~ msgstr "Cr�tica i carregant-se."
+
+#~ msgid "Critical!!"
+#~ msgstr "Cr�tica!!"
+
+#~ msgid "Charging."
+#~ msgstr "Carregant-se."
+
+#~ msgid "unknown minutes of battery."
+#~ msgstr "minuts de bateria desconeguts."
+
+#~ msgid "unknown minutes of battery (%d%%)"
+#~ msgstr "minuts de bateria desconeguts (%d%%)"
+
+#~ msgid "%d minutes of battery"
+#~ msgstr "%d minuts de bateria"
+
+#~ msgid "%d minutes of battery (%d%%)"
+#~ msgstr "%d minuts de bateria (%d%%)"
+
+#~ msgid "More than 100,000,000 minutes of battery life?!?"
+#~ msgstr "�!�La bateria t� m�s de 100.000.000 minuts de vida?!?"
+
+#~ msgid "APM Stats"
+#~ msgstr "Estat de l'APM"
+
+#~ msgid "Linux APM Driver Version:"
+#~ msgstr "Versi� del controlador APM de Linux:"
+
+#~ msgid "APM BIOS Version:"
+#~ msgstr "Versi� d'APM del BIOS:"
+
+#~ msgid "Battery Status:"
+#~ msgstr "Estat de la bateria:"
+
+#~ msgid "General Properties"
+#~ msgstr "Propietats generals"
+
+#~ msgid "Graph Interval:"
+#~ msgstr "Interval del gr�fic:"
+
+#~ msgid "Refresh Image"
+#~ msgstr "Actualitzar imatge"
+
+#~ msgid "The Bus Sign Applet"
+#~ msgstr "El complement Bus Sign"
+
+#~ msgid ""
+#~ "This applet is a total waste of time. Get back to work!\n"
+#~ "\n"
+#~ "To fill in the sign please see:\n"
+#~ "\n"
+#~ "http://people.netscape.com/mtoy/sign/index.html"
+#~ msgstr ""
+#~ "Aquest complement �s una p�rdua total de temps. Torna al treball!\n"
+#~ "\n"
+#~ "Per emplenar el senyal visita:\n"
+#~ "\n"
+#~ "http://people.netscape.com/mtoy/sign/index.html"
+
+#~ msgid "User Load"
+#~ msgstr "C�rrega d'usuari"
+
+#~ msgid "System Load"
+#~ msgstr "C�rrega de sistema"
+
+#~ msgid "CPULoad Settings"
+#~ msgstr "Propietats de C�rrega d'UPC"
+
+#~ msgid "1.0pre1"
+#~ msgstr "1.0pre1"
+
+#~ msgid "Loading headlines..."
+#~ msgstr "Carregant titulars..."
+
+#~ msgid "Show Article Listing"
+#~ msgstr "Mostrar llistat d'articles"
+
+#~ msgid "Refresh Articles"
+#~ msgstr "Actualitzar articles"
+
+#~ msgid "GTicker"
+#~ msgstr "GTicker"
+
+#~ msgid "Ticker for the GNOME Project\n"
+#~ msgstr "Marcador pel Projecte GNOME\n"
+
+#~ msgid "GTicker Article List"
+#~ msgstr "Llista d'articles de GTicker"
+
+#~ msgid ""
+#~ "unable to create user directory: \n"
+#~ "\t\t\t\t\t    %s\n"
+#~ msgstr ""
+#~ "no es pot crear el directori d'usuari: \n"
+#~ "\t\t\t\t\t    %s\n"
+
+#~ msgid "Ticker Information (unimplemented)"
+#~ msgstr "Informaci� del marcador (no implementat)"
+
+#~ msgid "Article index file:"
+#~ msgstr "Fitxer �ndex d'articles:"
+
+#~ msgid "Image Server Url:"
+#~ msgstr "URL del servidor d'imatges:"
+
+#~ msgid "Image path:"
+#~ msgstr "Ruta de les imatges:"
+
+#~ msgid ""
+#~ "This applet requires you to run a window manager with the XA_ extensions.\n"
+#~ msgstr ""
+#~ "Aquest complement requereix que uses un gestor de finestres amb les "
+#~ "extensions XA_.\n"
+
+#~ msgid "Copyright (C)1998 M.Watson"
+#~ msgstr "Copyright (C) 1998 M.Watson"
+
+#~ msgid "Failed to retrieve workspace property."
+#~ msgstr "No s'ha pogut obtenir una propietat de l'espai de treball."
+
+#~ msgid "Jon Anhold <jon@snoopy.net>"
+#~ msgstr "Jon Anhold <jon@snoopy.net>"
+
+#~ msgid "Roger Gulbranson <rlg@qual.net>"
+#~ msgstr "Roger Gulbranson <rlg@qual.net>"
+
+#~ msgid "Jon's Binary Clock"
+#~ msgstr "El Rellotge Binari de Jon"
+
+#~ msgid ""
+#~ "A binary clock for your panel\n"
+#~ "http://snoopy.net/~jon/jbc/\n"
+#~ msgstr ""
+#~ "Un rellotge binari pel vostre plaf�\n"
+#~ "http://snoopy.net/~jon/jbc/\n"
+
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: l'opci� �%s� �s amb�gua\n"
+
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: l'opci� �--%s� no admet arguments\n"
+
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: l'opci� �%c%s� no admet arguments\n"
+
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: l'opci� �%s� necessita un argument\n"
+
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: no es reconeix l'opci� �--%s�\n"
+
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: no es reconeix l'opci� �%c%s�\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: l'opci� no �s permesa -- %c\n"
+
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: l'opci� no �s v�lida -- %c\n"
+
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: l'opci� necessita un argument -- %c\n"
+
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: l'opci� �-W %s� �s amb�gua\n"
+
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: l'opci� �-W %s� no admet arguments\n"
+
+#~ msgid "Submenu: "
+#~ msgstr "Submen�:"
+
+#~ msgid "Unable to create file: %s\n"
+#~ msgstr "No s'ha pogut crear el fitxer: %s\n"
+
+#~ msgid "unable to remove .order file: %s\n"
+#~ msgstr "No s'ha pogut eliminar el fitxer .order: %s\n"
+
+#~ msgid "File exists."
+#~ msgstr "El fitxer existeix."
+
+#~ msgid "Create Submenu:"
+#~ msgstr "Crear submen�:"
+
+#~ msgid "You must select something first."
+#~ msgstr "Primer heu de seleccionar quelcom."
+
+#~ msgid ""
+#~ "You can't delete that file.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "No podeu esborrar aqueix fitxer.\n"
+#~ "No teniu els permissos nadequats."
+
+#~ msgid ""
+#~ "You are not allowed to move that item there.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "No podeu moure aqueix fitxer all�.\n"
+#~ "No teniu els pernissos adequats"
+
+#~ msgid "New"
+#~ msgstr "Nou"
+
+#~ msgid "Edit selected menu item properties"
+#~ msgstr "Editar les propietats de l'element seleccionat del men�"
+
+#~ msgid "GNOME"
+#~ msgstr "GNOME"
+
+#~ msgid "Enable gsm debugging"
+#~ msgstr "Habilitar depuraci� de gsm"
+
+#~ msgid ""
+#~ "The Gnome Session Manager unexpectedly\n"
+#~ "lost contact with program \"%s\"."
+#~ msgstr ""
+#~ "El Gestor de Sessions de GNOME ha perdut\n"
+#~ "inesperadament el contacte amb el programa \"%s\"."
+
+#~ msgid ""
+#~ "The Gnome Session Manager unexpectedly\n"
+#~ "lost contact with an unnamed program."
+#~ msgstr ""
+#~ "El Gestor de Sessions de GNOME ha perdut\n"
+#~ "inesperadament el contacte amb un programa sense nom."
+
+#~ msgid "Gnome Session Properties"
+#~ msgstr "Propietats de la Sessi� GNOME"
+
+#~ msgid "Startup Programs"
+#~ msgstr "Programes d'inici"
+
+#~ msgid "Add"
+#~ msgstr "Afegir"
+
+# ??? $$$???
+#~ msgid "Red Hat menus"
+#~ msgstr "Men�s de Red Hat"
+
+#~ msgid "Hidebutton options"
+#~ msgstr "Opcions dels botons d'amagat"
+
+#~ msgid "Really log out?"
+#~ msgstr "De veres voleu eixir?"
+
+#~ msgid "_Close"
+#~ msgstr "_Tancar"
 
-msgid "_Settings"
-msgstr "_Propietats"
+#~ msgid "_Settings"
+#~ msgstr "_Propietats"
 
-msgid "_Preferences..."
-msgstr "Pre_fer�ncies"
+#~ msgid "_Preferences..."
+#~ msgstr "Pre_fer�ncies"
 
-msgid "E_xit"
-msgstr "Ei_xir"
+#~ msgid "E_xit"
+#~ msgstr "Ei_xir"
 
-msgid "_About..."
-msgstr "_A prop�sit de..."
+#~ msgid "_About..."
+#~ msgstr "_A prop�sit de..."
diff --git a/po/cs.po b/po/cs.po
index 41e451c0..53ca6f60 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-06-11 12:07:51+0200\n"
 "From: GIS <gis@academy.cas.cz>\n"
@@ -23,127 +23,313 @@ msgstr ""
 "help-browser/history.c help-browser/toc2-man.c help-browser/toc2.c "
 "help-browser/visit.c\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "O programu..."
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr ""
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "Hodiny"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr ""
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "N�zev str�nky"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr ""
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr ""
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr ""
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr ""
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "O programu..."
+
+#: applets/battery/battery.c:837
+msgid "The GNOME Battery Monitor Applet"
+msgstr ""
+
+#: applets/battery/battery.c:838
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr ""
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr ""
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: applets/battery/properties.c:46
+#. Applet height
+#: applets/battery/properties.c:79
 #, fuzzy
-msgid "General Properties"
-msgstr "Vlastnosti spou�t��e"
+msgid "Applet Height:"
+msgstr "Aplikace"
 
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
-msgstr ""
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
+msgstr "Aplikace"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Update interval
+#: applets/battery/properties.c:102
+msgid "Update Interval (seconds):"
 msgstr ""
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
 msgstr ""
 
-#: applets/battery/properties.c:69
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
+msgstr "Aplikace"
+
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr ""
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 #, fuzzy
 msgid "Readout"
 msgstr "Obnovit"
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
+#: applets/battery/properties.c:202
+msgid "Low Battery Color:"
+msgstr ""
+
+#: applets/battery/properties.c:262
+msgid "Graph Battery Low Color:"
+msgstr ""
+
+#: applets/battery/properties.c:268
+msgid "Graph Tick Color:"
 msgstr ""
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr ""
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr ""
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr ""
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr ""
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr ""
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr ""
 
@@ -169,17 +355,6 @@ msgid ""
 "keyboard. Released under GNU General Public Licence."
 msgstr ""
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr "O programu..."
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -224,10 +399,6 @@ msgstr ""
 msgid "Clock"
 msgstr "Hodiny"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr ""
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr ""
@@ -253,96 +424,6 @@ msgstr ""
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr ""
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr ""
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr ""
@@ -359,7 +440,7 @@ msgstr ""
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr ""
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr ""
 
@@ -379,6 +460,11 @@ msgstr ""
 msgid "Backgroundcolor"
 msgstr ""
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr ""
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -392,36 +478,36 @@ msgstr ""
 msgid "Diskusage Settings"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
 msgstr ""
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 #, fuzzy
 msgid " mounted"
 msgstr "Po�et"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr ""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 #, fuzzy
 msgid "Eject"
 msgstr "Spustit"
@@ -527,9 +613,9 @@ msgstr ""
 msgid "The Animation Filename:"
 msgstr ""
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr ""
 
@@ -579,7 +665,7 @@ msgstr ""
 msgid "About\t"
 msgstr "O programu..."
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 #, fuzzy
 msgid "Properties"
 msgstr "Vlastnosti..."
@@ -763,7 +849,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 #, fuzzy
 msgid "Menu"
 msgstr "Me��tka"
@@ -793,81 +879,110 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
+#: applets/gnome-pager/gnomepager_applet.c:220
+msgid "Pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
+#: applets/gnome-pager/gnomepager_applet.c:222
+msgid "Show pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
+#: applets/gnome-pager/gnomepager_applet.c:229
+msgid "Use small pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:224
-msgid "Show pager"
+#: applets/gnome-pager/gnomepager_applet.c:241
+msgid "Rows of pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:232
-msgid "Use small pagers"
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
+#: applets/gnome-pager/gnomepager_applet.c:261
+msgid "Show task list button"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
-msgid "Show task list button"
+#: applets/gnome-pager/gnomepager_applet.c:268
+msgid "Show task list"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "Pozice"
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+msgid "Show all tasks"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+msgid "Show normal tasks only"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:313
+msgid "Show minimized tasks only"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+msgid "Show minimized tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+#, fuzzy
+msgid "Geometry"
+msgstr "V��ka okna"
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr ""
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 #, fuzzy
 msgid "Gnome Pager Error"
 msgstr "Hypertextov� prohl��e�"
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -879,27 +994,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "Zav��t"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr ""
 
@@ -988,7 +1103,7 @@ msgid "History"
 msgstr "Historie"
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "N�pov�da"
 
@@ -1057,7 +1172,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 #, fuzzy
 msgid "Colors"
 msgstr "Zav��t"
@@ -1300,7 +1415,7 @@ msgstr ""
 msgid "Open new window"
 msgstr "Otev�i nov� okno prohl��e�e"
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr ""
 
@@ -1324,6 +1439,10 @@ msgstr ""
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr ""
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr ""
+
 #: applets/slashapp/slashapp.c:152
 #, fuzzy
 msgid "No articles"
@@ -1333,12 +1452,12 @@ msgstr "��dn� nov� po�ta."
 msgid "Slashapp article list"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr ""
@@ -1430,554 +1549,576 @@ msgstr ""
 msgid "Look"
 msgstr ""
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
+#: gmenu/desktop.c:80
 #, fuzzy
-msgid "Submenu: "
-msgstr "��dn� nov� po�ta."
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr ""
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr ""
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr ""
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr ""
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr ""
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr ""
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr ""
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr ""
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr ""
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
-msgstr ""
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
+msgid " Folder"
+msgstr " M�d "
 
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr ""
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 #, fuzzy
 msgid "Revert"
 msgstr "Odstranit"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr ""
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+#, fuzzy
+msgid "User menus"
+msgstr "Me��tka"
+
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+#, fuzzy
+msgid "System menus"
+msgstr "Syst�mov� vol�n�"
 
-#: gmenu/gmenu.c:52
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr ""
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr ""
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr ""
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr ""
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 #, fuzzy
 msgid "_File"
 msgstr "Soubor"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr ""
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 #, fuzzy
 msgid "_Help"
 msgstr "N�pov�da"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr ""
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 #, fuzzy
 msgid "Move up"
 msgstr " M�d "
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr ""
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr ""
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 #, fuzzy
 msgid "Sort Submenu"
 msgstr "��dn� nov� po�ta."
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+msgid "Sort _Recursive"
+msgstr ""
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr ""
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
 msgstr ""
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr ""
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr ""
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 #, fuzzy
 msgid "Save changes?"
 msgstr "Vyrovn�vac� soubor"
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr ""
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr ""
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr ""
 
-#: gmenu/tree.c:418
-msgid "GNOME"
+#: gmenu/tree.c:410
+#, fuzzy
+msgid "User Menus"
+msgstr "Me��tka"
+
+#: gmenu/tree.c:411
+msgid "Top of user menus"
 msgstr ""
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:418
 #, fuzzy
 msgid "System Menus"
 msgstr "Syst�mov� vol�n�"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr ""
 
-#. user's menu tree
-#: gmenu/tree.c:445
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
+msgstr ""
+
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr ""
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr ""
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
 #, fuzzy
-msgid "User Menus"
-msgstr "Me��tka"
+msgid "New Folder"
+msgstr " M�d "
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
+#: gmenu/treenew.c:63
+msgid "Failed to create directory"
+msgstr ""
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr "Po�et"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
 "configuration of the new class?"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "Vlevo"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "Vpravo"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr ""
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 #, fuzzy
 msgid "Font:"
 msgstr "Po�et"
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr ""
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr ""
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr ""
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr ""
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr ""
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr ""
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 #, fuzzy
 msgid "Background type"
 msgstr "Vlastnosti..."
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 msgid "None"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr ""
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr ""
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr ""
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr ""
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 #, fuzzy
 msgid "Colors:"
 msgstr "Zav��t"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr ""
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr ""
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr ""
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+msgid "_Reset Terminal"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+msgid "TCLASS"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr ""
 
@@ -1989,24 +2130,51 @@ msgstr ""
 msgid "save-session: couldn't connect to session manager\n"
 msgstr ""
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr ""
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 #, fuzzy
 msgid "Cancel"
 msgstr "Vyrovn�vac� soubor"
 
+#: gsm/session-properties.c:258
+msgid "Session"
+msgstr ""
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr "Vyrovn�vac� soubor"
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "Vlastnosti spou�t��e"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr "Z�lo�ka"
@@ -2387,15 +2555,15 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr ""
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr ""
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr ""
 
@@ -2425,7 +2593,7 @@ msgstr ""
 msgid "Enable hidebutton arrow"
 msgstr ""
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr ""
 
@@ -2433,23 +2601,23 @@ msgstr ""
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr "Aplikace"
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "Vlastnosti spou�t��e"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr ""
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr ""
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 #, fuzzy
 msgid "Log out of GNOME"
 msgstr "O programu..."
@@ -2517,261 +2685,244 @@ msgstr ""
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 #, fuzzy
 msgid "Applets"
 msgstr "Aplikace"
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr ""
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr ""
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-#, fuzzy
-msgid "System menus"
-msgstr "Syst�mov� vol�n�"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 #, fuzzy
 msgid "Debian menus"
 msgstr "Me��tka"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 #, fuzzy
 msgid "No Debian menus found!"
 msgstr "<br><B>Nenalezeno</B>\n"
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-#, fuzzy
-msgid "User menus"
-msgstr "Me��tka"
-
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-#, fuzzy
-msgid "Red Hat menus"
-msgstr "Me��tka"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr ""
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr ""
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr ""
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr ""
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr ""
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr ""
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr ""
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr ""
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr ""
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr ""
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr ""
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr ""
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr ""
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr ""
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 #, fuzzy
 msgid "About GNOME..."
 msgstr "O programu..."
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr ""
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr ""
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 #, fuzzy
 msgid "On the main menu"
 msgstr "Me��tka"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 #, fuzzy
 msgid "Menu properties"
 msgstr "Vlastnosti hodin"
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 #, fuzzy
 msgid "Menu type"
 msgstr "Cesta k syst�mov�m manu�ln�m"
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 #, fuzzy
 msgid "Main menu"
 msgstr "Me��tka"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 #, fuzzy
 msgid "Normal menu"
 msgstr "��dn� nov� po�ta."
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 #, fuzzy
 msgid "System menu: "
 msgstr "Syst�mov� vol�n�"
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 #, fuzzy
 msgid "User menu: "
 msgstr "Me��tka"
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+msgid "AnotherLevel menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 #, fuzzy
 msgid "Menu path"
 msgstr "Cesta k syst�mov�m manu�ln�m"
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "Pozice"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "Naho�e"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "Dole"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr ""
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr ""
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr ""
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr ""
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr ""
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr ""
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr ""
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr ""
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr ""
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr ""
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr ""
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr ""
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr ""
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr ""
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr ""
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr ""
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr ""
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr ""
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr ""
 
@@ -2945,28 +3096,6 @@ msgstr "Administrace"
 msgid "General icon settings"
 msgstr "Vlastnosti spou�t��e"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr ""
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr ""
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr ""
@@ -2985,8 +3114,16 @@ msgid "Height"
 msgstr "Vpravo"
 
 #, fuzzy
-#~ msgid "Geometry of window"
-#~ msgstr "V��ka okna"
+#~ msgid "General Properties"
+#~ msgstr "Vlastnosti spou�t��e"
+
+#, fuzzy
+#~ msgid "Submenu: "
+#~ msgstr "��dn� nov� po�ta."
+
+#, fuzzy
+#~ msgid "Red Hat menus"
+#~ msgstr "Me��tka"
 
 #, fuzzy
 #~ msgid "High."
@@ -3005,10 +3142,6 @@ msgstr "Vpravo"
 #~ msgstr "Cesta k syst�mov�m manu�ln�m"
 
 #, fuzzy
-#~ msgid " Folder"
-#~ msgstr " M�d "
-
-#, fuzzy
 #~ msgid "Config"
 #~ msgstr "Nastaven�"
 
@@ -3097,10 +3230,6 @@ msgstr "Vpravo"
 #~ msgstr "Pozice"
 
 #, fuzzy
-#~ msgid "Dialog buttons have icons"
-#~ msgstr "Pozice"
-
-#, fuzzy
 #~ msgid "Application"
 #~ msgstr "Upozorn�n�"
 
diff --git a/po/da.po b/po/da.po
index c8ddb977..d872c464 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-core 0.99.7\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: 1998-12-28 14:36+0100\n"
 "Last-Translator: Kenneth Christiansen/Daleak <kenth@writeme.com>\n"
 "Language-Team: None yet\n"
@@ -13,106 +13,299 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "Om"
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "Egenskaber ..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr "Afterstep klokkeapplet"
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "Klokke"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr "Hvem sagde at NeXT er d�d?"
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "Side titel"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr "Vis tiden i 12-timers format (AM/PM)"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr ""
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr "Tidszone"
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr "Intern fejl: ugyldig mode i battery_set_mode"
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "Kan ikke oprette applet!\n"
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "Om..."
+
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
+msgstr "Gnome-fisk applet"
+
+#: applets/battery/battery.c:838
+#, fuzzy
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr "(c) 1998 Free Software Foundation"
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr "Kunne ikke allokere plads for grafv�rdiene"
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "Instillinger for batterimonitor:"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "Generelle egenskaber"
-
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
 msgstr "Applet-h�jde"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
 msgstr "Applet-bredde"
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Update interval
+#: applets/battery/properties.c:102
+#, fuzzy
+msgid "Update Interval (seconds):"
+msgstr "Opdatering i sekunder:"
+
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
+msgstr ""
+
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
 msgstr "Applet-mode"
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr "Graf"
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr "Udskrift"
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr "AC-P� batterifarve:"
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr "AC-Av batterifarve:"
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
-msgstr "Grafinterval:"
+#: applets/battery/properties.c:202
+#, fuzzy
+msgid "Low Battery Color:"
+msgstr "AC-P� batterifarve:"
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:262
+#, fuzzy
+msgid "Graph Battery Low Color:"
+msgstr "AC-P� batterifarve:"
+
+#: applets/battery/properties.c:268
+#, fuzzy
+msgid "Graph Tick Color:"
+msgstr "Orientering for graf:"
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr "Orientering for graf:"
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr "Fra venstre mod h�yre"
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr "Fra h�jre mod venstre"
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
@@ -120,20 +313,20 @@ msgstr ""
 "Kan ikke �bne /proc/apm! Tjek om du kompilerede med APM "
 "underst�ttelsekjernen.\n"
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "Kan ikke �bne /dev/apm; f�r ikke data."
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr "ioctl fejlet p� /dev/apm."
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr "APM er sl�et fra! Kan ikke l�se informasion om batteriladning."
 
@@ -161,17 +354,6 @@ msgstr ""
 "Gnome Panel applet til at v�lge m�rkelige karatkerer characters der ikke er "
 "p� mit keyboard. Udgivet under GNU General Public Licence."
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr "Om..."
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -221,10 +403,6 @@ msgstr "Ingen (forvalgt)"
 msgid "Clock"
 msgstr "Klokke"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr "Vis tiden i 12-timers format (AM/PM)"
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr "Vis tiden i forhold til GMT (Greenwich Mean Time):"
@@ -249,96 +427,6 @@ msgstr "N�r ny post modtages, k�r:"
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr "Antal breve for at postboxen anses fuld (Kbytes):"
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr ""
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr "Temafil (katalog):"
@@ -355,7 +443,7 @@ msgstr "PPP opringningsapplet"
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr "Et funky PPP opringningsprogram, hvorfor har ingen t�nkt p� det f�r!?"
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr "Fra"
 
@@ -375,6 +463,11 @@ msgstr "Tekstfarve"
 msgid "Backgroundcolor"
 msgstr "Baggrundsfarve"
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr "Applet-h�jde"
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -388,11 +481,11 @@ msgstr "Opdateringsfrekvens"
 msgid "Diskusage Settings"
 msgstr "Instillinger for diskbrug"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr "Diskmonteringsapplet"
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
@@ -400,19 +493,19 @@ msgstr ""
 "Udgivet under GNU general public license.\n"
 "Monterer og avmonterer disker.."
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr " monteret"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr " ikke monteret"
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr "\" rapportert:\n"
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
@@ -420,7 +513,7 @@ msgstr ""
 "Diskmonteringskommandoen fejlede.\n"
 "\""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "Skub ud"
 
@@ -526,9 +619,9 @@ msgstr "Navnet p� din Gnome fisk:"
 msgid "The Animation Filename:"
 msgstr "Filnavn for animationen:"
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr "Gennemse..."
 
@@ -581,7 +674,7 @@ msgstr "Skrivebord %d"
 msgid "About\t"
 msgstr "Om"
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr "Egenskaber"
 
@@ -771,7 +864,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr "Menu"
 
@@ -802,82 +895,118 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr "Gnome Pager applet"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 #, fuzzy
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr "Copyright (C) The Free Software Foundation"
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr "Gnome Pager indstillinger"
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
-msgstr "Vis"
-
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
-msgstr "Vis alle tsks p� alle skriveborde "
-
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
-msgstr "Vis tasks"
+#: applets/gnome-pager/gnomepager_applet.c:220
+#, fuzzy
+msgid "Pager"
+msgstr "Billedefil"
 
-#: applets/gnome-pager/gnomepager_applet.c:224
+#: applets/gnome-pager/gnomepager_applet.c:222
 msgid "Show pager"
 msgstr "Vis pager"
 
-#: applets/gnome-pager/gnomepager_applet.c:232
+#: applets/gnome-pager/gnomepager_applet.c:229
 msgid "Use small pagers"
 msgstr "Brug sm� pagers"
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
-msgstr "Vis ikoner i tasks"
+#: applets/gnome-pager/gnomepager_applet.c:241
+#, fuzzy
+msgid "Rows of pagers"
+msgstr "Antal r�kker af pagers"
+
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
+msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
+#: applets/gnome-pager/gnomepager_applet.c:261
 msgid "Show task list button"
 msgstr "Vis task list knapper"
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
+msgstr "Vis tasks"
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "Vis ... knapper"
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Vis tasks"
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+#, fuzzy
+msgid "Show normal tasks only"
+msgstr "Vis alle tsks p� alle skriveborde "
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+#, fuzzy
+msgid "Show minimized tasks only"
+msgstr "Vis ikoner i tasks"
+
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr "Vis alle tsks p� alle skriveborde "
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+#, fuzzy
+msgid "Show minimized tasks on all desktops"
+msgstr "Vis alle tsks p� alle skriveborde "
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+#, fuzzy
+msgid "Geometry"
+msgstr "Vinduets geometri"
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr "Max bredde af horisontale task list"
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 #, fuzzy
 msgid "Maximum width of vertical task list"
 msgstr "Max bredde af horisontale task list"
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr "Antal horisontale r�kker af tasks"
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr "Antal vertikale kolonner af tasks"
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr "Antal r�kker af pagers"
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr "Gnome Pager fejl"
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -889,27 +1018,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr "Vis / Gem"
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "Luk"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr "Dr�b"
 
@@ -995,7 +1124,7 @@ msgid "History"
 msgstr "Historie"
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "Hj�lp"
 
@@ -1062,7 +1191,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr "Farver"
 
@@ -1308,7 +1437,7 @@ msgstr ""
 msgid "Open new window"
 msgstr "�ben nyt vindue"
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr "Rullende"
 
@@ -1332,6 +1461,10 @@ msgstr ""
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr ""
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr "Vis"
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr "Ingen artikler"
@@ -1340,12 +1473,12 @@ msgstr "Ingen artikler"
 msgid "Slashapp article list"
 msgstr "Slashapp artikel liste"
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr "opretter brugerkatalog: %s\n"
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr "kunne ikke oprette brugerkatalog: %s\n"
@@ -1435,192 +1568,125 @@ msgstr "Vis \"�ben nyt vindue\"-valg"
 msgid "Look"
 msgstr "Se"
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-#, fuzzy
-msgid "Submenu: "
-msgstr "Ny undermenu"
-
-#: gmenu/desktop.c:194
-#, fuzzy, c-format
-msgid "Unable to create file: %s\n"
-msgstr "Kunne ikke oprette filen."
-
-#: gmenu/desktop.c:213
-#, fuzzy, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr "kunne ikke oprette brugerkatalog: %s\n"
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr "Filen eksisterer."
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr "Kunne ikke oprette filen."
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
+#: gmenu/desktop.c:80
+msgid " Folder"
 msgstr ""
-"Du kan ikke tilf�je noget i denne katalog.\n"
-"Du har ikke de rigtige tilgangsrettigheder."
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr "Ny undermenu"
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr "Opret undermenu:"
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr "Du m� v�lge noget f�rst."
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr "Du kan ikke slette en undermenu p� topniveau."
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Du kan ikke slette denne filen.\n"
-"Du har ikke rigtige tilgangsrettigheter."
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-#, fuzzy
-msgid "Delete this menu item?"
-msgstr "Slet valgte menuopf�ring"
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
-msgstr "Slet tomt undermenu?"
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr "Er du sikker p� at du vil slette denne undermenu og dets indhold?"
 
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-
-#: gmenu/dnd.c:175
-#, fuzzy
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Du kan ikke slette denne filen.\n"
-"Du har ikke rigtige tilgangsrettigheter."
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr "Gem"
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr "Forkast"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr "Ny"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
+msgstr "Brugermenuer"
+
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr "Systemmenuer"
 
-#: gmenu/gmenu.c:52
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr "_Ny undermenu"
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr "Opret en ny undermenu"
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 #, fuzzy
 msgid "New _Item..."
 msgstr "Ny _Katalog..."
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 #, fuzzy
 msgid "Create a new menu item"
 msgstr "Opret et nyt menu punkt"
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr "_Slet..."
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr "_Gem undermenu"
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr "Sorter undermenu rekursivt"
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr "_Fil"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr "_Sorter"
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr "_Hj�lp"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr "Ny undermenu"
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr "Opret et nyt punkt"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr "Slet"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr "Slet valgte menu punkt"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr "Flyt opad"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr "Flyt valgte menu et niveau op"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr "Flyt nedad"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr "Flyt valgte menu et niveau ned"
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr "Rediger valgte menu punkts egenskaber"
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr "sorter undermenu"
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr "Sorter valgte undermenuer"
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+#, fuzzy
+msgid "Sort _Recursive"
+msgstr "Sorter undermenu rekursivt"
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr "GNOME menuredigering"
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
@@ -1628,66 +1694,109 @@ msgstr ""
 "Udgivet under betingelsene givet i GNU Public License.\n"
 "GNOME menuredigering."
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr ""
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr ""
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr ""
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr ""
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr ""
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr "Et �jeblik, l�ser menuene..."
 
-#: gmenu/tree.c:418
-msgid "GNOME"
-msgstr "GNOME"
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "Brugermenuer"
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr "Toppen p� brugermenuerne"
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr "Systemmenuer"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr "Toppen p� systemmenuerne"
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "Brugermenuer"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
+msgstr "Du kan ikke slette en undermenu p� topniveau."
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
-msgstr "Toppen p� brugermenuerne"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+#, fuzzy
+msgid "Delete this menu item?"
+msgstr "Slet valgte menuopf�ring"
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr "Slet tomt undermenu?"
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr "Er du sikker p� at du vil slette denne undermenu og dets indhold?"
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+"Du kan ikke tilf�je noget i denne katalog.\n"
+"Du har ikke de rigtige tilgangsrettigheder."
+
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr ""
+
+#: gmenu/treenew.c:63
+#, fuzzy
+msgid "Failed to create directory"
+msgstr "Kunne ikke oprette filen."
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr " monteret"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr "GNOME terminal"
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr "GNOME terminalemulering"
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr "Forvalgt"
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
@@ -1697,304 +1806,345 @@ msgstr ""
 " rekonfigurere dette vinduet s� det passer med den forvalgte\n"
 "konfigurationen til den nye klasse?"
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr "Linux konsol"
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr "Xterm i farver"
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr "rxvt"
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr "Hvidt p� sort"
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr "Sort p� hvidt"
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr "Gr�nt p� sort"
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr "Sort p� lys gult"
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr "Brugerdefinerede farver"
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "Venstre"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "H�jre"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr "Gemt"
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr "Skrifttype:"
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr " Gennemse... "
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr "Terminalklasse"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr "Blinkende mark�r"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr "Gem menulinjen"
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr "Stille terminal klokke"
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr "Byt DEL/Backspace"
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr "Billedefil"
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 #, fuzzy
 msgid "Background type"
 msgstr "Baggrund"
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 msgid "None"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr "Baggrunds billede"
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr "Pixmap fil:"
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr "Gennemsigtig"
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr "Baggrund skal shades (langsom)"
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr "Farvepalet:"
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr "Forgrundsfarve:"
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr "Baggrundsfarve:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr "Farver:"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "Rullefelt position"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr "Antal linjer af tilbagerulling"
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr "Rul ned ved tastetryk"
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr "Rul ned ved output"
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr "Farvev�lger"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 #, fuzzy
 msgid "_New terminal"
 msgstr "GNOME terminal"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr "Opret en ny terminal vindue"
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr "_Gem menulinje"
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr "_Luk terminal"
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "_Luk terminal"
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr "_Gem menulinje"
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr "Farvev�lger..."
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr "Navn p� terminalklasse"
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+#, fuzzy
+msgid "TCLASS"
 msgstr "KLASSE"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr "Specifisere navnet p� skrifttypen"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr "FONT"
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr "Start ikke kommandoshell'en som loginshell"
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr "Start kommandoshell'en som loginshell"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr "Specifiserer geometrien for hovedvinduet"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr "K�r dette program i stedet for en shell"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr "KOMMANDO"
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr "Forgrundsfarve"
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr "COLOR"
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr "Baggrundsfarve"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 #, fuzzy
 msgid "Update utmp entry"
 msgstr "Opdater utmp/wtmp entries"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr "UTMP"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 #, fuzzy
 msgid "Do not update utmp entry"
 msgstr "Opdater ikke utmp/wtmp entries"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr "NOUTMP"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 #, fuzzy
 msgid "Update wtmp entry"
 msgstr "Opdater utmp/wtmp entries"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 #, fuzzy
 msgid "WTMP"
 msgstr "UTMP"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 #, fuzzy
 msgid "Do not update wtmp entry"
 msgstr "Opdater ikke utmp/wtmp entries"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 #, fuzzy
 msgid "NOWTMP"
 msgstr "NOUTMP"
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr "TITEL"
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr ""
 
@@ -2006,24 +2156,53 @@ msgstr "Dr�b session"
 msgid "save-session: couldn't connect to session manager\n"
 msgstr "save-session: kunne ikke koble til sessionsbehandleren\n"
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr "Program:"
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 #, fuzzy
 msgid "Cancel"
 msgstr "Panel"
 
+#: gsm/session-properties.c:258
+#, fuzzy
+msgid "Session"
+msgstr "Dr�b session"
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+#, fuzzy
+msgid "Start Session"
+msgstr "Afbryd session"
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr "Panel"
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "Generelle egenskaber"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr "Bogm�rke"
@@ -2397,15 +2576,15 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr "???"
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "Fjern fra panelet"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr "Flyt appleten"
 
@@ -2435,7 +2614,7 @@ msgstr "Sl� knappegenming til"
 msgid "Enable hidebutton arrow"
 msgstr "Sl� pile for knappegemming til"
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "Skuffe"
 
@@ -2443,23 +2622,23 @@ msgstr "Skuffe"
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr "Applikation"
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "Egenskaber for genvej"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr "Opret genvej"
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "Log ud"
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr "Log ud af GNOME"
 
@@ -2526,249 +2705,236 @@ msgstr ""
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr "Applets"
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr "Kantpanel"
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr "Hj�rnepanel"
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr "Systemmenuer"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 #, fuzzy
 msgid "Debian menus"
 msgstr "Hovedmenu"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 #, fuzzy
 msgid "No Debian menus found!"
 msgstr "Ingen artikler fundet"
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
-msgstr "Brugermenuer"
-
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr "RedHat menuer"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr "Fjern dette panel"
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr "Tilf�j applet"
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr "Tilf�j nyt panel"
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr "Konverter til hj�rnepanel"
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr "Konverter til kantpanel"
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr "Tilf�j hovedmenu"
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr "Tilf�j skuffe"
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr "Tilf�j logud knap"
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr "Tilf�j slugt applikation"
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr "Tilf�j ny genvej"
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr "Egenskaber for denne panel..."
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "Globale egenskaber..."
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr "Panel"
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr "L�s sk�rm"
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr "Om GNOME..."
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr "Kan ikke �bne bibliotek, bruger hovedmenu!"
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr "I en undermenu"
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr "P� hovedmenuen"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr "Egenskaber for menu"
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr "Menutype"
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr "Hovedmenu"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr "Normalmenu"
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr "Systemmenu:"
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr "Brugermenu:"
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+#, fuzzy
+msgid "AnotherLevel menu (if found): "
 msgstr "RedHat menu (hvis fundet): "
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 #, fuzzy
 msgid "Debian menu (if found): "
 msgstr "RedHat menu (hvis fundet): "
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr "Menusti"
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "Position"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "�verst"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "Nederst"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr "Minimeringsalternativer"
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr "Gem automatisk"
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr "Sl� knappegemning til"
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr "Sl� pile for knappegemming til"
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr "Nord�st"
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr "Sydvest"
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr "Nordvest"
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr "Sydvest"
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr "Pladsering"
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "Horisontal"
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "Vertikal"
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr "Knappegemnings indstillinger"
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr "Baggrund"
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr "Forvalgt"
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr "Pixmap"
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr "Farve"
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr "Billedefil"
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr "Skaler billede til at passe panelet"
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "Egenskaber for panelet"
 
@@ -2937,28 +3103,6 @@ msgstr "Animation"
 msgid "General icon settings"
 msgstr "Generelle egenskaber"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr "Virkelig logge ud?"
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr "Sp�rg n�ste gang"
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr "Opret en slugt applikation"
@@ -2975,6 +3119,75 @@ msgstr "Kommando (valgfri)"
 msgid "Height"
 msgstr "H�jt."
 
+#~ msgid "Afterstep Clock Applet"
+#~ msgstr "Afterstep klokkeapplet"
+
+#~ msgid "General Properties"
+#~ msgstr "Generelle egenskaber"
+
+#~ msgid "Graph Interval:"
+#~ msgstr "Grafinterval:"
+
+#, fuzzy
+#~ msgid "Submenu: "
+#~ msgstr "Ny undermenu"
+
+#, fuzzy
+#~ msgid "Unable to create file: %s\n"
+#~ msgstr "Kunne ikke oprette filen."
+
+#, fuzzy
+#~ msgid "unable to remove .order file: %s\n"
+#~ msgstr "kunne ikke oprette brugerkatalog: %s\n"
+
+#~ msgid "File exists."
+#~ msgstr "Filen eksisterer."
+
+#~ msgid "Create Submenu:"
+#~ msgstr "Opret undermenu:"
+
+#~ msgid "You must select something first."
+#~ msgstr "Du m� v�lge noget f�rst."
+
+#~ msgid ""
+#~ "You can't delete that file.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "Du kan ikke slette denne filen.\n"
+#~ "Du har ikke rigtige tilgangsrettigheter."
+
+#, fuzzy
+#~ msgid ""
+#~ "You are not allowed to move that item there.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "Du kan ikke slette denne filen.\n"
+#~ "Du har ikke rigtige tilgangsrettigheter."
+
+#~ msgid "New"
+#~ msgstr "Ny"
+
+#~ msgid "Edit selected menu item properties"
+#~ msgstr "Rediger valgte menu punkts egenskaber"
+
+#~ msgid "GNOME"
+#~ msgstr "GNOME"
+
+#~ msgid "Red Hat menus"
+#~ msgstr "RedHat menuer"
+
+#~ msgid "Red Hat menu (if found): "
+#~ msgstr "RedHat menu (hvis fundet): "
+
+#~ msgid "Hidebutton options"
+#~ msgstr "Knappegemnings indstillinger"
+
+#~ msgid "Really log out?"
+#~ msgstr "Virkelig logge ud?"
+
+#~ msgid "Ask next time"
+#~ msgstr "Sp�rg n�ste gang"
+
 #~ msgid "Enable gsm debugging"
 #~ msgstr "Sl� gsm debugging til"
 
@@ -2984,17 +3197,11 @@ msgstr "H�jt."
 #~ msgid "Startup Programs"
 #~ msgstr "Start programmer"
 
-#~ msgid "Geometry of window"
-#~ msgstr "Vinduets geometri"
-
 #~ msgid "Config"
 #~ msgstr "Konfiguration"
 
 #~ msgid "Add"
 #~ msgstr "Tilf�j"
 
-#~ msgid "Discard session"
-#~ msgstr "Afbryd session"
-
 #~ msgid "ID"
 #~ msgstr "ID"
diff --git a/po/de.po b/po/de.po
index ec049994..1258dcb1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-core VERSION\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: 1999-02-20 18:11+01:00\n"
 "Last-Translator: Matthias Warkus <mawa@iname.com>\n"
 "Language-Team: Matthias Warkus <mawa@iname.com>\n"
@@ -13,106 +13,298 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "�ber"
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "Eigenschaften..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr "Afterstep-Uhrenapplet"
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "Uhr"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr "Behauptet jemand, NeXT sei tot?"
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "Titel der Seite"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr "Zeit im 12-Stunden-Format anzeigen (AM/PM)"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr "Allgemein"
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr "Interner Fehler: Falscher Modus in battery_set_mode"
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "Kann kein Applet anlegen!\n"
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "�ber"
+
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
+msgstr "Das GNOME-KB-Applet"
+
+#: applets/battery/battery.c:838
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr ""
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr "Konnte keinen Raum f�r Graphenwerte schaffen"
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "Batteriestatus:"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "Eigenschaften"
-
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
 msgstr "Applet H�he"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
 msgstr "Applet H�he"
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Update interval
+#: applets/battery/properties.c:102
+#, fuzzy
+msgid "Update Interval (seconds):"
+msgstr "Zeit zwischen Auffrischungen in s:"
+
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
+msgstr ""
+
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
 msgstr "Applet H�he"
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr ""
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr "Neuladen"
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr "Batteriefarbe am Netz:"
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr "Batteriefarbe ohne Netzstrom:"
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
-msgstr "Graphenintervall:"
+#: applets/battery/properties.c:202
+#, fuzzy
+msgid "Low Battery Color:"
+msgstr "Batteriefarbe am Netz:"
+
+#: applets/battery/properties.c:262
+#, fuzzy
+msgid "Graph Battery Low Color:"
+msgstr "Batteriefarbe am Netz:"
+
+#: applets/battery/properties.c:268
+#, fuzzy
+msgid "Graph Tick Color:"
+msgstr "Graphenrichtung:"
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr "Graphenrichtung:"
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr "Von links nach rechts"
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr "Von rechts nach links"
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
@@ -120,20 +312,20 @@ msgstr ""
 "Kann /proc/apm nich �ffnen! Stellen Sie sicher, da� Sie\n"
 "APM-Unterst�tzung in Ihren Kernel eincompiliert haben.\n"
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr "Konnte APM-Dateideskriptor nicht mit dup() duplizieren: %s\n"
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "Kann '/proc/apm' nicht �ffnen.  Keine Informationen verf�gbar."
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr "ioctl auf /dev/apm fehlgeschlagen"
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr "APM ist abgeschaltet! Kann keine Batterieladeinformation lesen."
 
@@ -162,17 +354,6 @@ msgstr ""
 "meiner Tastatur sind. Freigegeben unter der GNU General Public\n"
 "License."
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr "�ber"
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -222,10 +403,6 @@ msgstr "Keines (Default)"
 msgid "Clock"
 msgstr "Uhr"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr "Zeit im 12-Stunden-Format anzeigen (AM/PM)"
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr "Zeit relativ zur GMT (Greenwich-Zeit) anzeigen:"
@@ -250,96 +427,6 @@ msgstr "Wenn neue Mail eintrifft, rufe auf:"
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr "Bei welcher Mailmenge das Postfach als voll ansehen (Kilobytes):"
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr "Allgemein"
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr "Themendatei (Verzeichnis):"
@@ -358,7 +445,7 @@ msgstr ""
 "Ein fetziger PPP-W�hler, warum hat da noch niemand vorher dran\n"
 "gedacht?"
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr "Aus"
 
@@ -378,6 +465,11 @@ msgstr "Nur Text"
 msgid "Backgroundcolor"
 msgstr "Hintergrund"
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr "Applet H�he"
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -391,11 +483,11 @@ msgstr "Sekunden zwischen dem Neuzeichnen"
 msgid "Diskusage Settings"
 msgstr "Einstellungen"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr "Laufwerks-Einh�nge-Applet"
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
@@ -403,19 +495,19 @@ msgstr ""
 "Freigegeben unter der GNU General Public License.\n"
 "H�ngt Laufwerke ein und wieder aus."
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr " eingeh�ngt"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr " nicht eingeh�ngt"
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr "\" berichtet:\n"
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
@@ -423,7 +515,7 @@ msgstr ""
 "Einh�ngebefehl schlug fehl.\n"
 "\""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "Auswerfen"
 
@@ -529,9 +621,9 @@ msgstr "Der Name Ihres GNOME Fischs:"
 msgid "The Animation Filename:"
 msgstr "Name der Animationsdatei:"
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr "Ausw�hlen..."
 
@@ -585,7 +677,7 @@ msgstr "Desktop %d"
 msgid "About\t"
 msgstr "�ber"
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr "Eigenschaften"
 
@@ -771,7 +863,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr "Men�"
 
@@ -808,80 +900,116 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr "Desktop-Pager-Applet"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr "Pager f�r GNOME-kompatible Fenstermanager"
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr "Gnome-Pager-Einstellungen"
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
-msgstr "Anzeige"
-
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
-msgstr "Alle Tasks auf allen Desktops anzeigen"
-
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
-msgstr "Tasks anzeigen"
+#: applets/gnome-pager/gnomepager_applet.c:220
+#, fuzzy
+msgid "Pager"
+msgstr "Grafik"
 
-#: applets/gnome-pager/gnomepager_applet.c:224
+#: applets/gnome-pager/gnomepager_applet.c:222
 msgid "Show pager"
 msgstr "Pager anzeigen"
 
-#: applets/gnome-pager/gnomepager_applet.c:232
+#: applets/gnome-pager/gnomepager_applet.c:229
 msgid "Use small pagers"
 msgstr "Kleine Pager verwenden"
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
-msgstr "Icons in Tasks anzeigen"
+#: applets/gnome-pager/gnomepager_applet.c:241
+#, fuzzy
+msgid "Rows of pagers"
+msgstr "Anzahl Zeilen an Pagern"
+
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
+msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
+#: applets/gnome-pager/gnomepager_applet.c:261
 msgid "Show task list button"
 msgstr "Tasklisten-Knopf an/aus"
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
+msgstr "Tasks anzeigen"
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "Kn�pfe mit ... anzeigen"
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Tasks anzeigen"
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+#, fuzzy
+msgid "Show normal tasks only"
+msgstr "Alle Tasks auf allen Desktops anzeigen"
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+#, fuzzy
+msgid "Show minimized tasks only"
+msgstr "Icons in Tasks anzeigen"
+
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr "Alle Tasks auf allen Desktops anzeigen"
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+#, fuzzy
+msgid "Show minimized tasks on all desktops"
+msgstr "Alle Tasks auf allen Desktops anzeigen"
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+#, fuzzy
+msgid "Geometry"
+msgstr "Fensterh�he"
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr "Maximale Breite der horizontalen Taskliste"
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr "Maximale Breite der vertikalen Taskliste"
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr "Anzahl Zeilen f�r horizontale Tasks"
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr "Anzahl vertikale Spalten f�r Tasks"
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr "Anzahl Zeilen an Pagern"
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr "Gnome-Pager-Fehler"
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -898,27 +1026,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr "Klebrig"
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr "Anzeigen / Verbergen"
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr "Aufrollen / Ausrollen"
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "Schlie�en"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr "Vernichten"
 
@@ -1004,7 +1132,7 @@ msgid "History"
 msgstr "Chronik"
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "Hilfe"
 
@@ -1074,7 +1202,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr "Farbe"
 
@@ -1320,7 +1448,7 @@ msgstr "(Diese Einstellungen werden erst bei einer Auffrischung wirksam )"
 msgid "Open new window"
 msgstr "Neues Fenster"
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr "Rollen"
 
@@ -1344,6 +1472,10 @@ msgstr "Verz�gerung beim Umbrechen von Text:"
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr "Rollgeschwindigkeit zwischen Zeilen (Weiches Rollen):"
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr "Anzeige"
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr "Keine Artikel."
@@ -1352,12 +1484,12 @@ msgstr "Keine Artikel."
 msgid "Slashapp article list"
 msgstr "Slashapp-Artikelliste"
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr "erzeuge Benutzerverzeichnis: %s\n"
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr "konnte Benutzerverzeichnis nicht erzeugen: %s\n"
@@ -1448,191 +1580,123 @@ msgstr "Zeige Option f�r \"erzeuge neues Fenster\""
 msgid "Look"
 msgstr "Aussehen"
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr "Untermen�:"
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr "Kann Datei nicht erzeugen: %s\n"
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr "kann .order-datei nicht entfernen: %s\n"
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr "Datei existiert."
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr "Konnte Datei nicht erzeugen."
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Sie k�nnen keinen Eintrag in diesem Untermen� hinzuf�gen.\n"
-"Sie haben nicht die notwendigen Berechtigungen."
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr "Neues Untermen�"
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr "Untermen� erzeugen:"
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr "Sie m�ssen zuerst etwas ausw�hlen."
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr "Sie k�nnen kein Untermen� der obersten Ebene l�schen."
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Sie k�nnen diese Datei nicht l�schen.\n"
-"Sie haben nicht die notwendigen Berechtigungen."
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr "Diesen Men�eintrag l�schen?"
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
-msgstr "Leeres Untermen� l�schen?"
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-"Sind Sie sicher, da� Sie dieses Untermen� samt seinem Inhalt l�schen\n"
-"wollen?"
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-"Diese �nderung steht im Konflikt mit einem vorhandenen Men�eintrag.\n"
-"Alle Eintr�ge in einem Untermen� m�ssen unterschiedliche Namen haben."
+#: gmenu/desktop.c:80
+msgid " Folder"
+msgstr " Ordner"
 
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Sie d�rfen diesen Eintrag nicht dorthin verschieben.\n"
-"Sie haben nicht die notwendigen Berechtigungen."
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr "Speichern"
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr "R�ckg�ngi"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr "Neu"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
+msgstr "Benutzermen�s"
+
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr "Systemmen�s"
 
-#: gmenu/gmenu.c:52
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr "Neues Untermen�..."
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr "Ein neues Untermen� erzeugen"
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr "Neuer Eintrag..."
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr "Einen neuen Men�eintrag erzeugen"
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr "L�schen..."
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr "Untermen� sortieren"
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr "Untermen� rekursiv sortieren"
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr "_Datei"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr "Sortieren"
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr "Neues Untermen�"
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr "Neuer Eintrag"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr "Neuen Eintrag anlegen"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr "L�schen"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr "Ausgew�hlten Men�eintrag l�schen"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr "Hinaufschieben"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr "Ausgew�hlten Men�eintrag nach oben verschieben"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr "Hinunterschieben"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr "Ausgew�hlten Men�eintrag nach unten verschieben"
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr "Eigenschaften des ausgew�hlten Men�eintrages bearbeiten"
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr "Untermen� sortieren"
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr "Ausgew�hltes Untermen� sortieren"
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+#, fuzzy
+msgid "Sort _Recursive"
+msgstr "Untermen� rekursiv sortieren"
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr "GNOME-Men�editor"
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
@@ -1640,66 +1704,113 @@ msgstr ""
 "Freigegeben unter den Bedingungen der GNU General Public License.\n"
 "GNOME-Men�editor."
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr "Der Men�eintrag braucht einen Namen"
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr "Der Men�eintrag braucht einen Dateinamen"
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr "�nderungen speichern?"
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr "Diese �nderung steht im Konflikt mit einem vorhandenen Men�eintrag"
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr "Vorhandenen Men�eintrag �berschreiben?"
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+"Diese �nderung steht im Konflikt mit einem vorhandenen Men�eintrag.\n"
+"Alle Eintr�ge in einem Untermen� m�ssen unterschiedliche Namen haben."
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr "Einen Moment, lese Men�s..."
 
-#: gmenu/tree.c:418
-msgid "GNOME"
-msgstr ""
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "Benutzermen�s"
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr "Oberste Ebene der Benutzermen�s"
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr "Systemaufrufe"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr "Oberste Ebene der Systemmen�s"
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "Benutzermen�s"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
+msgstr "Sie k�nnen kein Untermen� der obersten Ebene l�schen."
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
-msgstr "Oberste Ebene der Benutzermen�s"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr "Diesen Men�eintrag l�schen?"
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr "Leeres Untermen� l�schen?"
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+"Sind Sie sicher, da� Sie dieses Untermen� samt seinem Inhalt l�schen\n"
+"wollen?"
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+"Sie k�nnen keinen Eintrag in diesem Untermen� hinzuf�gen.\n"
+"Sie haben nicht die notwendigen Berechtigungen."
+
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+#, fuzzy
+msgid "New Folder"
+msgstr " Ordner"
+
+#: gmenu/treenew.c:63
+#, fuzzy
+msgid "Failed to create directory"
+msgstr "Konnte Datei nicht erzeugen."
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr " eingeh�ngt"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr "GNOME Terminal"
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr "Der GNOME-Terminalemulator"
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
@@ -1709,298 +1820,340 @@ msgstr ""
 "konfigurieren, um die Standardkonfiguration der neuen Klasse\n"
 "anzuwenden?"
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr "Linux-Konsole"
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr "Farbiges XTerm"
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr "Wei� auf schwarz"
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr "Schwarz auf wei�"
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr "Gr�n auf schwarz"
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr "Schwarz auf hellgelb"
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr "Eigene Farben"
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "Links"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "Rechts"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr "Verborgen"
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr "Schriftart:"
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr "Ausw�hlen..."
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr "Terminalklasse"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr "Blinkender Cursor"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr "Men�balken verbergen"
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr "Terminalklingel stummschalten"
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr "DEL/Backspace vertauschen"
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr "Zeichenmenge f�r Wortauswahl"
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr "Grafik"
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 #, fuzzy
 msgid "Background type"
 msgstr "Hintergrund"
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 msgid "None"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr "Hintergrundpixmap"
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr "Pixmapdatei:"
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr ""
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr "Hintergrund schattieren (langsam)"
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr "Farbpalette:"
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr "Vordergrundfarbe:"
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr "Hintergrundfarbe:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr "Farben:"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "Rollbalkenanordnung"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr "Anzahl Zeilen f�r Scrollback"
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr "Rollen auf Tastendruck"
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr "Rollen bei Ausgabe"
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr "Farbw�hler"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr "_Neues Terminal"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr "Erzeugt ein neues Terminalfenster"
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr "Men�balken verbergen"
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr "Terminal schlie�en"
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "Terminal schlie�en"
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr "Men�balken zeigen"
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr "Farbw�hler..."
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr "Name der Terminalklasse"
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+#, fuzzy
+msgid "TCLASS"
 msgstr "KLASSE"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr "Gibt Schriftartnamen an"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr "SCHRIFTART"
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr "Shells nicht als Login-Shells starten"
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr "Shells als Login-Shells starten"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr "Gibt Geometrie f�r das Hauptfenster an"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr "GEOMETRIE"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr "Dieses Programm statt einer Shell ausf�hren"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr "BEFEHL"
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr "Vordergrundfarbe"
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr "FARBE"
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr "Hintergrund"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr "utmp-Eintrag erneuern"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr "utmp-Eintrag nicht auffrischen"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr "UTMP AUS"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr "wtmp-Eintrag erneuern"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr "wtmp-Eintrag nicht erneuern"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr "WTMP AUS"
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr "Fenstertitel einstellen"
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr "TITEl"
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr "Wie lange auf Registrieren der Clients warten (0=ewig)"
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+#, fuzzy
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr "Wie lange auf Registrieren der Clients warten (0=ewig)"
+
+#: gsm/main.c:61
 #, fuzzy
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr "Wie lange auf Registrieren der Clients warten (0=ewig)"
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr "Die Sitzung f�hrt gerade herunter."
 
@@ -2012,24 +2165,52 @@ msgstr "Sitzung beenden"
 msgid "save-session: couldn't connect to session manager\n"
 msgstr "save-session: konnte Session-Manager nicht kontaktieren\n"
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr "Programm:"
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 #, fuzzy
 msgid "Cancel"
 msgstr "Panel"
 
+#: gsm/session-properties.c:258
+#, fuzzy
+msgid "Session"
+msgstr "Sitzung beenden"
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr "Panel"
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "Allgemeine Iconeigenschaften"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr "Lesezeichen"
@@ -2402,15 +2583,15 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr ""
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "Entfernen"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr "Verschieben"
 
@@ -2440,7 +2621,7 @@ msgstr "Versteckknopf an/aus"
 msgid "Enable hidebutton arrow"
 msgstr "Pfeil auf Versteckknopf an/aus"
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "Schublade"
 
@@ -2448,23 +2629,23 @@ msgstr "Schublade"
 msgid "This launch icon does not specify a program to run"
 msgstr "Dieses Startericon gibt kein zu startendes Programm an"
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr "Anwendung"
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "Startereigenschaften"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr "Starterapplet erzeugen"
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "Abmelden"
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr "Von GNOME abmelden"
 
@@ -2535,249 +2716,236 @@ msgstr "Erhalte keine goad_id f�r Desktopeintrag, ignoriere es"
 msgid " (empty)"
 msgstr " (leer)"
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr "Applet hinzuf�gen"
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr "Kantenpanel"
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr "Eckpanel"
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr "Systemmen�s"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 #, fuzzy
 msgid "Debian menus"
 msgstr "Hauptmen�"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 #, fuzzy
 msgid "No Debian menus found!"
 msgstr "Keine Artikel gefunden"
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
-msgstr "Benutzermen�s"
-
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr "Red-Hat-Men�s"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr "Entfernen"
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr "Applet hinzuf�gen"
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr "Hinzuf�gen"
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr "In Eckpanel umwandeln"
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr "In Kantenpanel umwandeln"
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr "Hauptmen� hinzuf�gen"
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr "Schublade hinzuf�gen"
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr "Abmelde-\"Button\" hinzuf�gen"
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr "Anwendung verschluckten"
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr "Neuen Starter hinzuf�gen"
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr "Eigenschaften..."
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "Konfiguration..."
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr "Panel"
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr "Bildschirm sperren"
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr "�ber GNOME..."
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr "Kann Verzeichnis nicht �ffnen, benutze Hauptmen�!"
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr "In einem Untermen�"
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr "Im Hauptmen�"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr "Men�eigenschaften"
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr "Men�typ"
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr "Hauptmen�"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr "Normales Men�"
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr "Systemmen�:"
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr "Benutzermen�:"
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+#, fuzzy
+msgid "AnotherLevel menu (if found): "
 msgstr "Red-Hat-Men� (wenn vorhanden): "
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 #, fuzzy
 msgid "Debian menu (if found): "
 msgstr "Red-Hat-Men� (wenn vorhanden): "
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr "Men�pfad"
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "Position"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "Oben"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "Unten"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr "Verkleinerungsoptionen"
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr "Automatisch verstecken"
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr "Versteckkn�pfe an/aus"
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr "Pfeile auf Versteckkn�pfen an/aus"
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr "Nordost"
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr "S�dwest"
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr "Nordwest"
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr "S�dost"
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr "Ausrichtung"
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "Vertikal"
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr "Optionen f�r Versteckknopf"
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr "Hintergrund"
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr ""
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr ""
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr "Farbe"
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr "Grafikdatei"
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr "Bild auf Panelma�stab skalieren"
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "Startereigenschaften"
 
@@ -2948,28 +3116,6 @@ msgstr ""
 msgid "General icon settings"
 msgstr "Allgemeine Iconeigenschaften"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr "Wollen Sie sich wirklich abmelden?"
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr "N�chstes Mal wieder nachfragen"
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr "Schlucker-Applet erzeugen"
@@ -2986,6 +3132,72 @@ msgstr "Befehl (optional)"
 msgid "Height"
 msgstr "H�he"
 
+#, fuzzy
+#~ msgid "Low Battery Warning"
+#~ msgstr "Niedrig und l�dt auf."
+
+#~ msgid "Afterstep Clock Applet"
+#~ msgstr "Afterstep-Uhrenapplet"
+
+#~ msgid "General Properties"
+#~ msgstr "Eigenschaften"
+
+#~ msgid "Graph Interval:"
+#~ msgstr "Graphenintervall:"
+
+#~ msgid "Submenu: "
+#~ msgstr "Untermen�:"
+
+#~ msgid "Unable to create file: %s\n"
+#~ msgstr "Kann Datei nicht erzeugen: %s\n"
+
+#~ msgid "unable to remove .order file: %s\n"
+#~ msgstr "kann .order-datei nicht entfernen: %s\n"
+
+#~ msgid "File exists."
+#~ msgstr "Datei existiert."
+
+#~ msgid "Create Submenu:"
+#~ msgstr "Untermen� erzeugen:"
+
+#~ msgid "You must select something first."
+#~ msgstr "Sie m�ssen zuerst etwas ausw�hlen."
+
+#~ msgid ""
+#~ "You can't delete that file.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "Sie k�nnen diese Datei nicht l�schen.\n"
+#~ "Sie haben nicht die notwendigen Berechtigungen."
+
+#~ msgid ""
+#~ "You are not allowed to move that item there.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "Sie d�rfen diesen Eintrag nicht dorthin verschieben.\n"
+#~ "Sie haben nicht die notwendigen Berechtigungen."
+
+#~ msgid "New"
+#~ msgstr "Neu"
+
+#~ msgid "Edit selected menu item properties"
+#~ msgstr "Eigenschaften des ausgew�hlten Men�eintrages bearbeiten"
+
+#~ msgid "Red Hat menus"
+#~ msgstr "Red-Hat-Men�s"
+
+#~ msgid "Red Hat menu (if found): "
+#~ msgstr "Red-Hat-Men� (wenn vorhanden): "
+
+#~ msgid "Hidebutton options"
+#~ msgstr "Optionen f�r Versteckknopf"
+
+#~ msgid "Really log out?"
+#~ msgstr "Wollen Sie sich wirklich abmelden?"
+
+#~ msgid "Ask next time"
+#~ msgstr "N�chstes Mal wieder nachfragen"
+
 #~ msgid "Enable gsm debugging"
 #~ msgstr "gsm-Fehlerdiagnose an/aus"
 
@@ -3009,9 +3221,6 @@ msgstr "H�he"
 #~ msgid "Startup Programs"
 #~ msgstr "Programme f�r automatischen Aufruf"
 
-#~ msgid "Geometry of window"
-#~ msgstr "Fensterh�he"
-
 #~ msgid "Can't open /proc/apm; can't get data."
 #~ msgstr "Kann '/proc/apm' nicht �ffnen.  Keine Informationen verf�gbar."
 
@@ -3030,9 +3239,6 @@ msgstr "H�he"
 #~ msgid "High."
 #~ msgstr "Hoch."
 
-#~ msgid "Low and charging."
-#~ msgstr "Niedrig und l�dt auf."
-
 #~ msgid "Low."
 #~ msgstr "Niedrig."
 
@@ -3185,8 +3391,5 @@ msgstr "H�he"
 #~ msgid "%s: option `-W %s' doesn't allow an argument\n"
 #~ msgstr "%s: Option `-W %s' erlaubt keinen Parameter\n"
 
-#~ msgid " Folder"
-#~ msgstr " Ordner"
-
 #~ msgid "Add"
 #~ msgstr "Hinzuf�gen"
diff --git a/po/es.po b/po/es.po
index aebf351d..856bf3dd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.99.8.1\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: 1999-01-13 00:46+0100\n"
 "Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
 "Language-Team: \n"
@@ -34,106 +34,299 @@ msgstr ""
 "help-browser/history.c help-browser/toc2-man.c help-browser/toc2.c "
 "help-browser/visit.c gnome-terminal/gnome-terminal.c\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "Acerca"
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr "Applet reloj Afterstep"
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "Reloj"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr "�Quien dijo que el NeXT est� muerto?"
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "T�tulo de la p�gina"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr "Afichar en formato de 12 horas (AM/PM)"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr "General"
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr "Huso horario"
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr "Error interno: modo inv�lido en battery_set_mode"
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "�No puedo crear el applet!\n"
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "Acerca..."
+
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
+msgstr "Applet configurador de teclado"
+
+#: applets/battery/battery.c:838
+#, fuzzy
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr "� 1998 la Free Software Foundation"
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr "No pude atribuir espacio para los valores de los grafos"
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "Configuraci�n del Monitor de Bater�a"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "Propiedades Generales"
-
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
 msgstr "Alto del applet"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
 msgstr "Ancho del applet"
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Update interval
+#: applets/battery/properties.c:102
+#, fuzzy
+msgid "Update Interval (seconds):"
+msgstr "Tiempo de actualizaci�n (s):"
+
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
+msgstr ""
+
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
 msgstr "Modo del applet"
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr "Grafo"
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr "Releer"
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr "Color Bater�a AC-On"
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr "Color Bater�a AC-Off"
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
-msgstr "Intervalo del Grafo:"
+#: applets/battery/properties.c:202
+#, fuzzy
+msgid "Low Battery Color:"
+msgstr "Color Bater�a AC-On"
+
+#: applets/battery/properties.c:262
+#, fuzzy
+msgid "Graph Battery Low Color:"
+msgstr "Color Bater�a AC-On"
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:268
+#, fuzzy
+msgid "Graph Tick Color:"
+msgstr "Direcci�n del Grafo:"
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr "Direcci�n del Grafo:"
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr "Izquierda a Derecha"
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr "Derecha a Izquierda"
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
@@ -141,20 +334,20 @@ msgstr ""
 "�No puedo abrir /proc/apm!  Asegurese que el n�cleo Linux tiene soporte "
 "APM.\n"
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr "Imposibe de hacer un dup() del descriptor de archivo APM: %s\n"
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "No puedo abrir /proc/apm;  No puedo obtener datos"
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr "Fall� el ioctl en /dev/apm."
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr ""
 "�APM desactivado!  No puedo leer informaci�n sobre la carga de la bater�a"
@@ -184,17 +377,6 @@ msgstr ""
 "accesibles directamente con el teclado. Distribuido bajo la licencia GPL de "
 "GNU."
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr "Acerca..."
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -243,10 +425,6 @@ msgstr "Ninguno (por omisi�n)"
 msgid "Clock"
 msgstr "Reloj"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr "Afichar en formato de 12 horas (AM/PM)"
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr "Muestra la hora GMT (Greenwich Mean Time):"
@@ -271,96 +449,6 @@ msgstr "Cuando llega nuevo correo lanzar:"
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr "Cantidad de correo para considerar la casilla llena (Kbytes):"
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr "General"
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr "Archivo de tema (directorio):"
@@ -377,7 +465,7 @@ msgstr "Applet Discador PPP"
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr "Un discador PPP amigable, ��como nadie penso en el antes?!"
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr "Cortar"
 
@@ -397,6 +485,11 @@ msgstr "Color del texto"
 msgid "Backgroundcolor"
 msgstr "Color del fondo"
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr "Alto del applet"
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -410,11 +503,11 @@ msgstr "Frecuencia de actualizaci�n"
 msgid "Diskusage Settings"
 msgstr "Configuraci�n Diskusage"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr "Applet Montador de Discos"
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
@@ -422,19 +515,19 @@ msgstr ""
 "Distribuido bajo los t�rminos de la licencia GPL de GNU.\n"
 "Monta y Desmonta discos/disquettes/CD/Zip/..."
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr " montado"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr " no montado"
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr "\" se�al�:\n"
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
@@ -442,7 +535,7 @@ msgstr ""
 "Fall� comando de Drivemount.\n"
 "\""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "Eyectar"
 
@@ -547,9 +640,9 @@ msgstr "El nombre de su pez GNOME"
 msgid "The Animation Filename:"
 msgstr "Nombre del archivo de animaci�n:"
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr "Buscar"
 
@@ -603,7 +696,7 @@ msgstr "Escritorio %d"
 msgid "About\t"
 msgstr "Acerca\t"
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr "Propiedades"
 
@@ -787,7 +880,7 @@ msgid "Xmodmap"
 msgstr "Xmodmap"
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr "Men�"
 
@@ -824,80 +917,116 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr "gkb.xpm"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr "Desktop Pager Applet"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr "Copyright � 1998,1999 Red Hat Software y la Free Software Foundation"
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr "Pager para gestores de ventanas compatibles Gnome"
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr "Propiedades del Pager Gnome"
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
-msgstr "Afichar"
-
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
-msgstr "Ver todas las tareas en todos los espacios de trabajo"
-
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
-msgstr "Ver tareas"
+#: applets/gnome-pager/gnomepager_applet.c:220
+#, fuzzy
+msgid "Pager"
+msgstr "Imagen"
 
-#: applets/gnome-pager/gnomepager_applet.c:224
+#: applets/gnome-pager/gnomepager_applet.c:222
 msgid "Show pager"
 msgstr "Ver pager"
 
-#: applets/gnome-pager/gnomepager_applet.c:232
+#: applets/gnome-pager/gnomepager_applet.c:229
 msgid "Use small pagers"
 msgstr "Usar peque�os pagers"
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
-msgstr "Ver �conos de las tareas"
+#: applets/gnome-pager/gnomepager_applet.c:241
+#, fuzzy
+msgid "Rows of pagers"
+msgstr "Cantidad de l�neas de los pagers"
+
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
+msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
+#: applets/gnome-pager/gnomepager_applet.c:261
 msgid "Show task list button"
 msgstr "Muesta el bot�n con las tareas"
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
+msgstr "Ver tareas"
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "Ver botones con \"...\""
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Ver tareas"
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+#, fuzzy
+msgid "Show normal tasks only"
+msgstr "Ver todas las tareas en todos los espacios de trabajo"
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+#, fuzzy
+msgid "Show minimized tasks only"
+msgstr "Ver �conos de las tareas"
+
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr "Ver todas las tareas en todos los espacios de trabajo"
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+#, fuzzy
+msgid "Show minimized tasks on all desktops"
+msgstr "Ver todas las tareas en todos los espacios de trabajo"
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+#, fuzzy
+msgid "Geometry"
+msgstr "Geometr�a de la ventana"
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr "Lista de tareas siempre al tama�o m�ximo"
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr "Ancho m�ximo de la lista de tareas horizontal"
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr "Ancho m�ximo de la lista de tareas vertical"
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr "Cantidad de l�neas de la lista de tareas horizontal"
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr "Cantidad de columnas verticales de la lista de tareas"
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr "Cantidad de l�neas de los pagers"
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr "Error del Pager de Gnome"
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -914,27 +1043,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr "?"
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr "Ver / Ocultar"
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr "Con / Sin sombreado"
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "Cerrar"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr "Destrozar"
 
@@ -1020,7 +1149,7 @@ msgid "History"
 msgstr "Historia"
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "Ayuda"
 
@@ -1091,7 +1220,7 @@ msgstr ""
 # gnome-terminal/gnome-terminal.c:801
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr "Colores"
 
@@ -1339,7 +1468,7 @@ msgstr ""
 msgid "Open new window"
 msgstr "Abrir nueva ventana"
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr "Desfile"
 
@@ -1363,6 +1492,10 @@ msgstr "Demora para la ida a la linea autom�tica del texto:"
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr "Velocidad de desfile entre lineas (desfile suave):"
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr "Afichar"
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr "No hay art�culos"
@@ -1371,12 +1504,12 @@ msgstr "No hay art�culos"
 msgid "Slashapp article list"
 msgstr "Lista de art�culos Slashapp"
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr "creando directorio usuario: %s\n"
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr "incapaz de crear directorio usuario: %s\n"
@@ -1467,189 +1600,123 @@ msgstr "Afichar la opci�n \"abrir nueva ventana\""
 msgid "Look"
 msgstr "Mirar"
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr "Submen�: "
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr "Imposible crear el archivo: %s\n"
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr "Imposible de borrar el archivo .order: %s\n"
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr "El archivo existe."
+#: gmenu/desktop.c:80
+msgid " Folder"
+msgstr " Carpeta"
 
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr "Fall� en crear el archivo."
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-"No puede a�adir una entrada en esa carpeta.\n"
-"Vd. no tiene los permisos adecuados."
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr "Nuevo submen�"
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr "Crear Carpeta:"
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr "Debe seleccionar algo primero."
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr "No puede borrar una carpeta ra�z."
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-"No puede borrar este archivo.\n"
-"Vd. no tiene los permisos adecuados."
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr "�Borrar �ste elemento de men�?"
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
-msgstr "�Borrar carpeta vac�a?"
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr "�Est� seguro de que quiere borrar esta carpeta y todos sus contenidos?"
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-"Este cambio conflictua con una entrada de men� existente.\n"
-"No se pueden tener dos entradas de men� con el mismo nombre."
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-"No puede desplazar ese elemento aqu�.\n"
-"Vd. no tiene los permisos adecuados."
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr "Guardar"
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr "Revertir"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr "Nuevo"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
+msgstr "Men�es Usuario"
+
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr "Men�es Sistema"
 
-#: gmenu/gmenu.c:52
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr "_Nueva Carpeta..."
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr "Crear una nueva carpeta"
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr "_Nueva entrada..."
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr "Crear una nueva carpeta"
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr "_Borrar..."
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr "_Ordenar el Submen�"
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr "Ordenar Carpeta _Recursivamente"
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr "_Archivo"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr "Nuevo submen�"
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr "Nuevo elemento"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr "Crear una nueva carpeta"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr "Borrar"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr "Borrar el elemento de men� seleccionado"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr "Hacia arriba"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr "Mover el men� seleccionado hacia arriba"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr "Hacia abajo"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr "Mover el men� seleccionado hacia abajo"
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr "Editar propiedades del elemento de men� seleccionado"
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr "Ordenar submen�"
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr "Ordenar carpeta seleccionada"
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+#, fuzzy
+msgid "Sort _Recursive"
+msgstr "Ordenar Carpeta _Recursivamente"
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr "Editor de Men� GNOME"
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
@@ -1657,66 +1724,110 @@ msgstr ""
 "Distribuido bajo los t�rminos de la licencia GPL de GNU.\n"
 "Editor de Men� GNOME. Le permite editar los men�es del Panel."
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr "El elemento de men� tiene que tener un nombre"
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr "La entrada de men� tiene que tener un nombre"
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr "�Guardar cambios?"
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr "Este cambio entra en conflicto con una entrada de men� existente"
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr "�Sobreescribir entrada de men� existente?"
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+"Este cambio conflictua con una entrada de men� existente.\n"
+"No se pueden tener dos entradas de men� con el mismo nombre."
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr "Un momento, leyendo men�es..."
 
-#: gmenu/tree.c:418
-msgid "GNOME"
-msgstr "GNOME"
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "Men�es Usuario"
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr "Ra�z de los men�es usuario"
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr "Men� Sistema"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr "Ra�z de los men�es sistema"
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "Men�es Usuario"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
+msgstr "No puede borrar una carpeta ra�z."
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
-msgstr "Ra�z de los men�es usuario"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr "�Borrar �ste elemento de men�?"
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr "�Borrar carpeta vac�a?"
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr "�Est� seguro de que quiere borrar esta carpeta y todos sus contenidos?"
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+"No puede a�adir una entrada en esa carpeta.\n"
+"Vd. no tiene los permisos adecuados."
+
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr "Nueva Carpeta"
+
+#: gmenu/treenew.c:63
+#, fuzzy
+msgid "Failed to create directory"
+msgstr "Fall� en crear el archivo."
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr " montado"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr "Terminal GNOME"
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr "El programa de emulaci�n de terminal de GNOME"
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr "Por omisi�n"
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
@@ -1726,299 +1837,341 @@ msgstr ""
 "la ventana para que corresponda a los valores por omisi�n \n"
 "de la nuava clase?"
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr "Consola Linux"
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr "Xterm a color"
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr "rxvt"
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr "Blanco sobre negro"
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr "Negro sobre blanco"
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr "Verde sobre negro"
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr "Negro sobre amarillo brillante"
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr "Colores personalizados"
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "Izquierda"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "Derecha"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr "Esconder"
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr "Fuente:"
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr "Buscar..."
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr "Clase del terminal"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr "Cursor intermitente"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr "Esconder barra de men�"
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr "Silenciar el 'bip' del terminal"
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr "Invertir Del/BackSpace"
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr "Car�cteres que pueden ser parte de una palabra"
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr "Imagen"
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 #, fuzzy
 msgid "Background type"
 msgstr " Fondo "
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 #, fuzzy
 msgid "None"
 msgstr "ninguno"
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr "Pixmap de fondo"
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr "Archivo pixmap:"
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr "Transparente"
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr "Fondo en degradado (lento)"
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr "Paleta de colores:"
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr "Color de primer plano:"
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr "Color del fondo:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr "Colores:"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "Posici�n de la barra de desfile"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr "Lineas de desfile hacia atr�s"
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr "Desfile al teclear"
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr "Desfile al afichar"
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr "Selector de colores"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr "_Nuevo terminal"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr "Crear un nuevo terminal"
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr "_Esconder barra de men�"
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr "_Cerrar el terminal"
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "_Cerrar el terminal"
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr "_Ver barra de men�"
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr "Selector de _colores..."
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr "Nombre de la clase del terminal"
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+#, fuzzy
+msgid "TCLASS"
 msgstr "CLASE"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr "Indicar nombre de la fuente"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr "FUENTE"
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr "No abrir los shells como shells de login"
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr "Abrir los shells como shells de login"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr "Indicar la geometr�a de la ventana principal"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr "GEOMETR�A"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr "Ejecutar este programa en vez del shell"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr "COMANDO"
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr "Color de primer plano"
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr "COLOR"
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr "Color de fondo"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr "Actualizar la entrada de utmp"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr "UTMP"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr "No actualizar la entrada de utmp"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr "NOUTMP"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr "Actualizar la entrada de wtmp"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr "WTMP"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr "No actualizar la entrada de wtmp"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr "NOWTMP"
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr "Definir el t�tulo de la ventana"
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr "T�TULO"
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr "Per�odo de espera (ms) para que los clientes se registren (0=infinito)"
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+#, fuzzy
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr "Per�odo de espera (ms) para que los clientes se registren (0=infinito)"
+
+#: gsm/main.c:61
 #, fuzzy
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr "Per�odo de espera (ms) para que los clientes se registren (0=infinito)"
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr "Un cierre de sesi�n est� en curso."
 
@@ -2030,24 +2183,53 @@ msgstr "Eliminar sesi�n"
 msgid "save-session: couldn't connect to session manager\n"
 msgstr "save-session: no pude conectar al gestor de sesi�n\n"
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr "Programa:"
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 #, fuzzy
 msgid "Cancel"
 msgstr "Panel"
 
+#: gsm/session-properties.c:258
+#, fuzzy
+msgid "Session"
+msgstr "Eliminar sesi�n"
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+#, fuzzy
+msgid "Start Session"
+msgstr "Descarta sesi�n"
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr "Panel"
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "Propiedades generales de los �conos"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr "Marcador"
@@ -2423,15 +2605,15 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr "��??"
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "Quitar del panel"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr "Mover applet"
 
@@ -2461,7 +2643,7 @@ msgstr "Activar el bot�n de escondido"
 msgid "Enable hidebutton arrow"
 msgstr "Activar flecha del bot�n de escondido"
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "Caj�n"
 
@@ -2469,23 +2651,23 @@ msgstr "Caj�n"
 msgid "This launch icon does not specify a program to run"
 msgstr "Este �cono de lanzamiento no especifica un programa para lanzar"
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr "Aplicaci�n"
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "Propiedades del lanzado de programas"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr "Crear un applet de lanzado de programas"
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "Terminar sesi�n"
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr "Salir del entorno GNOME"
 
@@ -2556,249 +2738,236 @@ msgstr "Imposible de recoger goad_id para el applet; ignorandolo."
 msgid " (empty)"
 msgstr " (vac�o)"
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr "Applets"
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr "Panel de lado"
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr "Panel de esquina"
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr "Men�es Sistema"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 #, fuzzy
 msgid "Debian menus"
 msgstr "Men� principal"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 #, fuzzy
 msgid "No Debian menus found!"
 msgstr "No se encontraron art�culos"
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
-msgstr "Men�es Usuario"
-
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr "Men�es Red Hat"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr "Quitar este panel"
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr "A�adir applet"
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr "A�adir un nuevo panel"
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr "Convertir a Panel de esquina"
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr "Convertir a Panel de lado"
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr "A�adir men� principal"
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr "A�adir caj�n"
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr "A�adir bot�n de salida de sesi�n"
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr "A�adir aplicaci�n miniaturizada"
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr "A�adir un nuevo lanzador"
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr "Propiedades de este panel..."
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "Propiedades globales..."
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr "Panel"
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr "Bloquear la pantalla"
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr "Acerca de GNOME..."
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr "�Imposible de abrir el directorio, usando el men� principal!"
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr "En un submen�"
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr "En el men� principal"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr "Propiedades del men�"
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr "Tipo de men�"
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr "Men� principal"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr "Men� normal"
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr "Men� Sistema: "
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr "Men� Usuario: "
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+#, fuzzy
+msgid "AnotherLevel menu (if found): "
 msgstr "Men� Red Hat (si se encuentra): "
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 #, fuzzy
 msgid "Debian menu (if found): "
 msgstr "Men� Red Hat (si se encuentra): "
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr "Ruta para Men�"
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "Posici�n"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "Arriba"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "Abajo"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr "Opciones de minimizaci�n"
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr "Esconderse autom�ticamente"
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr "Activar botones de escondido"
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr "Activar flechas de los botones de escondido"
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr "Noreste"
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr "Suroeste"
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr "Noroeste"
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr "Sureste"
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr "Orientaci�n"
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "Vertical"
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr "Opciones de botones de escondido"
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr "Fondo"
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr "Est�ndar"
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr "Pixmap"
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr "Color"
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr "Archivo de imagen"
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr "Redimencionar para que quepa en el panel"
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "Propiedades del panel"
 
@@ -2970,28 +3139,6 @@ msgstr "Animaci�n"
 msgid "General icon settings"
 msgstr "Propiedades generales de los �conos"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr "�Desconectar realmente?"
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr "Preguntar la pr�xima vez"
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr "Crear applet englobado"
@@ -3008,6 +3155,75 @@ msgstr "Comando (opcional)"
 msgid "Height"
 msgstr "Alto"
 
+#, fuzzy
+#~ msgid "Low Battery Warning"
+#~ msgstr "Baja y cargando."
+
+#~ msgid "Afterstep Clock Applet"
+#~ msgstr "Applet reloj Afterstep"
+
+#~ msgid "General Properties"
+#~ msgstr "Propiedades Generales"
+
+#~ msgid "Graph Interval:"
+#~ msgstr "Intervalo del Grafo:"
+
+#~ msgid "Submenu: "
+#~ msgstr "Submen�: "
+
+#~ msgid "Unable to create file: %s\n"
+#~ msgstr "Imposible crear el archivo: %s\n"
+
+#~ msgid "unable to remove .order file: %s\n"
+#~ msgstr "Imposible de borrar el archivo .order: %s\n"
+
+#~ msgid "File exists."
+#~ msgstr "El archivo existe."
+
+#~ msgid "Create Submenu:"
+#~ msgstr "Crear Carpeta:"
+
+#~ msgid "You must select something first."
+#~ msgstr "Debe seleccionar algo primero."
+
+#~ msgid ""
+#~ "You can't delete that file.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "No puede borrar este archivo.\n"
+#~ "Vd. no tiene los permisos adecuados."
+
+#~ msgid ""
+#~ "You are not allowed to move that item there.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "No puede desplazar ese elemento aqu�.\n"
+#~ "Vd. no tiene los permisos adecuados."
+
+#~ msgid "New"
+#~ msgstr "Nuevo"
+
+#~ msgid "Edit selected menu item properties"
+#~ msgstr "Editar propiedades del elemento de men� seleccionado"
+
+#~ msgid "GNOME"
+#~ msgstr "GNOME"
+
+#~ msgid "Red Hat menus"
+#~ msgstr "Men�es Red Hat"
+
+#~ msgid "Red Hat menu (if found): "
+#~ msgstr "Men� Red Hat (si se encuentra): "
+
+#~ msgid "Hidebutton options"
+#~ msgstr "Opciones de botones de escondido"
+
+#~ msgid "Really log out?"
+#~ msgstr "�Desconectar realmente?"
+
+#~ msgid "Ask next time"
+#~ msgstr "Preguntar la pr�xima vez"
+
 #~ msgid "Enable gsm debugging"
 #~ msgstr "Activar la epuraci�n de gsm"
 
@@ -3031,9 +3247,6 @@ msgstr "Alto"
 #~ msgid "Startup Programs"
 #~ msgstr "Programas de Inicio"
 
-#~ msgid "Geometry of window"
-#~ msgstr "Geometr�a de la ventana"
-
 #~ msgid "1.0pre1"
 #~ msgstr "1.0pre1"
 
@@ -3295,9 +3508,6 @@ msgstr "Alto"
 #~ msgid "MDI"
 #~ msgstr "MDI"
 
-#~ msgid "New Folder"
-#~ msgstr "Nueva Carpeta"
-
 #~ msgid "Failed to delete the folder."
 #~ msgstr "Fall� en borrar la carpeta."
 
@@ -3344,9 +3554,6 @@ msgstr "Alto"
 #~ msgid "Config"
 #~ msgstr "Configuraci�n"
 
-#~ msgid "Discard session"
-#~ msgstr "Descarta sesi�n"
-
 #~ msgid "E_xit"
 #~ msgstr "_Salir"
 
@@ -3371,9 +3578,6 @@ msgstr "Alto"
 #~ msgid "High."
 #~ msgstr "Alto."
 
-#~ msgid "Low and charging."
-#~ msgstr "Baja y cargando."
-
 #~ msgid "Low."
 #~ msgstr "Baja."
 
@@ -3536,8 +3740,5 @@ msgstr "Alto"
 #~ msgid "%s: option `-W %s' doesn't allow an argument\n"
 #~ msgstr "%s: la opci�n `-W %s' no admite argumentos\n"
 
-#~ msgid " Folder"
-#~ msgstr " Carpeta"
-
 #~ msgid "Add"
 #~ msgstr "A�adir"
diff --git a/po/es_DO.po b/po/es_DO.po
index 37006f37..73606002 100644
--- a/po/es_DO.po
+++ b/po/es_DO.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,125 +14,307 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr ""
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr ""
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
+#: applets/asclock/dialogs.c:17
+msgid "ASClock"
 msgstr ""
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr ""
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+msgid "My Title"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr ""
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr ""
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr ""
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr ""
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr ""
+
+#: applets/battery/battery.c:837
+msgid "The GNOME Battery Monitor Applet"
+msgstr ""
+
+#: applets/battery/battery.c:838
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr ""
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr ""
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
+#. Applet height
+#: applets/battery/properties.c:79
+msgid "Applet Height:"
 msgstr ""
 
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet width
+#: applets/battery/properties.c:90
+msgid "Applet Width:"
+msgstr ""
+
+#. Update interval
+#: applets/battery/properties.c:102
+msgid "Update Interval (seconds):"
 msgstr ""
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
 msgstr ""
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Applet mode label
+#: applets/battery/properties.c:130
+msgid "Applet Mode:"
 msgstr ""
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr ""
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr ""
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
+#: applets/battery/properties.c:202
+msgid "Low Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:262
+msgid "Graph Battery Low Color:"
+msgstr ""
+
+#: applets/battery/properties.c:268
+msgid "Graph Tick Color:"
+msgstr ""
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr ""
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr ""
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr ""
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr ""
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr ""
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr ""
 
@@ -158,17 +340,6 @@ msgid ""
 "keyboard. Released under GNU General Public Licence."
 msgstr ""
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr ""
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -213,10 +384,6 @@ msgstr ""
 msgid "Clock"
 msgstr ""
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr ""
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr ""
@@ -241,96 +408,6 @@ msgstr ""
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr ""
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr ""
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr ""
@@ -347,7 +424,7 @@ msgstr ""
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr ""
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr ""
 
@@ -367,6 +444,11 @@ msgstr ""
 msgid "Backgroundcolor"
 msgstr ""
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr ""
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -380,35 +462,35 @@ msgstr ""
 msgid "Diskusage Settings"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
 msgstr ""
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr ""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr ""
 
@@ -512,9 +594,9 @@ msgstr ""
 msgid "The Animation Filename:"
 msgstr ""
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr ""
 
@@ -563,7 +645,7 @@ msgstr ""
 msgid "About\t"
 msgstr ""
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr ""
 
@@ -744,7 +826,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr ""
 
@@ -773,80 +855,107 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
+#: applets/gnome-pager/gnomepager_applet.c:220
+msgid "Pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
+#: applets/gnome-pager/gnomepager_applet.c:222
+msgid "Show pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
+#: applets/gnome-pager/gnomepager_applet.c:229
+msgid "Use small pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:224
-msgid "Show pager"
+#: applets/gnome-pager/gnomepager_applet.c:241
+msgid "Rows of pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:232
-msgid "Use small pagers"
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
+#: applets/gnome-pager/gnomepager_applet.c:261
+msgid "Show task list button"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
-msgid "Show task list button"
+#: applets/gnome-pager/gnomepager_applet.c:268
+msgid "Show task list"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+msgid "Show button icons"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+msgid "Show all tasks"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+msgid "Show normal tasks only"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+msgid "Show minimized tasks only"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+msgid "Show minimized tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+msgid "Geometry"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr ""
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -858,27 +967,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr ""
 
@@ -964,7 +1073,7 @@ msgid "History"
 msgstr ""
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr ""
 
@@ -1031,7 +1140,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr ""
 
@@ -1268,7 +1377,7 @@ msgstr ""
 msgid "Open new window"
 msgstr ""
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr ""
 
@@ -1292,6 +1401,10 @@ msgstr ""
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr ""
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr ""
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr ""
@@ -1300,12 +1413,12 @@ msgstr ""
 msgid "Slashapp article list"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr ""
@@ -1393,542 +1506,560 @@ msgstr ""
 msgid "Look"
 msgstr ""
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr ""
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr ""
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr ""
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr ""
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr ""
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr ""
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr ""
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr ""
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr ""
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr ""
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
+#: gmenu/desktop.c:80
+msgid " Folder"
 msgstr ""
 
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr ""
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr ""
 
-#: gmenu/edit.c:249
-msgid "New"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
 msgstr ""
 
-#: gmenu/gmenu.c:52
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr ""
+
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr ""
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr ""
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr ""
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr ""
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr ""
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr ""
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr ""
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr ""
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr ""
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+msgid "Sort _Recursive"
+msgstr ""
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr ""
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
 msgstr ""
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr ""
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr ""
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr ""
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr ""
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr ""
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr ""
 
-#: gmenu/tree.c:418
-msgid "GNOME"
+#: gmenu/tree.c:410
+msgid "User Menus"
 msgstr ""
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr ""
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr ""
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr ""
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
 msgstr ""
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr ""
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr ""
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr ""
+
+#: gmenu/treenew.c:63
+msgid "Failed to create directory"
+msgstr ""
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+msgid "untitled"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
 "configuration of the new class?"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr ""
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr ""
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr ""
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr ""
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr ""
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr ""
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr ""
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 msgid "Background type"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 msgid "None"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr ""
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr ""
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr ""
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr ""
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr ""
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr ""
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr ""
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr ""
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+msgid "_Reset Terminal"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+msgid "TCLASS"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr ""
 
@@ -1940,23 +2071,48 @@ msgstr ""
 msgid "save-session: couldn't connect to session manager\n"
 msgstr ""
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr ""
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 msgid "Cancel"
 msgstr ""
 
+#: gsm/session-properties.c:258
+msgid "Session"
+msgstr ""
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+msgid "Cancel Login"
+msgstr ""
+
+#: gsm/session-properties.c:344
+msgid "Initialize session settings"
+msgstr ""
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr ""
@@ -2304,15 +2460,15 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr ""
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr ""
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr ""
 
@@ -2342,7 +2498,7 @@ msgstr ""
 msgid "Enable hidebutton arrow"
 msgstr ""
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr ""
 
@@ -2350,23 +2506,23 @@ msgstr ""
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr ""
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr ""
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr ""
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr ""
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr ""
 
@@ -2431,246 +2587,232 @@ msgstr ""
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr ""
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr ""
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr ""
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr ""
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 msgid "Debian menus"
 msgstr ""
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 msgid "No Debian menus found!"
 msgstr ""
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
 msgstr ""
 
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr ""
-
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr ""
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr ""
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr ""
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr ""
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr ""
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr ""
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr ""
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr ""
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr ""
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr ""
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr ""
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr ""
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr ""
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr ""
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr ""
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr ""
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr ""
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr ""
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr ""
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr ""
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr ""
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr ""
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr ""
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr ""
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+msgid "AnotherLevel menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr ""
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr ""
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr ""
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr ""
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr ""
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr ""
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr ""
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr ""
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr ""
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr ""
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr ""
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr ""
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr ""
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr ""
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr ""
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr ""
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr ""
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr ""
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr ""
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr ""
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr ""
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr ""
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr ""
 
@@ -2838,28 +2980,6 @@ msgstr ""
 msgid "General icon settings"
 msgstr ""
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr ""
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr ""
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr ""
diff --git a/po/es_GT.po b/po/es_GT.po
index 37006f37..73606002 100644
--- a/po/es_GT.po
+++ b/po/es_GT.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,125 +14,307 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr ""
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr ""
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
+#: applets/asclock/dialogs.c:17
+msgid "ASClock"
 msgstr ""
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr ""
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+msgid "My Title"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr ""
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr ""
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr ""
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr ""
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr ""
+
+#: applets/battery/battery.c:837
+msgid "The GNOME Battery Monitor Applet"
+msgstr ""
+
+#: applets/battery/battery.c:838
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr ""
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr ""
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
+#. Applet height
+#: applets/battery/properties.c:79
+msgid "Applet Height:"
 msgstr ""
 
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet width
+#: applets/battery/properties.c:90
+msgid "Applet Width:"
+msgstr ""
+
+#. Update interval
+#: applets/battery/properties.c:102
+msgid "Update Interval (seconds):"
 msgstr ""
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
 msgstr ""
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Applet mode label
+#: applets/battery/properties.c:130
+msgid "Applet Mode:"
 msgstr ""
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr ""
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr ""
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
+#: applets/battery/properties.c:202
+msgid "Low Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:262
+msgid "Graph Battery Low Color:"
+msgstr ""
+
+#: applets/battery/properties.c:268
+msgid "Graph Tick Color:"
+msgstr ""
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr ""
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr ""
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr ""
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr ""
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr ""
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr ""
 
@@ -158,17 +340,6 @@ msgid ""
 "keyboard. Released under GNU General Public Licence."
 msgstr ""
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr ""
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -213,10 +384,6 @@ msgstr ""
 msgid "Clock"
 msgstr ""
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr ""
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr ""
@@ -241,96 +408,6 @@ msgstr ""
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr ""
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr ""
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr ""
@@ -347,7 +424,7 @@ msgstr ""
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr ""
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr ""
 
@@ -367,6 +444,11 @@ msgstr ""
 msgid "Backgroundcolor"
 msgstr ""
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr ""
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -380,35 +462,35 @@ msgstr ""
 msgid "Diskusage Settings"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
 msgstr ""
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr ""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr ""
 
@@ -512,9 +594,9 @@ msgstr ""
 msgid "The Animation Filename:"
 msgstr ""
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr ""
 
@@ -563,7 +645,7 @@ msgstr ""
 msgid "About\t"
 msgstr ""
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr ""
 
@@ -744,7 +826,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr ""
 
@@ -773,80 +855,107 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
+#: applets/gnome-pager/gnomepager_applet.c:220
+msgid "Pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
+#: applets/gnome-pager/gnomepager_applet.c:222
+msgid "Show pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
+#: applets/gnome-pager/gnomepager_applet.c:229
+msgid "Use small pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:224
-msgid "Show pager"
+#: applets/gnome-pager/gnomepager_applet.c:241
+msgid "Rows of pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:232
-msgid "Use small pagers"
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
+#: applets/gnome-pager/gnomepager_applet.c:261
+msgid "Show task list button"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
-msgid "Show task list button"
+#: applets/gnome-pager/gnomepager_applet.c:268
+msgid "Show task list"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+msgid "Show button icons"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+msgid "Show all tasks"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+msgid "Show normal tasks only"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+msgid "Show minimized tasks only"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+msgid "Show minimized tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+msgid "Geometry"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr ""
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -858,27 +967,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr ""
 
@@ -964,7 +1073,7 @@ msgid "History"
 msgstr ""
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr ""
 
@@ -1031,7 +1140,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr ""
 
@@ -1268,7 +1377,7 @@ msgstr ""
 msgid "Open new window"
 msgstr ""
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr ""
 
@@ -1292,6 +1401,10 @@ msgstr ""
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr ""
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr ""
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr ""
@@ -1300,12 +1413,12 @@ msgstr ""
 msgid "Slashapp article list"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr ""
@@ -1393,542 +1506,560 @@ msgstr ""
 msgid "Look"
 msgstr ""
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr ""
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr ""
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr ""
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr ""
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr ""
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr ""
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr ""
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr ""
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr ""
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr ""
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
+#: gmenu/desktop.c:80
+msgid " Folder"
 msgstr ""
 
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr ""
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr ""
 
-#: gmenu/edit.c:249
-msgid "New"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
 msgstr ""
 
-#: gmenu/gmenu.c:52
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr ""
+
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr ""
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr ""
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr ""
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr ""
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr ""
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr ""
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr ""
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr ""
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr ""
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+msgid "Sort _Recursive"
+msgstr ""
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr ""
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
 msgstr ""
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr ""
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr ""
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr ""
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr ""
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr ""
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr ""
 
-#: gmenu/tree.c:418
-msgid "GNOME"
+#: gmenu/tree.c:410
+msgid "User Menus"
 msgstr ""
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr ""
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr ""
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr ""
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
 msgstr ""
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr ""
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr ""
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr ""
+
+#: gmenu/treenew.c:63
+msgid "Failed to create directory"
+msgstr ""
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+msgid "untitled"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
 "configuration of the new class?"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr ""
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr ""
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr ""
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr ""
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr ""
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr ""
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr ""
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 msgid "Background type"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 msgid "None"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr ""
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr ""
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr ""
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr ""
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr ""
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr ""
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr ""
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr ""
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+msgid "_Reset Terminal"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+msgid "TCLASS"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr ""
 
@@ -1940,23 +2071,48 @@ msgstr ""
 msgid "save-session: couldn't connect to session manager\n"
 msgstr ""
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr ""
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 msgid "Cancel"
 msgstr ""
 
+#: gsm/session-properties.c:258
+msgid "Session"
+msgstr ""
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+msgid "Cancel Login"
+msgstr ""
+
+#: gsm/session-properties.c:344
+msgid "Initialize session settings"
+msgstr ""
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr ""
@@ -2304,15 +2460,15 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr ""
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr ""
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr ""
 
@@ -2342,7 +2498,7 @@ msgstr ""
 msgid "Enable hidebutton arrow"
 msgstr ""
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr ""
 
@@ -2350,23 +2506,23 @@ msgstr ""
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr ""
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr ""
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr ""
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr ""
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr ""
 
@@ -2431,246 +2587,232 @@ msgstr ""
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr ""
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr ""
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr ""
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr ""
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 msgid "Debian menus"
 msgstr ""
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 msgid "No Debian menus found!"
 msgstr ""
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
 msgstr ""
 
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr ""
-
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr ""
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr ""
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr ""
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr ""
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr ""
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr ""
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr ""
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr ""
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr ""
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr ""
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr ""
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr ""
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr ""
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr ""
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr ""
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr ""
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr ""
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr ""
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr ""
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr ""
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr ""
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr ""
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr ""
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr ""
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+msgid "AnotherLevel menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr ""
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr ""
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr ""
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr ""
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr ""
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr ""
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr ""
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr ""
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr ""
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr ""
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr ""
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr ""
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr ""
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr ""
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr ""
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr ""
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr ""
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr ""
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr ""
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr ""
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr ""
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr ""
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr ""
 
@@ -2838,28 +2980,6 @@ msgstr ""
 msgid "General icon settings"
 msgstr ""
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr ""
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr ""
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr ""
diff --git a/po/es_HN.po b/po/es_HN.po
index 37006f37..73606002 100644
--- a/po/es_HN.po
+++ b/po/es_HN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,125 +14,307 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr ""
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr ""
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
+#: applets/asclock/dialogs.c:17
+msgid "ASClock"
 msgstr ""
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr ""
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+msgid "My Title"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr ""
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr ""
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr ""
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr ""
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr ""
+
+#: applets/battery/battery.c:837
+msgid "The GNOME Battery Monitor Applet"
+msgstr ""
+
+#: applets/battery/battery.c:838
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr ""
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr ""
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
+#. Applet height
+#: applets/battery/properties.c:79
+msgid "Applet Height:"
 msgstr ""
 
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet width
+#: applets/battery/properties.c:90
+msgid "Applet Width:"
+msgstr ""
+
+#. Update interval
+#: applets/battery/properties.c:102
+msgid "Update Interval (seconds):"
 msgstr ""
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
 msgstr ""
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Applet mode label
+#: applets/battery/properties.c:130
+msgid "Applet Mode:"
 msgstr ""
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr ""
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr ""
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
+#: applets/battery/properties.c:202
+msgid "Low Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:262
+msgid "Graph Battery Low Color:"
+msgstr ""
+
+#: applets/battery/properties.c:268
+msgid "Graph Tick Color:"
+msgstr ""
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr ""
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr ""
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr ""
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr ""
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr ""
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr ""
 
@@ -158,17 +340,6 @@ msgid ""
 "keyboard. Released under GNU General Public Licence."
 msgstr ""
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr ""
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -213,10 +384,6 @@ msgstr ""
 msgid "Clock"
 msgstr ""
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr ""
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr ""
@@ -241,96 +408,6 @@ msgstr ""
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr ""
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr ""
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr ""
@@ -347,7 +424,7 @@ msgstr ""
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr ""
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr ""
 
@@ -367,6 +444,11 @@ msgstr ""
 msgid "Backgroundcolor"
 msgstr ""
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr ""
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -380,35 +462,35 @@ msgstr ""
 msgid "Diskusage Settings"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
 msgstr ""
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr ""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr ""
 
@@ -512,9 +594,9 @@ msgstr ""
 msgid "The Animation Filename:"
 msgstr ""
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr ""
 
@@ -563,7 +645,7 @@ msgstr ""
 msgid "About\t"
 msgstr ""
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr ""
 
@@ -744,7 +826,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr ""
 
@@ -773,80 +855,107 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
+#: applets/gnome-pager/gnomepager_applet.c:220
+msgid "Pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
+#: applets/gnome-pager/gnomepager_applet.c:222
+msgid "Show pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
+#: applets/gnome-pager/gnomepager_applet.c:229
+msgid "Use small pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:224
-msgid "Show pager"
+#: applets/gnome-pager/gnomepager_applet.c:241
+msgid "Rows of pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:232
-msgid "Use small pagers"
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
+#: applets/gnome-pager/gnomepager_applet.c:261
+msgid "Show task list button"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
-msgid "Show task list button"
+#: applets/gnome-pager/gnomepager_applet.c:268
+msgid "Show task list"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+msgid "Show button icons"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+msgid "Show all tasks"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+msgid "Show normal tasks only"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+msgid "Show minimized tasks only"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+msgid "Show minimized tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+msgid "Geometry"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr ""
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -858,27 +967,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr ""
 
@@ -964,7 +1073,7 @@ msgid "History"
 msgstr ""
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr ""
 
@@ -1031,7 +1140,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr ""
 
@@ -1268,7 +1377,7 @@ msgstr ""
 msgid "Open new window"
 msgstr ""
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr ""
 
@@ -1292,6 +1401,10 @@ msgstr ""
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr ""
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr ""
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr ""
@@ -1300,12 +1413,12 @@ msgstr ""
 msgid "Slashapp article list"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr ""
@@ -1393,542 +1506,560 @@ msgstr ""
 msgid "Look"
 msgstr ""
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr ""
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr ""
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr ""
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr ""
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr ""
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr ""
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr ""
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr ""
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr ""
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr ""
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
+#: gmenu/desktop.c:80
+msgid " Folder"
 msgstr ""
 
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr ""
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr ""
 
-#: gmenu/edit.c:249
-msgid "New"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
 msgstr ""
 
-#: gmenu/gmenu.c:52
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr ""
+
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr ""
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr ""
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr ""
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr ""
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr ""
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr ""
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr ""
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr ""
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr ""
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+msgid "Sort _Recursive"
+msgstr ""
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr ""
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
 msgstr ""
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr ""
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr ""
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr ""
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr ""
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr ""
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr ""
 
-#: gmenu/tree.c:418
-msgid "GNOME"
+#: gmenu/tree.c:410
+msgid "User Menus"
 msgstr ""
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr ""
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr ""
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr ""
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
 msgstr ""
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr ""
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr ""
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr ""
+
+#: gmenu/treenew.c:63
+msgid "Failed to create directory"
+msgstr ""
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+msgid "untitled"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
 "configuration of the new class?"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr ""
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr ""
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr ""
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr ""
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr ""
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr ""
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr ""
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 msgid "Background type"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 msgid "None"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr ""
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr ""
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr ""
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr ""
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr ""
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr ""
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr ""
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr ""
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+msgid "_Reset Terminal"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+msgid "TCLASS"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr ""
 
@@ -1940,23 +2071,48 @@ msgstr ""
 msgid "save-session: couldn't connect to session manager\n"
 msgstr ""
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr ""
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 msgid "Cancel"
 msgstr ""
 
+#: gsm/session-properties.c:258
+msgid "Session"
+msgstr ""
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+msgid "Cancel Login"
+msgstr ""
+
+#: gsm/session-properties.c:344
+msgid "Initialize session settings"
+msgstr ""
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr ""
@@ -2304,15 +2460,15 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr ""
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr ""
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr ""
 
@@ -2342,7 +2498,7 @@ msgstr ""
 msgid "Enable hidebutton arrow"
 msgstr ""
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr ""
 
@@ -2350,23 +2506,23 @@ msgstr ""
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr ""
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr ""
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr ""
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr ""
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr ""
 
@@ -2431,246 +2587,232 @@ msgstr ""
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr ""
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr ""
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr ""
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr ""
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 msgid "Debian menus"
 msgstr ""
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 msgid "No Debian menus found!"
 msgstr ""
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
 msgstr ""
 
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr ""
-
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr ""
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr ""
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr ""
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr ""
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr ""
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr ""
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr ""
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr ""
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr ""
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr ""
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr ""
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr ""
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr ""
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr ""
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr ""
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr ""
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr ""
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr ""
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr ""
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr ""
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr ""
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr ""
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr ""
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr ""
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+msgid "AnotherLevel menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr ""
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr ""
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr ""
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr ""
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr ""
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr ""
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr ""
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr ""
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr ""
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr ""
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr ""
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr ""
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr ""
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr ""
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr ""
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr ""
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr ""
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr ""
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr ""
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr ""
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr ""
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr ""
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr ""
 
@@ -2838,28 +2980,6 @@ msgstr ""
 msgid "General icon settings"
 msgstr ""
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr ""
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr ""
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr ""
diff --git a/po/es_MX.po b/po/es_MX.po
index 6b50f7a7..320c68e1 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,125 +14,307 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr ""
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr ""
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
+#: applets/asclock/dialogs.c:17
+msgid "ASClock"
 msgstr ""
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr ""
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+msgid "My Title"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr ""
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr ""
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr ""
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr ""
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr ""
+
+#: applets/battery/battery.c:837
+msgid "The GNOME Battery Monitor Applet"
+msgstr ""
+
+#: applets/battery/battery.c:838
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr ""
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr ""
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
+#. Applet height
+#: applets/battery/properties.c:79
+msgid "Applet Height:"
 msgstr ""
 
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet width
+#: applets/battery/properties.c:90
+msgid "Applet Width:"
+msgstr ""
+
+#. Update interval
+#: applets/battery/properties.c:102
+msgid "Update Interval (seconds):"
 msgstr ""
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
 msgstr ""
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Applet mode label
+#: applets/battery/properties.c:130
+msgid "Applet Mode:"
 msgstr ""
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr ""
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr ""
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
+#: applets/battery/properties.c:202
+msgid "Low Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:262
+msgid "Graph Battery Low Color:"
+msgstr ""
+
+#: applets/battery/properties.c:268
+msgid "Graph Tick Color:"
+msgstr ""
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr ""
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr ""
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr ""
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr ""
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr ""
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr ""
 
@@ -158,17 +340,6 @@ msgid ""
 "keyboard. Released under GNU General Public Licence."
 msgstr ""
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr ""
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -213,10 +384,6 @@ msgstr ""
 msgid "Clock"
 msgstr ""
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr ""
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr ""
@@ -241,96 +408,6 @@ msgstr ""
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr ""
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr ""
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr ""
@@ -347,7 +424,7 @@ msgstr ""
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr ""
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr ""
 
@@ -367,6 +444,11 @@ msgstr ""
 msgid "Backgroundcolor"
 msgstr ""
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr ""
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -380,35 +462,35 @@ msgstr ""
 msgid "Diskusage Settings"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
 msgstr ""
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr ""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr ""
 
@@ -512,9 +594,9 @@ msgstr ""
 msgid "The Animation Filename:"
 msgstr ""
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr ""
 
@@ -563,7 +645,7 @@ msgstr ""
 msgid "About\t"
 msgstr ""
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr ""
 
@@ -744,7 +826,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr ""
 
@@ -773,80 +855,107 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
+#: applets/gnome-pager/gnomepager_applet.c:220
+msgid "Pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
+#: applets/gnome-pager/gnomepager_applet.c:222
+msgid "Show pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
+#: applets/gnome-pager/gnomepager_applet.c:229
+msgid "Use small pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:224
-msgid "Show pager"
+#: applets/gnome-pager/gnomepager_applet.c:241
+msgid "Rows of pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:232
-msgid "Use small pagers"
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
+#: applets/gnome-pager/gnomepager_applet.c:261
+msgid "Show task list button"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
-msgid "Show task list button"
+#: applets/gnome-pager/gnomepager_applet.c:268
+msgid "Show task list"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+msgid "Show button icons"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+msgid "Show all tasks"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+msgid "Show normal tasks only"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+msgid "Show minimized tasks only"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+msgid "Show minimized tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+msgid "Geometry"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr ""
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -858,27 +967,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr ""
 
@@ -964,7 +1073,7 @@ msgid "History"
 msgstr ""
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr ""
 
@@ -1031,7 +1140,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr ""
 
@@ -1268,7 +1377,7 @@ msgstr ""
 msgid "Open new window"
 msgstr ""
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr "Desplazamiento"
 
@@ -1292,6 +1401,10 @@ msgstr ""
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr ""
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr ""
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr ""
@@ -1300,12 +1413,12 @@ msgstr ""
 msgid "Slashapp article list"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr ""
@@ -1393,542 +1506,560 @@ msgstr ""
 msgid "Look"
 msgstr ""
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr ""
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr ""
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr ""
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr ""
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr ""
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr ""
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr ""
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr ""
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr ""
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr ""
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
+#: gmenu/desktop.c:80
+msgid " Folder"
 msgstr ""
 
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr ""
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr ""
 
-#: gmenu/edit.c:249
-msgid "New"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
 msgstr ""
 
-#: gmenu/gmenu.c:52
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr ""
+
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr ""
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr ""
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr ""
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr ""
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr ""
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr ""
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr ""
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr ""
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr ""
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+msgid "Sort _Recursive"
+msgstr ""
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr ""
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
 msgstr ""
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr ""
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr ""
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr ""
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr ""
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr ""
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr ""
 
-#: gmenu/tree.c:418
-msgid "GNOME"
+#: gmenu/tree.c:410
+msgid "User Menus"
 msgstr ""
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr ""
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr ""
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr ""
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
 msgstr ""
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr ""
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr ""
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr ""
+
+#: gmenu/treenew.c:63
+msgid "Failed to create directory"
+msgstr ""
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+msgid "untitled"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
 "configuration of the new class?"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr ""
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr ""
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr ""
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr ""
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr ""
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr ""
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr ""
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 msgid "Background type"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 msgid "None"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr ""
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr ""
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr ""
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr ""
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr ""
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "Posici�n de la barra de desplazamiento"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr "Hist�rico de la terminal"
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr "Desplaza al teclear"
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr "Desplazar cuando haya salida"
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+msgid "_Reset Terminal"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+msgid "TCLASS"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr ""
 
@@ -1940,23 +2071,48 @@ msgstr ""
 msgid "save-session: couldn't connect to session manager\n"
 msgstr ""
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr ""
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 msgid "Cancel"
 msgstr ""
 
+#: gsm/session-properties.c:258
+msgid "Session"
+msgstr ""
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+msgid "Cancel Login"
+msgstr ""
+
+#: gsm/session-properties.c:344
+msgid "Initialize session settings"
+msgstr ""
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr ""
@@ -2304,15 +2460,15 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr ""
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr ""
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr ""
 
@@ -2342,7 +2498,7 @@ msgstr ""
 msgid "Enable hidebutton arrow"
 msgstr ""
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr ""
 
@@ -2350,23 +2506,23 @@ msgstr ""
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr ""
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr ""
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr ""
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr ""
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr ""
 
@@ -2431,246 +2587,232 @@ msgstr ""
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr ""
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr ""
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr ""
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr ""
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 msgid "Debian menus"
 msgstr ""
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 msgid "No Debian menus found!"
 msgstr ""
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
 msgstr ""
 
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr ""
-
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr ""
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr ""
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr ""
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr ""
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr ""
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr ""
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr ""
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr ""
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr ""
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr ""
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr ""
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr ""
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr ""
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr ""
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr ""
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr ""
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr ""
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr ""
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr ""
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr ""
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr ""
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr ""
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr ""
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr ""
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+msgid "AnotherLevel menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr ""
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr ""
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr ""
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr ""
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr ""
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr ""
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr ""
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr ""
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr ""
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr ""
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr ""
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr ""
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr ""
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr ""
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr ""
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr ""
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr ""
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr ""
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr ""
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr ""
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr ""
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr ""
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr ""
 
@@ -2838,28 +2980,6 @@ msgstr ""
 msgid "General icon settings"
 msgstr ""
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr ""
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr ""
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr ""
diff --git a/po/es_PA.po b/po/es_PA.po
index 37006f37..73606002 100644
--- a/po/es_PA.po
+++ b/po/es_PA.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,125 +14,307 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr ""
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr ""
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
+#: applets/asclock/dialogs.c:17
+msgid "ASClock"
 msgstr ""
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr ""
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+msgid "My Title"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr ""
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr ""
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr ""
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr ""
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr ""
+
+#: applets/battery/battery.c:837
+msgid "The GNOME Battery Monitor Applet"
+msgstr ""
+
+#: applets/battery/battery.c:838
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr ""
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr ""
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
+#. Applet height
+#: applets/battery/properties.c:79
+msgid "Applet Height:"
 msgstr ""
 
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet width
+#: applets/battery/properties.c:90
+msgid "Applet Width:"
+msgstr ""
+
+#. Update interval
+#: applets/battery/properties.c:102
+msgid "Update Interval (seconds):"
 msgstr ""
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
 msgstr ""
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Applet mode label
+#: applets/battery/properties.c:130
+msgid "Applet Mode:"
 msgstr ""
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr ""
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr ""
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
+#: applets/battery/properties.c:202
+msgid "Low Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:262
+msgid "Graph Battery Low Color:"
+msgstr ""
+
+#: applets/battery/properties.c:268
+msgid "Graph Tick Color:"
+msgstr ""
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr ""
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr ""
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr ""
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr ""
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr ""
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr ""
 
@@ -158,17 +340,6 @@ msgid ""
 "keyboard. Released under GNU General Public Licence."
 msgstr ""
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr ""
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -213,10 +384,6 @@ msgstr ""
 msgid "Clock"
 msgstr ""
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr ""
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr ""
@@ -241,96 +408,6 @@ msgstr ""
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr ""
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr ""
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr ""
@@ -347,7 +424,7 @@ msgstr ""
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr ""
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr ""
 
@@ -367,6 +444,11 @@ msgstr ""
 msgid "Backgroundcolor"
 msgstr ""
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr ""
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -380,35 +462,35 @@ msgstr ""
 msgid "Diskusage Settings"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
 msgstr ""
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr ""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr ""
 
@@ -512,9 +594,9 @@ msgstr ""
 msgid "The Animation Filename:"
 msgstr ""
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr ""
 
@@ -563,7 +645,7 @@ msgstr ""
 msgid "About\t"
 msgstr ""
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr ""
 
@@ -744,7 +826,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr ""
 
@@ -773,80 +855,107 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
+#: applets/gnome-pager/gnomepager_applet.c:220
+msgid "Pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
+#: applets/gnome-pager/gnomepager_applet.c:222
+msgid "Show pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
+#: applets/gnome-pager/gnomepager_applet.c:229
+msgid "Use small pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:224
-msgid "Show pager"
+#: applets/gnome-pager/gnomepager_applet.c:241
+msgid "Rows of pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:232
-msgid "Use small pagers"
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
+#: applets/gnome-pager/gnomepager_applet.c:261
+msgid "Show task list button"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
-msgid "Show task list button"
+#: applets/gnome-pager/gnomepager_applet.c:268
+msgid "Show task list"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+msgid "Show button icons"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+msgid "Show all tasks"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+msgid "Show normal tasks only"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+msgid "Show minimized tasks only"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+msgid "Show minimized tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+msgid "Geometry"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr ""
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -858,27 +967,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr ""
 
@@ -964,7 +1073,7 @@ msgid "History"
 msgstr ""
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr ""
 
@@ -1031,7 +1140,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr ""
 
@@ -1268,7 +1377,7 @@ msgstr ""
 msgid "Open new window"
 msgstr ""
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr ""
 
@@ -1292,6 +1401,10 @@ msgstr ""
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr ""
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr ""
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr ""
@@ -1300,12 +1413,12 @@ msgstr ""
 msgid "Slashapp article list"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr ""
@@ -1393,542 +1506,560 @@ msgstr ""
 msgid "Look"
 msgstr ""
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr ""
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr ""
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr ""
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr ""
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr ""
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr ""
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr ""
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr ""
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr ""
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr ""
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
+#: gmenu/desktop.c:80
+msgid " Folder"
 msgstr ""
 
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr ""
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr ""
 
-#: gmenu/edit.c:249
-msgid "New"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
 msgstr ""
 
-#: gmenu/gmenu.c:52
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr ""
+
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr ""
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr ""
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr ""
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr ""
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr ""
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr ""
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr ""
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr ""
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr ""
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+msgid "Sort _Recursive"
+msgstr ""
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr ""
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
 msgstr ""
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr ""
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr ""
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr ""
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr ""
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr ""
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr ""
 
-#: gmenu/tree.c:418
-msgid "GNOME"
+#: gmenu/tree.c:410
+msgid "User Menus"
 msgstr ""
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr ""
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr ""
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr ""
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
 msgstr ""
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr ""
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr ""
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr ""
+
+#: gmenu/treenew.c:63
+msgid "Failed to create directory"
+msgstr ""
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+msgid "untitled"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
 "configuration of the new class?"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr ""
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr ""
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr ""
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr ""
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr ""
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr ""
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr ""
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 msgid "Background type"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 msgid "None"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr ""
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr ""
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr ""
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr ""
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr ""
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr ""
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr ""
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr ""
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+msgid "_Reset Terminal"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+msgid "TCLASS"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr ""
 
@@ -1940,23 +2071,48 @@ msgstr ""
 msgid "save-session: couldn't connect to session manager\n"
 msgstr ""
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr ""
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 msgid "Cancel"
 msgstr ""
 
+#: gsm/session-properties.c:258
+msgid "Session"
+msgstr ""
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+msgid "Cancel Login"
+msgstr ""
+
+#: gsm/session-properties.c:344
+msgid "Initialize session settings"
+msgstr ""
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr ""
@@ -2304,15 +2460,15 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr ""
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr ""
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr ""
 
@@ -2342,7 +2498,7 @@ msgstr ""
 msgid "Enable hidebutton arrow"
 msgstr ""
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr ""
 
@@ -2350,23 +2506,23 @@ msgstr ""
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr ""
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr ""
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr ""
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr ""
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr ""
 
@@ -2431,246 +2587,232 @@ msgstr ""
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr ""
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr ""
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr ""
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr ""
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 msgid "Debian menus"
 msgstr ""
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 msgid "No Debian menus found!"
 msgstr ""
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
 msgstr ""
 
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr ""
-
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr ""
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr ""
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr ""
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr ""
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr ""
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr ""
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr ""
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr ""
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr ""
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr ""
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr ""
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr ""
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr ""
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr ""
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr ""
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr ""
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr ""
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr ""
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr ""
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr ""
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr ""
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr ""
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr ""
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr ""
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+msgid "AnotherLevel menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr ""
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr ""
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr ""
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr ""
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr ""
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr ""
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr ""
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr ""
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr ""
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr ""
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr ""
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr ""
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr ""
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr ""
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr ""
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr ""
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr ""
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr ""
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr ""
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr ""
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr ""
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr ""
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr ""
 
@@ -2838,28 +2980,6 @@ msgstr ""
 msgid "General icon settings"
 msgstr ""
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr ""
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr ""
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr ""
diff --git a/po/es_PE.po b/po/es_PE.po
index 37006f37..73606002 100644
--- a/po/es_PE.po
+++ b/po/es_PE.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,125 +14,307 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr ""
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr ""
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
+#: applets/asclock/dialogs.c:17
+msgid "ASClock"
 msgstr ""
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr ""
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+msgid "My Title"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr ""
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr ""
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr ""
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr ""
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr ""
+
+#: applets/battery/battery.c:837
+msgid "The GNOME Battery Monitor Applet"
+msgstr ""
+
+#: applets/battery/battery.c:838
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr ""
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr ""
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
+#. Applet height
+#: applets/battery/properties.c:79
+msgid "Applet Height:"
 msgstr ""
 
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet width
+#: applets/battery/properties.c:90
+msgid "Applet Width:"
+msgstr ""
+
+#. Update interval
+#: applets/battery/properties.c:102
+msgid "Update Interval (seconds):"
 msgstr ""
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
 msgstr ""
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Applet mode label
+#: applets/battery/properties.c:130
+msgid "Applet Mode:"
 msgstr ""
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr ""
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr ""
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
+#: applets/battery/properties.c:202
+msgid "Low Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:262
+msgid "Graph Battery Low Color:"
+msgstr ""
+
+#: applets/battery/properties.c:268
+msgid "Graph Tick Color:"
+msgstr ""
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr ""
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr ""
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr ""
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr ""
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr ""
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr ""
 
@@ -158,17 +340,6 @@ msgid ""
 "keyboard. Released under GNU General Public Licence."
 msgstr ""
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr ""
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -213,10 +384,6 @@ msgstr ""
 msgid "Clock"
 msgstr ""
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr ""
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr ""
@@ -241,96 +408,6 @@ msgstr ""
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr ""
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr ""
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr ""
@@ -347,7 +424,7 @@ msgstr ""
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr ""
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr ""
 
@@ -367,6 +444,11 @@ msgstr ""
 msgid "Backgroundcolor"
 msgstr ""
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr ""
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -380,35 +462,35 @@ msgstr ""
 msgid "Diskusage Settings"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
 msgstr ""
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr ""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr ""
 
@@ -512,9 +594,9 @@ msgstr ""
 msgid "The Animation Filename:"
 msgstr ""
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr ""
 
@@ -563,7 +645,7 @@ msgstr ""
 msgid "About\t"
 msgstr ""
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr ""
 
@@ -744,7 +826,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr ""
 
@@ -773,80 +855,107 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
+#: applets/gnome-pager/gnomepager_applet.c:220
+msgid "Pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
+#: applets/gnome-pager/gnomepager_applet.c:222
+msgid "Show pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
+#: applets/gnome-pager/gnomepager_applet.c:229
+msgid "Use small pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:224
-msgid "Show pager"
+#: applets/gnome-pager/gnomepager_applet.c:241
+msgid "Rows of pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:232
-msgid "Use small pagers"
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
+#: applets/gnome-pager/gnomepager_applet.c:261
+msgid "Show task list button"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
-msgid "Show task list button"
+#: applets/gnome-pager/gnomepager_applet.c:268
+msgid "Show task list"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+msgid "Show button icons"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+msgid "Show all tasks"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+msgid "Show normal tasks only"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+msgid "Show minimized tasks only"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+msgid "Show minimized tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+msgid "Geometry"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr ""
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -858,27 +967,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr ""
 
@@ -964,7 +1073,7 @@ msgid "History"
 msgstr ""
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr ""
 
@@ -1031,7 +1140,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr ""
 
@@ -1268,7 +1377,7 @@ msgstr ""
 msgid "Open new window"
 msgstr ""
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr ""
 
@@ -1292,6 +1401,10 @@ msgstr ""
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr ""
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr ""
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr ""
@@ -1300,12 +1413,12 @@ msgstr ""
 msgid "Slashapp article list"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr ""
@@ -1393,542 +1506,560 @@ msgstr ""
 msgid "Look"
 msgstr ""
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr ""
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr ""
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr ""
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr ""
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr ""
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr ""
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr ""
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr ""
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr ""
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr ""
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
+#: gmenu/desktop.c:80
+msgid " Folder"
 msgstr ""
 
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr ""
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr ""
 
-#: gmenu/edit.c:249
-msgid "New"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
 msgstr ""
 
-#: gmenu/gmenu.c:52
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr ""
+
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr ""
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr ""
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr ""
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr ""
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr ""
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr ""
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr ""
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr ""
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr ""
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+msgid "Sort _Recursive"
+msgstr ""
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr ""
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
 msgstr ""
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr ""
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr ""
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr ""
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr ""
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr ""
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr ""
 
-#: gmenu/tree.c:418
-msgid "GNOME"
+#: gmenu/tree.c:410
+msgid "User Menus"
 msgstr ""
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr ""
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr ""
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr ""
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
 msgstr ""
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr ""
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr ""
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr ""
+
+#: gmenu/treenew.c:63
+msgid "Failed to create directory"
+msgstr ""
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+msgid "untitled"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
 "configuration of the new class?"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr ""
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr ""
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr ""
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr ""
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr ""
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr ""
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr ""
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 msgid "Background type"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 msgid "None"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr ""
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr ""
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr ""
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr ""
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr ""
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr ""
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr ""
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr ""
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+msgid "_Reset Terminal"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+msgid "TCLASS"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr ""
 
@@ -1940,23 +2071,48 @@ msgstr ""
 msgid "save-session: couldn't connect to session manager\n"
 msgstr ""
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr ""
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 msgid "Cancel"
 msgstr ""
 
+#: gsm/session-properties.c:258
+msgid "Session"
+msgstr ""
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+msgid "Cancel Login"
+msgstr ""
+
+#: gsm/session-properties.c:344
+msgid "Initialize session settings"
+msgstr ""
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr ""
@@ -2304,15 +2460,15 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr ""
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr ""
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr ""
 
@@ -2342,7 +2498,7 @@ msgstr ""
 msgid "Enable hidebutton arrow"
 msgstr ""
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr ""
 
@@ -2350,23 +2506,23 @@ msgstr ""
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr ""
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr ""
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr ""
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr ""
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr ""
 
@@ -2431,246 +2587,232 @@ msgstr ""
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr ""
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr ""
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr ""
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr ""
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 msgid "Debian menus"
 msgstr ""
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 msgid "No Debian menus found!"
 msgstr ""
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
 msgstr ""
 
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr ""
-
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr ""
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr ""
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr ""
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr ""
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr ""
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr ""
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr ""
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr ""
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr ""
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr ""
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr ""
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr ""
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr ""
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr ""
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr ""
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr ""
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr ""
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr ""
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr ""
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr ""
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr ""
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr ""
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr ""
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr ""
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+msgid "AnotherLevel menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr ""
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr ""
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr ""
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr ""
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr ""
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr ""
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr ""
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr ""
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr ""
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr ""
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr ""
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr ""
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr ""
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr ""
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr ""
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr ""
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr ""
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr ""
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr ""
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr ""
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr ""
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr ""
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr ""
 
@@ -2838,28 +2980,6 @@ msgstr ""
 msgid "General icon settings"
 msgstr ""
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr ""
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr ""
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr ""
diff --git a/po/es_SV.po b/po/es_SV.po
index 37006f37..73606002 100644
--- a/po/es_SV.po
+++ b/po/es_SV.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,125 +14,307 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr ""
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr ""
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
+#: applets/asclock/dialogs.c:17
+msgid "ASClock"
 msgstr ""
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr ""
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+msgid "My Title"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr ""
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr ""
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr ""
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr ""
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr ""
+
+#: applets/battery/battery.c:837
+msgid "The GNOME Battery Monitor Applet"
+msgstr ""
+
+#: applets/battery/battery.c:838
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr ""
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr ""
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr ""
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
+#. Applet height
+#: applets/battery/properties.c:79
+msgid "Applet Height:"
 msgstr ""
 
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet width
+#: applets/battery/properties.c:90
+msgid "Applet Width:"
+msgstr ""
+
+#. Update interval
+#: applets/battery/properties.c:102
+msgid "Update Interval (seconds):"
 msgstr ""
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
 msgstr ""
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Applet mode label
+#: applets/battery/properties.c:130
+msgid "Applet Mode:"
 msgstr ""
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr ""
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr ""
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
+#: applets/battery/properties.c:202
+msgid "Low Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:262
+msgid "Graph Battery Low Color:"
+msgstr ""
+
+#: applets/battery/properties.c:268
+msgid "Graph Tick Color:"
+msgstr ""
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr ""
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr ""
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr ""
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr ""
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr ""
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr ""
 
@@ -158,17 +340,6 @@ msgid ""
 "keyboard. Released under GNU General Public Licence."
 msgstr ""
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr ""
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -213,10 +384,6 @@ msgstr ""
 msgid "Clock"
 msgstr ""
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr ""
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr ""
@@ -241,96 +408,6 @@ msgstr ""
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr ""
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr ""
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr ""
@@ -347,7 +424,7 @@ msgstr ""
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr ""
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr ""
 
@@ -367,6 +444,11 @@ msgstr ""
 msgid "Backgroundcolor"
 msgstr ""
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr ""
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -380,35 +462,35 @@ msgstr ""
 msgid "Diskusage Settings"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
 msgstr ""
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr ""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr ""
 
@@ -512,9 +594,9 @@ msgstr ""
 msgid "The Animation Filename:"
 msgstr ""
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr ""
 
@@ -563,7 +645,7 @@ msgstr ""
 msgid "About\t"
 msgstr ""
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr ""
 
@@ -744,7 +826,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr ""
 
@@ -773,80 +855,107 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
+#: applets/gnome-pager/gnomepager_applet.c:220
+msgid "Pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
+#: applets/gnome-pager/gnomepager_applet.c:222
+msgid "Show pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
+#: applets/gnome-pager/gnomepager_applet.c:229
+msgid "Use small pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:224
-msgid "Show pager"
+#: applets/gnome-pager/gnomepager_applet.c:241
+msgid "Rows of pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:232
-msgid "Use small pagers"
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
+#: applets/gnome-pager/gnomepager_applet.c:261
+msgid "Show task list button"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
-msgid "Show task list button"
+#: applets/gnome-pager/gnomepager_applet.c:268
+msgid "Show task list"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+msgid "Show button icons"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+msgid "Show all tasks"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+msgid "Show normal tasks only"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+msgid "Show minimized tasks only"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+msgid "Show minimized tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+msgid "Geometry"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr ""
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -858,27 +967,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr ""
 
@@ -964,7 +1073,7 @@ msgid "History"
 msgstr ""
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr ""
 
@@ -1031,7 +1140,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr ""
 
@@ -1268,7 +1377,7 @@ msgstr ""
 msgid "Open new window"
 msgstr ""
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr ""
 
@@ -1292,6 +1401,10 @@ msgstr ""
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr ""
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr ""
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr ""
@@ -1300,12 +1413,12 @@ msgstr ""
 msgid "Slashapp article list"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr ""
@@ -1393,542 +1506,560 @@ msgstr ""
 msgid "Look"
 msgstr ""
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr ""
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr ""
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr ""
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr ""
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr ""
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr ""
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr ""
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr ""
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr ""
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr ""
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
+#: gmenu/desktop.c:80
+msgid " Folder"
 msgstr ""
 
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr ""
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr ""
 
-#: gmenu/edit.c:249
-msgid "New"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
 msgstr ""
 
-#: gmenu/gmenu.c:52
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr ""
+
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr ""
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr ""
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr ""
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr ""
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr ""
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr ""
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr ""
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr ""
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr ""
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+msgid "Sort _Recursive"
+msgstr ""
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr ""
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
 msgstr ""
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr ""
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr ""
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr ""
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr ""
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr ""
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr ""
 
-#: gmenu/tree.c:418
-msgid "GNOME"
+#: gmenu/tree.c:410
+msgid "User Menus"
 msgstr ""
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr ""
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr ""
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr ""
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
 msgstr ""
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr ""
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr ""
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr ""
+
+#: gmenu/treenew.c:63
+msgid "Failed to create directory"
+msgstr ""
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+msgid "untitled"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
 "configuration of the new class?"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr ""
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr ""
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr ""
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr ""
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr ""
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr ""
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr ""
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 msgid "Background type"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 msgid "None"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr ""
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr ""
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr ""
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr ""
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr ""
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr ""
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr ""
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr ""
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+msgid "_Reset Terminal"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+msgid "TCLASS"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr ""
 
@@ -1940,23 +2071,48 @@ msgstr ""
 msgid "save-session: couldn't connect to session manager\n"
 msgstr ""
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr ""
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 msgid "Cancel"
 msgstr ""
 
+#: gsm/session-properties.c:258
+msgid "Session"
+msgstr ""
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+msgid "Cancel Login"
+msgstr ""
+
+#: gsm/session-properties.c:344
+msgid "Initialize session settings"
+msgstr ""
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr ""
@@ -2304,15 +2460,15 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr ""
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr ""
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr ""
 
@@ -2342,7 +2498,7 @@ msgstr ""
 msgid "Enable hidebutton arrow"
 msgstr ""
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr ""
 
@@ -2350,23 +2506,23 @@ msgstr ""
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr ""
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr ""
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr ""
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr ""
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr ""
 
@@ -2431,246 +2587,232 @@ msgstr ""
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr ""
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr ""
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr ""
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr ""
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 msgid "Debian menus"
 msgstr ""
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 msgid "No Debian menus found!"
 msgstr ""
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
 msgstr ""
 
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr ""
-
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr ""
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr ""
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr ""
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr ""
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr ""
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr ""
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr ""
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr ""
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr ""
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr ""
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr ""
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr ""
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr ""
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr ""
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr ""
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr ""
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr ""
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr ""
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr ""
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr ""
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr ""
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr ""
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr ""
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr ""
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+msgid "AnotherLevel menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr ""
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr ""
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr ""
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr ""
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr ""
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr ""
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr ""
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr ""
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr ""
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr ""
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr ""
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr ""
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr ""
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr ""
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr ""
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr ""
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr ""
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr ""
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr ""
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr ""
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr ""
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr ""
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr ""
 
@@ -2838,28 +2980,6 @@ msgstr ""
 msgid "General icon settings"
 msgstr ""
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr ""
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr ""
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 6c522577..69b213b0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-core\n"
-"POT-Creation-Date: 1999-03-01 14:43-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: 1999-03-15 14:45+0300\n"
 "Last-Translator: Mikko Rauhala <mjr@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -13,110 +13,322 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applets/asclock/asclock.c:155 applets/mini-commander/src/mini-commander_applet.c:259
+#: applets/asclock/asclock.c:587
+#: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "Tietoja"
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449 applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478 applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514 applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793 applets/gen_util/printer.c:411 applets/gkb/gkb.c:506 applets/gnome-pager/gnomepager_applet.c:1420 applets/mini-commander/src/mini-commander_applet.c:246 applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64 applets/multiload/memload.c:60 applets/multiload/swapload.c:60 applets/netload/netload.c:346 applets/slashapp/slashapp.c:630 applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294 panel/menu.c:3460
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
+#: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
+#: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
+#: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
+#: applets/gnome-pager/gnomepager_applet.c:1491
+#: applets/mini-commander/src/mini-commander_applet.c:246
+#: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
+#: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
+#: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "Asetukset..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr "Afterstep-kellosovelma"
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "Kello"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
-msgstr "Kuka v\344itti NeXTin kuolleen?"
+msgstr "Kuka v�itti NeXTin kuolleen?"
+
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "Sivun otsikko"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr "N�yt� aika 12 tunnin muodossa (AM/PM)"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr "Yleinen"
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
-msgstr "Aikavy\366hyke"
+msgstr "Aikavy�hyke"
+
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
-msgstr "Virhe: ep\344kelpo tila 'battery_set_mode':ssa"
+msgstr "Virhe: ep�kelpo tila 'battery_set_mode':ssa"
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273 applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386 applets/netload/netload.c:321
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
+#: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
+#: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "Sovelmaa ei voitu luoda!\n"
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "Tietoja..."
+
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
+msgstr "GNOME-n�pp�imist�nvaihtaja"
+
+#: applets/battery/battery.c:838
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr ""
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
-msgstr "K\344yr\344n arvoille ei voitu varata tilaa"
+msgstr "K�yr�n arvoille ei voitu varata tilaa"
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "Akkumittarin asetukset"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "Yleiset asetukset"
-
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
 msgstr "Sovelman korkeus"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
 msgstr "Sovelman leveys"
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Update interval
+#: applets/battery/properties.c:102
+#, fuzzy
+msgid "Update Interval (seconds):"
+msgstr "P�ivitystiheys sekunneissa"
+
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
+msgstr ""
+
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
 msgstr "Sovelman moodi"
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
-msgstr "K\344yr\344"
+msgstr "K�yr�"
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr "Lukema"
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
-msgstr "Verkkovirta p\344\344ll\344 -v\344ri"
+msgstr "Verkkovirta p��ll� -v�ri"
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
-msgstr "Verkkovirta poissa -v\344ri"
+msgstr "Verkkovirta poissa -v�ri"
+
+#: applets/battery/properties.c:202
+#, fuzzy
+msgid "Low Battery Color:"
+msgstr "Verkkovirta p��ll� -v�ri"
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
-msgstr "K\344yr\344n v\344li:"
+#: applets/battery/properties.c:262
+#, fuzzy
+msgid "Graph Battery Low Color:"
+msgstr "Verkkovirta p��ll� -v�ri"
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:268
+#, fuzzy
+msgid "Graph Tick Color:"
+msgstr "K�yr�n suunta:"
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
-msgstr "K\344yr\344n suunta:"
+msgstr "K�yr�n suunta:"
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr "Vasemmalta oikealle"
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr "Oikealta vasemmalle"
 
-#: applets/battery/read-battery.c:28
-msgid "Cannot open /proc/apm!  Make sure that you built APM support into your kernel.\n"
-msgstr "Tiedostoa /proc/apm ei voitu avata! Varmista, ett\344 APM-tuki on mukana kerneliss\344si.\n"
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
+msgid ""
+"Cannot open /proc/apm!  Make sure that you built APM support into your "
+"kernel.\n"
+msgstr ""
+"Tiedostoa /proc/apm ei voitu avata! Varmista, ett� APM-tuki on mukana "
+"kerneliss�si.\n"
 
 # , c-format
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
+#, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr "Ei voitu suorittaa dup()-operaatiota APM-tiedostokuvaajalle: %s\n"
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "Tiedostoa /dev/apm ei voitu avata; tietoja ei saatu."
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
-msgstr "ioctl-kutsu laitteelle /dev/apm ep\344onnistui"
+msgstr "ioctl-kutsu laitteelle /dev/apm ep�onnistui"
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
-msgstr "APM on poissa p\344\344lt\344! Akun tietoja ei voida lukea."
+msgstr "APM on poissa p��lt�! Akun tietoja ei voida lukea."
 
 #: applets/cdplayer/cdplayer.c:318
 msgid "Run gtcd..."
@@ -135,15 +347,16 @@ msgid "Copyright (C) 1998"
 msgstr ""
 
 #: applets/charpick/charpick.c:207
-msgid "Gnome Panel applet for selecting strange characters that are not on my keyboard. Released under GNU General Public Licence."
-msgstr "Gnome-paneelisovelma ep\344tavallisten, n\344pp\344imist\366lt\344 puuttuvien merkkien valitsemiseen. Julkaistu GNU GPL -lisenssill\344"
-
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484 applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309 applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800 applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414 applets/modemlights/modemlights.c:762 applets/netload/netload.c:339 applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307 panel/menu.c:2456
-msgid "About..."
-msgstr "Tietoja..."
+msgid ""
+"Gnome Panel applet for selecting strange characters that are not on my "
+"keyboard. Released under GNU General Public Licence."
+msgstr ""
+"Gnome-paneelisovelma ep�tavallisten, n�pp�imist�lt� puuttuvien merkkien "
+"valitsemiseen. Julkaistu GNU GPL -lisenssill�"
 
 # , c-format
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
+#, c-format
 msgid "%d.%d.%d"
 msgstr ""
 
@@ -162,10 +375,14 @@ msgstr ""
 #: applets/clockmail/clockmail.c:58
 msgid ""
 "Released under the GNU general public license.\n"
-"Basic digital clock with date in a tooltip. Optional 12/24 time display. Mail blinking can be for any unread mail, or only briefly when new mail arrives."
+"Basic digital clock with date in a tooltip. Optional 12/24 time display. "
+"Mail blinking can be for any unread mail, or only briefly when new mail "
+"arrives."
 msgstr ""
-"Julkaistu GNU GPL -lisenssill\344.\n"
-"Digitaalikello, jossa on p\344iv\344m\344\344r\344 apuikkunassa. Valinnainen 12/24 tunnin n\344ytt\366. Postih\344lytys voidaan asettaa toimimaan joko aina, kun laatikossa on lukematonta postia, tai vain hetkellisesti uuden postin saapuessa."
+"Julkaistu GNU GPL -lisenssill�.\n"
+"Digitaalikello, jossa on p�iv�m��r� apuikkunassa. Valinnainen 12/24 tunnin "
+"n�ytt�. Postih�lytys voidaan asettaa toimimaan joko aina, kun laatikossa on "
+"lukematonta postia, tai vain hetkellisesti uuden postin saapuessa."
 
 #: applets/clockmail/clockmail.c:128
 msgid " (GMT)"
@@ -173,25 +390,23 @@ msgstr ""
 
 # , c-format
 #: applets/clockmail/clockmail.c:134
+#, c-format
 msgid " (GMT %+d)"
 msgstr ""
 
 #. add default theme
 #: applets/clockmail/properties.c:134
 msgid "None (default)"
-msgstr "Ei mik\344\344n (oletus)"
+msgstr "Ei mik��n (oletus)"
 
-#: applets/clockmail/properties.c:286 applets/gen_util/clock.c:502 applets/mini-commander/src/preferences.c:438
+#: applets/clockmail/properties.c:286 applets/gen_util/clock.c:502
+#: applets/mini-commander/src/preferences.c:438
 msgid "Clock"
 msgstr "Kello"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr "N\344yt\344 aika 12 tunnin muodossa (AM/PM)"
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
-msgstr "N\344yt\344 aika suhteessa GMT:een (Greenwichin aikaan):"
+msgstr "N�yt� aika suhteessa GMT:een (Greenwichin aikaan):"
 
 #: applets/clockmail/properties.c:319
 msgid "Mail"
@@ -211,92 +426,7 @@ msgstr "Kun uutta postia saadaan, aja:"
 
 #: applets/clockmail/properties.c:375
 msgid "Amount of mail to consider mailbox full (Kbytes):"
-msgstr "Postin m\344\344r\344, jolla postilaatikko katsotaan t\344ydeksi (kilotavuja):"
-
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344 applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246 applets/mini-commander/src/preferences.c:659 applets/modemlights/properties.c:204 applets/netload/properties.c:280 applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919 panel/panel_config_global.c:310
-msgid "General"
-msgstr "Yleinen"
+msgstr "Postin m��r�, jolla postilaatikko katsotaan t�ydeksi (kilotavuja):"
 
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
@@ -312,15 +442,15 @@ msgstr "PPP-soittajasovelma"
 
 #: applets/dialer/dialer.c:49
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
-msgstr "Kiva PPP-soittaja, miksei kukaan ei keksinyt t\344t\344 aikaisemmin!?"
+msgstr "Kiva PPP-soittaja, miksei kukaan ei keksinyt t�t� aikaisemmin!?"
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr "Pois"
 
 #: applets/diskusage/properties.c:209
 msgid "Used Diskspace"
-msgstr "K\344ytetty levytila"
+msgstr "K�ytetty levytila"
 
 #: applets/diskusage/properties.c:214
 msgid "Free Diskspace"
@@ -328,57 +458,63 @@ msgstr "Vapaa levytila"
 
 #: applets/diskusage/properties.c:219
 msgid "Textcolor"
-msgstr "Tekstin v\344ri"
+msgstr "Tekstin v�ri"
 
 #: applets/diskusage/properties.c:225
 msgid "Backgroundcolor"
-msgstr "Taustav\344ri"
+msgstr "Taustav�ri"
 
-#: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184 applets/netload/properties.c:147 panel/swallow.c:246
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr "Sovelman korkeus"
+
+#: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
+#: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
 msgstr "Leveys"
 
 #: applets/diskusage/properties.c:259 applets/netload/properties.c:170
 msgid "Update Frequency"
-msgstr "P\344ivitystiheys"
+msgstr "P�ivitystiheys"
 
 #: applets/diskusage/properties.c:334
 msgid "Diskusage Settings"
-msgstr "Levynk\344yt\366n asetukset"
+msgstr "Levynk�yt�n asetukset"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr "Levynliitossovelma"
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
 msgstr ""
-"Julkaistu GNU GPL -lisenssill\344.\n"
-"Liitt\344\344 ja irroittaa tiedostoj\344rjestelmi\344."
+"Julkaistu GNU GPL -lisenssill�.\n"
+"Liitt�� ja irroittaa tiedostoj�rjestelmi�."
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr " liitetty"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr " irti"
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr "\" ilmoitti:\n"
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr ""
-"Liitt\344miskomento ep\344onnistui.\n"
+"Liitt�miskomento ep�onnistui.\n"
 "\""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "Levy ulos"
 
@@ -388,7 +524,7 @@ msgstr "Liitossovelman asetukset"
 
 #: applets/drivemount/properties.c:148
 msgid "Update in seconds:"
-msgstr "P\344ivitystiheys sekunneissa"
+msgstr "P�ivitystiheys sekunneissa"
 
 #: applets/drivemount/properties.c:160
 msgid "Icon:"
@@ -416,7 +552,7 @@ msgstr "Liitospiste:"
 
 #: applets/drivemount/properties.c:204
 msgid "Use automount friendly status test"
-msgstr "K\344yt\344 automount-yhteensopivaa tilankokeilua"
+msgstr "K�yt� automount-yhteensopivaa tilankokeilua"
 
 #: applets/esd-manager/esdmanager_applet.c:29
 msgid "Esound MAnager Applet"
@@ -428,7 +564,7 @@ msgstr ""
 
 #: applets/esd-manager/esdmanager_applet.c:31
 msgid "This does nothing useful"
-msgstr "T\344m\344 ei tee mit\344\344n hy\366dyllist\344"
+msgstr "T�m� ei tee mit��n hy�dyllist�"
 
 #: applets/fifteen/fifteen.c:36
 msgid "You win!"
@@ -447,8 +583,12 @@ msgid "Copyright (C) The Free Software Foundation"
 msgstr ""
 
 #: applets/fifteen/fifteen.c:270
-msgid "Sam Lloyd's all-time favorite game, now for your delight in the Gnome Panel. Guaranteed to be a productivity buster."
-msgstr "Sam Lloydin paras peli, nyt sinun iloksesi Gnomen paneelissa. Taattu tuottavuudentuhoaja."
+msgid ""
+"Sam Lloyd's all-time favorite game, now for your delight in the Gnome Panel. "
+"Guaranteed to be a productivity buster."
+msgstr ""
+"Sam Lloydin paras peli, nyt sinun iloksesi Gnomen paneelissa. Taattu "
+"tuottavuudentuhoaja."
 
 #: applets/fifteen/fifteen.c:292
 msgid "Can't create fifteen applet!"
@@ -460,11 +600,13 @@ msgstr "Sotke palat"
 
 # , c-format
 #: applets/fish/fish.c:126 applets/fish/fish.c:407
+#, c-format
 msgid "%s the Fish"
 msgstr "%s-kala"
 
 # , c-format
 #: applets/fish/fish.c:127
+#, c-format
 msgid "%s the GNOME Fish Says:"
 msgstr "%s, GNOME-kala sanoo:"
 
@@ -480,7 +622,9 @@ msgstr "GNOME-kalasi nimi:"
 msgid "The Animation Filename:"
 msgstr "Animaatiotiedosto:"
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072 panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116 panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr "Selaa"
 
@@ -505,12 +649,20 @@ msgid "The GNOME Fish Applet"
 msgstr "GNOME-kalasovelma"
 
 #: applets/fish/fish.c:423
-msgid "This applet has no use what-so-ever. It only takes up disk space and compilation time, and if loaded it also takes up precious panel space and memory. If anyone is found using this applet, he should be promptly sent for a psychiatric evaluation."
-msgstr "T\344ll\344 sovelmalla ei ole mit\344\344n k\344ytt\366\344. Se vain k\344ytt\344\344 levytilaa ja k\344\344nn\366saikaa. Jos se ladataan paneeliin, se voi my\366s vied\344 arvokasta paneelitilaa ja muistia. Jos joku k\344ytt\344\344 t\344t\344 sovelmaa, h\344net pit\344isi pikaisesti l\344hett\344\344 psykiatriseen arviointiin."
+msgid ""
+"This applet has no use what-so-ever. It only takes up disk space and "
+"compilation time, and if loaded it also takes up precious panel space and "
+"memory. If anyone is found using this applet, he should be promptly sent for "
+"a psychiatric evaluation."
+msgstr ""
+"T�ll� sovelmalla ei ole mit��n k�ytt��. Se vain k�ytt�� levytilaa ja "
+"k��nn�saikaa. Jos se ladataan paneeliin, se voi my�s vied� arvokasta "
+"paneelitilaa ja muistia. Jos joku k�ytt�� t�t� sovelmaa, h�net pit�isi "
+"pikaisesti l�hett�� psykiatriseen arviointiin."
 
 #: applets/fvwm-pager/fvwm-pager.c:154
 msgid "Fvwm Pager Applet"
-msgstr "Fvwm-ty\366p\366yd\344nvaihtosovelma"
+msgstr "Fvwm-ty�p�yd�nvaihtosovelma"
 
 #: applets/fvwm-pager/fvwm-pager.c:156
 msgid "Copyright (C) 1998 M. Lausch"
@@ -518,36 +670,37 @@ msgstr ""
 
 # , c-format
 #: applets/fvwm-pager/fvwm-pager.c:314
+#, c-format
 msgid "Desk %d"
-msgstr "Ty\366p\366yt\344 %d"
+msgstr "Ty�p�yt� %d"
 
 #: applets/fvwm-pager/fvwm-pager.c:403
 msgid "About\t"
 msgstr "Tietoja\t"
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr "Asetukset"
 
 #: applets/fvwm-pager/properties.c:133 applets/fvwm-pager/properties.c:162
 msgid "Active Window Color"
-msgstr "Aktiivisen ikkunan v\344ri"
+msgstr "Aktiivisen ikkunan v�ri"
 
 #: applets/fvwm-pager/properties.c:137 applets/fvwm-pager/properties.c:166
 msgid "Inactive Window Color"
-msgstr "Passiivisten ikkunoiden v\344ri"
+msgstr "Passiivisten ikkunoiden v�ri"
 
 #: applets/fvwm-pager/properties.c:141 applets/fvwm-pager/properties.c:170
 msgid "Active Desktop Color"
-msgstr "Aktiivisen ty\366p\366yd\344n v\344ri"
+msgstr "Aktiivisen ty�p�yd�n v�ri"
 
 #: applets/fvwm-pager/properties.c:145 applets/fvwm-pager/properties.c:174
 msgid "Inactive Desktop Color"
-msgstr "Passiivisen ty\366p\366yd\344n v\344ri"
+msgstr "Passiivisen ty�p�yd�n v�ri"
 
 #: applets/fvwm-pager/properties.c:242
 msgid "Fvwm Pager Settings"
-msgstr "Ty\366p\366yd\344nvaihdon asetukset"
+msgstr "Ty�p�yd�nvaihdon asetukset"
 
 #. This format string is used, to display the actual day,
 #. when showing a vertical panel.  For an explanation of
@@ -590,32 +743,32 @@ msgstr "Ajan muoto"
 
 #: applets/gen_util/clock.c:421
 msgid "12 hour"
-msgstr "12h-n\344ytt\366"
+msgstr "12h-n�ytt�"
 
 #: applets/gen_util/clock.c:430
 msgid "24 hour"
-msgstr "24h-n\344ytt\366"
+msgstr "24h-n�ytt�"
 
 #. show date check box
 #: applets/gen_util/clock.c:465 applets/mini-commander/src/preferences.c:459
 msgid "Show date"
-msgstr "N\344yt\344 p\344iv\344m\344\344r\344"
+msgstr "N�yt� p�iv�m��r�"
 
 #: applets/gen_util/clock.c:479
 msgid "Unix time"
-msgstr "N\344yt\344 Unix-aikana"
+msgstr "N�yt� Unix-aikana"
 
 #: applets/gen_util/mailcheck.c:267
 msgid "You have new mail."
-msgstr "Sinulla on uutta s\344hk\366postia."
+msgstr "Sinulla on uutta s�hk�postia."
 
 #: applets/gen_util/mailcheck.c:269
 msgid "You have mail."
-msgstr "Sinulla on s\344hk\366postia."
+msgstr "Sinulla on s�hk�postia."
 
 #: applets/gen_util/mailcheck.c:271
 msgid "No mail."
-msgstr "Ei s\344hk\366postia."
+msgstr "Ei s�hk�postia."
 
 #: applets/gen_util/mailcheck.c:557 applets/gen_util/mailcheck.c:578
 msgid "Execute"
@@ -623,7 +776,7 @@ msgstr "Suorita"
 
 #: applets/gen_util/mailcheck.c:569
 msgid "before each update"
-msgstr "ennen jokaista virkistyst\344"
+msgstr "ennen jokaista virkistyst�"
 
 #: applets/gen_util/mailcheck.c:591
 msgid "when clicked."
@@ -639,7 +792,7 @@ msgstr ":s sekunti"
 
 #: applets/gen_util/mailcheck.c:621
 msgid "Select animation"
-msgstr "K\344ytett\344v\344 animaatio:"
+msgstr "K�ytett�v� animaatio:"
 
 #: applets/gen_util/mailcheck.c:649
 msgid "Mail check properties"
@@ -659,11 +812,12 @@ msgstr ""
 
 #: applets/gen_util/mailcheck.c:707
 msgid "Mail check notifies you when new mail is on your mailbox"
-msgstr "Postintarkistussovelma ilmoittaa, kun postilaatikossa on uutta s\344hk\366postia"
+msgstr ""
+"Postintarkistussovelma ilmoittaa, kun postilaatikossa on uutta s�hk�postia"
 
 #: applets/gen_util/mailcheck.c:772
 msgid "Text only"
-msgstr "Pelkk\344 teksti"
+msgstr "Pelkk� teksti"
 
 #: applets/gen_util/printer.c:346
 msgid "Printer properties"
@@ -687,7 +841,7 @@ msgstr "Asetukset"
 
 #: applets/gkb/gkb.c:200
 msgid "Flag One"
-msgstr "Ensimm\344inen lippu"
+msgstr "Ensimm�inen lippu"
 
 #: applets/gkb/gkb.c:233
 msgid "Flag Two"
@@ -695,7 +849,7 @@ msgstr "Toinen lippu"
 
 #: applets/gkb/gkb.c:262
 msgid "Program"
-msgstr "N\344pp\344imist\366asetusohjelma"
+msgstr "N�pp�imist�asetusohjelma"
 
 #: applets/gkb/gkb.c:272
 msgid "Xkb"
@@ -705,7 +859,8 @@ msgstr ""
 msgid "Xmodmap"
 msgstr ""
 
-#: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769 panel/menu.c:3061 panel/menu.c:3414
+#: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr "Valikko"
 
@@ -723,87 +878,128 @@ msgstr ""
 
 #: applets/gkb/gkb.c:430
 msgid ""
-"This applet switches between keyboard maps. Not more. It uses setxkbmap, or xmodmap. The main site of this app moved temporarily to URL http://lsc.kva.hu/gkb.Mail me your flag, please (60x40 size),I will put it to CVS.So long, and thanks for all the fish.\n"
+"This applet switches between keyboard maps. Not more. It uses setxkbmap, or "
+"xmodmap. The main site of this app moved temporarily to URL "
+"http://lsc.kva.hu/gkb.Mail me your flag, please (60x40 size),I will put it "
+"to CVS.So long, and thanks for all the fish.\n"
 "Thanks for Balazs Nagy (Kevin)<julian7@kva.hu> for minor help."
-msgstr "T\344m\344 sovelma vaihtaa n\344pp\344imist\366karttoja k\344ytt\344en setxkbmap- tai xmodmap-ohjelmia."
+msgstr ""
+"T�m� sovelma vaihtaa n�pp�imist�karttoja k�ytt�en setxkbmap- tai "
+"xmodmap-ohjelmia."
 
 #: applets/gkb/gkb.c:441
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
-msgstr "Ty\366p\366yd\344nvaihtosovelma"
+msgstr "Ty�p�yd�nvaihtosovelma"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
-msgstr "Ty\366p\366yd\344nvaihtosovelma GNOME-yhteensopivalle ikkunanhallintaohjelmalle"
+msgstr "Ty�p�yd�nvaihtosovelma GNOME-yhteensopivalle ikkunanhallintaohjelmalle"
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
-msgstr "GNOME-ty\366p\366yd\344nvaihtajan asetukset"
-
-#: applets/gnome-pager/gnomepager_applet.c:207 applets/slashapp/properties.c:422
-msgid "Display"
-msgstr "N\344ytt\366"
+msgstr "GNOME-ty�p�yd�nvaihtajan asetukset"
 
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
-msgstr "N\344yt\344 teht\344v\344palkissa kaikkien ty\366p\366ytien sovellukset"
-
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
-msgstr "N\344yt\344 teht\344v\344palkki"
+#: applets/gnome-pager/gnomepager_applet.c:220
+#, fuzzy
+msgid "Pager"
+msgstr "Taustakuva"
 
-#: applets/gnome-pager/gnomepager_applet.c:224
+#: applets/gnome-pager/gnomepager_applet.c:222
 msgid "Show pager"
-msgstr "N\344yt\344 ty\366p\366yd\344nvaihtaja"
+msgstr "N�yt� ty�p�yd�nvaihtaja"
 
-#: applets/gnome-pager/gnomepager_applet.c:232
+#: applets/gnome-pager/gnomepager_applet.c:229
 msgid "Use small pagers"
-msgstr "K\344yt\344 pient\344 ty\366p\366yd\344nvaihtajaa"
+msgstr "K�yt� pient� ty�p�yd�nvaihtajaa"
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
-msgstr "N\344yt\344 teht\344v\344palkissa sovellusten kuvakkeet"
+#: applets/gnome-pager/gnomepager_applet.c:241
+#, fuzzy
+msgid "Rows of pagers"
+msgstr "Ty�p�yd�nvaihtajan rivim��r�"
 
-#: applets/gnome-pager/gnomepager_applet.c:248
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:261
 msgid "Show task list button"
-msgstr "N\344yt\344 teht\344v\344listapainike"
+msgstr "N�yt� teht�v�listapainike"
+
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
+msgstr "N�yt� teht�v�palkki"
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "N�yt� ... -painikkeet"
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
+msgstr "N�yt� teht�v�palkki"
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:306
+#, fuzzy
+msgid "Show normal tasks only"
+msgstr "N�yt� teht�v�palkissa kaikkien ty�p�ytien sovellukset"
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+#, fuzzy
+msgid "Show minimized tasks only"
+msgstr "N�yt� teht�v�palkissa sovellusten kuvakkeet"
+
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr "N�yt� teht�v�palkissa kaikkien ty�p�ytien sovellukset"
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+#, fuzzy
+msgid "Show minimized tasks on all desktops"
+msgstr "N�yt� teht�v�palkissa kaikkien ty�p�ytien sovellukset"
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+msgid "Geometry"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
-msgstr "Teht\344v\344palkki aina maksimikokoisena"
+msgstr "Teht�v�palkki aina maksimikokoisena"
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
-msgstr "Teht\344v\344palkin maksimileveys vaaka-asennossa"
+msgstr "Teht�v�palkin maksimileveys vaaka-asennossa"
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
-msgstr "Teht\344v\344palkin maksimileveys pystyasennossa"
+msgstr "Teht�v�palkin maksimileveys pystyasennossa"
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr "Sovelluksia sarakkeessa"
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
-msgstr "Sovelluksia rivill\344"
-
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr "Ty\366p\366yd\344nvaihtajan rivim\344\344r\344"
+msgstr "Sovelluksia rivill�"
 
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
-msgstr "GNOME-ty\366p\366yd\344nvaihtajan virhe"
+msgstr "GNOME-ty�p�yd�nvaihtajan virhe"
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -811,36 +1007,36 @@ msgid ""
 "Enlightenment (DR-0.15)\n"
 "Then start this applet again.\n"
 msgstr ""
-"Et k\344yt\344 GNOME-yhteensopivaa ikkunanhallintaohjelmaa.\n"
-"Ole hyv\344, ja vaihda GNOME-yhteensopivaan ikkunanhallintaohjelmaan.\n"
+"Et k�yt� GNOME-yhteensopivaa ikkunanhallintaohjelmaa.\n"
+"Ole hyv�, ja vaihda GNOME-yhteensopivaan ikkunanhallintaohjelmaan.\n"
 "Esimerkiksi:\n"
 "Enlightenment (DR-0.15)\n"
-"K\344ynnist\344 sitten t\344m\344 sovelma uudelleen.\n"
+"K�ynnist� sitten t�m� sovelma uudelleen.\n"
 
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr "Liimautunut"
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
-msgstr "N\344yt\344 / Piilota"
+msgstr "N�yt� / Piilota"
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr "Varjosta / Palauta"
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "Sulje"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr "Tapa"
 
@@ -848,15 +1044,17 @@ msgstr "Tapa"
 msgid "Mini-Commander Applet"
 msgstr "Mini-komentotulkkisovelma"
 
-#: applets/mini-commander/src/cmd_completion.c:67 applets/mini-commander/src/cmd_completion.c:118
+#: applets/mini-commander/src/cmd_completion.c:67
+#: applets/mini-commander/src/cmd_completion.c:118
 msgid "not unique"
 msgstr "ei yksiselitteinen"
 
 #: applets/mini-commander/src/cmd_completion.c:71
 msgid "completing..."
-msgstr "t\344ydenn\344n..."
+msgstr "t�ydenn�n..."
 
-#: applets/mini-commander/src/cmd_completion.c:83 applets/mini-commander/src/exec.c:105
+#: applets/mini-commander/src/cmd_completion.c:83
+#: applets/mini-commander/src/exec.c:105
 msgid "no /bin/sh"
 msgstr "ei /bin/sh:ta"
 
@@ -866,20 +1064,22 @@ msgstr "valmis"
 
 #: applets/mini-commander/src/cmd_completion.c:121
 msgid "not found"
-msgstr "ei l\366ytynyt"
+msgstr "ei l�ytynyt"
 
-#: applets/mini-commander/src/command_line.c:86 applets/mini-commander/src/command_line.c:106
+#: applets/mini-commander/src/command_line.c:86
+#: applets/mini-commander/src/command_line.c:106
 msgid "end of history list"
 msgstr "komentohistorian loppu"
 
 #. enter pressed -> exec command
-#: applets/mini-commander/src/command_line.c:116 applets/mini-commander/src/exec.c:58
+#: applets/mini-commander/src/command_line.c:116
+#: applets/mini-commander/src/exec.c:58
 msgid "starting..."
-msgstr "k\344ynnistet\344\344n..."
+msgstr "k�ynnistet��n..."
 
 #: applets/mini-commander/src/command_line.c:236
 msgid "history list empty"
-msgstr "komentohistoria tyhj\344"
+msgstr "komentohistoria tyhj�"
 
 #. title
 #: applets/mini-commander/src/command_line.c:254
@@ -889,11 +1089,11 @@ msgstr "Komentohistoria"
 #. build file select dialog
 #: applets/mini-commander/src/command_line.c:371
 msgid "Start program"
-msgstr "K\344ynnistett\344v\344 ohjelma"
+msgstr "K�ynnistett�v� ohjelma"
 
 #: applets/mini-commander/src/exec.c:60
 msgid "fork error"
-msgstr "fork ep\344onnistui"
+msgstr "fork ep�onnistui"
 
 #: applets/mini-commander/src/exec.c:92
 msgid "child exited"
@@ -911,15 +1111,18 @@ msgstr ""
 msgid "orient. changed"
 msgstr "orientaatio muutettu"
 
-#: applets/mini-commander/src/mini-commander_applet.c:184 applets/slashapp/properties.c:249
+#: applets/mini-commander/src/mini-commander_applet.c:184
+#: applets/slashapp/properties.c:249
 msgid "Browser"
 msgstr "Selaa..."
 
-#: applets/mini-commander/src/mini-commander_applet.c:197 help-browser/window.c:202
+#: applets/mini-commander/src/mini-commander_applet.c:197
+#: help-browser/window.c:202
 msgid "History"
 msgstr "Historia"
 
-#: applets/mini-commander/src/mini-commander_applet.c:252 gsm/session-properties.c:145 help-browser/window.c:207
+#: applets/mini-commander/src/mini-commander_applet.c:252
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "Ohje"
 
@@ -929,7 +1132,7 @@ msgstr "valmis..."
 
 #: applets/mini-commander/src/preferences.c:122
 msgid "time & date on"
-msgstr "aika & p\344iv\344ys"
+msgstr "aika & p�iv�ys"
 
 #: applets/mini-commander/src/preferences.c:124
 msgid "time on"
@@ -937,7 +1140,7 @@ msgstr "kellonaika"
 
 #: applets/mini-commander/src/preferences.c:126
 msgid "date on"
-msgstr "p\344iv\344ys"
+msgstr "p�iv�ys"
 
 #: applets/mini-commander/src/preferences.c:128
 msgid "clock off"
@@ -954,7 +1157,7 @@ msgstr "Minikomentotulkin asetukset"
 #. show time check box
 #: applets/mini-commander/src/preferences.c:446
 msgid "Show time"
-msgstr "N\344yt\344 kellonaika"
+msgstr "N�yt� kellonaika"
 
 #. Size
 #: applets/mini-commander/src/preferences.c:471
@@ -984,33 +1187,36 @@ msgid ""
 "to make a change of the size visible."
 msgstr ""
 "\n"
-"Joskus saattaa olla tarpeen siirt\344\344 sovelmaa paneelissa,\n"
-"jotta koon muutos tulisi n\344kyviin."
+"Joskus saattaa olla tarpeen siirt�� sovelmaa paneelissa,\n"
+"jotta koon muutos tulisi n�kyviin."
 
 #. Color
-#: applets/mini-commander/src/preferences.c:581 applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/mini-commander/src/preferences.c:581
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
-msgstr "V\344rit"
+msgstr "V�rit"
 
 #. fg
 #: applets/mini-commander/src/preferences.c:591
 msgid "Command line foreground:"
-msgstr "Komentorivin tekstiv\344ri:"
+msgstr "Komentorivin tekstiv�ri:"
 
 #. bg
 #: applets/mini-commander/src/preferences.c:626
 msgid "Command line background:"
-msgstr "Komentorivin taustav\344ri:"
+msgstr "Komentorivin taustav�ri:"
 
 # , c-format
 #. prefix
 #: applets/mini-commander/src/preferences.c:686
+#, c-format
 msgid "Prefix %.2d:"
 msgstr "Prefiksi %.2d:"
 
 # , c-format
 #. command
 #: applets/mini-commander/src/preferences.c:704
+#, c-format
 msgid "   Macro %.2d:"
 msgstr "   Komento %.2d:"
 
@@ -1029,15 +1235,18 @@ msgstr "Modeemivalosovelma"
 #: applets/modemlights/modemlights.c:122
 msgid ""
 "Released under the GNU general public license.\n"
-"A modem status indicator and dialer.Lights in order from the top or left are RX and TX"
-msgstr "Julkaistu GNU GPL -lisenssill\344. N\344ytt\344\344 modeemin valot ja haluttaessa soittaa. Valot ylh\344\344lt\344 tai vasemmalta lukien ovat RX ja TX."
+"A modem status indicator and dialer.Lights in order from the top or left are "
+"RX and TX"
+msgstr ""
+"Julkaistu GNU GPL -lisenssill�. N�ytt�� modeemin valot ja haluttaessa "
+"soittaa. Valot ylh��lt� tai vasemmalta lukien ovat RX ja TX."
 
 #: applets/modemlights/modemlights.c:360
 msgid ""
 "You are currently connected.\n"
 "Do you want to disconnect?"
 msgstr ""
-"Yhteys on p\344\344ll\344.\n"
+"Yhteys on p��ll�.\n"
 "Haluatko katkaista yhteyden?"
 
 #: applets/modemlights/modemlights.c:371
@@ -1046,7 +1255,7 @@ msgstr "Haluatko ottaa yhteyden?"
 
 #: applets/modemlights/modemlights.c:390
 msgid "not connected"
-msgstr "Ei yhteytt\344"
+msgstr "Ei yhteytt�"
 
 #: applets/modemlights/properties.c:142
 msgid "Modem Lights Settings"
@@ -1054,7 +1263,7 @@ msgstr "Modeemivalojen asetukset"
 
 #: applets/modemlights/properties.c:150
 msgid "Updates per second"
-msgstr "P\344ivityksi\344 / sekunti"
+msgstr "P�ivityksi� / sekunti"
 
 #: applets/modemlights/properties.c:167
 msgid "Connect command:"
@@ -1080,7 +1289,7 @@ msgstr "Laite:"
 #. ISDN checkbox
 #: applets/modemlights/properties.c:247
 msgid "Use ISDN"
-msgstr "K\344yt\344 ISDN:\344\344"
+msgstr "K�yt� ISDN:��"
 
 #: applets/modemlights/properties.c:260
 msgid "Advanced"
@@ -1108,7 +1317,7 @@ msgstr "Korkeus:"
 
 #: applets/multiload/main.c:27
 msgid "User"
-msgstr "K\344ytt\344j\344t"
+msgstr "K�ytt�j�t"
 
 #: applets/multiload/main.c:27
 msgid "Nice"
@@ -1116,7 +1325,7 @@ msgstr "Kiltit"
 
 #: applets/multiload/main.c:27
 msgid "System"
-msgstr "J\344rjestelm\344"
+msgstr "J�rjestelm�"
 
 #: applets/multiload/main.c:27
 msgid "Idle"
@@ -1140,7 +1349,7 @@ msgstr "Vapaana"
 
 #: applets/multiload/main.c:35
 msgid "Used"
-msgstr "K\344ytetty"
+msgstr "K�ytetty"
 
 #: applets/multiload/main.c:130 applets/multiload/memload.c:47
 msgid "Memory Load"
@@ -1163,8 +1372,15 @@ msgid "The GNOME Network Load Applet"
 msgstr "GNOME-verkonkuormitusmittari"
 
 #: applets/netload/netload.c:298
-msgid "This applet is released under the terms and conditions of the GNU Public Licence.This applet shows the load on a network device. It requires the /proc/net/ip_acct interface to be present and set up correctly for the device."
-msgstr "Julkaistu GNU GPL -lisenssill\344. T\344m\344 sovelma n\344ytt\344\344 verkkolaitteen kuormituksen. Sovelma vaatii /proc/net/ip_acct-rajapinnan olevan l\344sn\344 ja asetettu oikein tarkkailtavalle laitteelle."
+msgid ""
+"This applet is released under the terms and conditions of the GNU Public "
+"Licence.This applet shows the load on a network device. It requires the "
+"/proc/net/ip_acct interface to be present and set up correctly for the "
+"device."
+msgstr ""
+"Julkaistu GNU GPL -lisenssill�. T�m� sovelma n�ytt�� verkkolaitteen "
+"kuormituksen. Sovelma vaatii /proc/net/ip_acct-rajapinnan olevan l�sn� ja "
+"asetettu oikein tarkkailtavalle laitteelle."
 
 #: applets/netload/properties.c:133
 msgid "Network Traffic"
@@ -1172,7 +1388,7 @@ msgstr "Verkkoliikenne"
 
 #: applets/netload/properties.c:137
 msgid "Traffic bars"
-msgstr "Liikennepylv\344\344t"
+msgstr "Liikennepylv��t"
 
 #: applets/netload/properties.c:215
 msgid "Device name (like ppp0 or eth0)"
@@ -1180,7 +1396,7 @@ msgstr "Laitteen nimi (esim. ppp0 tai eth0)"
 
 #: applets/netload/properties.c:223
 msgid "Vertical spacing of bars (in kilobytes)"
-msgstr "Pylv\344itten pystyv\344lit (kilotavuissa)"
+msgstr "Pylv�itten pystyv�lit (kilotavuissa)"
 
 #: applets/netload/properties.c:271
 msgid "properties.c: gnome_property_box_new() failed.\n"
@@ -1200,39 +1416,39 @@ msgstr "Artikkelit"
 
 #: applets/slashapp/properties.c:208
 msgid "Show topic images"
-msgstr "N\344yt\344 aihekuvat"
+msgstr "N�yt� aihekuvat"
 
 #: applets/slashapp/properties.c:214
 msgid "Show department"
-msgstr "N\344yt\344 osasto"
+msgstr "N�yt� osasto"
 
 #: applets/slashapp/properties.c:220
 msgid "Show extra information (Time, Author, Comments)"
-msgstr "N\344yt\344 lis\344tietoja (p\344iv\344ys, tekij\344, kommenttien m\344\344r\344)"
+msgstr "N�yt� lis�tietoja (p�iv�ys, tekij�, kommenttien m��r�)"
 
 #: applets/slashapp/properties.c:230
 msgid "Delay between articles (10 = 1 sec):"
-msgstr "Artikkelien v\344linen viive (10 = 1 sekunti):"
+msgstr "Artikkelien v�linen viive (10 = 1 sekunti):"
 
 #: applets/slashapp/properties.c:244
 msgid "(These settings do not take effect until a refresh)"
-msgstr "(N\344m\344 asetukset tulevat voimaan vasta virkistyksen j\344lkeen)"
+msgstr "(N�m� asetukset tulevat voimaan vasta virkistyksen j�lkeen)"
 
 #: applets/slashapp/properties.c:258
 msgid "Open new window"
 msgstr "Avaa uusi ikkuna"
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr "Vieritys"
 
 #: applets/slashapp/properties.c:365
 msgid "Smooth scroll"
-msgstr "Pehme\344 vieritys"
+msgstr "Pehme� vieritys"
 
 #: applets/slashapp/properties.c:371
 msgid "Smooth type"
-msgstr "Pehme\344 kirjasinlaji"
+msgstr "Pehme� kirjasinlaji"
 
 #: applets/slashapp/properties.c:377
 msgid "Speed"
@@ -1244,7 +1460,11 @@ msgstr "Viive tekstin rivijaossa:"
 
 #: applets/slashapp/properties.c:408
 msgid "Scroll speed between lines (Smooth scroll):"
-msgstr "Rivien v\344linen vieritysnopeus (pehme\344 vieritys):"
+msgstr "Rivien v�linen vieritysnopeus (pehme� vieritys):"
+
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr "N�ytt�"
 
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
@@ -1255,18 +1475,20 @@ msgid "Slashapp article list"
 msgstr "Slashapp-artikkelilista"
 
 # , c-format
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
+#, c-format
 msgid "creating user directory: %s\n"
-msgstr "luon k\344ytt\344j\344n hakemistoa: %s\n"
+msgstr "luon k�ytt�j�n hakemistoa: %s\n"
 
 # , c-format
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
+#, c-format
 msgid "unable to create user directory: %s\n"
-msgstr "ei voitu luoda k\344ytt\344j\344n hakemistoa: %s\n"
+msgstr "ei voitu luoda k�ytt�j�n hakemistoa: %s\n"
 
 #: applets/slashapp/slashapp.c:532
 msgid "No articles found"
-msgstr "Artikkeleita ei l\366ytynyt"
+msgstr "Artikkeleita ei l�ytynyt"
 
 #: applets/slashapp/slashapp.c:566
 msgid "Justin Maurer <justin@openprojects.net>"
@@ -1294,7 +1516,7 @@ msgstr ""
 
 #: applets/slashapp/slashapp.c:575
 msgid "A ticker to display Slashdot headlines\n"
-msgstr "Vieritin, joka n\344ytt\344\344 Slashdotin otsikot\n"
+msgstr "Vieritin, joka n�ytt�� Slashdotin otsikot\n"
 
 #: applets/slashapp/slashapp.c:621
 msgid "Loading headlines........"
@@ -1302,7 +1524,7 @@ msgstr "Lataan otsikoita........."
 
 #: applets/slashapp/slashapp.c:641
 msgid "Show article listing"
-msgstr "N\344yt\344 artikkelilista"
+msgstr "N�yt� artikkelilista"
 
 #: applets/slashapp/slashapp.c:646
 msgid "Refresh articles"
@@ -1313,8 +1535,12 @@ msgid "The Web Browser Controller"
 msgstr "Selainohjain"
 
 #: applets/webcontrol/webcontrol.c:59
-msgid "This applet currently sends getURL commands to netscape throught the -remote interface.  Hopefully later more webrowsers will be supported."
-msgstr "T\344m\344 sovelma l\344hett\344\344 getURL-komentoja netscapelle. Jatkossa aiomme tukea my\366s muita selaimia."
+msgid ""
+"This applet currently sends getURL commands to netscape throught the -remote "
+"interface.  Hopefully later more webrowsers will be supported."
+msgstr ""
+"T�m� sovelma l�hett�� getURL-komentoja netscapelle. Jatkossa aiomme tukea "
+"my�s muita selaimia."
 
 #. create the widget we are going to put on the applet
 #: applets/webcontrol/webcontrol.c:117
@@ -1323,7 +1549,7 @@ msgstr ""
 
 #: applets/webcontrol/webcontrol.c:120
 msgid "Clear"
-msgstr "Tyhjenn\344"
+msgstr "Tyhjenn�"
 
 #: applets/webcontrol/webcontrol.c:136
 msgid "Launch new window"
@@ -1335,559 +1561,582 @@ msgstr "Selainohjaimen asetukset"
 
 #: applets/webcontrol/webcontrol.c:209
 msgid "Display URL label"
-msgstr "N\344yt\344 URL-kehotin"
+msgstr "N�yt� URL-kehotin"
 
 #: applets/webcontrol/webcontrol.c:218
 msgid "Display \"launch new window\" option"
-msgstr "N\344yt\344 \"Uuteen ikkunaan\"-optio"
+msgstr "N�yt� \"Uuteen ikkunaan\"-optio"
 
 #: applets/webcontrol/webcontrol.c:231
 msgid "Look"
 msgstr "Ulkoasu"
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr "Kansio: "
-
-# , c-format
-#: gmenu/desktop.c:194
-msgid "Unable to create file: %s\n"
-msgstr "Ei voitu luoda tiedostoa: %s\n"
-
-# , c-format
-#: gmenu/desktop.c:213
-msgid "unable to remove .order file: %s\n"
-msgstr ".order -tiedostoa ei voida poistaa: %s\n"
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr "Tiedosto on olemassa."
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr "Tiedostoa ei voitu luoda."
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Et voi lis\344t\344 mit\344\344n t\344h\344n kansioon,\n"
-"sinulta puuttuu tarvittavat oikeudet."
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr "Uusi kansio"
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr "Luo kansio:"
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr "Sinun t\344ytyy ensin valita jotakin."
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr "Et voi poistaa p\344\344tason kansiota."
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Et voi tuhota sit\344 tiedostoa,\n"
-"sinulta puuttuu tarvittavat oikeudet."
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr "Poistetaanko t\344m\344 valikon kohta?"
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
-msgstr "Tuhotaanko tyhj\344 kansio?"
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr "Oletko varma, ett\344 haluat tuhota t\344m\344n kansion sis\344lt\366ineen?"
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
+#: gmenu/desktop.c:80
+msgid " Folder"
 msgstr ""
-"T\344m\344 muutos on ristiriidassa olemassaolevan valikon kohdan kanssa.\n"
-"Jokaisella valikon kohdalla t\344ytyy olla yksiselitteinen nimi."
 
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Et voi siirt\344\344 kohtaa sinne,\n"
-"sinulta puuttuu tarvittavat oikeudet."
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr "Tallenna"
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr "Palauta"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr "Uusi"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
+msgstr "K�ytt�j�valikot"
+
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr "J�rjestelm�valikot"
 
-#: gmenu/gmenu.c:52
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr "_Uusi kansio..."
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr "Luo uusi kansio"
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr "Uusi _kohta"
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr "Luo uusi valikon kohta"
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr "P_oista"
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
-msgstr "_J\344rjest\344 kansio"
+msgstr "_J�rjest� kansio"
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
-msgstr "J\344rjest\344 kansio _rekursiivisesti"
+msgstr "J�rjest� kansio _rekursiivisesti"
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
-msgstr "_J\344rjest\344"
+msgstr "_J�rjest�"
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr "_Ohje"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr "Uusi kansio"
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr "Uusi kohta"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr "Luo uusi kohta"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr "Poista"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr "Poista valittu valikon kohta"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
-msgstr "Siirr\344 yl\366s"
+msgstr "Siirr� yl�s"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
-msgstr "Siirr\344 valittua kohtaa yl\366s"
+msgstr "Siirr� valittua kohtaa yl�s"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
-msgstr "Siirr\344 alas"
+msgstr "Siirr� alas"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
-msgstr "Siirr\344 valittua kohtaa alas"
-
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr "Muokkaa valitun kohdan ominaisuuksia"
+msgstr "Siirr� valittua kohtaa alas"
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
-msgstr "J\344rjest\344 kansio"
+msgstr "J�rjest� kansio"
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
-msgstr "J\344rjest\344 valittu kansio"
+msgstr "J�rjest� valittu kansio"
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+#, fuzzy
+msgid "Sort _Recursive"
+msgstr "J�rjest� kansio _rekursiivisesti"
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr "GNOME-valikkomuokkain"
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
-msgstr "Julkaistu GNU GPL -lisenssill\344. GNOME-valikkomuokkain."
+msgstr "Julkaistu GNU GPL -lisenssill�. GNOME-valikkomuokkain."
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
-msgstr "Valikon kohdalla t\344ytyy olla nimi"
+msgstr "Valikon kohdalla t�ytyy olla nimi"
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
-msgstr "Valikon kohdalla t\344ytyy olla tiedostonimi"
+msgstr "Valikon kohdalla t�ytyy olla tiedostonimi"
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr "Talletetaanko muutokset?"
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
-msgstr "T\344m\344 muutos on ristiriidassa olemassaolevan valikon kohdan kanssa"
+msgstr "T�m� muutos on ristiriidassa olemassaolevan valikon kohdan kanssa"
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
-msgstr "Kirjoitetaanko olemassaolevan valikon kohdan p\344\344lle?"
+msgstr "Kirjoitetaanko olemassaolevan valikon kohdan p��lle?"
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+"T�m� muutos on ristiriidassa olemassaolevan valikon kohdan kanssa.\n"
+"Jokaisella valikon kohdalla t�ytyy olla yksiselitteinen nimi."
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr "Hetki, luen valikkoja..."
 
-#: gmenu/tree.c:418
-msgid "GNOME"
-msgstr ""
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "K�ytt�j�valikot"
+
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr "K�ytt�j�n valikkojen p��taso"
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:418
 msgid "System Menus"
-msgstr "J\344rjestelm\344valikot"
+msgstr "J�rjestelm�valikot"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
-msgstr "J\344rjestelm\344valikkojen p\344\344taso"
+msgstr "J�rjestelm�valikkojen p��taso"
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "K\344ytt\344j\344valikot"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
+msgstr "Et voi poistaa p��tason kansiota."
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
-msgstr "K\344ytt\344j\344n valikkojen p\344\344taso"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr "Poistetaanko t�m� valikon kohta?"
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr "Tuhotaanko tyhj� kansio?"
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr "Oletko varma, ett� haluat tuhota t�m�n kansion sis�lt�ineen?"
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+"Et voi lis�t� mit��n t�h�n kansioon,\n"
+"sinulta puuttuu tarvittavat oikeudet."
+
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr ""
+
+#: gmenu/treenew.c:63
+#, fuzzy
+msgid "Failed to create directory"
+msgstr "Tiedostoa ei voitu luoda."
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr " liitetty"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
-msgstr "GNOME-p\344\344te"
+msgstr "GNOME-p��te"
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
-msgstr "GNOME-p\344\344te-emulaattoriohjelma"
+msgstr "GNOME-p��te-emulaattoriohjelma"
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958 gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr "Oletukset"
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
 "configuration of the new class?"
 msgstr ""
-"Olet vaihtanut t\344m\344n ikkunan luokan. Haluatko\n"
-"muuttaa t\344t\344 ikkunaa uuden luokan oletuksia vastaavaksi?"
+"Olet vaihtanut t�m�n ikkunan luokan. Haluatko\n"
+"muuttaa t�t� ikkunaa uuden luokan oletuksia vastaavaksi?"
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr "Linux-konsoli"
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
-msgstr "V\344rillinen Xterm"
+msgstr "V�rillinen Xterm"
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr "Valkoinen mustalla"
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr "Musta valkoisella"
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
-msgstr "Vihre\344 mustalla"
+msgstr "Vihre� mustalla"
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr "Musta keltaisella"
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
-msgstr "Omat v\344rit"
+msgstr "Omat v�rit"
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "Vasen"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "Oikea"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr "Piilotettu"
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr "Kirjasinlaji:"
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr "Selaa... "
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
-msgstr "P\344\344teluokka"
+msgstr "P��teluokka"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr "Vilkkuva kursori"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr "Piilota menupalkki"
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
-msgstr "Hiljenn\344 \344\344nimerkki"
+msgstr "Hiljenn� ��nimerkki"
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr "Vaihda DEL/Backspace"
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr "Sanan mukaan valinnan merkit"
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr "Taustakuva"
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 msgid "Background type"
 msgstr "Taustan tyyppi"
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 msgid "None"
-msgstr "Ei mik\344\344n"
+msgstr "Ei mik��n"
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr "Taustakuva"
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr "Kuvatiedosto:"
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
-msgstr "L\344pin\344kyv\344"
+msgstr "L�pin�kyv�"
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr "Varjostettu tausta (hidas)"
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr "Paletti:"
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
-msgstr "Tekstin v\344ri:"
+msgstr "Tekstin v�ri:"
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
-msgstr "Taustan v\344ri:"
+msgstr "Taustan v�ri:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
-msgstr "V\344rit:"
+msgstr "V�rit:"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "Vieritinpalkin sijainti"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
-msgstr "Vierityspuskurin rivim\344\344r\344"
+msgstr "Vierityspuskurin rivim��r�"
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
-msgstr "Palauta vieritys n\344pp\344ilt\344ess\344"
+msgstr "Palauta vieritys n�pp�ilt�ess�"
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr "Palauta vieritys tulostaessa"
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
-msgstr "V\344rivalitsin"
+msgstr "V�rivalitsin"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293 gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
-msgstr "_Uusi p\344\344te"
+msgstr "_Uusi p��te"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293 gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
-msgstr "Luo uuden p\344\344teikkunan"
+msgstr "Luo uuden p��teikkunan"
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr "_Piilota valikkopalkki"
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
-msgstr "_Sulje p\344\344teikkuna"
+msgstr "_Sulje p��teikkuna"
+
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "_Sulje p��teikkuna"
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
-msgstr "_N\344yt\344 valikkopalkki"
+msgstr "_N�yt� valikkopalkki"
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
-msgstr "_V\344rivalitsin"
+msgstr "_V�rivalitsin"
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
-msgstr "P\344\344teluokan nimi"
+msgstr "P��teluokan nimi"
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+msgid "TCLASS"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
-msgstr "M\344\344rittelee kirjasinlajin nimen"
+msgstr "M��rittelee kirjasinlajin nimen"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
-msgstr "\304l\344 k\344ynnist\344 komentotulkkeja sis\344\344nkirjoittautumistason tulkkeina"
+msgstr "�l� k�ynnist� komentotulkkeja sis��nkirjoittautumistason tulkkeina"
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
-msgstr "K\344ynnist\344 komentotulkit sis\344\344nkirjoittautumistason tulkkeina"
+msgstr "K�ynnist� komentotulkit sis��nkirjoittautumistason tulkkeina"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
-msgstr "M\344\344rittelee p\344\344ikkunan sijainnin ja koon"
+msgstr "M��rittelee p��ikkunan sijainnin ja koon"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
-msgstr "Suorita t\344m\344 ohjelma komentotulkin sijaan"
+msgstr "Suorita t�m� ohjelma komentotulkin sijaan"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
-msgstr "Tekstin v\344ri"
+msgstr "Tekstin v�ri"
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
-msgstr "Taustan v\344ri"
+msgstr "Taustan v�ri"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
-msgstr "P\344ivit\344 utmp-merkinn\344t"
+msgstr "P�ivit� utmp-merkinn�t"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
-msgstr "\304l\344 p\344ivit\344 utmp-merkint\366j\344"
+msgstr "�l� p�ivit� utmp-merkint�j�"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
-msgstr "P\344ivit\344 wtmp-merkinn\344t"
+msgstr "P�ivit� wtmp-merkinn�t"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
-msgstr "\304l\344 p\344ivit\344 wtmp-merkint\366j\344"
+msgstr "�l� p�ivit� wtmp-merkint�j�"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr "Aseta ikkunan otsikko"
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
-msgstr "Asiakkaiden rekister\366itymisen odotusaika millisekunneissa (0=ikuisesti)"
+msgstr ""
+"Asiakkaiden rekister�itymisen odotusaika millisekunneissa (0=ikuisesti)"
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+#, fuzzy
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr "Asiakkaiden kuoleman odotusaika millisekunneissa (0=ikuisesti)"
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr "Asiakkaiden kuoleman odotusaika millisekunneissa (0=ikuisesti)"
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr "Odotus lopetettu ristiriidan vuoksi."
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
-msgstr "Uudelleenk\344ynnistys hyl\344tty virheiden vuoksi."
+msgstr "Uudelleenk�ynnistys hyl�tty virheiden vuoksi."
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr "Istuntoa ollaan sulkemassa."
 
@@ -1897,25 +2146,53 @@ msgstr "Tuhoa istunto"
 
 #: gsm/save-session.c:62
 msgid "save-session: couldn't connect to session manager\n"
-msgstr "save-session: ei saatu yhteytt\344 istunnonhallintaan\n"
+msgstr "save-session: ei saatu yhteytt� istunnonhallintaan\n"
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr "Ohjelma:"
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
-msgstr "Yrit\344"
+msgstr "Yrit�"
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr "OK"
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 msgid "Cancel"
 msgstr "Peruuta"
 
+#: gsm/session-properties.c:258
+#, fuzzy
+msgid "Session"
+msgstr "Tuhoa istunto"
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr "Peruuta"
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "Yleiset kuvakeasetukset"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr "Kirjanmerkki"
@@ -1967,7 +2244,7 @@ msgstr ""
 
 #: help-browser/gnome-help-browser.c:125
 msgid "Debug level"
-msgstr "Vianm\344\344ritystaso"
+msgstr "Vianm��ritystaso"
 
 #: help-browser/gnome-help-browser.c:336 help-browser/window.c:690
 msgid "Gnome Help Browser"
@@ -1978,8 +2255,12 @@ msgid "Copyright (c) 1998 Red Hat Software, Inc."
 msgstr ""
 
 #: help-browser/gnome-help-browser.c:339
-msgid "GNOME Help Browser allows easy access to various forms of documentation on your system"
-msgstr "GNOME-ohjeselain tarjoaa yhten\344isen, helpon k\344ytt\366liittym\344n useisiin j\344rjestelm\344n dokumentaatiomuotoihin."
+msgid ""
+"GNOME Help Browser allows easy access to various forms of documentation on "
+"your system"
+msgstr ""
+"GNOME-ohjeselain tarjoaa yhten�isen, helpon k�ytt�liittym�n useisiin "
+"j�rjestelm�n dokumentaatiomuotoihin."
 
 #: help-browser/gnome-help-browser.c:598
 msgid "History size"
@@ -1991,11 +2272,11 @@ msgstr "Historiatiedosto"
 
 #: help-browser/gnome-help-browser.c:600
 msgid "Cache size"
-msgstr "V\344limuistin koko"
+msgstr "V�limuistin koko"
 
 #: help-browser/gnome-help-browser.c:601
 msgid "Cache file"
-msgstr "V\344limuistitiedosto"
+msgstr "V�limuistitiedosto"
 
 #: help-browser/gnome-help-browser.c:602
 msgid "Bookmark file"
@@ -2019,7 +2300,7 @@ msgstr "GNOME-ohjeselaimen asetukset"
 
 #: help-browser/gnome-help-browser.c:688
 msgid "History and cache"
-msgstr "Historia ja v\344limuisti"
+msgstr "Historia ja v�limuisti"
 
 #: help-browser/gnome-help-browser.c:689
 msgid "Paths"
@@ -2027,7 +2308,7 @@ msgstr "Polut"
 
 #: help-browser/gnome-helpwin.c:215
 msgid "<body><h2>Error: file not found</h2></body>"
-msgstr "<body><h2>Virhe: tiedostoa ei l\366ydy</h2></body>"
+msgstr "<body><h2>Virhe: tiedostoa ei l�ydy</h2></body>"
 
 #: help-browser/history.c:257
 msgid "URL"
@@ -2039,7 +2320,7 @@ msgstr "Viimeinen"
 
 #: help-browser/history.c:257
 msgid "Count"
-msgstr "M\344\344r\344"
+msgstr "M��r�"
 
 #: help-browser/history.c:270
 msgid "Gnome Help History"
@@ -2047,11 +2328,11 @@ msgstr "GNOME-ohjeen historia"
 
 #: help-browser/toc-man.c:19 help-browser/toc2-man.c:21
 msgid "User Commands"
-msgstr "K\344ytt\344j\344n komennot"
+msgstr "K�ytt�j�n komennot"
 
 #: help-browser/toc-man.c:20 help-browser/toc2-man.c:22
 msgid "System Calls"
-msgstr "J\344rjestelm\344kutsut"
+msgstr "J�rjestelm�kutsut"
 
 #: help-browser/toc-man.c:21 help-browser/toc2-man.c:23
 msgid "Library Functions"
@@ -2070,13 +2351,14 @@ msgid "Games"
 msgstr "Pelit"
 
 #. Miscellaneous frame
-#: help-browser/toc-man.c:25 help-browser/toc2-man.c:27 panel/panel_config_global.c:503 panel/panel_config_global.c:632
+#: help-browser/toc-man.c:25 help-browser/toc2-man.c:27
+#: panel/panel_config_global.c:503 panel/panel_config_global.c:632
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
 #: help-browser/toc-man.c:26 help-browser/toc2-man.c:28
 msgid "Administration"
-msgstr "Yll\344pito"
+msgstr "Yll�pito"
 
 #: help-browser/toc-man.c:27 help-browser/toc2-man.c:29
 msgid "man9"
@@ -2109,7 +2391,7 @@ msgstr "GNOME-ohjesivut"
 
 #: help-browser/toc2.c:115 help-browser/toc2.c:256 help-browser/toc2.c:318
 msgid "<h1>Table of Contents</h1>\n"
-msgstr "<h1>Sis\344llysluettelo</h1>\n"
+msgstr "<h1>Sis�llysluettelo</h1>\n"
 
 #. Man Pages
 #: help-browser/toc2.c:119
@@ -2182,15 +2464,15 @@ msgstr ""
 
 #: help-browser/toc2.c:536
 msgid "<br><B>No matches found</B>\n"
-msgstr "<br><B>Osumia ei l\366ytynyt</B>\n"
+msgstr "<br><B>Osumia ei l�ytynyt</B>\n"
 
 #: help-browser/visit.c:84
 msgid "<BODY>Could not load default TOC page</BODY>"
-msgstr "<BODY>Oletusarvoista sis\344llysluettelosivua ei voitu ladata</BODY>"
+msgstr "<BODY>Oletusarvoista sis�llysluettelosivua ei voitu ladata</BODY>"
 
 #: help-browser/visit.c:102
 msgid "<BODY>Unknown TOC argument</BODY>"
-msgstr "<BODY>Tuntematon sis\344lt\366m\344\344re</BODY>"
+msgstr "<BODY>Tuntematon sis�lt�m��re</BODY>"
 
 #: help-browser/window.c:129
 msgid "_New Window"
@@ -2202,11 +2484,11 @@ msgstr "Avaa uusi selainikkuna"
 
 #: help-browser/window.c:136
 msgid "_Add Bookmark"
-msgstr "Lis\344\344 _kirjanmerkki"
+msgstr "Lis�� _kirjanmerkki"
 
 #: help-browser/window.c:136
 msgid "Add bookmark"
-msgstr "Lis\344\344 kirjanmerkki"
+msgstr "Lis�� kirjanmerkki"
 
 #: help-browser/window.c:161
 msgid "_History"
@@ -2214,7 +2496,7 @@ msgstr "_Historia"
 
 #: help-browser/window.c:161 help-browser/window.c:202
 msgid "Show History Window"
-msgstr "N\344yt\344 historiaikkuna"
+msgstr "N�yt� historiaikkuna"
 
 #: help-browser/window.c:166
 msgid "_Bookmarks"
@@ -2222,7 +2504,7 @@ msgstr "_Kirjanmerkit"
 
 #: help-browser/window.c:166 help-browser/window.c:204
 msgid "Show Bookmarks Window"
-msgstr "N\344yt\344 kirjanmerkki-ikkuna"
+msgstr "N�yt� kirjanmerkki-ikkuna"
 
 #: help-browser/window.c:180
 msgid "_Window"
@@ -2238,7 +2520,7 @@ msgstr "Palaa takaisin historialistalla"
 
 #: help-browser/window.c:192
 msgid "Forward"
-msgstr "Eteenp\344in"
+msgstr "Eteenp�in"
 
 #: help-browser/window.c:193
 msgid "Go to the next location in the history list"
@@ -2246,7 +2528,7 @@ msgstr "Etene historialistalla"
 
 #: help-browser/window.c:196
 msgid "Reload"
-msgstr "P\344ivit\344"
+msgstr "P�ivit�"
 
 #: help-browser/window.c:199
 msgid "Index"
@@ -2254,7 +2536,7 @@ msgstr "Hakemisto"
 
 #: help-browser/window.c:199
 msgid "Show Documentation Index"
-msgstr "N\344yt\344 dokumentaatiohakemisto"
+msgstr "N�yt� dokumentaatiohakemisto"
 
 #: help-browser/window.c:204
 msgid "BMarks"
@@ -2270,6 +2552,7 @@ msgstr "Sijainti: "
 
 # , c-format
 #: help-browser/window.c:819
+#, c-format
 msgid ""
 "Error loading document:\n"
 "\n"
@@ -2283,17 +2566,17 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr ""
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "Poista paneelista"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
-msgstr "Siirr\344 paneelissa"
+msgstr "Siirr� paneelissa"
 
 #: panel/drawer.c:112
 msgid "Tooltip/Name"
@@ -2305,7 +2588,7 @@ msgstr "Kuvake"
 
 #: panel/drawer.c:120
 msgid "Applet appearance"
-msgstr "Sovelman ulkon\344k\366"
+msgstr "Sovelman ulkon�k�"
 
 #: panel/drawer.c:127
 msgid "Drawer handle"
@@ -2315,37 +2598,37 @@ msgstr "Vetolaatikon kahva"
 #. on
 #: panel/drawer.c:132
 msgid "Enable hidebutton"
-msgstr "N\344yt\344 piilotuspainike"
+msgstr "N�yt� piilotuspainike"
 
 #: panel/drawer.c:141
 msgid "Enable hidebutton arrow"
-msgstr "N\344yt\344 piilotuspainikenuoli"
+msgstr "N�yt� piilotuspainikenuoli"
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "Vetolaatikko"
 
 #: panel/launcher.c:41
 msgid "This launch icon does not specify a program to run"
-msgstr "T\344m\344 k\344ynnistinkuvake ei m\344\344rittele ajettavaa ohjelmaa"
+msgstr "T�m� k�ynnistinkuvake ei m��rittele ajettavaa ohjelmaa"
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr "Sovellus"
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
-msgstr "K\344ynnistimen asetukset"
+msgstr "K�ynnistimen asetukset"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
-msgstr "Luo k\344ynnistin"
+msgstr "Luo k�ynnistin"
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr "Kirjoittaudu ulos"
 
@@ -2355,17 +2638,22 @@ msgid ""
 "Start another panel as well?\n"
 "(The new panel will not be restarted.)"
 msgstr ""
-"K\344ynniss\344 oleva paneeli havaittu.\n"
-"K\344ynnistet\344\344nk\366 uusi paneeli sen lis\344ksi?\n"
-"(Uutta paneelia ei uudelleenk\344ynnistet\344.)"
+"K�ynniss� oleva paneeli havaittu.\n"
+"K�ynnistet��nk� uusi paneeli sen lis�ksi?\n"
+"(Uutta paneelia ei uudelleenk�ynnistet�.)"
 
 #: panel/menu.c:539
 msgid "The GNOME Panel"
 msgstr "GNOME-paneeli"
 
 #: panel/menu.c:542
-msgid "This program is responsible for launching other applications, embedding small applets within itself, world peace, and random X crashes."
-msgstr "T\344m\344 ohjelma on vastuussa muitten sovellusten k\344ynnist\344misest\344, pienten sovelmien nielaisemisesta, maailmanrauhasta ja satunnaisista X:n kaatumisista."
+msgid ""
+"This program is responsible for launching other applications, embedding "
+"small applets within itself, world peace, and random X crashes."
+msgstr ""
+"T�m� ohjelma on vastuussa muitten sovellusten k�ynnist�misest�, pienten "
+"sovelmien nielaisemisesta, maailmanrauhasta ja satunnaisista X:n "
+"kaatumisista."
 
 #: panel/menu.c:565 panel/menu.c:1314
 msgid "Can't load entry"
@@ -2373,23 +2661,23 @@ msgstr "En voi ladata kohtaa"
 
 #: panel/menu.c:755 panel/menu.c:789
 msgid "Desktop entry properties"
-msgstr "Ty\366p\366yd\344n kohdan asetukset"
+msgstr "Ty�p�yd�n kohdan asetukset"
 
 #: panel/menu.c:855
 msgid "Add this launcher to panel"
-msgstr "Lis\344\344 t\344m\344 k\344ynnistin paneeliin"
+msgstr "Lis�� t�m� k�ynnistin paneeliin"
 
 #: panel/menu.c:862 panel/menu.c:888
 msgid "Add this to personal menu"
-msgstr "Lis\344\344 t\344m\344 henkil\366kohtaiseen valikkoon"
+msgstr "Lis�� t�m� henkil�kohtaiseen valikkoon"
 
 #: panel/menu.c:873
 msgid "Add this as drawer to panel"
-msgstr "Lis\344\344 t\344m\344 vetolaatikkona paneeliin"
+msgstr "Lis�� t�m� vetolaatikkona paneeliin"
 
 #: panel/menu.c:881
 msgid "Add this as menu to panel"
-msgstr "Lis\344\344 t\344m\344 valikkona paneeliin"
+msgstr "Lis�� t�m� valikkona paneeliin"
 
 #: panel/menu.c:916
 msgid "Properties ..."
@@ -2401,254 +2689,243 @@ msgstr ""
 
 #: panel/menu.c:1322
 msgid "Can't get goad_id from desktop entry!"
-msgstr "Ty\366p\366yd\344n kohdan goad_id:t\344 ei saatu!"
+msgstr "Ty�p�yd�n kohdan goad_id:t� ei saatu!"
 
 #: panel/menu.c:1607
 msgid "Can't get goad_id for applet, ignoring it"
-msgstr "Sovelman goad_id:t\344 ei saatu, j\344tet\344\344n huomiotta..."
+msgstr "Sovelman goad_id:t� ei saatu, j�tet��n huomiotta..."
 
 #: panel/menu.c:1769
 msgid " (empty)"
-msgstr " (tyhj\344)"
+msgstr " (tyhj�)"
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr "Sovelmat"
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr "Reunapaneeli"
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr "Nurkkapaneeli"
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr "J\344rjestelm\344valikot"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 msgid "Debian menus"
 msgstr "Debian-valikot"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 msgid "No Debian menus found!"
-msgstr "Debian-valikkoja ei l\366ytynyt!"
-
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892 panel/menu.c:2895
-msgid "User menus"
-msgstr "K\344ytt\344j\344valikot"
+msgstr "Debian-valikkoja ei l�ytynyt!"
 
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858 panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr "Red Hat -valikot"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
-msgstr "Poista t\344m\344 paneeli"
+msgstr "Poista t�m� paneeli"
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
-msgstr "Lis\344\344 sovelma"
+msgstr "Lis�� sovelma"
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
-msgstr "Lis\344\344 paneeli"
+msgstr "Lis�� paneeli"
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr "Muuta nurkkapaneeliksi"
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr "Muuta reunapaneeliksi"
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
-msgstr "Lis\344\344 p\344\344valikko"
+msgstr "Lis�� p��valikko"
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
-msgstr "Lis\344\344 vetolaatikko"
+msgstr "Lis�� vetolaatikko"
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
-msgstr "Lis\344\344 uloskirjoittautumispainike"
+msgstr "Lis�� uloskirjoittautumispainike"
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr "Nielaise ohjelma"
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
-msgstr "Lis\344\344 uusi k\344ynnistin"
+msgstr "Lis�� uusi k�ynnistin"
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
-msgstr "T\344m\344n paneelin asetukset..."
+msgstr "T�m�n paneelin asetukset..."
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "Yleiset asetukset..."
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr "Paneeli"
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
-msgstr "Lukitse n\344ytt\366"
+msgstr "Lukitse n�ytt�"
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr "Tietoja GNOME:sta..."
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
-msgstr "Ei voida avata hakemistoa; k\344ytet\344\344n p\344\344valikkoa"
+msgstr "Ei voida avata hakemistoa; k�ytet��n p��valikkoa"
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr "Alivalikossa"
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
-msgstr "P\344\344valikossa"
+msgstr "P��valikossa"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr "Valikon ominaisuudet"
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr "Valikon tyyppi"
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
-msgstr "P\344\344valikko"
+msgstr "P��valikko"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr "Normaali valikko"
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
-msgstr "J\344rjestelm\344valikko: "
+msgstr "J�rjestelm�valikko: "
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
-msgstr "K\344ytt\344j\344valikko: "
+msgstr "K�ytt�j�valikko: "
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
-msgstr "Red Hat -valikko (jos l\366ytyi): "
+#: panel/menu.c:3374
+#, fuzzy
+msgid "AnotherLevel menu (if found): "
+msgstr "Debian-valikko (jos l�ytyi): "
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
-msgstr "Debian-valikko (jos l\366ytyi): "
+msgstr "Debian-valikko (jos l�ytyi): "
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr "Valikkopolku"
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "Sijainti"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
-msgstr "Yl\344reuna"
+msgstr "Yl�reuna"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "Alareuna"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr "Piilotusasetukset"
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr "Piilota automaattisesti"
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
-msgstr "N\344yt\344 piilotuspainikkeet"
+msgstr "N�yt� piilotuspainikkeet"
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
-msgstr "N\344yt\344 piilotuspainikkeiden nuolet"
+msgstr "N�yt� piilotuspainikkeiden nuolet"
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr "Koillinen"
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr "Lounas"
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr "Luode"
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr "Lounas"
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr "Suunta"
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "Vaaka"
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "Pysty"
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr "Piilotuspainikevalinnat"
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr "Tausta"
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr "Normaali"
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr "Kuva"
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
-msgstr "V\344ri"
+msgstr "V�ri"
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr "Kuvatiedosto"
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr "Skaalaa kuva sopimaan paneeliin"
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "Paneelin ominaisuudet"
 
@@ -2659,7 +2936,7 @@ msgstr "Salli animaatiot"
 
 #: panel/panel_config_global.c:204
 msgid "Constant speed animations"
-msgstr "N\344yt\344 animaatiot vakionopeudella"
+msgstr "N�yt� animaatiot vakionopeudella"
 
 #. AutoHide Animation step_size scale frame
 #: panel/panel_config_global.c:218
@@ -2684,12 +2961,12 @@ msgstr "Automaattipiilotuksen odotus (ms)"
 #. Minimized size scale frame
 #: panel/panel_config_global.c:254
 msgid "Auto-hide minimized size (pixels)"
-msgstr "Automaattipiilotetun paneelin koko (pikseleit\344)"
+msgstr "Automaattipiilotetun paneelin koko (pikseleit�)"
 
 #. Enable tiles frame
 #: panel/panel_config_global.c:320 panel/panel_config_global.c:347
 msgid "Tiles enabled"
-msgstr "N\344yt\344 kuvakkeiden taustakuvat"
+msgstr "N�yt� kuvakkeiden taustakuvat"
 
 #. Image frame
 #: panel/panel_config_global.c:356
@@ -2712,7 +2989,7 @@ msgstr "Reunanleveys (taustakuva)"
 #. Minimized size scale frame
 #: panel/panel_config_global.c:386
 msgid "Depth (displacement when pressed)"
-msgstr "Syvyys (siirtym\344 painettuna)"
+msgstr "Syvyys (siirtym� painettuna)"
 
 #. Tooltips frame
 #: panel/panel_config_global.c:408
@@ -2722,7 +2999,7 @@ msgstr "Vinkit"
 #. Tooltips enable
 #: panel/panel_config_global.c:418
 msgid "Tooltips enabled"
-msgstr "N\344yt\344 vinkit"
+msgstr "N�yt� vinkit"
 
 #. Menu frame
 #: panel/panel_config_global.c:427
@@ -2732,22 +3009,22 @@ msgstr "Valikot"
 #. Small Icons
 #: panel/panel_config_global.c:437
 msgid "Show small icons"
-msgstr "N\344yt\344 pienet kuvakkeet valikoissa"
+msgstr "N�yt� pienet kuvakkeet valikoissa"
 
 #. Dot Buttons
 #: panel/panel_config_global.c:446
 msgid "Show ... buttons"
-msgstr "N\344yt\344 ... -painikkeet"
+msgstr "N�yt� ... -painikkeet"
 
 #. Off Panel Popup menus
 #: panel/panel_config_global.c:455
 msgid "Show popup menus outside of panels"
-msgstr "N\344yt\344 ponnahdusvalikot paneelien ulkopuolella"
+msgstr "N�yt� ponnahdusvalikot paneelien ulkopuolella"
 
 #. Hungry Menus
 #: panel/panel_config_global.c:464
 msgid "Keep menus in memory"
-msgstr "Pid\344 valikot muistissa"
+msgstr "Pid� valikot muistissa"
 
 #. Movement frame
 #: panel/panel_config_global.c:473
@@ -2757,11 +3034,11 @@ msgstr "Paneelin elementtien liike"
 #. Switched
 #: panel/panel_config_global.c:483
 msgid "Switched movement"
-msgstr "Vaihtoliike - elementit siirtyv\344t siirrett\344v\344n tielt\344"
+msgstr "Vaihtoliike - elementit siirtyv�t siirrett�v�n tielt�"
 
 #: panel/panel_config_global.c:494
 msgid "Free movement (doesn't disturb other applets)"
-msgstr "Vapaa liike - ei liikuta muita elementtej\344"
+msgstr "Vapaa liike - ei liikuta muita elementtej�"
 
 #. Prompt before log out
 #: panel/panel_config_global.c:513
@@ -2771,22 +3048,26 @@ msgstr "Varmista ennen uloskirjoittautumista"
 #. Autoraise
 #: panel/panel_config_global.c:522
 msgid "Raise panels on mouse-over (non GNOME compliant window managers only)"
-msgstr "Nosta paneelit hiiren kosketuksesta (GNOME-yhteensopimattomille ikkunanhallintaohjelmille)"
+msgstr ""
+"Nosta paneelit hiiren kosketuksesta (GNOME-yhteensopimattomille "
+"ikkunanhallintaohjelmille)"
 
 #. Keep on bottom
 #: panel/panel_config_global.c:531
 msgid "Keep panel below windows (GNOME compliant window managers only)"
-msgstr "Pid\344 paneeli ikkunoiden alapuolella (GNOME-yhteensopiville ikkunanhallintaohjelmille)"
+msgstr ""
+"Pid� paneeli ikkunoiden alapuolella (GNOME-yhteensopiville "
+"ikkunanhallintaohjelmille)"
 
 #. Drawer/launcher auto close
 #: panel/panel_config_global.c:540
 msgid "Close drawer if a launcher inside it is pressed"
-msgstr "Sulje vetolaatikko, kun siin\344 olevaa laukaisinta painetaan"
+msgstr "Sulje vetolaatikko, kun siin� olevaa laukaisinta painetaan"
 
 #. Minimize Delay scale frame
 #: panel/panel_config_global.c:549
 msgid "Applet padding"
-msgstr "Sovelmien v\344li"
+msgstr "Sovelmien v�li"
 
 #: panel/panel_config_global.c:577
 msgid "Launcher icon"
@@ -2816,32 +3097,6 @@ msgstr "Animaatio"
 msgid "General icon settings"
 msgstr "Yleiset kuvakeasetukset"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-"Oletko varma, ett\344 haluat lopettaa vain paneelin?\n"
-"\n"
-"Jos sinun tarvitsee k\344ynnist\344\344 paneeli uudestaan lopetettuasi sen t\344st\344, sinun pit\344\344 k\344ynnist\344\344 se p\344\344teikkunassa komennolla \"panel\".\n"
-"\n"
-"Paina OK lopettaaksesi paneeli."
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr "Haluatko todella kirjoittautua ulos?"
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr "Lopeta vain paneeli"
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr "Kysy ensi kerralla"
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr "Luo nielaisusovelma"
@@ -2852,8 +3107,90 @@ msgstr "Nielaistavan sovelluksen nimi"
 
 #: panel/swallow.c:235
 msgid "Command (optional)"
-msgstr "Komento (ei v\344ltt\344m\344t\366n)"
+msgstr "Komento (ei v�ltt�m�t�n)"
 
 #: panel/swallow.c:258
 msgid "Height"
 msgstr "Korkeus"
+
+#~ msgid "Afterstep Clock Applet"
+#~ msgstr "Afterstep-kellosovelma"
+
+#~ msgid "General Properties"
+#~ msgstr "Yleiset asetukset"
+
+#~ msgid "Graph Interval:"
+#~ msgstr "K�yr�n v�li:"
+
+#~ msgid "Submenu: "
+#~ msgstr "Kansio: "
+
+# , c-format
+#~ msgid "Unable to create file: %s\n"
+#~ msgstr "Ei voitu luoda tiedostoa: %s\n"
+
+# , c-format
+#~ msgid "unable to remove .order file: %s\n"
+#~ msgstr ".order -tiedostoa ei voida poistaa: %s\n"
+
+#~ msgid "File exists."
+#~ msgstr "Tiedosto on olemassa."
+
+#~ msgid "Create Submenu:"
+#~ msgstr "Luo kansio:"
+
+#~ msgid "You must select something first."
+#~ msgstr "Sinun t�ytyy ensin valita jotakin."
+
+#~ msgid ""
+#~ "You can't delete that file.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "Et voi tuhota sit� tiedostoa,\n"
+#~ "sinulta puuttuu tarvittavat oikeudet."
+
+#~ msgid ""
+#~ "You are not allowed to move that item there.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "Et voi siirt�� kohtaa sinne,\n"
+#~ "sinulta puuttuu tarvittavat oikeudet."
+
+#~ msgid "New"
+#~ msgstr "Uusi"
+
+#~ msgid "Edit selected menu item properties"
+#~ msgstr "Muokkaa valitun kohdan ominaisuuksia"
+
+#~ msgid "Red Hat menus"
+#~ msgstr "Red Hat -valikot"
+
+#~ msgid "Red Hat menu (if found): "
+#~ msgstr "Red Hat -valikko (jos l�ytyi): "
+
+#~ msgid "Hidebutton options"
+#~ msgstr "Piilotuspainikevalinnat"
+
+#~ msgid ""
+#~ "Are you sure you want to just terminate the panel?\n"
+#~ "\n"
+#~ "If you need to restart the panel after terminating it here, you will need to "
+#~ "type panel in a terminal window\n"
+#~ "\n"
+#~ "Press OK to terminate the panel!"
+#~ msgstr ""
+#~ "Oletko varma, ett� haluat lopettaa vain paneelin?\n"
+#~ "\n"
+#~ "Jos sinun tarvitsee k�ynnist�� paneeli uudestaan lopetettuasi sen t�st�, "
+#~ "sinun pit�� k�ynnist�� se p��teikkunassa komennolla \"panel\".\n"
+#~ "\n"
+#~ "Paina OK lopettaaksesi paneeli."
+
+#~ msgid "Really log out?"
+#~ msgstr "Haluatko todella kirjoittautua ulos?"
+
+#~ msgid "Only terminate panel"
+#~ msgstr "Lopeta vain paneeli"
+
+#~ msgid "Ask next time"
+#~ msgstr "Kysy ensi kerralla"
diff --git a/po/fr.po b/po/fr.po
index 0e4341db..c981f3d8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-core VERSION\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: 1998-02-28 19:34+0100\n"
 "Last-Translator: Vincent Renardias <vincent@ldsol.com>\n"
 "Language-Team: Vincent Renardias <vincent@ldsol.com>\n"
@@ -13,106 +13,298 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "A Propos"
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "Propri�t�s..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr "Applet Horloge Afterstep"
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "Horloge"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr "Qui a dit que le NeXT est mort?"
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "Page de Titre"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr "Affichage au format ``12 heures'' (AM/PM)"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr "G�n�ral"
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr "Fuseau Horaire"
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr "Erreur interne: mode invalide dans batterie_set_mode"
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "Impossible de cr��r l'applet!\n"
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "A Propos..."
+
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
+msgstr "L'applet GNOME KB"
+
+#: applets/battery/battery.c:838
+#, fuzzy
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr "(C) 1998 the Free Software Foundation"
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr "Impossible d'allouer de l'espace pour les valeurs du graphe"
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "Configuration du moniteur de batterie"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "Propri�t�s g�n�rales"
-
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
 msgstr "Hauteur de l'applet"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
 msgstr "Largeur de l'applet"
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Update interval
+#: applets/battery/properties.c:102
+#, fuzzy
+msgid "Update Interval (seconds):"
+msgstr "Intervalle (en secondes) entre les mises � jour:"
+
+#. Low battery value
+#: applets/battery/properties.c:116
+#, fuzzy
+msgid "Low Charge Threshold:"
+msgstr "R�activit�"
+
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
 msgstr "Mode applet"
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr "Graphe"
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr ""
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
-msgstr "Intervalle du graphe:"
+#: applets/battery/properties.c:202
+msgid "Low Battery Color:"
+msgstr ""
+
+#: applets/battery/properties.c:262
+msgid "Graph Battery Low Color:"
+msgstr ""
+
+#: applets/battery/properties.c:268
+#, fuzzy
+msgid "Graph Tick Color:"
+msgstr "Direction du graphe:"
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr "Direction du graphe:"
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr "de gauche � droite"
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr "de droite � gauche"
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
@@ -120,20 +312,20 @@ msgstr ""
 "Impossible d'ouvrir /proc/apm! Assurez-vous d'avoir APM compil� dans votre "
 "noyau.\n"
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "Impossible d'ouvrir /dev/apm; ne peut obtenir les informations."
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr "echec d'ioctl sur /dev/apm."
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr ""
 "APM est d�sactiv�! Impossible d'obtenir les informations sur la charge de la "
@@ -164,17 +356,6 @@ msgstr ""
 "disponibles sur votre clavier. Disponible sous les termes de la licence "
 "publique GNU."
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr "A Propos..."
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -219,10 +400,6 @@ msgstr "Aucun (d�faut)"
 msgid "Clock"
 msgstr "Horloge"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr "Affichage au format ``12 heures'' (AM/PM)"
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr ""
@@ -249,96 +426,6 @@ msgstr "Lorsqu'un nouveau message est re�u, ex�cuter:"
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr ""
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr "G�n�ral"
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr "Fichiers de th�me (r�pertoire):"
@@ -355,7 +442,7 @@ msgstr "Applet composition PPP"
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr ""
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr "Off"
 
@@ -375,6 +462,11 @@ msgstr "Couleur du texte"
 msgid "Backgroundcolor"
 msgstr "Couleur de fond"
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr "Hauteur de l'applet"
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -388,35 +480,35 @@ msgstr "Fr�quence de mise � jour"
 msgid "Diskusage Settings"
 msgstr "Param�tres de Diskusage"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
 msgstr ""
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr "mount�"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr " d�mont�"
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr ""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "Ejecter"
 
@@ -520,9 +612,9 @@ msgstr "Nom de votre Poisson GNOME:"
 msgid "The Animation Filename:"
 msgstr "Nom de fichier de l'animation:"
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr " Parcourir"
 
@@ -571,7 +663,7 @@ msgstr "Bureau %d"
 msgid "About\t"
 msgstr "A Propos\t"
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr "Propri�t�s"
 
@@ -757,7 +849,7 @@ msgid "Xmodmap"
 msgstr "Xmodmap"
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr "Menu"
 
@@ -789,80 +881,116 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr "gkb.xpm"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr "Applet Pagination du Bureau"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr "Param�tres du Pageur Gnome"
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
-msgstr "Affichage"
-
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
-msgstr "Afficher toutes les t�ches sur tous les bureaux"
-
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
-msgstr "Afficher les t�ches"
+#: applets/gnome-pager/gnomepager_applet.c:220
+#, fuzzy
+msgid "Pager"
+msgstr "Image"
 
-#: applets/gnome-pager/gnomepager_applet.c:224
+#: applets/gnome-pager/gnomepager_applet.c:222
 msgid "Show pager"
 msgstr "Afficher le pageur"
 
-#: applets/gnome-pager/gnomepager_applet.c:232
+#: applets/gnome-pager/gnomepager_applet.c:229
 msgid "Use small pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
-msgstr "Afficher les icones dans les t�ches"
+#: applets/gnome-pager/gnomepager_applet.c:241
+#, fuzzy
+msgid "Rows of pagers"
+msgstr "Nombre de lignes de pageurs"
 
-#: applets/gnome-pager/gnomepager_applet.c:248
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:261
 msgid "Show task list button"
 msgstr "Afficher le bouton de la liste des t�ches"
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
+msgstr "Afficher les t�ches"
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "Afficher ... boutons"
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Afficher les t�ches"
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+#, fuzzy
+msgid "Show normal tasks only"
+msgstr "Afficher toutes les t�ches sur tous les bureaux"
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+#, fuzzy
+msgid "Show minimized tasks only"
+msgstr "Afficher les icones dans les t�ches"
+
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr "Afficher toutes les t�ches sur tous les bureaux"
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+#, fuzzy
+msgid "Show minimized tasks on all desktops"
+msgstr "Afficher toutes les t�ches sur tous les bureaux"
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+#, fuzzy
+msgid "Geometry"
+msgstr "G�om�trie de la fen�tre"
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr "Largeur maximale de la liste des t�ches horizontale"
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr "Largeur maximale de la liste des t�ches horizontale"
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr "Nombre de lignes dans la liste des t�ches horizontale"
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr "Nombre de colonnes pour les t�ches"
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr "Nombre de lignes de pageurs"
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr "Erreur du Pageur Gnome"
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -880,27 +1008,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr "Coll�"
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr "Montrer / Masquer"
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr "Ombrer / D�sombrer"
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "Fermer"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr "Enlever"
 
@@ -986,7 +1114,7 @@ msgid "History"
 msgstr "Historique"
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "Aide"
 
@@ -1056,7 +1184,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr "Couleurs"
 
@@ -1296,7 +1424,7 @@ msgstr "(Ces param�tres ne prendront effet qu'apr�s un raffraichissement)"
 msgid "Open new window"
 msgstr "Ouvrir une nouvelle fen�tre"
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr "D�filement"
 
@@ -1320,6 +1448,10 @@ msgstr ""
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr ""
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr "Affichage"
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr "Aucun article"
@@ -1328,12 +1460,12 @@ msgstr "Aucun article"
 msgid "Slashapp article list"
 msgstr "Liste des articles SlashApp"
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr "cr�ation du r�pertoire utilisateur: %s\n"
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr "impossible de cr�er le r�pertoire utilisateur: %s\n"
@@ -1421,552 +1553,571 @@ msgstr "Afficher l'option \"lancer dans une nouvelle fen�tre\""
 msgid "Look"
 msgstr "Apparence"
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr "Sous-menu: "
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr "Impossible de cr�er le fichier: %s\n"
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr "impossible d'enlever le fichier .order: %s\n"
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr "Le fichier existe."
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr "Echec de la cr�ation du fichier."
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Vous ne pouvez pas ajouter d'entr�e dans ce dossier.\n"
-"Vous n'avez pas les permissions n�cessaires."
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr "Nouveau Sous-menu"
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr "Cr�er Sous-menu:"
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr "Vous devez d'abord s�lectionner quelque chose."
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr "Vous ne pouvez pas effacer un sous-menu du premier niveau."
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Vous ne pouvez pas effacer ce fichier.\n"
-"Vous n'avez pas les permissions requises."
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr "Effacer cet �l�ment de menu?"
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
-msgstr "Effacer sous-menu vide?"
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr "Voulez-vous vraiment effacer ce sous-menu et sont contenu?"
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-"Ce changement cr�� un conflit avec un �l�ment de menu existant.\n"
-"Deux items dans le m�me sous-menu ne peuvent avoir le m�me nom."
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Vous ne pouvez pas d�placer ce fichier � cet endroit.\n"
-"Vous n'avez pas les permissions requises."
+#: gmenu/desktop.c:80
+msgid " Folder"
+msgstr " Dossier"
 
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr "Enregistrer"
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr "Enlever"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr "Nouveau"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
+msgstr "Menus utilisateurs"
+
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr "Menus syst�mes"
 
-#: gmenu/gmenu.c:52
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr "_Nouveau Sous-menu..."
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr "Cr�er un nouveau sous-menu"
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr "Nouvel _Item..."
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr "Cr�er un nouvel item"
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr "_Enlever..."
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr "Trier _Sous-menu"
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr "Trier le sous-menu _Recursivement"
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr "_Fichier"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr "_Trier"
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr "_Aide"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr "Nouveau Sous-menu"
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr "Nouvel Item"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr "Cr�er un nouvel item"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr "Effacer"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr "Effacer l'entr�e s�lectionn�e"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr "D�placer vers le haut"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr "D�placer le menu s�lectionn� vers le haut"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr "D�placer vers le bas"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr "D�placer le menu s�lectionn� vers le bas"
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr "Editer les propri�t�s des �l�ments de menu s�lectionn�s"
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr "Trier sous-menu"
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr "Tri le sous-menu s�lectionn�"
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+#, fuzzy
+msgid "Sort _Recursive"
+msgstr "Trier le sous-menu _Recursivement"
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr "Editeur de menu GNOME"
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
 msgstr ""
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr "Les items de menu doivent avoir un nom"
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr "L'entr�e doit avoir un nom de fichier"
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr "Enregistrer les changements?"
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr "Ce changement entre en conflit avec un item de menu existant"
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr "Ecraser le fichier de menu existant?"
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+"Ce changement cr�� un conflit avec un �l�ment de menu existant.\n"
+"Deux items dans le m�me sous-menu ne peuvent avoir le m�me nom."
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr "Un moment, je relis les menus..."
 
-#: gmenu/tree.c:418
-msgid "GNOME"
-msgstr "GNOME"
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "Menus Utilisateurs"
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr "Sommet des menus utilisateurs"
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr "Menus Syst�mes"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr "Sommet des menus syst�mes"
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "Menus Utilisateurs"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
+msgstr "Vous ne pouvez pas effacer un sous-menu du premier niveau."
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
-msgstr "Sommet des menus utilisateurs"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr "Effacer cet �l�ment de menu?"
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr "Effacer sous-menu vide?"
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr "Voulez-vous vraiment effacer ce sous-menu et sont contenu?"
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+"Vous ne pouvez pas ajouter d'entr�e dans ce dossier.\n"
+"Vous n'avez pas les permissions n�cessaires."
+
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr "Nouveau dossier"
+
+#: gmenu/treenew.c:63
+#, fuzzy
+msgid "Failed to create directory"
+msgstr "Echec de la cr�ation du fichier."
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr "mount�"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr "GNOME Terminal"
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr "L'�mulateur de terminal Gnome."
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr "D�faut"
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
 "configuration of the new class?"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr "Console Linux"
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr "Couleur Xterm"
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr "rxvt"
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr "Blanc sur noir"
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr "Noir sur blanc"
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr "Vert sur noir"
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr "Noir sur jaune clair"
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr "Couleurs personnalis�es"
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "Gauche"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "Droite"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr "Cach�"
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr "Police:"
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr "Parcourir... "
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr "Classe de terminal"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr "Curseur clignotant"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr "Cacher la barre de menu"
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr ""
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr "Inverser DEL&Backspace"
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr "Image"
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 #, fuzzy
 msgid "Background type"
 msgstr " Fond "
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 #, fuzzy
 msgid "None"
 msgstr "aucun"
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr "Pixmap de fond"
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr "Fichier pixmap:"
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr "Transparent"
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr ""
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr "Palette de couleurs:"
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr "Couleur de l'avant-plan:"
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr "Couleur du fond:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr "Couleurs:"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "Position de l'ascenseur"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr "Lignes dans l'historique"
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr ""
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr "S�lection de la couleur"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr "_Nouveau Terminal"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr "Cr�e une nouvelle fen�tre de terminal"
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr "_Cacher la barre de menu"
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr "_Fermer terminal"
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "_Fermer terminal"
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr "_Montrer la barre de menu"
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr "S�lection de la c_ouleur..."
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr "Classe de terminal"
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+#, fuzzy
+msgid "TCLASS"
 msgstr "CLASSE"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr "Sp�cifie le nom de la police"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr "POLICE"
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr "Ne pas lancer les shells comme shells de login"
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr "Lancer les shells comme shells de login"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr "Sp�cifier la g�om�trie pour la fen�tre principale"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr "GEOMETRIE"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr "Ex�cuter ce prorgamme � la place du shell"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr "COMMANDE"
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr "Couleur de de l'avant-plan"
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr "COULEUR"
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr "Couleur de fond"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr "Mettre � jour l'entr�e dans utmp"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr "UTMP"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr "Ne pas mettre � jour l'entr�e dans utmp"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr "NOUTMP"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr "Mettre � jour l'entr�e dans wtmp"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr "WTMP"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr "Ne pas mettre � jour l'entr�e dans wtmp"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr "NOWTMP"
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr "Changer le titre de la fen�tre"
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr "TITRE"
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr "Une fermeture de session est en cours."
 
@@ -1978,24 +2129,53 @@ msgstr "Terminer la session"
 msgid "save-session: couldn't connect to session manager\n"
 msgstr "save-session: impossible de se connecter au gestionnaire de session\n"
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr "Programme:"
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 #, fuzzy
 msgid "Cancel"
 msgstr "Panneau"
 
+#: gsm/session-properties.c:258
+#, fuzzy
+msgid "Session"
+msgstr "Terminer la session"
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+#, fuzzy
+msgid "Start Session"
+msgstr "Ne pas sauver la session"
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr "Panneau"
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "Propri�t�s g�n�rales des icones"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr "Signet"
@@ -2368,15 +2548,15 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr "???"
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "Enlever du panneau"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr "D�placer l'applet"
 
@@ -2406,7 +2586,7 @@ msgstr "Activer le bouton de masquage"
 msgid "Enable hidebutton arrow"
 msgstr ""
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "Tiroir"
 
@@ -2414,23 +2594,23 @@ msgstr "Tiroir"
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr "Appli"
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "Propri�t�s du lanceur"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr "Cr�er une applet englobante"
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "Clore la Session"
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr "Clore la session GNOME"
 
@@ -2495,250 +2675,237 @@ msgstr "Impossible d'obtenir goad_id pour l'applet, ignor�"
 msgid " (empty)"
 msgstr " (vide)"
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr "Applets"
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr "Panneau lat�ral"
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr "Panneau en coin"
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr "Menus syst�mes"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 #, fuzzy
 msgid "Debian menus"
 msgstr "Menu principal"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 #, fuzzy
 msgid "No Debian menus found!"
 msgstr "Aucune article trouv�"
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
-msgstr "Menus utilisateurs"
-
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr "Menus Red Hat"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr "Enlever ce panneau"
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr "Ajouter l'applet"
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr "Ajouter un nouveau panneau"
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr "Convertir en panneau en coin"
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr "Convertir en panneau lat�ral"
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr "Ajouter le menu principal"
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr "Ajouter tiroir"
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr "Ajouter un bouton pour clore la session"
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr "Ins�rer une application"
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr "Ajouter un nouveau lanceur"
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr "Propri�t�s de ce panneau..."
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "Propri�t�s globales..."
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr "Panneau"
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr "V�rouiller l'�cran"
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr "A Propos de GNOME..."
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr ""
 "Impossible d'ouvrir le r�pertoire, utilisation du menu principal � la place!"
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr "Dans un sous-menu"
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr "Sur le menu principal"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr "Propri�t�s du menu"
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr "Type du menu"
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr "Menu principal"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr "Menu normal"
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr "Menu syst�me: "
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr "Menu utilisateur: "
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+#, fuzzy
+msgid "AnotherLevel menu (if found): "
 msgstr "Menu Red Hat (si existant): "
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 #, fuzzy
 msgid "Debian menu (if found): "
 msgstr "Menu Red Hat (si existant): "
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr "Chemin du menu"
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "Placement"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "Haut"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "Bas"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr "Options de minimisation"
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr "Masquer automatiquement"
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr "Activer les boutons de masquage"
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr "Activer les fl�ches des boutons de masquage"
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr "Nord-est"
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr "Sud-ouest"
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr "Nord-ouest"
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr "Sud-est"
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr "Orientation"
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "Vertical"
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr "Options des boutons de masquage"
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr "Fond"
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr "Standard"
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr "Pixmap"
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr "Couleur"
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr "Fichier Image"
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr "Etirer l'image aux dimensions du panel"
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "Propri�t�s du panel"
 
@@ -2909,28 +3076,6 @@ msgstr "Animation"
 msgid "General icon settings"
 msgstr "Propri�t�s g�n�rales des icones"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr "Voulez-vous vraiment clore la session?"
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr "Demander la prochaine fois"
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr "Cr�er une applet englobante"
@@ -2947,6 +3092,75 @@ msgstr "Commande (optionel)"
 msgid "Height"
 msgstr "Hauteur"
 
+#, fuzzy
+#~ msgid "Low Battery Warning"
+#~ msgstr "Basse et en chargement."
+
+#~ msgid "Afterstep Clock Applet"
+#~ msgstr "Applet Horloge Afterstep"
+
+#~ msgid "General Properties"
+#~ msgstr "Propri�t�s g�n�rales"
+
+#~ msgid "Graph Interval:"
+#~ msgstr "Intervalle du graphe:"
+
+#~ msgid "Submenu: "
+#~ msgstr "Sous-menu: "
+
+#~ msgid "Unable to create file: %s\n"
+#~ msgstr "Impossible de cr�er le fichier: %s\n"
+
+#~ msgid "unable to remove .order file: %s\n"
+#~ msgstr "impossible d'enlever le fichier .order: %s\n"
+
+#~ msgid "File exists."
+#~ msgstr "Le fichier existe."
+
+#~ msgid "Create Submenu:"
+#~ msgstr "Cr�er Sous-menu:"
+
+#~ msgid "You must select something first."
+#~ msgstr "Vous devez d'abord s�lectionner quelque chose."
+
+#~ msgid ""
+#~ "You can't delete that file.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "Vous ne pouvez pas effacer ce fichier.\n"
+#~ "Vous n'avez pas les permissions requises."
+
+#~ msgid ""
+#~ "You are not allowed to move that item there.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "Vous ne pouvez pas d�placer ce fichier � cet endroit.\n"
+#~ "Vous n'avez pas les permissions requises."
+
+#~ msgid "New"
+#~ msgstr "Nouveau"
+
+#~ msgid "Edit selected menu item properties"
+#~ msgstr "Editer les propri�t�s des �l�ments de menu s�lectionn�s"
+
+#~ msgid "GNOME"
+#~ msgstr "GNOME"
+
+#~ msgid "Red Hat menus"
+#~ msgstr "Menus Red Hat"
+
+#~ msgid "Red Hat menu (if found): "
+#~ msgstr "Menu Red Hat (si existant): "
+
+#~ msgid "Hidebutton options"
+#~ msgstr "Options des boutons de masquage"
+
+#~ msgid "Really log out?"
+#~ msgstr "Voulez-vous vraiment clore la session?"
+
+#~ msgid "Ask next time"
+#~ msgstr "Demander la prochaine fois"
+
 #~ msgid "Enable gsm debugging"
 #~ msgstr "Activer le d�bugage de gsm"
 
@@ -2970,9 +3184,6 @@ msgstr "Hauteur"
 #~ msgid "Startup Programs"
 #~ msgstr "Programmes de d�marrage"
 
-#~ msgid "Geometry of window"
-#~ msgstr "G�om�trie de la fen�tre"
-
 #~ msgid "1.0pre1"
 #~ msgstr "1.0pre1"
 
@@ -2994,9 +3205,6 @@ msgstr "Hauteur"
 #~ msgid "High."
 #~ msgstr "Haute."
 
-#~ msgid "Low and charging."
-#~ msgstr "Basse et en chargement."
-
 #~ msgid "Low."
 #~ msgstr "Basse."
 
@@ -3155,15 +3363,9 @@ msgstr "Hauteur"
 #~ msgid "%s: option `-W %s' doesn't allow an argument\n"
 #~ msgstr "%s: l'option `-W %s' n'a pas d'argument\n"
 
-#~ msgid " Folder"
-#~ msgstr " Dossier"
-
 #~ msgid "Config"
 #~ msgstr "Config"
 
-#~ msgid "Discard session"
-#~ msgstr "Ne pas sauver la session"
-
 #~ msgid "ID"
 #~ msgstr "ID"
 
@@ -3314,9 +3516,6 @@ msgstr "Hauteur"
 #~ msgid "Slow"
 #~ msgstr "Lent"
 
-#~ msgid "Threshold"
-#~ msgstr "R�activit�"
-
 #~ msgid "Large"
 #~ msgstr "Importante"
 
@@ -3421,9 +3620,6 @@ msgstr "Hauteur"
 #~ msgid "MDI"
 #~ msgstr "MDI"
 
-#~ msgid "New Folder"
-#~ msgstr "Nouveau dossier"
-
 #~ msgid "Failed to delete the folder."
 #~ msgstr "Echec de l'effacement du dossier."
 
diff --git a/po/ga.po b/po/ga.po
index 0eb795d0..403b72e5 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-core VERSION\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: 1998-05-07 11:00+0100\n"
 "Last-Translator:Alastair McKinstry <alastair@ilo.dec.com>\n"
 "Language-Team: Alastair McKinstry <alastair@ilo.dec.com>\n"
@@ -13,125 +13,314 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr ""
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "Abaltachtam go liir..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr ""
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "Cniog"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr ""
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "Leacaithe"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr ""
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr ""
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr ""
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr ""
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr ""
 
-#: applets/battery/battery.c:623
-msgid "Could not allocate space for graph values"
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
 msgstr ""
 
-#: applets/battery/properties.c:37
-msgid "Battery Monitor Settings"
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
 msgstr "Staid batairm:"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "Albaltachtam Luch"
+#: applets/battery/battery.c:838
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr ""
 
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
 msgstr ""
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#: applets/battery/battery.c:975
+msgid "Could not allocate space for graph values"
 msgstr ""
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#: applets/battery/properties.c:67
+msgid "Battery Monitor Settings"
+msgstr "Staid batairm:"
+
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
+msgstr "Dian"
+
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
+msgstr "Dian"
+
+#. Update interval
+#: applets/battery/properties.c:102
+msgid "Update Interval (seconds):"
 msgstr ""
 
-#: applets/battery/properties.c:69
+#. Low battery value
+#: applets/battery/properties.c:116
+#, fuzzy
+msgid "Low Charge Threshold:"
+msgstr "Tairseach"
+
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
+msgstr "Dian"
+
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr ""
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr ""
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
+#: applets/battery/properties.c:202
+msgid "Low Battery Color:"
+msgstr ""
+
+#: applets/battery/properties.c:262
+msgid "Graph Battery Low Color:"
 msgstr ""
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:268
+msgid "Graph Tick Color:"
+msgstr ""
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr ""
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr ""
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr ""
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "Nml oscailt ar fail \"proc/apm\"; Nml sonrai ar fail."
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr ""
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr ""
 
@@ -157,17 +346,6 @@ msgid ""
 "keyboard. Released under GNU General Public Licence."
 msgstr ""
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr ""
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -212,10 +390,6 @@ msgstr ""
 msgid "Clock"
 msgstr "Cniog"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr ""
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr ""
@@ -240,96 +414,6 @@ msgstr ""
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr ""
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr ""
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr ""
@@ -346,7 +430,7 @@ msgstr ""
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr ""
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr ""
 
@@ -366,6 +450,11 @@ msgstr ""
 msgid "Backgroundcolor"
 msgstr " Czlra "
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr ""
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -379,35 +468,35 @@ msgstr ""
 msgid "Diskusage Settings"
 msgstr "Cur Szil"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
 msgstr ""
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr ""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "Dian"
 
@@ -511,9 +600,9 @@ msgstr ""
 msgid "The Animation Filename:"
 msgstr ""
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr " Dearcadh.."
 
@@ -562,7 +651,7 @@ msgstr ""
 msgid "About\t"
 msgstr ""
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr ""
 
@@ -746,7 +835,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr ""
 
@@ -775,81 +864,112 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 #, fuzzy
 msgid "Gnome Pager Settings"
 msgstr "Cur Szil"
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
+#: applets/gnome-pager/gnomepager_applet.c:220
+#, fuzzy
+msgid "Pager"
+msgstr "Msr"
+
+#: applets/gnome-pager/gnomepager_applet.c:222
+msgid "Show pager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
+#: applets/gnome-pager/gnomepager_applet.c:229
+msgid "Use small pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
+#: applets/gnome-pager/gnomepager_applet.c:241
+msgid "Rows of pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:224
-msgid "Show pager"
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:232
-msgid "Use small pagers"
+#: applets/gnome-pager/gnomepager_applet.c:261
+msgid "Show task list button"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
+msgstr "Taispeain Iomhanna beag"
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "Taispeain Iomhanna beag"
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Taispeain Iomhanna beag"
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+msgid "Show normal tasks only"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
-msgid "Show task list button"
+#: applets/gnome-pager/gnomepager_applet.c:313
+msgid "Show minimized tasks only"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+msgid "Show minimized tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+msgid "Geometry"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr ""
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -861,27 +981,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "Dzn"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr ""
 
@@ -971,7 +1091,7 @@ msgid "History"
 msgstr ""
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "Cznamh"
 
@@ -1040,7 +1160,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr "Dath"
 
@@ -1283,7 +1403,7 @@ msgstr ""
 msgid "Open new window"
 msgstr ""
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr ""
 
@@ -1307,6 +1427,10 @@ msgstr ""
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr ""
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr ""
+
 #: applets/slashapp/slashapp.c:152
 #, fuzzy
 msgid "No articles"
@@ -1316,12 +1440,12 @@ msgstr "Nml rmomhphost agat."
 msgid "Slashapp article list"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr ""
@@ -1410,558 +1534,582 @@ msgstr ""
 msgid "Look"
 msgstr ""
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-#, fuzzy
-msgid "Submenu: "
-msgstr "Nml rmomhphost agat."
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr ""
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr ""
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr ""
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr ""
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr ""
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr ""
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr ""
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr ""
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr ""
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
-msgstr ""
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
+#: gmenu/desktop.c:80
+msgid " Folder"
+msgstr " Msd "
 
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr ""
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr ""
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr ""
+# FIXME Check
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+#, fuzzy
+msgid "User menus"
+msgstr "Claireanna"
+
+# FIXME Check
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+#, fuzzy
+msgid "System menus"
+msgstr "Claireanna"
 
-#: gmenu/gmenu.c:52
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr ""
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 #, fuzzy
 msgid "New _Item..."
 msgstr " Msd "
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr ""
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr ""
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 #, fuzzy
 msgid "_File"
 msgstr "Leacaithe"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr ""
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 #, fuzzy
 msgid "_Help"
 msgstr "Cznamh"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr ""
+
+#: gmenu/main.c:102
 #, fuzzy
 msgid "New Item"
 msgstr "Triall ina bhfuinneog fiin"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr ""
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr ""
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr ""
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 #, fuzzy
 msgid "Sort Submenu"
 msgstr "Nml rmomhphost agat."
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+msgid "Sort _Recursive"
+msgstr ""
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr ""
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
 msgstr ""
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 #, fuzzy
 msgid "The menu item must have a name"
 msgstr "Position"
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr ""
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr ""
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr ""
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr ""
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr ""
 
-#: gmenu/tree.c:418
-msgid "GNOME"
+# FIXME Check
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "Claireanna"
+
+#: gmenu/tree.c:411
+msgid "Top of user menus"
 msgstr ""
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr ""
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr ""
 
-# FIXME Check
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "Claireanna"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
+msgstr ""
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr ""
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr ""
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+#, fuzzy
+msgid "New Folder"
+msgstr " Msd "
+
+#: gmenu/treenew.c:63
+msgid "Failed to create directory"
+msgstr ""
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr "Leacaithe"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
 "configuration of the new class?"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr "Dath"
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "Links"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "Rechts"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr ""
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 #, fuzzy
 msgid "Browse..."
 msgstr " Dearcadh.."
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 #, fuzzy
 msgid "Terminal Class"
 msgstr "Ingearach"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr ""
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr ""
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr ""
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr ""
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 #, fuzzy
 msgid "Image"
 msgstr "Msr"
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 #, fuzzy
 msgid "Background type"
 msgstr " Czlra "
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 #, fuzzy
 msgid "None"
 msgstr "tada"
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 #, fuzzy
 msgid "Background pixmap"
 msgstr " Czlra "
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr ""
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr ""
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr ""
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr " Czlra "
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr "Dath"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr ""
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr ""
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr ""
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 #, fuzzy
 msgid "_New terminal"
 msgstr "Triall ina bhfuinneog fiin"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 #, fuzzy
 msgid "_Close terminal"
 msgstr "Triall ina bhfuinneog fiin"
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "Triall ina bhfuinneog fiin"
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+msgid "TCLASS"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr " Czlra "
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr ""
 
@@ -1973,24 +2121,51 @@ msgstr ""
 msgid "save-session: couldn't connect to session manager\n"
 msgstr ""
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr ""
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 #, fuzzy
 msgid "Cancel"
 msgstr "Painial"
 
+#: gsm/session-properties.c:258
+msgid "Session"
+msgstr ""
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr "Painial"
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "Albaltachtam Luch"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr ""
@@ -2339,15 +2514,15 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr ""
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "Cuir as Painial"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr "Bog mionuirlis"
 
@@ -2380,7 +2555,7 @@ msgstr "Tsg iomha"
 msgid "Enable hidebutton arrow"
 msgstr "Tsg iomha"
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "Cuir isteach Taisceadan"
 
@@ -2388,23 +2563,23 @@ msgstr "Cuir isteach Taisceadan"
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr "Uirlis"
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "Cumas seoltsra"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr ""
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "Ealu as"
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 #, fuzzy
 msgid "Log out of GNOME"
 msgstr "Ealu as"
@@ -2471,264 +2646,245 @@ msgstr ""
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr "Dian"
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 #, fuzzy
 msgid "Edge panel"
 msgstr "Painial"
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 #, fuzzy
 msgid "Corner panel"
 msgstr "Cuir le Painial"
 
-# FIXME Check
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-#, fuzzy
-msgid "System menus"
-msgstr "Claireanna"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 #, fuzzy
 msgid "Debian menus"
 msgstr "Cuir le Prmomhchlair"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 msgid "No Debian menus found!"
 msgstr ""
 
-# FIXME Check
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-#, fuzzy
-msgid "User menus"
-msgstr "Claireanna"
-
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-#, fuzzy
-msgid "Red Hat menus"
-msgstr "Cuir le Prmomhchlair"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr "Cuir as Painial"
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr "Bog mionuirlis"
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr "Cuir le Painial"
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr ""
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr ""
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr "Cuir le Prmomhchlair"
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 #, fuzzy
 msgid "Add drawer"
 msgstr "Cuir isteach Taisceadan"
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr ""
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr ""
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr ""
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr "Abaltachtam painial seo..."
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "Abaltachtam go liir..."
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr "Painial"
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr "Glasal an scathan"
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr ""
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr ""
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr ""
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 #, fuzzy
 msgid "On the main menu"
 msgstr "Cuir le Prmomhchlair"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr ""
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr ""
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 #, fuzzy
 msgid "Main menu"
 msgstr "Cuir le Prmomhchlair"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 #, fuzzy
 msgid "Normal menu"
 msgstr "Nml rmomhphost agat."
 
 # FIXME Check
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 #, fuzzy
 msgid "System menu: "
 msgstr "Claireanna"
 
 # FIXME Check
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 #, fuzzy
 msgid "User menu: "
 msgstr "Claireanna"
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+msgid "AnotherLevel menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr ""
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "Position"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "Oben"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "Unten"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr ""
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr ""
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 #, fuzzy
 msgid "Enable hidebuttons"
 msgstr "Tsg iomha"
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 #, fuzzy
 msgid "Enable hidebutton arrows"
 msgstr "Tsg iomha"
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr ""
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr ""
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr ""
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr ""
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr ""
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "Cothromanach"
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "Ingearach"
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr ""
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr " Czlra "
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr ""
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr ""
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr "Dath"
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr ""
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr ""
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "Cumas seoltsra"
 
@@ -2908,28 +3064,6 @@ msgstr "Fograiocht."
 msgid "General icon settings"
 msgstr "Albaltachtam Luch"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr ""
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr ""
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr ""
@@ -2947,6 +3081,21 @@ msgstr ""
 msgid "Height"
 msgstr "Ard."
 
+#, fuzzy
+#~ msgid "Low Battery Warning"
+#~ msgstr "Lag agus ag luchtu."
+
+#~ msgid "General Properties"
+#~ msgstr "Albaltachtam Luch"
+
+#, fuzzy
+#~ msgid "Submenu: "
+#~ msgstr "Nml rmomhphost agat."
+
+#, fuzzy
+#~ msgid "Red Hat menus"
+#~ msgstr "Cuir le Prmomhchlair"
+
 #~ msgid "Gnome Session Properties"
 #~ msgstr "Albaltachtam Luch"
 
@@ -2968,9 +3117,6 @@ msgstr "Ard."
 #~ msgid "High."
 #~ msgstr "Ard."
 
-#~ msgid "Low and charging."
-#~ msgstr "Lag agus ag luchtu."
-
 #~ msgid "Low."
 #~ msgstr "Lag."
 
@@ -3034,9 +3180,6 @@ msgstr "Ard."
 #~ msgid "Image path:"
 #~ msgstr "Msr"
 
-#~ msgid " Folder"
-#~ msgstr " Msd "
-
 #~ msgid "Background Properties"
 #~ msgstr "Albaltachtam Czlra"
 
@@ -3070,9 +3213,6 @@ msgstr "Ard."
 #~ msgid "Centered"
 #~ msgstr "Sa Lar"
 
-#~ msgid "Tiled"
-#~ msgstr "Leacaithe"
-
 #, fuzzy
 #~ msgid "Specifies the background color"
 #~ msgstr " Czlra "
@@ -3134,9 +3274,6 @@ msgstr "Ard."
 #~ msgid "Slow"
 #~ msgstr "Mallaigh"
 
-#~ msgid "Threshold"
-#~ msgstr "Tairseach"
-
 #~ msgid "Large"
 #~ msgstr "Msr"
 
diff --git a/po/hu.po b/po/hu.po
index 5fbe6200..d8df4d02 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,133 +5,325 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-core 1.0.0\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "Last-Translator: Shooby Ban <bansz@szif.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "N�vjegy"
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "Tulajdons�gok..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr "Afterstep �ra Applet"
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "�ra"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr "Ki mondta, hogy a NeXT halott?"
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "Lap c�me"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr "12 �r�s form�tumban jelenjen meg az id� (AM/PM)"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr "Alap"
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr "Id�z�na"
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr "Bels� hiba: hib�s m�d a battery_set_mode-ban"
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "Nem tudom elk�sz�teni az appletet!\n"
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "N�vjegy..."
+
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
+msgstr "GNOME billenty�zet-�tkapcsol�"
+
+#: applets/battery/battery.c:838
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr ""
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr "Nem tudok a grafikon�rt�keknek helyet foglalni"
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "Elemek �llapota:"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "Alap tulajdons�gok"
-
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
 msgstr "Applet magass�g"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
 msgstr "Applet sz�less�g"
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Update interval
+#: applets/battery/properties.c:102
+#, fuzzy
+msgid "Update Interval (seconds):"
+msgstr "K�p friss�t�s�nek gyakoris�ga:"
+
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
+msgstr ""
+
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
 msgstr "Applet m�d"
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr "Grafika"
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr "Kiolvas�s"
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr "AC-Bekapcsolt sz�n:"
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr "AC-Kikapcsolt sz�n:"
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
-msgstr "Grafikon intervallum:"
+#: applets/battery/properties.c:202
+#, fuzzy
+msgid "Low Battery Color:"
+msgstr "AC-Bekapcsolt sz�n:"
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:262
+#, fuzzy
+msgid "Graph Battery Low Color:"
+msgstr "AC-Bekapcsolt sz�n:"
+
+#: applets/battery/properties.c:268
+#, fuzzy
+msgid "Graph Tick Color:"
+msgstr "Grafikon ir�ny:"
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr "Grafikon ir�ny:"
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr "Balr�l jobbra"
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr "Jobbr�l balra"
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
 msgstr ""
 "Nem tudom megnyitni a /proc/apm-t ! T�nyleg van APM t�mogat�s a kernelben?\n"
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr "Nem tudom lam�solni az APM f�jlle�r�t: %s\n"
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "Nem lehet megnyinti a '/proc/apm' f�jlt. Nem tudok adatokhoz jutni."
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr "ioctl hiba a /dev/apm f�jln�l"
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr ""
 "APM ki van vapcsolva! Nem tudom kiolvasni a telepek t�lt�tts�gi �rt�keit."
@@ -160,17 +352,6 @@ msgstr ""
 "Gnome Panel applet azon karakterek kiv�laszt�s�ra, amelyek nincsenek a "
 "billenty�zeteden. GNU GPL-es."
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr "N�vjegy..."
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -219,10 +400,6 @@ msgstr "Nincs (alap�rtelmezett)"
 msgid "Clock"
 msgstr "�ra"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr "12 �r�s form�tumban jelenjen meg az id� (AM/PM)"
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr "Az id�t GMT-hez viszony�tva mutassa (Greenwich-i id�):"
@@ -247,96 +424,6 @@ msgstr "Lev�l �rkez�skor induljon:"
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr "A levelesl�da maxim�lis m�rete (Kilob�jtokban):"
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr "Alap"
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr "T�maf�jl"
@@ -353,7 +440,7 @@ msgstr "PPP t�rcs�z� applet"
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr "Egy naccer� PPP t�rcs�z�, hogy nem csin�lta eddig meg senki?"
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr "Ki"
 
@@ -373,6 +460,11 @@ msgstr "Sz�vegsz�n"
 msgid "Backgroundcolor"
 msgstr "H�tt�rsz�n"
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr "Applet magass�g"
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -386,11 +478,11 @@ msgstr "Friss�t�s gyakoris�ga"
 msgid "Diskusage Settings"
 msgstr "Lemezhaszn�lts�gm�r� be�ll�t�sok"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr "Lemezbeilleszt� applet"
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
@@ -398,19 +490,19 @@ msgstr ""
 "GNU GPL-es program.\n"
 "Lemezes egys�gek f�jlrendszerb�l ki- �s beilleszt�s�t v�gzi.."
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr " beillesztve"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr " nincs beillesztve"
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr "\" jelenti:\n"
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
@@ -418,7 +510,7 @@ msgstr ""
 "A beilleszt�s nem j�rt sikerrel.\n"
 "\""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "Lemezkiad�s"
 
@@ -524,9 +616,9 @@ msgstr "A GNOME halad neve:"
 msgid "The Animation Filename:"
 msgstr "Az anim�ci� f�jlneve:"
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr "Keres�s"
 
@@ -579,7 +671,7 @@ msgstr "%d. k�perny�"
 msgid "About\t"
 msgstr "N�vjegy\t"
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr "Be�ll�t�sok"
 
@@ -760,7 +852,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr "Men�"
 
@@ -795,80 +887,115 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr "GNOME virtu�lis lapkezel�"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr "Lapkezel� a GNOME kompatibilis ablakkezel�kh�z"
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr "Gnome Pager be�ll�t�sok"
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
-msgstr "K�perny�"
-
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
-msgstr "Minden taszk mutat�sa minden k�perny�n"
-
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
-msgstr "Mutassa a taszkokat"
+#: applets/gnome-pager/gnomepager_applet.c:220
+#, fuzzy
+msgid "Pager"
+msgstr "K�p"
 
-#: applets/gnome-pager/gnomepager_applet.c:224
+#: applets/gnome-pager/gnomepager_applet.c:222
 msgid "Show pager"
 msgstr "Mutassa a pager-t"
 
-#: applets/gnome-pager/gnomepager_applet.c:232
+#: applets/gnome-pager/gnomepager_applet.c:229
 msgid "Use small pagers"
 msgstr "Kis pager-ek haszn�lata"
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
-msgstr "Ikonok mutat�sa a taszkokon"
+#: applets/gnome-pager/gnomepager_applet.c:241
+#, fuzzy
+msgid "Rows of pagers"
+msgstr "Pager-k sorainak sz�ma"
 
-#: applets/gnome-pager/gnomepager_applet.c:248
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:261
 msgid "Show task list button"
 msgstr "Mutassa a taszklista gombokat"
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
+msgstr "Mutassa a taszkokat"
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "Mutassa a > gombokat"
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Mutassa a taszkokat"
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+#, fuzzy
+msgid "Show normal tasks only"
+msgstr "Minden taszk mutat�sa minden k�perny�n"
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+#, fuzzy
+msgid "Show minimized tasks only"
+msgstr "Ikonok mutat�sa a taszkokon"
+
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr "Minden taszk mutat�sa minden k�perny�n"
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+#, fuzzy
+msgid "Show minimized tasks on all desktops"
+msgstr "Minden taszk mutat�sa minden k�perny�n"
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+msgid "Geometry"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr "A taszklista mindig maxim�lis"
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr "A v�zszintes taszklista maxim�lis hossza"
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr "A f�gg�leges taszklista maxim�lis hossza"
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr "A taszkok sorainak sz�ma"
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr "Taszkok oszlopainak sz�ma"
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr "Pager-k sorainak sz�ma"
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr "GNOME lapoz� hiba"
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -885,27 +1012,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr "�tl�tsz�s�g"
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr "Mutat / Elrejt"
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr "Felcsuk/Lenyit"
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "Bez�r�s"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr "Kiny�r"
 
@@ -991,7 +1118,7 @@ msgid "History"
 msgstr "Napl�"
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "S�g�"
 
@@ -1061,7 +1188,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr "Sz�nek"
 
@@ -1305,7 +1432,7 @@ msgstr "(Ezek nem �ll�t�dnak �t friss�t�sig)"
 msgid "Open new window"
 msgstr "�j ablakban megnyit"
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr "G�rget�s"
 
@@ -1329,6 +1456,10 @@ msgstr "V�rakoz�s a sz�vegt�r�sig:"
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr "G�rget�si sebess�g (sima g�rget�sn�l):"
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr "K�perny�"
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr "Nincsenek cikkek"
@@ -1337,12 +1468,12 @@ msgstr "Nincsenek cikkek"
 msgid "Slashapp article list"
 msgstr "Slahapp cikklista"
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr "k�sz�ti a felhaszn�l�i k�nyvt�rat: %s\n"
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr "nem tudja a felhaszn�l�i k�nyvt�rat l�trehozni: %s\n"
@@ -1432,189 +1563,123 @@ msgstr "Mutasd a \"hozd fel �j ablakban\" opci�t"
 msgid "Look"
 msgstr "Megn�z"
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr "Almen�: "
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr "Nem tudom l�trehozni a f�jlt: %s\n"
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr "nem tudom kit�r�lni a .order f�jlt: %s\n"
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr "A f�jl l�tezik."
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr "Nem siker�lt l�trehozni a f�jlt."
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
+#: gmenu/desktop.c:80
+msgid " Folder"
 msgstr ""
-"Nem adhatsz hozz� elemet almen�h�z.\n"
-"Nincsenek meg hozz� a jogaid."
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr "�j almen�"
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr "Almen� l�trehoz�sa:"
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr "Valamit ki kell v�lasztanod el�bb"
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr "Nem t�r�lhetsz egy f�men�t."
 
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Nem t�r�lheted azt a f�jlt.\n"
-"Nincsenek meg hozz� a jogosults�gaid."
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr "Kit�rli a kiv�lasztott men�elemet?"
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
-msgstr "T�r�ljem az �res men�t?"
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr "T�nyleg t�r�lni akarod az almen�t minden tartalm�val?"
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-"Ez a v�ltoz�s egy megl�v� men�elemmel �tk�zik.\n"
-"Nem lehet ugyanazon a n�ven k�t men�elem ugyanabban a men�ben."
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Nem mozgathatod azt az elemet ide.\n"
-"Nincsenek meg hozz� a jogosults�gaid."
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr "Ment"
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr "Vissza�ll�t�s"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr "_�j"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
+msgstr "Felhaszn�l�i men�k"
+
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr "Rendszer men�k"
 
-#: gmenu/gmenu.c:52
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr "_�j almen�..."
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr "�j almen� l�trehoz�sa"
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr "�j _men�elem..."
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr "�j men�elem l�trehoz�sa"
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr "_T�rl�s"
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr "Men� _rendez�se"
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr "Men� rendez�se re_kurz�van"
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr "_F�jl"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr "_Rendez"
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr "_S�g�"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr "�j almen�"
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr "�j men�elem"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr "�j men�elem l�trehoz�sa"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr "T�rl�s"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr "Kit�rli a kiv�lasztott men�elemet"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr "Felfel� mozgat�s"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr "Mozgatja a kiv�lasztott men�pontot felfel�"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr "Lemozgat�s"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr "Mozgatja a kiv�lasztott men�pontot lefel�"
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr "Szerkeszti a kiv�lasztott men�elem be�ll�t�sait"
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr "Almen� rendez�se"
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr "A kiv�lasztott men�t rendezi"
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+#, fuzzy
+msgid "Sort _Recursive"
+msgstr "Men� rendez�se re_kurz�van"
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr "GNOME men�szerkeszt�"
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
@@ -1622,66 +1687,110 @@ msgstr ""
 "GPL.\n"
 "GNOME men�szerkeszt�."
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr "Men�elemnek nev�nek kell lenni"
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr "A men�bejegyz�snek kell egy f�jln�v"
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr "Mentsem a v�ltoz�sokat?"
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr "Ez a v�ltoz�s egy megl�v� men�elemmel �tk�zik"
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr "F�l�l�rjam a l�tez� men�bejegyz�st?"
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+"Ez a v�ltoz�s egy megl�v� men�elemmel �tk�zik.\n"
+"Nem lehet ugyanazon a n�ven k�t men�elem ugyanabban a men�ben."
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr "Egy pillanat, olvasom a men�ket..."
 
-#: gmenu/tree.c:418
-msgid "GNOME"
-msgstr ""
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "Felhaszn�l�i men�k"
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr "A felhaszn�l�i men�k teteje"
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr "Rendszer men�k"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr "A rendszermen�k teteje"
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "Felhaszn�l�i men�k"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
+msgstr "Nem t�r�lhetsz egy f�men�t."
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
-msgstr "A felhaszn�l�i men�k teteje"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr "Kit�rli a kiv�lasztott men�elemet?"
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr "T�r�ljem az �res men�t?"
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr "T�nyleg t�r�lni akarod az almen�t minden tartalm�val?"
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+"Nem adhatsz hozz� elemet almen�h�z.\n"
+"Nincsenek meg hozz� a jogaid."
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr ""
+
+#: gmenu/treenew.c:63
+#, fuzzy
+msgid "Failed to create directory"
+msgstr "Nem siker�lt l�trehozni a f�jlt."
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr " beillesztve"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr "GNOME Termin�l"
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr "A GNOME termin�lemul�tor."
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr " Alapbe�ll�t�s"
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
@@ -1691,296 +1800,337 @@ msgstr ""
 "be�ll�sam az alap ablaktipusra, amit most\n"
 " adt�l meg?"
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr "Linux konzol"
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr "Sz�nes Xterm"
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr "Feh�r a feket�n"
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr "Fekete a feh�ren"
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr "Z�ld a feket�n"
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr "Fekete a vil�goss�rg�n"
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr "Be�ll�tott sz�nek"
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "Balra"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "Jobbra"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr "Rejtett"
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr "Bet�tipus:"
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr "Keres..."
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr "Termin�l tipus"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr "Villog� kurzor"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr "Men� elrejt�se"
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr "Csendes termin�lviszhang"
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr "DEL/Backspace felcser�l�se"
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr "A sz� szerint kiv�laszt�s karakterei"
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr "K�p"
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 msgid "Background type"
 msgstr "H�tt�r t�pusa"
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 msgid "None"
 msgstr "Nincs"
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr "H�tt�rk�p"
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr "F�jl:"
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr "�tl�tsz�"
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr "A h�tt�r el lehet mosva (lass�)"
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr "Sz�npaletta:"
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr "Sz�vegsz�n:"
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr "H�tt�r sz�ne:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr "Sz�nek:"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "G�rd�l�s�v helye"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr "Mentett sorok sz�ma"
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr "Billenty�le�t�sre g�rd�l"
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr "Ki�r�skor g�rd�l"
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr "Sz�nes kiv�laszt�s"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr "�_j Termin�l"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr "�j termin�l l�trehoz�sa"
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr "_Men� elrejt�se"
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr "Termin�l _bez�r�sa"
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "Termin�l _bez�r�sa"
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr "_Men� megjelen�t�se"
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr "Sz�n kiv�laszr�sa"
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr "Termin�l tipus neve"
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+msgid "TCLASS"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr "Megadja a bet�tipus nev�t"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr "Ne ind�tson shellt mint bejelentkez�skor"
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr "Bejelentkez�si shell ind�t�sa"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr "A f�ablak m�ret�t adja meg"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr "Ezt ind�tsa shell helyett"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr "Sz�vegsz�n"
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr "SZ�N"
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr "H�tt�rsz�n"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr "UTMP bejegyz�s friss�t�se"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr "Ne friss�tsd az UTMP bejegyz�st"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr "WTMP bejegyz�s friss�t�se"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr "Nem friss�tsd a WTMP bejegyz�st"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr "Az ablak cimk�j�nek be�ll�t�sa"
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr "Milliszekundumos id� am�g a kliensek regisztr�l�s�ra v�r (0=�r�kk�)"
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+#, fuzzy
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr "Milliszekundumos id� am�g a kliensek meg�ll�s�ra v�r (0=�r�kk�)"
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr "Milliszekundumos id� am�g a kliensek meg�ll�s�ra v�r (0=�r�kk�)"
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr "V�rakozz m�g"
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr "Egy szezon lel�v�se folyamatban van."
 
@@ -1992,23 +2142,51 @@ msgstr "Folyamat kil�v�se"
 msgid "save-session: couldn't connect to session manager\n"
 msgstr "szezon-ment�s: nem tudok a szezonkezel�h�z kapcsol�dni\n"
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr "Programok:"
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr "Kipr�b�l"
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 msgid "Cancel"
 msgstr "M�gsem"
 
+#: gsm/session-properties.c:258
+#, fuzzy
+msgid "Session"
+msgstr "Folyamat kil�v�se"
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr "M�gsem"
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "Alap tulajdons�gok"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr "K�nyvjelz�"
@@ -2381,15 +2559,15 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr ""
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "T�rl�s a panelr�l"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr "Applet mozgat�sa"
 
@@ -2419,7 +2597,7 @@ msgstr "Az elrejt�gomb enged�lyez�se"
 msgid "Enable hidebutton arrow"
 msgstr "Az elrejt�gombon l�v� ny�l enged�lyez�se"
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "Fi�k"
 
@@ -2427,23 +2605,23 @@ msgstr "Fi�k"
 msgid "This launch icon does not specify a program to run"
 msgstr "Ez az ind�t� ikon nem ind�t programot"
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr ""
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "Ind�t� be�ll�t�sai"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr "Nem tudom elk�sz�teni az appletet!"
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "Kil�p�s"
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr "Kil�p�s"
 
@@ -2515,246 +2693,233 @@ msgstr "Nem tudom megkapne a goad_id-t, elvetem azt"
 msgid " (empty)"
 msgstr " (�res)"
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr "Appletek"
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr "�lpanel"
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr "Sarok panel"
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr "Rendszer men�k"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 msgid "Debian menus"
 msgstr "Debian men�k"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 msgid "No Debian menus found!"
 msgstr "Nem tal�ltam debian men�ket"
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
-msgstr "Felhaszn�l�i men�k"
-
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr "Red Hat men�k"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr "Panel t�rl�se"
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr "Applet hozz�ad�sa"
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr "Panel hozz�ad�sa"
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr "Sarok panell� alak�t"
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr "�lpanell� alak�t"
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr "F�men� hozz�ad�sa"
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr "Fi�k"
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr "Kil�p�s-gomb hozz�ad�sa"
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr "Lebeg� alkalmaz�s hozz�ad�sa"
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr "�j ind�t� hozz�ad�sa"
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr "Panel jellemz�i..."
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "�sszes panel be�ll�t�sai..."
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr ""
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr "K�perny�z�r"
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr "GNOME n�vjegy..."
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr "Nem tudom megnyitni a k�nyvt�rat, a f�men�t haszn�lom!"
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr "Almen�ben"
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr "F�men�n"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr "Men� tulajdons�gok"
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr "Men� tipusa"
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr "F�men�"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr "Norm�l men�"
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr "Rendszer men�: "
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr "Felhaszn�l�i men�: "
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
-msgstr "Red Hat men� (ha tal�lt): "
+#: panel/menu.c:3374
+#, fuzzy
+msgid "AnotherLevel menu (if found): "
+msgstr "Debian men� (ha tal�lt): "
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
 msgstr "Debian men� (ha tal�lt): "
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr "Men� �tvonala"
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "Poz�ci�"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "Fent"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "Lent"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr "Minimaliz�l�si be�ll�t�sok"
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr "Automatikus elrejt�s"
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr "Az elrejt�gombok enged�lyez�se"
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr "Az elrejt�gombok nyilainak enged�lyez�se"
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr "�szakkelet"
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr "D�lnyugat"
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr "�szaknyugat"
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr "D�lkelet"
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr "Elhelyezked�s"
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "F�gg�leges"
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "V�zszintes"
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr "Az elrejt�gombok be�ll�t�sa"
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr "H�tt�r"
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr "Alap"
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr "K�p"
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr "Sz�n"
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr "K�pf�jl"
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr "A k�p r�fesz�t�se a panelra"
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "Panel be�ll�t�sok"
 
@@ -2922,34 +3087,6 @@ msgstr "Anim�ci�"
 msgid "General icon settings"
 msgstr "Alap tulajdons�gok"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-"Biztos vagy benne, hogy kikapcsolod a panelt?\n"
-"\n"
-"Ha �rja szeretn�d ind�tani a panelt azut�n, hogy kikapcsoltad, egy "
-"termin�lablakban be kell g�pelned, hogy 'panel'.\n"
-"\n"
-"Nyomd le az OK-t a panel kikapcsol�s�hoz."
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr "T�nyleg kil�psz?"
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr "Panel kikapcsol�sa"
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr "K�rdezze meg k�vetkez� alkalommal is"
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr "Lebeg� alkalmaz�s k�sz�t�se"
@@ -2965,3 +3102,83 @@ msgstr "Parancs (opcion�lis)"
 #: panel/swallow.c:258
 msgid "Height"
 msgstr "Magass�g"
+
+#~ msgid "Afterstep Clock Applet"
+#~ msgstr "Afterstep �ra Applet"
+
+#~ msgid "General Properties"
+#~ msgstr "Alap tulajdons�gok"
+
+#~ msgid "Graph Interval:"
+#~ msgstr "Grafikon intervallum:"
+
+#~ msgid "Submenu: "
+#~ msgstr "Almen�: "
+
+#~ msgid "Unable to create file: %s\n"
+#~ msgstr "Nem tudom l�trehozni a f�jlt: %s\n"
+
+#~ msgid "unable to remove .order file: %s\n"
+#~ msgstr "nem tudom kit�r�lni a .order f�jlt: %s\n"
+
+#~ msgid "File exists."
+#~ msgstr "A f�jl l�tezik."
+
+#~ msgid "Create Submenu:"
+#~ msgstr "Almen� l�trehoz�sa:"
+
+#~ msgid "You must select something first."
+#~ msgstr "Valamit ki kell v�lasztanod el�bb"
+
+#~ msgid ""
+#~ "You can't delete that file.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "Nem t�r�lheted azt a f�jlt.\n"
+#~ "Nincsenek meg hozz� a jogosults�gaid."
+
+#~ msgid ""
+#~ "You are not allowed to move that item there.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "Nem mozgathatod azt az elemet ide.\n"
+#~ "Nincsenek meg hozz� a jogosults�gaid."
+
+#~ msgid "New"
+#~ msgstr "_�j"
+
+#~ msgid "Edit selected menu item properties"
+#~ msgstr "Szerkeszti a kiv�lasztott men�elem be�ll�t�sait"
+
+#~ msgid "Red Hat menus"
+#~ msgstr "Red Hat men�k"
+
+#~ msgid "Red Hat menu (if found): "
+#~ msgstr "Red Hat men� (ha tal�lt): "
+
+#~ msgid "Hidebutton options"
+#~ msgstr "Az elrejt�gombok be�ll�t�sa"
+
+#~ msgid ""
+#~ "Are you sure you want to just terminate the panel?\n"
+#~ "\n"
+#~ "If you need to restart the panel after terminating it here, you will need to "
+#~ "type panel in a terminal window\n"
+#~ "\n"
+#~ "Press OK to terminate the panel!"
+#~ msgstr ""
+#~ "Biztos vagy benne, hogy kikapcsolod a panelt?\n"
+#~ "\n"
+#~ "Ha �rja szeretn�d ind�tani a panelt azut�n, hogy kikapcsoltad, egy "
+#~ "termin�lablakban be kell g�pelned, hogy 'panel'.\n"
+#~ "\n"
+#~ "Nyomd le az OK-t a panel kikapcsol�s�hoz."
+
+#~ msgid "Really log out?"
+#~ msgstr "T�nyleg kil�psz?"
+
+#~ msgid "Only terminate panel"
+#~ msgstr "Panel kikapcsol�sa"
+
+#~ msgid "Ask next time"
+#~ msgstr "K�rdezze meg k�vetkez� alkalommal is"
diff --git a/po/it.po b/po/it.po
index 26983c4f..f5c0696a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,106 +14,297 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "Informazioni su..."
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "Propriet�..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr ""
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "Orologio"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr "Chi ha detto che NeXT � morta?"
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "Titolo pagina"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr "Visualizza l'ora nel formato 12 ore (AM/PM)"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr "Generiche"
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr ""
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr "Errore interno: modo invalido in battery_set_mode"
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "Impossibile creare l'applet!\n"
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "Informazioni su..."
+
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
+msgstr "Applet GNOME KB"
+
+#: applets/battery/battery.c:838
+#, fuzzy
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr "(c) 1998 the Free Software Foundation"
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr "Impossibile allocare lo spazio per i valori del grafico"
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "Settaggi per il Controllo Batteria"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "Propriet� Generali"
-
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
 msgstr "Altezza dell'applet"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
 msgstr "Altezza dell'applet"
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Update interval
+#: applets/battery/properties.c:102
+#, fuzzy
+msgid "Update Interval (seconds):"
+msgstr "Aggiornamento in secondi:"
+
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
+msgstr ""
+
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
 msgstr "Altezza dell'applet"
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr "Grafico"
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr "Carica"
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
-msgstr "Intervallo del grafico:"
+#: applets/battery/properties.c:202
+msgid "Low Battery Color:"
+msgstr ""
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:262
+msgid "Graph Battery Low Color:"
+msgstr ""
+
+#: applets/battery/properties.c:268
+#, fuzzy
+msgid "Graph Tick Color:"
+msgstr "Direzione del grafico:"
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr "Direzione del grafico:"
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr "Da sinistra a destra"
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr "Da destra a sinistra"
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
@@ -120,20 +312,20 @@ msgstr ""
 "Impossibile aprire /proc/apm!  Assicurarsi che il supporto APM sia stato "
 "compilato nel kernel.\n"
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr "Impossibile dup()licare il descrittore file APM: %s\n"
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "Impossibile aprire /proc/apm; impossibile leggere dati."
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr "ioctl fallita su /dev/apm."
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr ""
 "APM � disabilitato!  Impossibile ricevere informazioni sulla carica della "
@@ -163,17 +355,6 @@ msgstr ""
 "Applet del il Pannello Gnome per selezionare caratteri strani che non sono "
 "sulla mia tastiera.  Rilasciato sotto la GNU General Public Licence."
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr "Informazioni su..."
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -223,10 +404,6 @@ msgstr "Nessuno (default) "
 msgid "Clock"
 msgstr "Orologio"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr "Visualizza l'ora nel formato 12 ore (AM/PM)"
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr "Visualizza ora relativa a GMT (Greenwich Mean Time):"
@@ -253,96 +430,6 @@ msgstr "Quando arriva nuova posta esegui:"
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr "Dimensione mailbox da considerare piena (Kbytes):"
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr "Generiche"
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr "File del tema (directory):"
@@ -359,7 +446,7 @@ msgstr "Applet di Composizione PPP"
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr "Un bel dialer PPP, come mai nessuno ci ha pensato prima!?"
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr ""
 
@@ -379,6 +466,11 @@ msgstr "Colore del testo"
 msgid "Backgroundcolor"
 msgstr "Colore dello sfondo"
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr "Altezza dell'applet"
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -392,35 +484,35 @@ msgstr "Frequenza di aggiornamento"
 msgid "Diskusage Settings"
 msgstr "Opzioni"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
 msgstr ""
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr "Contatore"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr ""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "Espelli"
 
@@ -527,9 +619,9 @@ msgstr "Il nome del tuo pesce GNOME:"
 msgid "The Animation Filename:"
 msgstr "Nome del file dell'animazione"
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr "Sfoglia"
 
@@ -583,7 +675,7 @@ msgstr ""
 msgid "About\t"
 msgstr "Informazioni"
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr "Propriet�"
 
@@ -770,7 +862,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr "Men�"
 
@@ -806,80 +898,115 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr "Applet Desktop Pager"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr "Pager per Window Manager GNOME-compliant"
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr "Opzioni GNOME Pager"
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
-msgstr "Visualizzazione"
-
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
-msgstr "Mostra tutti i task su tutti i desktop"
-
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
-msgstr "Mostra i task"
+#: applets/gnome-pager/gnomepager_applet.c:220
+#, fuzzy
+msgid "Pager"
+msgstr "Immagine"
 
-#: applets/gnome-pager/gnomepager_applet.c:224
+#: applets/gnome-pager/gnomepager_applet.c:222
 msgid "Show pager"
 msgstr "Mostra il pager"
 
-#: applets/gnome-pager/gnomepager_applet.c:232
+#: applets/gnome-pager/gnomepager_applet.c:229
 msgid "Use small pagers"
 msgstr "Usa pager piccoli"
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
-msgstr "Mostra le icone nei task"
+#: applets/gnome-pager/gnomepager_applet.c:241
+#, fuzzy
+msgid "Rows of pagers"
+msgstr "Numero di righe di pager"
 
-#: applets/gnome-pager/gnomepager_applet.c:248
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:261
 msgid "Show task list button"
 msgstr "Mostra bottone per lista dei task"
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
+msgstr "Mostra i task"
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "Mostra i bottoni \"...\""
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Mostra i task"
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+#, fuzzy
+msgid "Show normal tasks only"
+msgstr "Mostra tutti i task su tutti i desktop"
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+#, fuzzy
+msgid "Show minimized tasks only"
+msgstr "Mostra le icone nei task"
+
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr "Mostra tutti i task su tutti i desktop"
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+#, fuzzy
+msgid "Show minimized tasks on all desktops"
+msgstr "Mostra tutti i task su tutti i desktop"
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+msgid "Geometry"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr "Lista task sempre a dimensione massima"
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr "Massima larghezza della lista task verticale"
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr "Massima altezza della task list"
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr "Numero di righe di task orizzontali"
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr "Numero di colonne di task"
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr "Numero di righe di pager"
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr "Errore dello Gnome Pager"
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -894,27 +1021,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr "Mostra / Nascondi"
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "Chiudi"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr "Distruggi"
 
@@ -1005,7 +1132,7 @@ msgid "History"
 msgstr "Storico"
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "Aiuto"
 
@@ -1078,7 +1205,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr "Colori"
 
@@ -1323,7 +1450,7 @@ msgstr ""
 msgid "Open new window"
 msgstr "Apri una nuova finestra"
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr "Scrolling"
 
@@ -1347,6 +1474,10 @@ msgstr ""
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr ""
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr "Visualizzazione"
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr "Nessun articolo."
@@ -1355,12 +1486,12 @@ msgstr "Nessun articolo."
 msgid "Slashapp article list"
 msgstr "Lista degli articoli Slashapp"
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr "creazione directory utente: %s\n"
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr "impossibile creare directory utente: %s\n"
@@ -1451,190 +1582,123 @@ msgstr "Visualizza l'opzione \"nuova finestra\""
 msgid "Look"
 msgstr ""
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr "Sottomen�: "
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr "Impossibile creare il file: %s\n"
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr "Impossibile rimuovere il file `.order': %s\n"
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr "Il file esiste di gi�."
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr "Impossibile creare il file."
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Non puoi aggiungere un elemento a quel sottomen�.\n"
-"Non hai i permessi richiesti."
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr "Nuovo sottomen�"
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr "Crea un sottomen�:"
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr "� necessario selezionare qualcosa prima."
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr "Non � possibile cancellare un sottomen� del men� principale"
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
+#: gmenu/desktop.c:80
+msgid " Folder"
 msgstr ""
-"Non puoi cancellare quel file.\n"
-"Non hai i permessi richiesti."
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr "Cancellare questo elemento di men�?"
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
-msgstr "Cancellare il sottomen� vuoto?"
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-"Sei sicuro di voler cancellare questo sottomen� e tutto il suo contenuto?"
 
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-"Questa modifica � in conflitto con un elemento di men� esistente.\n"
-"Due elementi in un sottomen� non devono mai avere lo stesso nome."
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Non puoi spostare l'elemento in questo modo.\n"
-"Non hai i permessi richiesti."
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr "Salva"
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr "Ripristina"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr "Nuovo"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
+msgstr "Men� utente"
+
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr "Men� di sistema"
 
-#: gmenu/gmenu.c:52
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr "_Nuovo sottomen�..."
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr "Crea un nuovo sottomen�"
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr "Nuovo _Elemento..."
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr "Crea un nuovo elemento di men�"
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr "_Rimuovi..."
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr "_Ordina sottomen�"
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr "Ordina sottomen� _Ricorsivamente"
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr "_File"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr "_Ordina"
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr "Nuovo sottomen�"
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr "Nuovo elemento"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr "Crea un nuovo elemento"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr "Elimina"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr "Elimina l'elemento selezionato"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr "Vai s�"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr "Sposta verso l'alto il men� selezionato"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr "Vai gi�"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr "Sposta verso il basso il men� selezionato"
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr "Modifica le propriet� dell'elemento di men� selezionato"
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr "Ordina sottomen�"
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr "Ordina il sottomen� selezionato"
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+#, fuzzy
+msgid "Sort _Recursive"
+msgstr "Ordina sottomen� _Ricorsivamente"
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr ""
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
@@ -1642,66 +1706,111 @@ msgstr ""
 "Rilasciato sotto i termini della GNU Public License.\n"
 "Editor dei men� di GNOME"
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr "L'elemento del men� deve avere un nome"
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr "L'elemento del men� deve contenere un nome di file"
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr "Memorizzare i cambiamenti?"
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr "Questa modifica � in conflitto con un elemento di men� esistente"
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr "Sovrascrivere l'elemento di men� esistente?"
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+"Questa modifica � in conflitto con un elemento di men� esistente.\n"
+"Due elementi in un sottomen� non devono mai avere lo stesso nome."
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr "Attendere prego: lettura dei men� in corso..."
 
-#: gmenu/tree.c:418
-msgid "GNOME"
-msgstr "GNOME"
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "Men� utente"
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr ""
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr "Men� di sistema"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr ""
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "Men� utente"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
+msgstr "Non � possibile cancellare un sottomen� del men� principale"
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr "Cancellare questo elemento di men�?"
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr "Cancellare il sottomen� vuoto?"
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
 msgstr ""
+"Sei sicuro di voler cancellare questo sottomen� e tutto il suo contenuto?"
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+"Non puoi aggiungere un elemento a quel sottomen�.\n"
+"Non hai i permessi richiesti."
+
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr ""
+
+#: gmenu/treenew.c:63
+#, fuzzy
+msgid "Failed to create directory"
+msgstr "Impossibile creare il file."
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr "Contatore"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr "Il programma di emulazione di terminale di GNOME"
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr "Default"
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
@@ -1711,298 +1820,339 @@ msgstr ""
 "questa finestra in accordo con la configurazione di default\n"
 "della nuova classe?"
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr "Console Linux"
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr "XTerm a colori"
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr "RXVT"
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr "Bianco su nero"
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr "Nero su bianco"
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr "Verde su nero"
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr "Nero su giallo chiaro"
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr "Colori customizzati"
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "Sinistra"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "Destra"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr "Nascosta"
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr "Font:"
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr "Sfoglia..."
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr "Classe del terminale"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr "Cursore lampeggiante"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr "Nascondi la barra dei men�"
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr "Disabilita il segnale acustico"
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr "Scambia DEL e BS"
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr "Caratteri selezione parola"
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr "Immagine"
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 msgid "Background type"
 msgstr "Tipo di sfondo"
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 #, fuzzy
 msgid "None"
 msgstr "nessuna"
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 #, fuzzy
 msgid "Background pixmap"
 msgstr "Immagine di sfondo"
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr "File pixmap:"
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr "Trasparente"
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr "Lo sfondo dovrebbe essere sfumato (lento)"
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr "Tavolozza dei colori:"
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr "Colore di primo piano:"
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr "Colore dello sfondo:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr "Colori:"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "Posizione della barra di scorrimento"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr "Numero linee di scorrimento"
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr "Scorri alla pressione di un tasto"
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr "Scorri ad ogni output"
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr "Selettore colore"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr "_Nuovo terminale"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr "Crea una nuova finestra di terminale"
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr "Nascondi barra dei _men�"
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr "_Chiudi il terminale"
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "_Chiudi il terminale"
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr "_Visualizza la barra dei men�"
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr "Selettore c_olori..."
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr "Nome della classe del terminale"
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+msgid "TCLASS"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr "Non eseguire le shell come shell di login"
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr "Esegui le shell come shell di login"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr "Specifica la dimensione della finestra principale"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr "Esegui questo programma invece della shell"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr "Colore di primo piano"
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr "COLORE"
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr "Colore dello sfondo"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr "Aggiorna il file `utmp'"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr "Non aggiornare il file `utmp'"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr "Aggiorna il file `wtmp'"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr "Non aggiornare il file `wtmp'"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr "Imposta il titolo della finestra"
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr "Tempo (ms) speso in attesa della registrazione dei client (0=infinito)"
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+#, fuzzy
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr "Tempo (ms) speso in attesa della morte del client (0=infinito)"
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr "Tempo (ms) speso in attesa della morte del client (0=infinito)"
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr "Attesa interrotta a causa di un conflitto."
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr "Riesecuzione interrotta a causa di errori."
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr "Lo shutdown di una sessione � in corso."
 
@@ -2014,23 +2164,51 @@ msgstr "Termina sessione"
 msgid "save-session: couldn't connect to session manager\n"
 msgstr "save-session: impossibile collegarsi al gestore di sessione\n"
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr "Programma:"
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr "Prova"
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 msgid "Cancel"
 msgstr "Annulla"
 
+#: gsm/session-properties.c:258
+#, fuzzy
+msgid "Session"
+msgstr "Termina sessione"
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr "Annulla"
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "Opzioni generali icone"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr "Bookmark"
@@ -2385,15 +2563,15 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr "???"
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "Rimuovi dal pannello"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr "Muovi applet"
 
@@ -2423,7 +2601,7 @@ msgstr "Abilita i bottoni di minimizzazione"
 msgid "Enable hidebutton arrow"
 msgstr "Abilita le frecce sui bottoni di minimizzazione"
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "Cassetto"
 
@@ -2431,23 +2609,23 @@ msgstr "Cassetto"
 msgid "This launch icon does not specify a program to run"
 msgstr "Questo bottone di esecuzione non specifica il programma da lanciare"
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr "App"
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "Propriet� bottone di esecuzione"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr "Crea applet di esecuzione"
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "Esci"
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr "Esci da GNOME"
 
@@ -2517,246 +2695,233 @@ msgstr "Impossibile ottenere il goad_id per l'applet, ignorato"
 msgid " (empty)"
 msgstr " (vuoto)"
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr "Applet"
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr "Pannello laterale"
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr "Pannello d'angolo"
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr "Men� di sistema"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 msgid "Debian menus"
 msgstr "Men� Debian"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 msgid "No Debian menus found!"
 msgstr "Nessun men� Debian esistente!"
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
-msgstr "Men� utente"
-
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr "Men� Red Hat"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr "Rimuovi questo pannello"
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr "Aggiungi applet"
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr "Aggiungi nuovo pannello"
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr "Converti a pannello d'angolo"
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr "Converti a pannello laterale"
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr "Aggiungi men� principale"
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr "Aggiungi cassetto"
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr "Aggiungi bottone di uscita"
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr "Aggiungi applicazione inglobata"
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr "Aggiungi bottone di lancio"
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr "Propriet� di questo pannello..."
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "Propriet� di tutti i pannelli..."
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr "Pannello"
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr "Blocca lo schermo"
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr "Informazioni su GNOME..."
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr "Impossibile aprire la directory, uso il menu principale!"
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr "In un sottomen�"
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr "Nel men� principale"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr "Propriet� del men�"
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr "Tipo di men�"
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr "Menu principale"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr "Men� normale"
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr "Men� di sistema: "
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr "Men� utente: "
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
-msgstr "Men� Red Hat (se presente): "
+#: panel/menu.c:3374
+#, fuzzy
+msgid "AnotherLevel menu (if found): "
+msgstr "Men� Debian (se presente): "
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
 msgstr "Men� Debian (se presente): "
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr "Path del menu"
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "Posizione"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "Alto"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "Basso"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr "Opzioni di minimizzazione"
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr "Minimizzazione automatica"
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr "Abilita bottoni di minimizzazione"
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr "Abilita frecce sui bottoni di minimizzazione"
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr "In alto a destra"
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr "In basso a sinistra"
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr "In alto a sinistra"
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr "In basso a destra"
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr "Orientamento"
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "Orizzontale"
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "Verticale"
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr "Opzione bottoni di minimizzazione"
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr "Sfondo"
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr ""
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr ""
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr "Colore"
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr "File d'immagine"
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr "Scala l'immagine"
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "Propriet� pannello"
 
@@ -2928,34 +3093,6 @@ msgstr "Animazioni"
 msgid "General icon settings"
 msgstr "Opzioni generali icone"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-"Sei sicuro di volere solo terminare il pannello?\n"
-"\n"
-"Per fare ripartire il pannello dopo averlo terminato, sar� necessario \n"
-"digitare `panel' in una finestra di terminale.\n"
-"\n"
-"Premi OK per terminare il pannello!"
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr "Vuoi davvero uscire?"
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr "Termina solo il pannello"
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr "Chiedi anche la prossima volta"
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr "Crea applet inserita"
@@ -2971,3 +3108,83 @@ msgstr "Comando (opzionale)"
 #: panel/swallow.c:258
 msgid "Height"
 msgstr "Altezza"
+
+#~ msgid "General Properties"
+#~ msgstr "Propriet� Generali"
+
+#~ msgid "Graph Interval:"
+#~ msgstr "Intervallo del grafico:"
+
+#~ msgid "Submenu: "
+#~ msgstr "Sottomen�: "
+
+#~ msgid "Unable to create file: %s\n"
+#~ msgstr "Impossibile creare il file: %s\n"
+
+#~ msgid "unable to remove .order file: %s\n"
+#~ msgstr "Impossibile rimuovere il file `.order': %s\n"
+
+#~ msgid "File exists."
+#~ msgstr "Il file esiste di gi�."
+
+#~ msgid "Create Submenu:"
+#~ msgstr "Crea un sottomen�:"
+
+#~ msgid "You must select something first."
+#~ msgstr "� necessario selezionare qualcosa prima."
+
+#~ msgid ""
+#~ "You can't delete that file.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "Non puoi cancellare quel file.\n"
+#~ "Non hai i permessi richiesti."
+
+#~ msgid ""
+#~ "You are not allowed to move that item there.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "Non puoi spostare l'elemento in questo modo.\n"
+#~ "Non hai i permessi richiesti."
+
+#~ msgid "New"
+#~ msgstr "Nuovo"
+
+#~ msgid "Edit selected menu item properties"
+#~ msgstr "Modifica le propriet� dell'elemento di men� selezionato"
+
+#~ msgid "GNOME"
+#~ msgstr "GNOME"
+
+#~ msgid "Red Hat menus"
+#~ msgstr "Men� Red Hat"
+
+#~ msgid "Red Hat menu (if found): "
+#~ msgstr "Men� Red Hat (se presente): "
+
+#~ msgid "Hidebutton options"
+#~ msgstr "Opzione bottoni di minimizzazione"
+
+#~ msgid ""
+#~ "Are you sure you want to just terminate the panel?\n"
+#~ "\n"
+#~ "If you need to restart the panel after terminating it here, you will need to "
+#~ "type panel in a terminal window\n"
+#~ "\n"
+#~ "Press OK to terminate the panel!"
+#~ msgstr ""
+#~ "Sei sicuro di volere solo terminare il pannello?\n"
+#~ "\n"
+#~ "Per fare ripartire il pannello dopo averlo terminato, sar� necessario \n"
+#~ "digitare `panel' in una finestra di terminale.\n"
+#~ "\n"
+#~ "Premi OK per terminare il pannello!"
+
+#~ msgid "Really log out?"
+#~ msgstr "Vuoi davvero uscire?"
+
+#~ msgid "Only terminate panel"
+#~ msgstr "Termina solo il pannello"
+
+#~ msgid "Ask next time"
+#~ msgstr "Chiedi anche la prossima volta"
diff --git a/po/ja.po b/po/ja.po
index 8c02c5f0..705074a4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-core VERSION\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: 1998-12-11 06:39+09:00\n"
 "Last-Translator: Yukihiro Nakai <Nakai@abricot.co.jp>\n"
 "Language-Team: Yukihiro Nakai <Nakai@abricot.co.jp>\n"
@@ -13,106 +13,299 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-japan\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "����"
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "�ץ��ѥƥ�..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr "Afterstep�����å����ץ�å�"
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "����"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr "NeXT�ϻ����ʤ�ƤȤ�Ǥ�ʤ�"
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "�ڡ��������ȥ�"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr "12�����ե����ޥå�(AM/PM)�ǻ����ɽ������"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr "����"
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr "�����ॾ����"
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr "�������顼: battery_set_mode�Υ⡼�ɤ������Ǥ�"
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "���ץ�åȤ������Ǥ��ޤ���Ǥ���\n"
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "����..."
+
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
+msgstr "GNOME KB���ץ�å�"
+
+#: applets/battery/battery.c:838
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr ""
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr "������ͤ��ΰ����ݤǤ��ޤ���Ǥ���"
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "�Хåƥ꡼��˥�������"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "��������"
-
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
 msgstr "���ץ�åȤι⤵"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
 msgstr "���ץ�åȤ���"
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Update interval
+#: applets/battery/properties.c:102
+#, fuzzy
+msgid "Update Interval (seconds):"
+msgstr "�����ֳ�(��)"
+
+#. Low battery value
+#: applets/battery/properties.c:116
+#, fuzzy
+msgid "Low Charge Threshold:"
+msgstr "��������"
+
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
 msgstr "���ץ�åȤΥ⡼��"
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr "�����"
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr "�ɤ߽Ф�"
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr "�Ÿ�������ΥХåƥ꡼�ο�"
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr "�Ÿ����ջ��ΥХåƥ꡼�ο�"
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
-msgstr "����դι����ֳ�:"
+#: applets/battery/properties.c:202
+#, fuzzy
+msgid "Low Battery Color:"
+msgstr "�Ÿ�������ΥХåƥ꡼�ο�"
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:262
+#, fuzzy
+msgid "Graph Battery Low Color:"
+msgstr "�Ÿ�������ΥХåƥ꡼�ο�"
+
+#: applets/battery/properties.c:268
+#, fuzzy
+msgid "Graph Tick Color:"
+msgstr "����դ�����:"
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr "����դ�����:"
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr "�����鱦��"
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr "�����麸��"
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
@@ -120,20 +313,20 @@ msgstr ""
 "/proc/apm�򳫤��ޤ���! "
 "APM���ݡ��Ȥ�����ƥ����ͥ���ۤ��Ƥ��뤫��ǧ���Ƥ���������\n"
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "/dev/apm�򳫤��ޤ���;�ǡ���������Ǥ��ޤ���"
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr "/dev/apm��ioctl�Ǥ��ޤ���Ǥ�����"
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr "APM�ϻ��ѤǤ��ޤ���!�Хåƥ꡼���ž��������Ǥ��ޤ���"
 
@@ -162,17 +355,6 @@ msgstr ""
 "��Υ����ܡ��ɤǤ��ǤƤʤ��Ѥ�ä�ʸ�������Ϥ��뤿��� Panel "
 "���ץ�åȤǤ���GNUGNU���̸�ͭ���ѵ�����˴�Ť��ƥ�꡼������Ƥ��ޤ���"
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr "����..."
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -220,10 +402,6 @@ msgstr "�ʤ�(�ǥե����)"
 msgid "Clock"
 msgstr "����"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr "12�����ե����ޥå�(AM/PM)�ǻ����ɽ������"
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr "GMT(����˥å�ɸ���)��������л����ɽ������"
@@ -248,96 +426,6 @@ msgstr "�������᡼�뤬�Ϥ����Ȥ��˼¹Ԥ�����:"
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr "�᡼��ܥå��������äѤ��ȸ��ʤ��Ȥ��Υ᡼�����(�����Х���)"
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr "����"
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr "�ơ��ޥե�����(�ǥ��쥯�ȥ�):"
@@ -354,7 +442,7 @@ msgstr "PPP�������顼���ץ�å�"
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr "�ե��󥭡���PPP�������顼�Ǥ������ޤǹͤ��Ĥ����ͤ�������!?"
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr "����"
 
@@ -374,6 +462,11 @@ msgstr "ʸ���ο�"
 msgid "Backgroundcolor"
 msgstr "�طʤο�"
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr "���ץ�åȤι⤵"
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -387,11 +480,11 @@ msgstr "���åץǡ��Ȥδֳ�"
 msgid "Diskusage Settings"
 msgstr "�ǥ��������̤�����"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr "�ɥ饤�֥ޥ���ȥ��ץ�å�"
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
@@ -399,19 +492,19 @@ msgstr ""
 "GNU���̻��ѵ�����˴�Ť��ƥ�꡼������Ƥ��ޤ���\n"
 "�ɥ饤�֤Υޥ���Ȥȥ���ޥ���Ȥ򤷤ޤ�.."
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr "�ޥ���Ȥ���Ƥ��ޤ�"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr "�ޥ���Ȥ���Ƥ��ޤ���"
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr "\" �Τ��Τ餻:\n"
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
@@ -419,7 +512,7 @@ msgstr ""
 "�ɥ饤�֥ޥ���ȥ��ޥ�ɤ����Ԥ��ޤ�����\n"
 "\""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "���Ф�"
 
@@ -524,9 +617,9 @@ msgstr "GNOME�����ʷ���̾��"
 msgid "The Animation Filename:"
 msgstr "���˥᡼�����ե������̾��"
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr "����"
 
@@ -579,7 +672,7 @@ msgstr ""
 msgid "About\t"
 msgstr "����\t"
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr "�ץ��ѥƥ�"
 
@@ -762,7 +855,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr "��˥塼"
 
@@ -798,86 +891,119 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr "�ǥ����ȥåץڡ����㡦���ץ�å�"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 #, fuzzy
 msgid "Gnome Pager Settings"
 msgstr "FVWM�ڡ����������"
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
-msgstr "ɽ��"
+#: applets/gnome-pager/gnomepager_applet.c:220
+#, fuzzy
+msgid "Pager"
+msgstr "����"
 
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
+#: applets/gnome-pager/gnomepager_applet.c:222
+#, fuzzy
+msgid "Show pager"
+msgstr "���դ�ɽ��"
+
+#: applets/gnome-pager/gnomepager_applet.c:229
+msgid "Use small pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:216
+#: applets/gnome-pager/gnomepager_applet.c:241
 #, fuzzy
-msgid "Show tasks"
+msgid "Rows of pagers"
 msgstr "���դ�ɽ��"
 
-#: applets/gnome-pager/gnomepager_applet.c:224
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:261
 #, fuzzy
-msgid "Show pager"
+msgid "Show task list button"
+msgstr "�ܥ����ɽ��"
+
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
 msgstr "���դ�ɽ��"
 
-#: applets/gnome-pager/gnomepager_applet.c:232
-msgid "Use small pagers"
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "�ܥ����ɽ��"
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:240
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
+msgstr "���դ�ɽ��"
+
+#: applets/gnome-pager/gnomepager_applet.c:306
 #, fuzzy
-msgid "Show icons in tasks"
+msgid "Show normal tasks only"
+msgstr "���դ�ɽ��"
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+#, fuzzy
+msgid "Show minimized tasks only"
 msgstr "�ȥԥå��γ���ɽ��"
 
-#: applets/gnome-pager/gnomepager_applet.c:248
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+msgid "Show minimized tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:334
 #, fuzzy
-msgid "Show task list button"
-msgstr "�ܥ����ɽ��"
+msgid "Geometry"
+msgstr "������ɥ��ΰ���"
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr ""
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 #, fuzzy
 msgid "Gnome Pager Error"
 msgstr "Gnome�إ�ץ֥饦��"
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -889,28 +1015,28 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 #, fuzzy
 msgid "Show / Hide"
 msgstr "���դ�ɽ��"
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "�Ĥ���"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr ""
 
@@ -1004,7 +1130,7 @@ msgid "History"
 msgstr "����"
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "�إ��"
 
@@ -1076,7 +1202,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr "���顼"
 
@@ -1335,7 +1461,7 @@ msgstr "(�ʾ������Ϻ��ɤ߹��ߤ���ޤ�ͭ���ˤʤ�ޤ���)"
 msgid "Open new window"
 msgstr "������ɥ��򿷵��˳���"
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr "����������"
 
@@ -1359,6 +1485,10 @@ msgstr "�ޤ��֤��Ԥ�ɽ��®��:"
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr "�ƹԤΥ���������®��(��餫����������):"
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr "ɽ��"
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr "�����ʤ�"
@@ -1367,12 +1497,12 @@ msgstr "�����ʤ�"
 msgid "Slashapp article list"
 msgstr "Slashapp ��������"
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr "�桼���ǥ��쥯�ȥ�κ�����: %s\n"
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr "�桼���ǥ��쥯�ȥ������Ǥ��ޤ���Ǥ���: %s\n"
@@ -1462,202 +1592,133 @@ msgstr "\"������������ɥ��ǳ���\"���ץ�����ɽ��"
 msgid "Look"
 msgstr "����"
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-#, fuzzy
-msgid "Submenu: "
-msgstr "��������ե����:"
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr "�ե����������Ǥ��ޤ���Ǥ���: %s\n"
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr ".order�ե���������Ǥ��ޤ���Ǥ���: %s\n"
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr "�ե����뤬¸�ߤ��ޤ���"
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr "�ե����������Ǥ��ޤ���Ǥ�����"
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-#, fuzzy
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-"�ե�����˥���ȥ���ɲäǤ��ޤ���!\n"
-"���ʤ��ˤϸ��¤�����ޤ���"
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr ""
-
-#: gmenu/dialogs.c:150
-#, fuzzy
-msgid "Create Submenu:"
-msgstr "��������ե����:"
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr "�ޤ����������򤷤Ƥ�������!"
-
-#: gmenu/dialogs.c:239
-#, fuzzy
-msgid "You can not delete a top level submenu."
-msgstr "�ȥåץ�٥�ե�����Ϻ���Ǥ��ޤ���!"
+#: gmenu/desktop.c:80
+msgid " Folder"
+msgstr " �ե����"
 
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-"�ե���������Ǥ��ޤ���!\n"
-"���ʤ��ˤϸ��¤�����ޤ���"
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-#, fuzzy
-msgid "Delete this menu item?"
-msgstr "���򤷤���˥塼�����ƥ�������ޤ�"
-
-#: gmenu/dialogs.c:262
-#, fuzzy
-msgid "Delete empty submenu?"
-msgstr "���Υե�����������ޤ���?"
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-
-#: gmenu/dnd.c:175
-#, fuzzy
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-"�ե���������Ǥ��ޤ���!\n"
-"���ʤ��ˤϸ��¤�����ޤ���"
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr "��¸"
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr "�᤹"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr "����"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+#, fuzzy
+msgid "User menus"
+msgstr "�桼����˥塼"
+
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+#, fuzzy
+msgid "System menus"
+msgstr "�����ƥ��˥塼"
 
-#: gmenu/gmenu.c:52
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr ""
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 #, fuzzy
 msgid "Create a new submenu"
 msgstr "�����ե������������ޤ�"
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 #, fuzzy
 msgid "New _Item..."
 msgstr "�����ե����(_F)..."
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 #, fuzzy
 msgid "Create a new menu item"
 msgstr "�����ե������������ޤ�"
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr "���(_D)..."
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 #, fuzzy
 msgid "_Sort Submenu"
 msgstr "��˥塼�С���ɽ��(_S)"
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 #, fuzzy
 msgid "Sort Submenu _Recursive"
 msgstr "�ե�����εս祽����(_R)"
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr "�ե�����(_F)"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr "������(_S)"
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr "�إ��(_H)"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr ""
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 #, fuzzy
 msgid "Create a new item"
 msgstr "�����ե������������ޤ�"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr "���"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr "���򤷤���˥塼�����ƥ�������ޤ�"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr "���ư"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr "���򤷤���˥塼���˰�ư���ޤ�"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr "����ư"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr "���򤷤���˥塼�򲼤˰�ư���ޤ�"
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr "���򤷤���˥塼�����ƥ�Υץ��ѥƥ����Խ����ޤ�"
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 #, fuzzy
 msgid "Sort Submenu"
 msgstr "�Ρ��ޥ��˥塼"
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 #, fuzzy
 msgid "Sort selected submenu"
 msgstr "���򤷤��ե�����򥽡��Ȥ��ޤ�"
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+#, fuzzy
+msgid "Sort _Recursive"
+msgstr "�ե�����εս祽����(_R)"
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr "GNOME��˥塼���ǥ���"
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
@@ -1665,69 +1726,115 @@ msgstr ""
 "GNU���̻��ѵ�����˴�Ť��ƥ�꡼������Ƥ��ޤ���\n"
 "GNOME��˥塼���ǥ����Ǥ���"
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 #, fuzzy
 msgid "The menu item must have a name"
 msgstr "��˥塼���ܤ˥��������ɽ������"
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr ""
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 #, fuzzy
 msgid "Save changes?"
 msgstr "�ѹ�����¸���ޤ���?"
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr ""
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 #, fuzzy
 msgid "Overwrite existing menu entry?"
 msgstr "���Ǥˤ���ե�����˾�񤭤��ޤ���?"
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr "���Ԥ�������������˥塼���ɤ߹���Ǥ��ޤ�..."
 
-#: gmenu/tree.c:418
-msgid "GNOME"
-msgstr ""
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "�桼����˥塼"
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr "�桼����˥塼�Υȥå�"
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr "�����ƥ��˥塼"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr "�����ƥ��˥塼�Υȥå�"
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "�桼����˥塼"
+#: gmenu/treedel.c:116
+#, fuzzy
+msgid "You can not delete a top level submenu."
+msgstr "�ȥåץ�٥�ե�����Ϻ���Ǥ��ޤ���!"
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
-msgstr "�桼����˥塼�Υȥå�"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+#, fuzzy
+msgid "Delete this menu item?"
+msgstr "���򤷤���˥塼�����ƥ�������ޤ�"
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treedel.c:138
+#, fuzzy
+msgid "Delete empty submenu?"
+msgstr "���Υե�����������ޤ���?"
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+#, fuzzy
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+"�ե�����˥���ȥ���ɲäǤ��ޤ���!\n"
+"���ʤ��ˤϸ��¤�����ޤ���"
+
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr "�����ե����"
+
+#: gmenu/treenew.c:63
+#, fuzzy
+msgid "Failed to create directory"
+msgstr "�ե����������Ǥ��ޤ���Ǥ�����"
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr "�ޥ���Ȥ���Ƥ��ޤ�"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr "GNOME�����ߥʥ�"
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr "GNOME�����ߥʥ륨�ߥ�졼�����ץ������Ǥ���"
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr "�ǥե����"
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
@@ -1737,306 +1844,347 @@ msgstr ""
 "�ǥե���Ȥ�����ˤ����褦�ˡ����Υ�����ɥ���\n"
 "���ꤷ�ʤ����ޤ���?"
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr "Linux���󥽡���"
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr "���顼Xterm"
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr "���Ϥ���ʸ��"
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr "���Ϥ˹�ʸ��"
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr "���Ϥ���ʸ��"
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr "���뤤�����˹�ʸ��"
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr "�������५�顼"
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "��"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "��"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr "����"
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr "�ե����:"
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr "����..."
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr "�����ߥʥ륯�饹"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr "�������������"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr "��˥塼�С��򱣤�"
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr "�����ߥʥ�٥���Ĥ餵�ʤ�"
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr "DEL/Backspace�����촹��"
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr "����"
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 #, fuzzy
 msgid "Background type"
 msgstr " �ط�"
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 #, fuzzy
 msgid "None"
 msgstr "�ʤ�"
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr "�طʲ���"
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr "�����ե�����:"
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr "Ʃ��"
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr "�طʤ�Ť�����(�٤�)"
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr "���顼�ѥ�å�:"
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr "ʸ����"
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr "�طʿ�:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr "���顼:"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "����������С��ΰ���"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr "����������Хå��Υ饤��"
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr "�������ȥ������ǥ���������"
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr "�����̤ǥ���������"
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr "���顼������"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 #, fuzzy
 msgid "_New terminal"
 msgstr "GNOME�����ߥʥ�"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 #, fuzzy
 msgid "Creates a new terminal window"
 msgstr "�����ե������������ޤ�"
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr "��˥塼�С��򱣤�(_H)"
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 #, fuzzy
 msgid "_Close terminal"
 msgstr "���顼Xterm"
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "���顼Xterm"
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr "��˥塼�С���ɽ��(_S)"
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 #, fuzzy
 msgid "C_olor selector..."
 msgstr "���顼������"
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr "�����ߥʥ�Υ��饹̾��"
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+#, fuzzy
+msgid "TCLASS"
 msgstr "���饹"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr "�ե����̾�Τ���ꤷ�ޤ�"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr "�ե����"
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr "��ư�������������󥷥���ˤ��ʤ�"
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr "��ư�������������󥷥���ˤ���"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr "�ᥤ�󥦥���ɥ��ΰ��֤���ꤷ�ޤ�"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr "����"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr "�����������ˤ��Υץ�������¹Ԥ��ޤ�"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr "���ޥ��"
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr "ʸ����"
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr "���顼"
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr "�طʿ�"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 #, fuzzy
 msgid "Update utmp entry"
 msgstr "utmp/wtmp����ȥ�򹹿�����"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 #, fuzzy
 msgid "Do not update utmp entry"
 msgstr "utmp/wtmp����ȥ�򹹿����ʤ�"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 #, fuzzy
 msgid "Update wtmp entry"
 msgstr "utmp/wtmp����ȥ�򹹿�����"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 #, fuzzy
 msgid "Do not update wtmp entry"
 msgstr "utmp/wtmp����ȥ�򹹿����ʤ�"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr ""
 
@@ -2048,24 +2196,53 @@ msgstr "���å����ζ�����λ"
 msgid "save-session: couldn't connect to session manager\n"
 msgstr "save-ssession: ���å����ޥ͡��������³�Ǥ��ޤ���Ǥ�����\n"
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr ""
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 #, fuzzy
 msgid "Cancel"
 msgstr " ����󥻥� "
 
+#: gsm/session-properties.c:258
+#, fuzzy
+msgid "Session"
+msgstr "���å����ζ�����λ"
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+#, fuzzy
+msgid "Start Session"
+msgstr "���å�����λ����"
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr " ����󥻥� "
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "��������"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr "�֥å��ޡ���"
@@ -2443,15 +2620,15 @@ msgstr ""
 msgid "Ok"
 msgstr "OK"
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr "???"
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "�ѥͥ뤫�������"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr "���ץ�åȤΰ�ư"
 
@@ -2483,7 +2660,7 @@ msgstr "���åܥ����Ȥ�ʤ�"
 msgid "Enable hidebutton arrow"
 msgstr "����ܥ���ϻȤ�ʤ�"
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "���Ф�"
 
@@ -2491,23 +2668,23 @@ msgstr "���Ф�"
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr "���ץ�"
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "������Υץ��ѥƥ�"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr "�����㥢�ץ�åȤ��������"
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "����������"
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 #, fuzzy
 msgid "Log out of GNOME"
 msgstr "����������"
@@ -2578,271 +2755,253 @@ msgstr "�ǥ����ȥåץ���ȥ꤫��goad_id������Ǥ��ޤ���!"
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr "���ץ�å�"
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 #, fuzzy
 msgid "Edge panel"
 msgstr "���å��ѥͥ�"
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 #, fuzzy
 msgid "Corner panel"
 msgstr "�����ʡ��ѥͥ�"
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-#, fuzzy
-msgid "System menus"
-msgstr "�����ƥ��˥塼"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 #, fuzzy
 msgid "Debian menus"
 msgstr "�ᥤ���˥塼"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 #, fuzzy
 msgid "No Debian menus found!"
 msgstr "�����ϸ��Ĥ���ޤ���"
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-#, fuzzy
-msgid "User menus"
-msgstr "�桼����˥塼"
-
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-#, fuzzy
-msgid "Red Hat menus"
-msgstr "�ᥤ���˥塼���ɲ�"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr "���Υѥͥ��������"
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr "���ץ�åȤ��ɲ�"
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr "�����ѥͥ���ɲ�"
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 #, fuzzy
 msgid "Convert to corner panel"
 msgstr "�����ʡ��ѥͥ�"
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 #, fuzzy
 msgid "Convert to edge panel"
 msgstr "�����ʡ��ѥͥ�"
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr "�ᥤ���˥塼���ɲ�"
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 #, fuzzy
 msgid "Add drawer"
 msgstr "���Ф�"
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr "���������ȥܥ�����ɲ�"
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr "��������ɥ��ץ���ɲ�"
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr "������������ɲ�"
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr "���Υѥͥ�Υץ��ѥƥ�..."
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "���ΤΥץ��ѥƥ�..."
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr "�ѥͥ�"
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr "�����꡼��Υ��å�"
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr "GNOME�ˤĤ���..."
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr ""
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr ""
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 #, fuzzy
 msgid "On the main menu"
 msgstr "�ᥤ���˥塼���ɲ�"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr "��˥塼�ץ��ѥƥ�"
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 #, fuzzy
 msgid "Menu type"
 msgstr "��˥塼������"
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 #, fuzzy
 msgid "Main menu"
 msgstr "�ᥤ���˥塼"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 #, fuzzy
 msgid "Normal menu"
 msgstr "�Ρ��ޥ��˥塼"
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 #, fuzzy
 msgid "System menu: "
 msgstr "�����ƥ��˥塼"
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 #, fuzzy
 msgid "User menu: "
 msgstr "�桼����˥塼"
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+msgid "AnotherLevel menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr "��˥塼�ѥ�"
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "����"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "��"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "��"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 #, fuzzy
 msgid "Minimize options"
 msgstr "�Ǿ������ץ����"
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 #, fuzzy
 msgid "Auto hide"
 msgstr "��ưŪ�˱���"
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 #, fuzzy
 msgid "Enable hidebuttons"
 msgstr "����Ƥ���ܥ���ϻ�����ǽ�ˤ���"
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 #, fuzzy
 msgid "Enable hidebutton arrows"
 msgstr "����ܥ����Ȥ�ʤ�"
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 #, fuzzy
 msgid "North east"
 msgstr "����"
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 #, fuzzy
 msgid "South west"
 msgstr "����"
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 #, fuzzy
 msgid "North west"
 msgstr "����"
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 #, fuzzy
 msgid "South east"
 msgstr "����"
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr "���"
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "��ʿ"
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "��ľ"
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-#, fuzzy
-msgid "Hidebutton options"
-msgstr "���åܥ���Υ��ץ����"
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr "�ǥ����ȥåפ��ط�"
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr "ɸ��"
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr "�ԥ����ޥå�"
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr "��"
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr "�����ե�����"
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr "������ѥͥ�Υ������ˤ��碌���ѹ�����"
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "�ѥͥ�Υץ��ѥƥ�"
 
@@ -3021,28 +3180,6 @@ msgstr "���˥᡼�����"
 msgid "General icon settings"
 msgstr "��������"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr "�����˥��������Ȥ��ޤ���?"
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr "�����ɽ������"
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr "����������ץ�åȤ���������"
@@ -3059,6 +3196,74 @@ msgstr "���ޥ��(���ץ����)"
 msgid "Height"
 msgstr "�⤵"
 
+#, fuzzy
+#~ msgid "Low Battery Warning"
+#~ msgstr "���٥�ǽ�����Ǥ���"
+
+#~ msgid "Afterstep Clock Applet"
+#~ msgstr "Afterstep�����å����ץ�å�"
+
+#~ msgid "General Properties"
+#~ msgstr "��������"
+
+#~ msgid "Graph Interval:"
+#~ msgstr "����դι����ֳ�:"
+
+#, fuzzy
+#~ msgid "Submenu: "
+#~ msgstr "��������ե����:"
+
+#~ msgid "Unable to create file: %s\n"
+#~ msgstr "�ե����������Ǥ��ޤ���Ǥ���: %s\n"
+
+#~ msgid "unable to remove .order file: %s\n"
+#~ msgstr ".order�ե���������Ǥ��ޤ���Ǥ���: %s\n"
+
+#~ msgid "File exists."
+#~ msgstr "�ե����뤬¸�ߤ��ޤ���"
+
+#, fuzzy
+#~ msgid "Create Submenu:"
+#~ msgstr "��������ե����:"
+
+#~ msgid "You must select something first."
+#~ msgstr "�ޤ����������򤷤Ƥ�������!"
+
+#~ msgid ""
+#~ "You can't delete that file.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "�ե���������Ǥ��ޤ���!\n"
+#~ "���ʤ��ˤϸ��¤�����ޤ���"
+
+#, fuzzy
+#~ msgid ""
+#~ "You are not allowed to move that item there.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "�ե���������Ǥ��ޤ���!\n"
+#~ "���ʤ��ˤϸ��¤�����ޤ���"
+
+#~ msgid "New"
+#~ msgstr "����"
+
+#~ msgid "Edit selected menu item properties"
+#~ msgstr "���򤷤���˥塼�����ƥ�Υץ��ѥƥ����Խ����ޤ�"
+
+#, fuzzy
+#~ msgid "Red Hat menus"
+#~ msgstr "�ᥤ���˥塼���ɲ�"
+
+#, fuzzy
+#~ msgid "Hidebutton options"
+#~ msgstr "���åܥ���Υ��ץ����"
+
+#~ msgid "Really log out?"
+#~ msgstr "�����˥��������Ȥ��ޤ���?"
+
+#~ msgid "Ask next time"
+#~ msgstr "�����ɽ������"
+
 #~ msgid "Enable gsm debugging"
 #~ msgstr "gsm�ǥХå���ͭ���ˤ���"
 
@@ -3068,9 +3273,6 @@ msgstr "�⤵"
 #~ msgid "Startup Programs"
 #~ msgstr "�������ȥ��å�"
 
-#~ msgid "Geometry of window"
-#~ msgstr "������ɥ��ΰ���"
-
 #~ msgid "Can't open /proc/apm; can't get data."
 #~ msgstr "/proc/apm�򳫤��ޤ��󡣥ǡ���������Ǥ��ޤ���"
 
@@ -3089,9 +3291,6 @@ msgstr "�⤵"
 #~ msgid "High."
 #~ msgstr "���٥�Ǥ���"
 
-#~ msgid "Low and charging."
-#~ msgstr "���٥�ǽ�����Ǥ���"
-
 #~ msgid "Low."
 #~ msgstr "���٥�Ǥ���"
 
@@ -3202,15 +3401,9 @@ msgstr "�⤵"
 #~ msgid "Failed to retrieve workspace property."
 #~ msgstr "������ڡ��������������Ǥ��ޤ���Ǥ�����"
 
-#~ msgid " Folder"
-#~ msgstr " �ե����"
-
 #~ msgid "Config"
 #~ msgstr "����"
 
-#~ msgid "Discard session"
-#~ msgstr "���å�����λ����"
-
 #, fuzzy
 #~ msgid "Special Prefixes"
 #~ msgstr "�ü�ե�����"
@@ -3357,9 +3550,6 @@ msgstr "�⤵"
 #~ msgid "Slow"
 #~ msgstr "�٤�"
 
-#~ msgid "Threshold"
-#~ msgstr "��������"
-
 #~ msgid "Large"
 #~ msgstr "Ĺ��"
 
@@ -3462,9 +3652,6 @@ msgstr "�⤵"
 #~ msgid "MDI notebook tab position"
 #~ msgstr "MDI�Ρ��ȥ��֤ΰ���"
 
-#~ msgid "New Folder"
-#~ msgstr "�����ե����"
-
 #~ msgid "Failed to delete the folder."
 #~ msgstr "�ե���������Ǥ��ޤ���"
 
diff --git a/po/ko.po b/po/ko.po
index 89a110db..51ee12f6 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-core 1.0.0\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: 1999-03-01 07:10+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@adam.kaist.ac.kr>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -13,126 +13,319 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "�� ���α׷���"
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "�Ӽ�..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr "Afterstep �ð� ���ø�"
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "�ð�"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr "���� NeXT�� �׾��ٰ� �ϴ°�?"
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "������ ����"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr "12�ð� �������� ǥ�� (AM/PM)"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr "�Ϲ�"
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr "�ð���"
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr "���� �ַ�: battery_set_mode�� �߸��� ���"
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "���ø��� ���� �� ����!\n"
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "�� ���α׷���..."
+
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
+msgstr "�׳� KB ���ø�"
+
+#: applets/battery/battery.c:838
+#, fuzzy
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr "(c) 1998 the Free Software Foundation"
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr "�׷����� ���� ���� ����� ������ Ȯ������ ����"
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "���͸� ����:"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "�г� �Ӽ�"
-
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
 msgstr "���ø� ����"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
 msgstr "���ø� ����"
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Update interval
+#: applets/battery/properties.c:102
+#, fuzzy
+msgid "Update Interval (seconds):"
+msgstr "���ʸ��� ������Ʈ?:"
+
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
+msgstr ""
+
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
 msgstr "���ø� ����"
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr "�׷���"
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr "�ٽ� �б�"
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr "AC-On ���͸� ����:"
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr "AC-Off ���͸� ����:"
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
-msgstr "�׷��� ����:"
+#: applets/battery/properties.c:202
+#, fuzzy
+msgid "Low Battery Color:"
+msgstr "AC-On ���͸� ����:"
+
+#: applets/battery/properties.c:262
+#, fuzzy
+msgid "Graph Battery Low Color:"
+msgstr "AC-On ���͸� ����:"
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:268
+#, fuzzy
+msgid "Graph Tick Color:"
+msgstr "�׷��� ����:"
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr "�׷��� ����:"
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr "���ʿ��� ������"
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr "�����ʿ��� ����"
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
 msgstr ""
 "/proc/apm�� �� �� �����ϴ�!  APM support�� Ŀ�ο� ���ԵǾ����� Ȯ���ϼ���\n"
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr "APM ���� ��ũ���͸� dup()�� �� �����ϴ�: %s\n"
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "/proc/apm�� ���� �����ϴ�: �����͸� ������ �� �����ϴ�"
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr "/dev/apm�� ���� ioctl ����"
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr "APM�� ����� �� �����ϴ�!  ���͸� ���� ������ ���� �� �����ϴ�."
 
@@ -160,17 +353,6 @@ msgstr ""
 "�� Ű���忡 ���� ������ ���ڸ� �����ϴ� �׳� �г� ���ø�.  GNU General "
 "Public License�� release"
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr "�� ���α׷���..."
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -219,10 +401,6 @@ msgstr "���� (�⺻)"
 msgid "Clock"
 msgstr "�ð�"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr "12�ð� �������� ǥ�� (AM/PM)"
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr "UTC�� ���ð����� ǥ��."
@@ -247,96 +425,6 @@ msgstr "���ο� ������ �������� �� ����:"
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr "�������� ���� á�ٰ� ������ ������ ũ�� (ų�ι���Ʈ)"
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr "�Ϲ�"
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr "�׸� ���� (���丮)"
@@ -353,7 +441,7 @@ msgstr "PPP �ɱ� ���ø�"
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr "���ɹ��� PPP ��ȭ �ɱ�, ��� ������ �ƹ��� ������ ��������?"
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr "����"
 
@@ -373,6 +461,11 @@ msgstr "���ڸ� ���"
 msgid "Backgroundcolor"
 msgstr "���"
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr "���ø� ����"
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -386,11 +479,11 @@ msgstr "���� ����"
 msgid "Diskusage Settings"
 msgstr "����"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr "����̺� ����Ʈ ���ø�"
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
@@ -398,19 +491,19 @@ msgstr ""
 "GNU General Public License�� ���� release\n"
 "����̺긦 ����Ʈ/�𸶿�Ʈ�Ѵ�.."
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr " ����Ʈ��"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr " ����Ʈ���� ����"
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr "\" ������:\n"
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
@@ -418,7 +511,7 @@ msgstr ""
 "����̺� ����Ʈ ���� ����\n"
 "\""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "Eject"
 
@@ -524,9 +617,9 @@ msgstr "����� �׳� �������� �̸�:"
 msgid "The Animation Filename:"
 msgstr "�ִϸ��̼� �����̸�:"
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr "ã�ƺ���"
 
@@ -579,7 +672,7 @@ msgstr "����ũž %d"
 msgid "About\t"
 msgstr "�� ���α׷���\t"
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr "�Ӽ�"
 
@@ -762,7 +855,7 @@ msgid "Xmodmap"
 msgstr "Xmodmap"
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr "�޴�"
 
@@ -799,80 +892,116 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr "gkb.xpm"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr "����ũž ������ ���ø�"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr "�׳� �´� ������ �Ŵ����� ���� ������"
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr "Gnome ������ ����"
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
-msgstr "ǥ��"
-
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
-msgstr "��� ����ũž�� �½�ũ �����ֱ�"
-
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
-msgstr "�½�ũ �����ֱ�"
+#: applets/gnome-pager/gnomepager_applet.c:220
+#, fuzzy
+msgid "Pager"
+msgstr "�׸�"
 
-#: applets/gnome-pager/gnomepager_applet.c:224
+#: applets/gnome-pager/gnomepager_applet.c:222
 msgid "Show pager"
 msgstr "������ �����ֱ�"
 
-#: applets/gnome-pager/gnomepager_applet.c:232
+#: applets/gnome-pager/gnomepager_applet.c:229
 msgid "Use small pagers"
 msgstr "���� ������ ���"
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
-msgstr "�½�ũ�� ������ �����ֱ�"
+#: applets/gnome-pager/gnomepager_applet.c:241
+#, fuzzy
+msgid "Rows of pagers"
+msgstr "�������� �� ��"
+
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
+msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
+#: applets/gnome-pager/gnomepager_applet.c:261
 msgid "Show task list button"
 msgstr "�½�ũ ��� ��ư �����ֱ�"
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
+msgstr "�½�ũ �����ֱ�"
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "���̱� ... ��ư"
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
+msgstr "�½�ũ �����ֱ�"
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+#, fuzzy
+msgid "Show normal tasks only"
+msgstr "��� ����ũž�� �½�ũ �����ֱ�"
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+#, fuzzy
+msgid "Show minimized tasks only"
+msgstr "�½�ũ�� ������ �����ֱ�"
+
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr "��� ����ũž�� �½�ũ �����ֱ�"
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+#, fuzzy
+msgid "Show minimized tasks on all desktops"
+msgstr "��� ����ũž�� �½�ũ �����ֱ�"
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+#, fuzzy
+msgid "Geometry"
+msgstr "â ����"
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr "�½�ũ ����Ʈ�� ũ��� ��� �ִ��"
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr "���� �½�ũ ����Ʈ�� �ִ� ��"
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr "���� �½�ũ ����Ʈ�� �ִ� ��"
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr "���� �½�ũ�� �� ����"
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr "���� �½�ũ�� �� ����"
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr "�������� �� ��"
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr "Gnome ������ ����"
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -889,27 +1018,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr "?"
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr "����"
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr "�����ֱ� / �����"
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr "������ / ���߱�"
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "�ݱ�"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr "�ٰ���"
 
@@ -995,7 +1124,7 @@ msgid "History"
 msgstr "�����丮"
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "����"
 
@@ -1065,7 +1194,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr "����"
 
@@ -1310,7 +1439,7 @@ msgstr "(�� ������ refresh�Ҷ������� ȿ���� �����ϴ�)"
 msgid "Open new window"
 msgstr "���ο� â ����"
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr "��ũ��"
 
@@ -1334,6 +1463,10 @@ msgstr "wrapping text�� �ð�����"
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr "�� �ٻ����� ��ũ�� �ӵ� (�ε巯�� ��ũ��)"
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr "ǥ��"
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr "��簡 �����ϴ�"
@@ -1342,12 +1475,12 @@ msgstr "��簡 �����ϴ�"
 msgid "Slashapp article list"
 msgstr "Slashapp ��� ����Ʈ"
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr "����� ���丮 �����: %s\n"
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr "����� ���丮�� ���� �� �����ϴ�: %s\n"
@@ -1437,189 +1570,123 @@ msgstr "\"�� â ����\" �ɼ� ǥ��"
 msgid "Look"
 msgstr "�Ѹ��"
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr "����޴�: "
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr "������ ���� ���� �� ����: %s\n"
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr ".order ������ ���� �� ����: %s\n"
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr "������ �̹� �����մϴ�."
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr "������ ���� ����� �� ����."
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-"�� ����޴��� ���ο� �׸��� �߰��� �� �����ϴ�.\n"
-"�׷� ������ �����ϴ�."
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr "�� ����޴�"
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr "����޴� �����:"
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr "���� ���𰡸� �����ؾ� �մϴ�."
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr "�� ���� ����޴��� ���� �� �����ϴ�."
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-"�� ������ ���� �� �����ϴ�.\n"
-"�׷� ������ �����ϴ�."
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr "�� �޴��׸� ������?"
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
-msgstr "�� ����޴��� ������?"
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr "������ �� ����޴��� �� �ȿ� ��� �ִ� �͵��� ���� ������?"
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-"�̷��� �ٲٸ� ������ �޴� �׸�� �浹�մϴ�.\n"
-"�� ����޴��� �ΰ��� �޴� �׸��� ���� �̸��� ���� �� �����ϴ�."
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
+#: gmenu/desktop.c:80
+msgid " Folder"
 msgstr ""
-"�� �׸��� ����� �ű� �� �����ϴ�.\n"
-"�׷� ������ �����ϴ�."
 
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr "����"
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr "�ǵ�����"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr "����"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
+msgstr "����� �޴�"
+
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr "�ý��� �޴�"
 
-#: gmenu/gmenu.c:52
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr "�� ����޴�(_N)..."
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr "�� ����޴� �����"
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr "�� �׸�(_I)..."
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr "���ο� �޴� �׸� �����"
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr "�����(_D)..."
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr "����޴� ����(_S)"
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr "�Ʒ� ����޴����� ����(_R)"
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr "����(_F)"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr "����(_S)"
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr "����(_H)"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr "�� ����޴�"
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr "�� �׸�"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr "�� �׸� �����"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr "�����"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr "���õ� �޴��׸� �����"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr "���� �̵�"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr "���õ� �޴� ���� �̵�"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr "�Ʒ��� �̵�"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr "���õ� �޴� �Ʒ��� �̵�"
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr "���õ� �޴��� �Ӽ� ����"
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr "����޴� ����"
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr "���õ� ����޴� ����"
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+#, fuzzy
+msgid "Sort _Recursive"
+msgstr "�Ʒ� ����޴����� ����(_R)"
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr "�׳� �޴� ������"
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
@@ -1627,66 +1694,110 @@ msgstr ""
 "GNU General Public License�� ���� ������.\n"
 "�׳� �޴� ������."
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr "�޴� �������� �̸��� �־�� �մϴ�"
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr "�޴� �׸��� �����̸����־�� �մϴ�."
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr "�ٲ� ���� �����ұ��?"
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr "�̷��� �ٲٸ� ������ �޴� �����۰� �浹�մϴ�"
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr "���� �޴� �׸��� ������?"
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+"�̷��� �ٲٸ� ������ �޴� �׸�� �浹�մϴ�.\n"
+"�� ����޴��� �ΰ��� �޴� �׸��� ���� �̸��� ���� �� �����ϴ�."
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr "���, �޴��� �а� �ֽ��ϴ�..."
 
-#: gmenu/tree.c:418
-msgid "GNOME"
-msgstr "�׳�"
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "����� �޴�"
+
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr "����� �޴��� �� ��"
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr "�ý��� �޴�"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr "�ý��� �޴��� �� ��"
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "����� �޴�"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
+msgstr "�� ���� ����޴��� ���� �� �����ϴ�."
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
-msgstr "����� �޴��� �� ��"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr "�� �޴��׸� ������?"
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr "�� ����޴��� ������?"
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr "������ �� ����޴��� �� �ȿ� ��� �ִ� �͵��� ���� ������?"
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+"�� ����޴��� ���ο� �׸��� �߰��� �� �����ϴ�.\n"
+"�׷� ������ �����ϴ�."
+
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr ""
+
+#: gmenu/treenew.c:63
+#, fuzzy
+msgid "Failed to create directory"
+msgstr "������ ���� ����� �� ����."
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr " ����Ʈ��"
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr "�׳� �͹̳�"
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr "�׳� �͹̳� ���α׷�"
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr "�⺻����"
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
@@ -1696,298 +1807,340 @@ msgstr ""
 "�� �����츦 ���ο� class�� �⺻ ������\n"
 "�µ��� �ٽ� �����Ͻðڽ��ϱ�?"
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr "������ �ܼ�"
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr "�÷� Xterm"
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr "rxvt"
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr "���� ��濡 �����"
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr "�� ��濡 ���� ����"
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr "���� ��濡 ��� ����"
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr "���� ����� ��濡 ���� ����"
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr "�� ���� ����"
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "����"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "������"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr "����"
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr "�۲�:"
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr " ã�ƺ���... "
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr "�͹̳� class"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr "�����̴� Ŀ��"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr "�޴��� �����"
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr "�͹̳� ��Ҹ� ���ֱ�"
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr "DEL/Backspace �� �ٲٱ�"
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr "�ܾ� ������ ����"
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr "�׸�"
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 #, fuzzy
 msgid "Background type"
 msgstr "���"
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 msgid "None"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr "��� �׸�"
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr "�׸� ����:"
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr "�����ϰ�"
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr "��濡 �״��� ������ �Ѵ� (������)"
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr "���� �ķ�Ʈ:"
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr "�����:"
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr "����:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr "����:"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "��ũ�ѹ� ��ġ"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr "��ũ���� �� �ִ� �ټ�"
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr "Ű�Է��� ���� ��� ��ũ��"
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr "����� ���� ��� ��ũ��"
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr "���� ����"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr "�� �͹̳�(_N)"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr "�� �͹̳� ������ �����"
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr "�޴��� �����(_H)"
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr "�͹̳� �ݱ�(_C)"
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "�͹̳� �ݱ�(_C)"
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr "�޴��� ���̱�(_S)"
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr "���� ����...(_O)"
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr "�͹̳� class �̸�"
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+#, fuzzy
+msgid "TCLASS"
 msgstr "CLASS"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr "��Ʈ �̸� ����"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr "FONT"
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr "�α���� �������� �ʴ´�"
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr "�α���� �����Ѵ�"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr "�� �������� ��ġ,ũ�� ����"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr "�� ��ſ� ���α׷��� �����Ѵ�"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr "COMMAND"
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr "�����"
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr "COLOR"
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr "����"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr "utmp �׸� ����"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr "UTMP"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr "utmp �׸� �������� ����"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr "NOUTMP"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr "wtmp �׸� ����"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr "WTMP"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr "wtmp �׸� �������� ����"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr "NOWTMP"
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr "������ ���� ���ϱ�"
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr "����"
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr "Ŭ���̾�Ʈ�� ����ϱ���� ��ٸ��� �ð� (õ���� ����) (0=������)"
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+#, fuzzy
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr "Ŭ���̾�Ʈ�� ����ϱ���� ��ٸ��� �ð� (õ���� ����) (0=������)"
+
+#: gsm/main.c:61
 #, fuzzy
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr "Ŭ���̾�Ʈ�� ����ϱ���� ��ٸ��� �ð� (õ���� ����) (0=������)"
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr "���� �ݱⰡ ���� ���Դϴ�."
 
@@ -1999,24 +2152,52 @@ msgstr "���� ���ֱ�"
 msgid "save-session: couldn't connect to session manager\n"
 msgstr "save-session: ���� �����ڿ� ������ �� ����\n"
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr "���α׷�:"
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 #, fuzzy
 msgid "Cancel"
 msgstr "�г�"
 
+#: gsm/session-properties.c:258
+#, fuzzy
+msgid "Session"
+msgstr "���� ���ֱ�"
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr "�г�"
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "�Ϲ� ������ ����"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr "å����"
@@ -2389,15 +2570,15 @@ msgstr ""
 msgid "Ok"
 msgstr "Ȯ��"
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr "???"
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "�гο��� ����"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr "���ø� �̵�"
 
@@ -2427,7 +2608,7 @@ msgstr "������ư ����"
 msgid "Enable hidebutton arrow"
 msgstr "������ư ȭ��ǥ ����"
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "����"
 
@@ -2435,23 +2616,23 @@ msgstr "����"
 msgid "This launch icon does not specify a program to run"
 msgstr "�� ���� �������� ������ ���α׷��� �������� �ʰ� �ֽ��ϴ�"
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr "���α׷�"
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "����� �Ӽ�"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr "���� ���ø� �����"
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "�α׾ƿ�"
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr "�׳� �α׾ƿ�"
 
@@ -2521,249 +2702,236 @@ msgstr "���ø��� ���� goad_id�� ���� �� ����, ����"
 msgid " (empty)"
 msgstr "(�����)"
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr "���ø�"
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr "�����ڸ� �г�"
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr "���� �г�"
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr "�ý��� �޴�"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 #, fuzzy
 msgid "Debian menus"
 msgstr "�� �޴�"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 #, fuzzy
 msgid "No Debian menus found!"
 msgstr "��縦 ã�� �� ����"
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
-msgstr "����� �޴�"
-
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr "Red Hat �޴�"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr "�гο��� ����"
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr "���ø� �߰�"
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr "�гο� �߰�"
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr "���� �гη� �ٲٱ�"
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr "�����ڸ� �гη� �ٲٱ�"
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr "�� �޴� �߰�"
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr "���� �߰�"
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr "�α׾ƿ� ��ư �߰�"
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr "��ų ���α׷� �߰�"
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr "���ο� ����� �߰�"
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr "�г� �Ӽ�..."
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "��ü �Ӽ�..."
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr "�г�"
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr "ȭ�� ���"
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr "�׳���..."
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr "���丮�� ���� ���, ���� �޴��� ����մϴ�!"
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr "����޴� �ȿ���"
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr "�� �޴�����"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr "�޴� �Ӽ�"
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr "�޴� Ÿ��"
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr "�� �޴�"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr "���� �޴�"
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr "�ý��� �޴�: "
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr "����� �޴�: "
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+#, fuzzy
+msgid "AnotherLevel menu (if found): "
 msgstr "Red Hat �޴� (ã������): "
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 #, fuzzy
 msgid "Debian menu (if found): "
 msgstr "Red Hat �޴� (ã������): "
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr "�޴� ���"
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "��ġ"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "��"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "�Ʒ�"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr "�ּ�ȭ �ɼ�"
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr "�ڵ� �����"
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr "������ư ���̱�"
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr "������ư ȭ��ǥ ���̱�"
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr "�ϵ�"
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr "����"
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr "�ϼ�"
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr "����"
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr "����"
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "����"
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "����"
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr "������ư ���û���"
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr "���"
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr "ǥ��"
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr "�Ƚ���"
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr "����"
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr "�׸� ����"
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr "�г� ũ�⿡ �°� �׸� ũ�⸦ ����"
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "�г� �Ӽ�"
 
@@ -2931,34 +3099,6 @@ msgstr "�ִϸ��̼�"
 msgid "General icon settings"
 msgstr "�Ϲ� ������ ����"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-"������ �г��� �����ڽ��ϱ�?\n"
-"\n"
-"���� �г��� ���� �Ŀ� �ٽ� �г��� �����Ϸ���, �͹̳� �����쿡�� panel�� "
-"Ÿ�����ؾ� �մϴ�.\n"
-"\n"
-"�г��� �������� Ȯ�� ��ư�� ��������!"
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr "������ �α׾ƿ��ϰڽ��ϱ�?"
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr "�гθ� ������"
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr "�������� �����"
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr "��Ŵ ���ø� �����"
@@ -2975,6 +3115,89 @@ msgstr "���� (���û���)"
 msgid "Height"
 msgstr "����"
 
+#~ msgid "Afterstep Clock Applet"
+#~ msgstr "Afterstep �ð� ���ø�"
+
+#~ msgid "General Properties"
+#~ msgstr "�г� �Ӽ�"
+
+#~ msgid "Graph Interval:"
+#~ msgstr "�׷��� ����:"
+
+#~ msgid "Submenu: "
+#~ msgstr "����޴�: "
+
+#~ msgid "Unable to create file: %s\n"
+#~ msgstr "������ ���� ���� �� ����: %s\n"
+
+#~ msgid "unable to remove .order file: %s\n"
+#~ msgstr ".order ������ ���� �� ����: %s\n"
+
+#~ msgid "File exists."
+#~ msgstr "������ �̹� �����մϴ�."
+
+#~ msgid "Create Submenu:"
+#~ msgstr "����޴� �����:"
+
+#~ msgid "You must select something first."
+#~ msgstr "���� ���𰡸� �����ؾ� �մϴ�."
+
+#~ msgid ""
+#~ "You can't delete that file.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "�� ������ ���� �� �����ϴ�.\n"
+#~ "�׷� ������ �����ϴ�."
+
+#~ msgid ""
+#~ "You are not allowed to move that item there.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "�� �׸��� ����� �ű� �� �����ϴ�.\n"
+#~ "�׷� ������ �����ϴ�."
+
+#~ msgid "New"
+#~ msgstr "����"
+
+#~ msgid "Edit selected menu item properties"
+#~ msgstr "���õ� �޴��� �Ӽ� ����"
+
+#~ msgid "GNOME"
+#~ msgstr "�׳�"
+
+#~ msgid "Red Hat menus"
+#~ msgstr "Red Hat �޴�"
+
+#~ msgid "Red Hat menu (if found): "
+#~ msgstr "Red Hat �޴� (ã������): "
+
+#~ msgid "Hidebutton options"
+#~ msgstr "������ư ���û���"
+
+#~ msgid ""
+#~ "Are you sure you want to just terminate the panel?\n"
+#~ "\n"
+#~ "If you need to restart the panel after terminating it here, you will need to "
+#~ "type panel in a terminal window\n"
+#~ "\n"
+#~ "Press OK to terminate the panel!"
+#~ msgstr ""
+#~ "������ �г��� �����ڽ��ϱ�?\n"
+#~ "\n"
+#~ "���� �г��� ���� �Ŀ� �ٽ� �г��� �����Ϸ���, �͹̳� �����쿡�� panel�� "
+#~ "Ÿ�����ؾ� �մϴ�.\n"
+#~ "\n"
+#~ "�г��� �������� Ȯ�� ��ư�� ��������!"
+
+#~ msgid "Really log out?"
+#~ msgstr "������ �α׾ƿ��ϰڽ��ϱ�?"
+
+#~ msgid "Only terminate panel"
+#~ msgstr "�гθ� ������"
+
+#~ msgid "Ask next time"
+#~ msgstr "�������� �����"
+
 #~ msgid "Enable gsm debugging"
 #~ msgstr "gsm ����� �ѱ�"
 
@@ -2997,6 +3220,3 @@ msgstr "����"
 
 #~ msgid "Startup Programs"
 #~ msgstr "���α׷� ����"
-
-#~ msgid "Geometry of window"
-#~ msgstr "â ����"
diff --git a/po/nl.po b/po/nl.po
index 578e7fb1..7906f3ff 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-core VERSION\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: 1999-01-31 19:53+02:00\n"
 "Last-Translator: Dirk-Jan C. Binnema <djcb@dds.nl>\n"
 "Language-Team: Linux Gebruikersgroep Den Haag <djcb@dds.nl>\n"
@@ -13,106 +13,299 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "Info"
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "Eigenschappen..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr "AfterStep Klok Applet"
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "Klok"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr "Wie zei dat NeXT dood was?"
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "Paginatitel"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr "Tijdweergave in 12 uur formaat (AM/PM)"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr "Algemeen"
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr "Tijdzone"
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr "Interne fout: ongeldige modus in battery_set_mode"
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "Applet kan niet gecre�erd worden!\n"
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "Info..."
+
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
+msgstr "Het GNOME KB Applet"
+
+#: applets/battery/battery.c:838
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr ""
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr "Er is geen ruimte voor grafieken"
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "Batterijstatus:"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "Algemene eigenschappen"
-
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
 msgstr "Applethoogte"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
 msgstr "Appletbreedte"
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Update interval
+#: applets/battery/properties.c:102
+#, fuzzy
+msgid "Update Interval (seconds):"
+msgstr "Verversingstijd in seconden:"
+
+#. Low battery value
+#: applets/battery/properties.c:116
+#, fuzzy
+msgid "Low Charge Threshold:"
+msgstr "Drempelwaarde"
+
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
 msgstr "Appletmodus"
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr "Grafiek"
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr ""
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr "'AC-On' Batterijkleur"
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr "'AC-Off' Batterijkleur"
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
-msgstr "Grafiekinterval"
+#: applets/battery/properties.c:202
+#, fuzzy
+msgid "Low Battery Color:"
+msgstr "'AC-On' Batterijkleur"
+
+#: applets/battery/properties.c:262
+#, fuzzy
+msgid "Graph Battery Low Color:"
+msgstr "'AC-On' Batterijkleur"
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:268
+#, fuzzy
+msgid "Graph Tick Color:"
+msgstr "Grafiekrichting"
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr "Grafiekrichting"
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr "Van links naar rechts"
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr "Van rechts naar links"
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
@@ -120,20 +313,20 @@ msgstr ""
 "'/proc/apm' kan niet geopend worden. Zorg voor APM-ondersteuning in de "
 "kernel.\n"
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "'/proc/apm' kan niet geopend worden.  Geen informatie beschikbaar."
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr "ioctl mislukt op '/dev/apm'"
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr "APM uitgeschakeld! Geen informatie beschikbaar"
 
@@ -161,17 +354,6 @@ msgid ""
 "keyboard. Released under GNU General Public Licence."
 msgstr "Gnome Panel applet voor het kiezen van vreemde lettertekens."
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr "Info..."
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -219,10 +401,6 @@ msgstr "Geen (default)"
 msgid "Clock"
 msgstr "Klok"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr "Tijdweergave in 12 uur formaat (AM/PM)"
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr "Tijdweergave ten opzichte van GMT (Greenwich Mean Time):"
@@ -247,96 +425,6 @@ msgstr "Wanneer nieuwe mail binnenkomt, voer dan uit: "
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr "Hoeveelheid mail voor een 'volle' mailbox (Kbytes):"
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr "Algemeen"
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr "Themabestand (directory):"
@@ -354,7 +442,7 @@ msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr ""
 "Een PPP-verbindings applet, waarom heeft niemand hier eerder aan gedacht!?"
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr "Uit"
 
@@ -374,6 +462,11 @@ msgstr "Tekstkleur"
 msgid "Backgroundcolor"
 msgstr "Achtergrondkleur"
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr "Applethoogte"
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -387,11 +480,11 @@ msgstr "Verversingsfrequentie"
 msgid "Diskusage Settings"
 msgstr "Instellingen"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
@@ -399,25 +492,25 @@ msgstr ""
 "UItgebracht volgens de GPL.\n"
 "Mount en unmount schijven.."
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr "gemount"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr "niet gemount"
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr "\" doorgegeven:\n"
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr "Mountopdracht mislukt\""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "Eject"
 
@@ -526,9 +619,9 @@ msgstr "De naam van uw GNOME vis:"
 msgid "The Animation Filename:"
 msgstr "Naam van het animatiebestand:"
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr "Zoeken..."
 
@@ -582,7 +675,7 @@ msgstr "Bureaublad %d"
 msgid "About\t"
 msgstr "Info\t"
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr "Eigenschappen"
 
@@ -771,7 +864,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr ""
 
@@ -806,86 +899,120 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr "Bureaubladschakelaar Applet"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr "Bureaubladschakelaar voor GNOME-Compliant Window Manager"
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 #, fuzzy
 msgid "Gnome Pager Settings"
 msgstr "GNOME Bureaubladschakelaar Instellingen"
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
-msgstr "Afbeelden"
-
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
-msgstr "Toon alle taken op alle bureaubladen"
-
-#: applets/gnome-pager/gnomepager_applet.c:216
+#: applets/gnome-pager/gnomepager_applet.c:220
 #, fuzzy
-msgid "Show tasks"
-msgstr "Toon taken"
+msgid "Pager"
+msgstr "Afbeelding"
 
-#: applets/gnome-pager/gnomepager_applet.c:224
+#: applets/gnome-pager/gnomepager_applet.c:222
 #, fuzzy
 msgid "Show pager"
 msgstr "Toon bureaubladschakelaar"
 
-#: applets/gnome-pager/gnomepager_applet.c:232
+#: applets/gnome-pager/gnomepager_applet.c:229
 msgid "Use small pagers"
 msgstr "Gebruik kleine bureaubladschakelaars"
 
-#: applets/gnome-pager/gnomepager_applet.c:240
+#: applets/gnome-pager/gnomepager_applet.c:241
 #, fuzzy
-msgid "Show icons in tasks"
-msgstr "Toon pictogrammen bij taken"
+msgid "Rows of pagers"
+msgstr "Aantal regels voor bureaubladschakelaar"
 
-#: applets/gnome-pager/gnomepager_applet.c:248
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:261
 #, fuzzy
 msgid "Show task list button"
 msgstr "Toon taaklijstknoppen"
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
+msgstr "Toon taken"
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "Toon ... knoppen"
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Toon taken"
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+#, fuzzy
+msgid "Show normal tasks only"
+msgstr "Toon alle taken op alle bureaubladen"
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+#, fuzzy
+msgid "Show minimized tasks only"
+msgstr "Toon pictogrammen bij taken"
+
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr "Toon alle taken op alle bureaubladen"
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+#, fuzzy
+msgid "Show minimized tasks on all desktops"
+msgstr "Toon alle taken op alle bureaubladen"
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+#, fuzzy
+msgid "Geometry"
+msgstr "Venstergeometrie"
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr "Maximale breedte van horizontale taaklijst"
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 #, fuzzy
 msgid "Maximum width of vertical task list"
 msgstr "Maximale breedte van horizontale taaklijst"
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr "Aantal regels voor taaklijst"
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr "Aantal kolommen voor taaklijst"
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr "Aantal regels voor bureaubladschakelaar"
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr "Fout in Gnome Bureaubladschakelaar"
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -900,28 +1027,28 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr "Plakkerig"
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 #, fuzzy
 msgid "Show / Hide"
 msgstr "Toon / Verberg"
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr "Arceer / Arceer niet"
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "Afsluiten"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr "Beeindig"
 
@@ -1013,7 +1140,7 @@ msgid "History"
 msgstr ""
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "Help"
 
@@ -1086,7 +1213,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr "Kleuren"
 
@@ -1346,7 +1473,7 @@ msgstr "(Deze instellingen worden pas actief na een verversing)"
 msgid "Open new window"
 msgstr "Open nieuw venster"
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr "Aan het scrollen"
 
@@ -1370,6 +1497,10 @@ msgstr "Vertraging bij het 'wrappen' van tekst:"
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr "Scrollsnelheid tussen regels (gelijkmatig scrollen):"
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr "Afbeelden"
+
 #: applets/slashapp/slashapp.c:152
 #, fuzzy
 msgid "No articles"
@@ -1379,12 +1510,12 @@ msgstr "Geen berichten."
 msgid "Slashapp article list"
 msgstr "Slashapp berichtenlijst"
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr "cre�er gebruikersdirectory: %s\n"
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr "cre�ren van gebruikersdirectory '%s' mislukt\n"
@@ -1475,275 +1606,252 @@ msgstr "Toon 'Nieuw venster'-optie"
 msgid "Look"
 msgstr "Uiterlijk"
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-#, fuzzy
-msgid "Submenu: "
-msgstr "In een submenu"
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr "Cre�ren van bestand '%s' mislukt\n"
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr "verwijderen .order bestand '%s' mislukt\n"
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr "Bestand bestaat."
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr "Cre�ren van bestand mislukt."
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-#, fuzzy
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-"U kunt niets toevoegen aan die map,\n"
-"want u heeft niet de benodigde rechten."
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-#, fuzzy
-msgid "New Submenu"
-msgstr "In een submenu"
-
-#: gmenu/dialogs.c:150
-#, fuzzy
-msgid "Create Submenu:"
-msgstr "Cre�er Map:"
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr "U moet eerst iets selecteren."
+#: gmenu/desktop.c:80
+msgid " Folder"
+msgstr " Map"
 
-#: gmenu/dialogs.c:239
-#, fuzzy
-msgid "You can not delete a top level submenu."
-msgstr "U kunt geen map van het hoogste niveau wissen."
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-"U kunt dat bestand niet wissen,\n"
-"want u heeft niet de benodigde rechten"
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-#, fuzzy
-msgid "Delete this menu item?"
-msgstr "Verwijderen geselecteerd menu-item"
-
-#: gmenu/dialogs.c:262
-#, fuzzy
-msgid "Delete empty submenu?"
-msgstr "Verwijderen lege map?"
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-
-#: gmenu/dnd.c:175
-#, fuzzy
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-"U kunt dat bestand niet wissen,\n"
-"want u heeft niet de benodigde rechten"
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr "Bewaren"
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr "Herstel"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr "Nieuw"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+#, fuzzy
+msgid "User menus"
+msgstr "Gebruikersmenu's"
+
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+#, fuzzy
+msgid "System menus"
+msgstr "Systeemmenu's"
 
-#: gmenu/gmenu.c:52
+#: gmenu/main.c:51 gmenu/main.c:128
 #, fuzzy
 msgid "_New Submenu..."
 msgstr "Nieuwe Map..."
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 #, fuzzy
 msgid "Create a new submenu"
 msgstr "Maak een nieuwe map"
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 #, fuzzy
 msgid "New _Item..."
 msgstr "Nieuwe Map..."
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 #, fuzzy
 msgid "Create a new menu item"
 msgstr "Maak een nieuwe map"
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr "Verwijderen"
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 #, fuzzy
 msgid "_Sort Submenu"
 msgstr "Toon menubalk"
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 #, fuzzy
 msgid "Sort Submenu _Recursive"
 msgstr "Map _Recursief Sorteren"
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 #, fuzzy
 msgid "_File"
 msgstr "Bestand"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr "Sorteren"
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 #, fuzzy
 msgid "_Help"
 msgstr "_Help"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+#, fuzzy
+msgid "New Submenu"
+msgstr "In een submenu"
+
+#: gmenu/main.c:102
 #, fuzzy
 msgid "New Item"
 msgstr "Nieuwe terminal"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 #, fuzzy
 msgid "Create a new item"
 msgstr "Maak een nieuwe map"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr "Verwijderen geselecteerd menu-item"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr "Naar boven"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr "Geselecteerd menu naar boven"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr "Naar beneden"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr "Geselecteerd menu naar beneden"
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr "Eigenschappen geselecteerd menu-item"
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 #, fuzzy
 msgid "Sort Submenu"
 msgstr "Gewoon menu"
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 #, fuzzy
 msgid "Sort selected submenu"
 msgstr "Sorteer geselecteerde map"
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+#, fuzzy
+msgid "Sort _Recursive"
+msgstr "Map _Recursief Sorteren"
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr "GNOME Menu-editor"
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
 msgstr ""
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 #, fuzzy
 msgid "The menu item must have a name"
 msgstr "Dialoogknoppen hebben pictogrammen"
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr ""
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 #, fuzzy
 msgid "Save changes?"
 msgstr "Veranderingen bewaren?"
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr ""
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 #, fuzzy
 msgid "Overwrite existing menu entry?"
 msgstr "Overschrijven van bestaand bestand?"
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr "Even geduld, menu's worden ingelezen"
 
-#: gmenu/tree.c:418
-msgid "GNOME"
-msgstr ""
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "Gebruikersmenu's"
+
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr "Top van gebruikersmenu's"
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr "Systeemmenu's"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr "Top van systeemmenu's"
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "Gebruikersmenu's"
+#: gmenu/treedel.c:116
+#, fuzzy
+msgid "You can not delete a top level submenu."
+msgstr "U kunt geen map van het hoogste niveau wissen."
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
-msgstr "Top van gebruikersmenu's"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+#, fuzzy
+msgid "Delete this menu item?"
+msgstr "Verwijderen geselecteerd menu-item"
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treedel.c:138
+#, fuzzy
+msgid "Delete empty submenu?"
+msgstr "Verwijderen lege map?"
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+#, fuzzy
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+"U kunt niets toevoegen aan die map,\n"
+"want u heeft niet de benodigde rechten."
+
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr "Nieuwe Map"
+
+#: gmenu/treenew.c:63
+#, fuzzy
+msgid "Failed to create directory"
+msgstr "Cre�ren van bestand mislukt."
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr "gemount"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr "GNOME Terminal"
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr "De GNOME terminal-emulator"
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr "Standaard"
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
@@ -1753,311 +1861,352 @@ msgstr ""
 " het venster herconfigureren zodat het overeenkomt met\n"
 " de standaardconfiguratie van de nieuwe klasse?"
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr "Kleuren X-Term"
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr "Wit op zwart"
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr "Zwart op wit"
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr "Groen op zwart"
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr "Zwart op lichtgeel"
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr "Aangepaste kleuren"
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "Links"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "Rechts"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr "Verborgen"
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr "Lettertype:"
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 #, fuzzy
 msgid "Browse..."
 msgstr "Zoeken..."
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 #, fuzzy
 msgid "Terminal Class"
 msgstr "Terminalklasse"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr "Knipperende cursor"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr "Verberg menubalk"
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr "Uitzetten terminalbel"
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr "Verwissel DEL en Backspace"
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 #, fuzzy
 msgid "Image"
 msgstr "Afbeelding"
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 #, fuzzy
 msgid "Background type"
 msgstr " Achtergrond "
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 #, fuzzy
 msgid "None"
 msgstr "geen"
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 #, fuzzy
 msgid "Background pixmap"
 msgstr "Achtergrondplaatje"
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 #, fuzzy
 msgid "Pixmap file:"
 msgstr "Afbeeldingsbestand:"
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr "Transparant"
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr "Achtergrond gearceerd (langzaam)"
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr "Kleurenpalet:"
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr "Voorgrondkleur:"
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr "Achtergrondkleur:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr "Kleuren:"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "Schuifbalkpositie"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr "Aantal regels in schuifbuffer"
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr "Schuiven bij toetsaanslag"
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr "Schuiven bij uitvoer"
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr "Kleurselector"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 #, fuzzy
 msgid "_New terminal"
 msgstr "Nieuwe terminal"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 #, fuzzy
 msgid "Creates a new terminal window"
 msgstr "Maak een nieuwe map"
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr "Verberg menubalk"
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 #, fuzzy
 msgid "_Close terminal"
 msgstr "Terminal sluiten"
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "Terminal sluiten"
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr "Toon menubalk"
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 #, fuzzy
 msgid "C_olor selector..."
 msgstr "Kleurselector"
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr "Terminalklasse"
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+#, fuzzy
+msgid "TCLASS"
 msgstr "KLASSE"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr "Geeft lettertype aan"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr "LETTERTYPE"
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr "Start 'shell' niet als 'login shell'"
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr "Start 'shell' als 'login shell'"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr "Geeft de geometrie van het hoofdvenster"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr "GEOMETRIE"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr "In plaats van een shell, voer dit programma uit"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr "OPDRACHT"
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr "Voorgrondkleur"
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr "KLEUR"
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr "Achtergrondkleur"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 #, fuzzy
 msgid "Update utmp entry"
 msgstr "Ververs utmp/wtmp gegevens"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 #, fuzzy
 msgid "Do not update utmp entry"
 msgstr "Ververs utmp/wtml gegevens niet"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 #, fuzzy
 msgid "Update wtmp entry"
 msgstr "Ververs utmp/wtmp gegevens"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 #, fuzzy
 msgid "Do not update wtmp entry"
 msgstr "Ververs utmp/wtml gegevens niet"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr "Zet de venstertitel"
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr "TITEL"
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr ""
 
@@ -2069,24 +2218,53 @@ msgstr "Sessie beeindigen"
 msgid "save-session: couldn't connect to session manager\n"
 msgstr "'save-session': verbinding met sessiebeheer mislukt\n"
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr ""
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 #, fuzzy
 msgid "Cancel"
 msgstr "Panel"
 
+#: gsm/session-properties.c:258
+#, fuzzy
+msgid "Session"
+msgstr "Sessie beeindigen"
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+#, fuzzy
+msgid "Start Session"
+msgstr "Vergeet sessie"
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr "Panel"
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "Algemene pictogrameigenschappen"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr "Bladwijzer"
@@ -2465,15 +2643,15 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr "???"
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "Verwijderen van panel"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr "Verplaats applet"
 
@@ -2506,7 +2684,7 @@ msgstr "Toon verbergknop"
 msgid "Enable hidebutton arrow"
 msgstr "Toon pijl op verbergknop"
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "Subpanel"
 
@@ -2514,24 +2692,24 @@ msgstr "Subpanel"
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr "Toepassing"
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "Snelkoppelingseigenschappen"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 #, fuzzy
 msgid "Create launcher applet"
 msgstr "Maak snelkoppeling\n"
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "Uitloggen"
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 #, fuzzy
 msgid "Log out of GNOME"
 msgstr "Uitloggen"
@@ -2602,265 +2780,249 @@ msgstr "'goad_id'van bureaubladobject kan niet verkregen worden!"
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr ""
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 #, fuzzy
 msgid "Edge panel"
 msgstr "Randpanel"
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 #, fuzzy
 msgid "Corner panel"
 msgstr "Hoekpanel"
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-#, fuzzy
-msgid "System menus"
-msgstr "Systeemmenu's"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 #, fuzzy
 msgid "Debian menus"
 msgstr "Hoofdmenu"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 #, fuzzy
 msgid "No Debian menus found!"
 msgstr "Geen berichten gevonden"
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-#, fuzzy
-msgid "User menus"
-msgstr "Gebruikersmenu's"
-
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-#, fuzzy
-msgid "Red Hat menus"
-msgstr "RedHat menu's"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr "Verwijder dit panel"
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr "Applet toevoegen"
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr "Toevoegen nieuw panel"
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr "Omzetten naar hoekpanel"
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr "Omzetten naar randpanel"
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr "Toevoegen hoofdmenu"
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 #, fuzzy
 msgid "Add drawer"
 msgstr "Subpanel toevoegen"
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr "Toevoegen uitlogknop"
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr "Toevoegen ingeslikte applicatie"
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr "Toevoegen nieuwe snelkoppeling"
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr "Eigenschappen van dit panel..."
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "Algemene eigenschappen..."
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr "Panel"
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr "Vergrendelen beeldscherm"
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 #, fuzzy
 msgid "About GNOME..."
 msgstr "Over GNOME..."
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr "Directory kan niet geopend worden via het hoofdmenu!"
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr "In een submenu"
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 #, fuzzy
 msgid "On the main menu"
 msgstr "In het hoofdmenu"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr "Menu-eigenschappen"
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr "Menutype"
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 #, fuzzy
 msgid "Main menu"
 msgstr "Hoofdmenu"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 #, fuzzy
 msgid "Normal menu"
 msgstr "Gewoon menu"
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 #, fuzzy
 msgid "System menu: "
 msgstr "Systeemmenu: "
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 #, fuzzy
 msgid "User menu: "
 msgstr "Gebruikersmenu: "
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+#, fuzzy
+msgid "AnotherLevel menu (if found): "
 msgstr "RedHat menu (indien gevonden): "
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 #, fuzzy
 msgid "Debian menu (if found): "
 msgstr "RedHat menu (indien gevonden): "
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr "Menupad"
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "Positie"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "Bovenrand"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "Onderrand"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 #, fuzzy
 msgid "Minimize options"
 msgstr "Opties voor minimaliseren"
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 #, fuzzy
 msgid "Auto hide"
 msgstr "Automatisch verbergen"
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 #, fuzzy
 msgid "Enable hidebuttons"
 msgstr "Toon verbergknoppen"
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 #, fuzzy
 msgid "Enable hidebutton arrows"
 msgstr "Toon verbergknoppijlen"
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr "Noord-Oost"
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr "Zuid-West"
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr "Noord-West"
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr "Zuid-Oost"
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr "Ori�ntatie"
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "Horizontaal"
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "Verticaal"
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr "Verbergknopopties"
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr "Achtergrond"
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr "Standaard"
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr "Afbeelding"
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr "Kleur"
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr "Afbeeldingsbestand"
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr "Schaal afbeelding naar panelgrootte"
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "Panel eigenschappen"
 
@@ -3047,28 +3209,6 @@ msgstr "Animatie"
 msgid "General icon settings"
 msgstr "Algemene pictogrameigenschappen"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr "Weet u zeker dat u wilt uitloggen?"
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr "Stel vraag de volgende keer"
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr "Maak inslikapplet"
@@ -3086,6 +3226,76 @@ msgstr "Opdracht (optioneel)"
 msgid "Height"
 msgstr "Hoogte."
 
+#, fuzzy
+#~ msgid "Low Battery Warning"
+#~ msgstr "Laag en aan het opladen."
+
+#~ msgid "Afterstep Clock Applet"
+#~ msgstr "AfterStep Klok Applet"
+
+#~ msgid "General Properties"
+#~ msgstr "Algemene eigenschappen"
+
+#~ msgid "Graph Interval:"
+#~ msgstr "Grafiekinterval"
+
+#, fuzzy
+#~ msgid "Submenu: "
+#~ msgstr "In een submenu"
+
+#~ msgid "Unable to create file: %s\n"
+#~ msgstr "Cre�ren van bestand '%s' mislukt\n"
+
+#~ msgid "unable to remove .order file: %s\n"
+#~ msgstr "verwijderen .order bestand '%s' mislukt\n"
+
+#~ msgid "File exists."
+#~ msgstr "Bestand bestaat."
+
+#, fuzzy
+#~ msgid "Create Submenu:"
+#~ msgstr "Cre�er Map:"
+
+#~ msgid "You must select something first."
+#~ msgstr "U moet eerst iets selecteren."
+
+#~ msgid ""
+#~ "You can't delete that file.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "U kunt dat bestand niet wissen,\n"
+#~ "want u heeft niet de benodigde rechten"
+
+#, fuzzy
+#~ msgid ""
+#~ "You are not allowed to move that item there.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "U kunt dat bestand niet wissen,\n"
+#~ "want u heeft niet de benodigde rechten"
+
+#~ msgid "New"
+#~ msgstr "Nieuw"
+
+#~ msgid "Edit selected menu item properties"
+#~ msgstr "Eigenschappen geselecteerd menu-item"
+
+#, fuzzy
+#~ msgid "Red Hat menus"
+#~ msgstr "RedHat menu's"
+
+#~ msgid "Red Hat menu (if found): "
+#~ msgstr "RedHat menu (indien gevonden): "
+
+#~ msgid "Hidebutton options"
+#~ msgstr "Verbergknopopties"
+
+#~ msgid "Really log out?"
+#~ msgstr "Weet u zeker dat u wilt uitloggen?"
+
+#~ msgid "Ask next time"
+#~ msgstr "Stel vraag de volgende keer"
+
 #~ msgid "Enable gsm debugging"
 #~ msgstr "Zet gsm debugging aan"
 
@@ -3095,9 +3305,6 @@ msgstr "Hoogte."
 #~ msgid "Startup Programs"
 #~ msgstr "Opstartprogramma's"
 
-#~ msgid "Geometry of window"
-#~ msgstr "Venstergeometrie"
-
 #~ msgid "Can't open /proc/apm; can't get data."
 #~ msgstr "'/proc/apm' kan niet geopend worden. Geen informatie beschikbaar."
 
@@ -3116,9 +3323,6 @@ msgstr "Hoogte."
 #~ msgid "High."
 #~ msgstr "Hoog."
 
-#~ msgid "Low and charging."
-#~ msgstr "Laag en aan het opladen."
-
 #~ msgid "Low."
 #~ msgstr "Laag."
 
@@ -3277,16 +3481,10 @@ msgstr "Hoogte."
 #~ msgid "%s: option `-W %s' doesn't allow an argument\n"
 #~ msgstr "%s: optie `-W %s' staat geen argument toe\n"
 
-#~ msgid " Folder"
-#~ msgstr " Map"
-
 #, fuzzy
 #~ msgid "Config"
 #~ msgstr "Configuratie"
 
-#~ msgid "Discard session"
-#~ msgstr "Vergeet sessie"
-
 #~ msgid "ID"
 #~ msgstr "ID"
 
@@ -3441,9 +3639,6 @@ msgstr "Hoogte."
 #~ msgid "Slow"
 #~ msgstr "Traag"
 
-#~ msgid "Threshold"
-#~ msgstr "Drempelwaarde"
-
 #~ msgid "Large"
 #~ msgstr "Groot"
 
@@ -3551,9 +3746,6 @@ msgstr "Hoogte."
 #~ msgid "MDI notebook tab position"
 #~ msgstr "MDI notitieboek tabpositie"
 
-#~ msgid "New Folder"
-#~ msgstr "Nieuwe Map"
-
 #~ msgid "Failed to delete the folder."
 #~ msgstr "Verwijderen map mislukt."
 
diff --git a/po/no.po b/po/no.po
index 24fe5109..bd045674 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-core 1.0.3\n"
-"POT-Creation-Date: 1999-03-26 01:22+0100\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: 1999-03-26 01:26+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -13,12 +13,12 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: applets/asclock/asclock.c:582
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "Om"
 
-#: applets/asclock/asclock.c:589 applets/clockmail/clockmail.c:449
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
 #: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
@@ -155,17 +155,32 @@ msgstr "Generelt"
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: applets/battery/battery.c:478
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr "Batteriet har lite str�m."
+
+#: applets/battery/battery.c:156
+#, fuzzy
+msgid "The battery is fully charged."
+msgstr "Batteriet har lite str�m."
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr "Intern feil: ugyldig modus i battery_set_mode"
 
-#: applets/battery/battery.c:539 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "Kan ikke opprette applet!\n"
 
-#: applets/battery/battery.c:660 applets/charpick/charpick.c:338
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
 #: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
 #: applets/drivemount/drivemount.c:491
 #: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
@@ -177,30 +192,26 @@ msgstr "Kan ikke opprette applet!\n"
 msgid "About..."
 msgstr "Om..."
 
-#: applets/battery/battery.c:718
+#: applets/battery/battery.c:837
 msgid "The GNOME Battery Monitor Applet"
 msgstr "GNOME batterimonitor applet"
 
-#: applets/battery/battery.c:719
+#: applets/battery/battery.c:838
 msgid " (C) 1997-1998 The Free Software Foundation"
 msgstr " (C) 1997-1998 The Free Software Foundation"
 
-#: applets/battery/battery.c:721
+#: applets/battery/battery.c:840
 msgid ""
 "This applet monitors the charge of your laptop's battery.  Click on it to "
 "change display modes."
 msgstr ""
-"Denne appleten overv�ker str�mstyrken til batteriet p� din b�rbare. Klikk "
-"p� den for � endre visningsmodus."
+"Denne appleten overv�ker str�mstyrken til batteriet p� din b�rbare. Klikk p� "
+"den for � endre visningsmodus."
 
-#: applets/battery/battery.c:833
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr "Kunne ikke allokere plass for grafverdiene"
 
-#: applets/battery/battery.c:920
-msgid "The battery is low."
-msgstr "Batteriet har lite str�m."
-
 #: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "Innstillinger for batterimonitor"
@@ -272,8 +283,8 @@ msgid "Right to Left"
 msgstr "Fra h�yre mot venstre"
 
 #: applets/battery/properties.c:300
-msgid "Low Battery Warning"
-msgstr "Advarsel ved d�rlig batteri"
+msgid "Battery Charge Messages"
+msgstr ""
 
 #: applets/battery/properties.c:303
 msgid "Enable Low Battery Warning"
@@ -283,6 +294,10 @@ msgstr "Sl� p� advarsel ved d�rlig batteri"
 msgid "Warn if the battery charge dips below:"
 msgstr "Advar hvis str�mstyrken blir lavere enn:"
 
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
 #: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
@@ -3073,3 +3088,5 @@ msgstr "Kommando (valgfri)"
 msgid "Height"
 msgstr "H�yde"
 
+#~ msgid "Low Battery Warning"
+#~ msgstr "Advarsel ved d�rlig batteri"
diff --git a/po/pl.po b/po/pl.po
index a7616ed7..29ec0fa7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,112 +1,303 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: 1998-12-05 14:10+0100\n"
 "Last-Translator: Zbigniew Chyla <chyla@alice.ci.pwr.wroc.pl>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "Informacje"
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "W�a�ciwo�ci..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr "Zegar Afterstep - aplet"
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "Zegar"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr ""
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "Kafelka"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr "Wy�wietlaj czas w formacje 12-godzinnym"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr "Og�lne"
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr "B��d wewn�trzny: niew�a�ciwy tryb w battery_set_mode"
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "Nie mog� stworzy� apletu!\n"
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "Informacje..."
+
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
+msgstr "Aplet GNOME KB"
+
+#: applets/battery/battery.c:838
+#, fuzzy
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr "(c) 1998 the Free Software Foundation"
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr ""
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "Ustawienia monitora baterii"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "Og�lne w�a�ciwo�ci"
-
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
 msgstr "Wysoko�� apletu"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
 msgstr "Szeroko�� apletu"
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
-msgstr ""
+#. Update interval
+#: applets/battery/properties.c:102
+#, fuzzy
+msgid "Update Interval (seconds):"
+msgstr "Okres od�wie�ania w sekundach"
+
+#. Low battery value
+#: applets/battery/properties.c:116
+#, fuzzy
+msgid "Low Charge Threshold:"
+msgstr "Pr�g"
 
-#: applets/battery/properties.c:69
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
+msgstr "Szeroko�� apletu"
+
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr ""
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr ""
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr ""
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
+#: applets/battery/properties.c:202
+msgid "Low Battery Color:"
+msgstr ""
+
+#: applets/battery/properties.c:262
+msgid "Graph Battery Low Color:"
+msgstr ""
+
+#: applets/battery/properties.c:268
+msgid "Graph Tick Color:"
 msgstr ""
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr ""
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr ""
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr ""
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
@@ -114,20 +305,20 @@ msgstr ""
 "Nie mo�na otworzy� pliku /proc/apm!  Upewnij si�, �e w j�drze systemu "
 "wbudowano obs�ug� APM.\n"
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "Nie mo�na otworzy� /dev/apm; nie mo�na uzyska� danych."
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr ""
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr "APM jest wy��czon!  Nie mo�na odczyta� stanu baterii."
 
@@ -156,17 +347,6 @@ msgstr ""
 "Aplet Panela Gnome, pozwalaj�cy wybiera� nietypowe znaki, kt�rych nie ma na "
 "klawiaturze. Rozpowszechniany na licencji GNU GPL."
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr "Informacje..."
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -212,10 +392,6 @@ msgstr "Brak (domy�lny)"
 msgid "Clock"
 msgstr "Zegar"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr "Wy�wietlaj czas w formacje 12-godzinnym"
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr "Wy�wietlaj czas wzgl�dem GMT:"
@@ -240,96 +416,6 @@ msgstr "Kiedy nadejdzie poczta uruchom:"
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr "Ilo�� poczty, przy kt�rej skrzynka uznawana jest za pe�n� (KB):"
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr "Og�lne"
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr "Plik z motywem (katalog):"
@@ -346,7 +432,7 @@ msgstr ""
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr ""
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr ""
 
@@ -366,6 +452,11 @@ msgstr "Kolor tekstu"
 msgid "Backgroundcolor"
 msgstr "Kolor t�a"
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr "Wysoko�� apletu"
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -379,35 +470,35 @@ msgstr "Cz�stotliwo�� od�wie�ania"
 msgid "Diskusage Settings"
 msgstr "Ustawienia monitora przestrzeni dyskowej"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
 msgstr ""
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr " zamontowany"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr " nie zamontowany"
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr ""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "Wysu�"
 
@@ -512,9 +603,9 @@ msgstr "Imi� twojej rybki GNOME:"
 msgid "The Animation Filename:"
 msgstr "Nazwa pliku z animacj�:"
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr "Przegl�daj"
 
@@ -563,7 +654,7 @@ msgstr ""
 msgid "About\t"
 msgstr "Informacje\t"
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr "W�a�ciwo�ci"
 
@@ -746,7 +837,7 @@ msgid "Xmodmap"
 msgstr "Xmodmap"
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr "Menu"
 
@@ -778,86 +869,118 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr "gkb.xpm"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 #, fuzzy
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr "Copyright (C) The Free Software Foundation"
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 #, fuzzy
 msgid "Gnome Pager Settings"
 msgstr "Ustawienia wygaszacza ekranu"
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
-msgstr ""
-
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
-msgstr ""
-
-#: applets/gnome-pager/gnomepager_applet.c:216
+#: applets/gnome-pager/gnomepager_applet.c:220
 #, fuzzy
-msgid "Show tasks"
-msgstr "Wy�wietlaj dat�"
+msgid "Pager"
+msgstr "Plik z obrazem t�a"
 
-#: applets/gnome-pager/gnomepager_applet.c:224
+#: applets/gnome-pager/gnomepager_applet.c:222
 #, fuzzy
 msgid "Show pager"
 msgstr "Wy�wietlaj dat�"
 
-#: applets/gnome-pager/gnomepager_applet.c:232
+#: applets/gnome-pager/gnomepager_applet.c:229
 msgid "Use small pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
+#: applets/gnome-pager/gnomepager_applet.c:241
+#, fuzzy
+msgid "Rows of pagers"
+msgstr "Wy�wietlaj dat�"
+
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
+#: applets/gnome-pager/gnomepager_applet.c:261
 #, fuzzy
 msgid "Show task list button"
 msgstr "Poka� przyciski \"...\""
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
+msgstr "Wy�wietlaj dat�"
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "Poka� przyciski \"...\""
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Wy�wietlaj dat�"
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+#, fuzzy
+msgid "Show normal tasks only"
+msgstr "Wy�wietlaj dat�"
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+msgid "Show minimized tasks only"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+msgid "Show minimized tasks on all desktops"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+msgid "Geometry"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr ""
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 #, fuzzy
 msgid "Gnome Pager Error"
 msgstr "Przegl�darka pomocy GNOME"
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -869,28 +992,28 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 #, fuzzy
 msgid "Show / Hide"
 msgstr "Wy�wietlaj dat�"
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "Zamknij"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr ""
 
@@ -983,7 +1106,7 @@ msgid "History"
 msgstr "Historia"
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "Pomoc"
 
@@ -1055,7 +1178,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr "Kolory"
 
@@ -1302,7 +1425,7 @@ msgstr ""
 msgid "Open new window"
 msgstr "Otw�rz nowe okno"
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr "Przewijanie"
 
@@ -1326,6 +1449,10 @@ msgstr ""
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr "Szybko�� przewijania pomi�dzy liniami (p�ynne przewijanie):"
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr ""
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr ""
@@ -1334,12 +1461,12 @@ msgstr ""
 msgid "Slashapp article list"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr "tworzenie katalogu u�ytkownika: %s\n"
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr "nie mo�na utworzy� katalogu u�ytkownika: %s\n"
@@ -1428,202 +1555,133 @@ msgstr "Wy�wietl opcj� \"Otw�rz nowe okno\""
 msgid "Look"
 msgstr "Wygl�d"
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-#, fuzzy
-msgid "Submenu: "
-msgstr "Utw�rz folder:"
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr "Nie mo�na utworzy� pliku: %s\n"
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr "nie mo�na usun�� pliku .order: %s\n"
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr "Plik istnieje."
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr "Nie uda�o si� utworzy� pliku."
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-#, fuzzy
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Nie mo�na usun�� podanego ktalogu.\n"
-"Brak praw dost�pu."
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr ""
-
-#: gmenu/dialogs.c:150
-#, fuzzy
-msgid "Create Submenu:"
-msgstr "Utw�rz folder:"
+#: gmenu/desktop.c:80
+msgid " Folder"
+msgstr " Folder"
 
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr ""
-
-#: gmenu/dialogs.c:239
-#, fuzzy
-msgid "You can not delete a top level submenu."
-msgstr "Nie mo�na usun�c g��wnego katalogu."
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Nie mo�na usun�� podanego ktalogu.\n"
-"Brak praw dost�pu."
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-#, fuzzy
-msgid "Delete this menu item?"
-msgstr "Usu� wybrany element menu"
-
-#: gmenu/dialogs.c:262
-#, fuzzy
-msgid "Delete empty submenu?"
-msgstr "Usun�� pusty folder?"
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-
-#: gmenu/dnd.c:175
-#, fuzzy
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-"Nie mo�na usun�� podanego ktalogu.\n"
-"Brak praw dost�pu."
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr "Zapisz"
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr "Cofnij"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr "Nowy"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+#, fuzzy
+msgid "User menus"
+msgstr "Menu u�ytkownika"
+
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+#, fuzzy
+msgid "System menus"
+msgstr "Menu systemowe"
 
-#: gmenu/gmenu.c:52
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr ""
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 #, fuzzy
 msgid "Create a new submenu"
 msgstr "Stw�rz nowy folder"
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 #, fuzzy
 msgid "New _Item..."
 msgstr "Nowy _folder..."
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 #, fuzzy
 msgid "Create a new menu item"
 msgstr "Stw�rz nowy folder"
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr "_Usu�..."
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 #, fuzzy
 msgid "_Sort Submenu"
 msgstr "_Ukryj pasek menu"
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 #, fuzzy
 msgid "Sort Submenu _Recursive"
 msgstr "Sortuj folder _rekurencyjnie"
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr "_Plik"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr "_Sortuj"
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr ""
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr ""
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 #, fuzzy
 msgid "Create a new item"
 msgstr "Stw�rz nowy folder"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr "Usu�"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr "Usu� wybrany element menu"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr "Przesu� w g�r�"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr "Przesu� wybrane menu w g�r�"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr "Przesu� w d�"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr "Przesu� wybrane menu w d�"
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr "Edytuj w�a�ciwo�ci wybranego elementu menu"
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 #, fuzzy
 msgid "Sort Submenu"
 msgstr "Zwyk�e menu"
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 #, fuzzy
 msgid "Sort selected submenu"
 msgstr "Sortuj wybrany folder"
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+#, fuzzy
+msgid "Sort _Recursive"
+msgstr "Sortuj folder _rekurencyjnie"
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr "Edytor menu GNOME"
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
@@ -1631,373 +1689,460 @@ msgstr ""
 "Rozpowszechniany na warunkach licencji GNU GPL.\n"
 "Edytor menu GNOME."
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 #, fuzzy
 msgid "The menu item must have a name"
 msgstr "Ikony w pozycjach menu"
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr ""
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 #, fuzzy
 msgid "Save changes?"
 msgstr "Zapisa� zmiany?"
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr ""
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 #, fuzzy
 msgid "Overwrite existing menu entry?"
 msgstr "Nadpisa� istniej�cy plik?"
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr "Chwileczk�, analizuj� menu..."
 
-#: gmenu/tree.c:418
-msgid "GNOME"
-msgstr "GNOME"
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "Menu u�ytkownika"
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr ""
+
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr "Menu systemowe"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr ""
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "Menu u�ytkownika"
+#: gmenu/treedel.c:116
+#, fuzzy
+msgid "You can not delete a top level submenu."
+msgstr "Nie mo�na usun�c g��wnego katalogu."
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+#, fuzzy
+msgid "Delete this menu item?"
+msgstr "Usu� wybrany element menu"
+
+#: gmenu/treedel.c:138
+#, fuzzy
+msgid "Delete empty submenu?"
+msgstr "Usun�� pusty folder?"
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+#, fuzzy
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+"Nie mo�na usun�� podanego ktalogu.\n"
+"Brak praw dost�pu."
+
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr "Nowy folder"
+
+#: gmenu/treenew.c:63
+#, fuzzy
+msgid "Failed to create directory"
+msgstr "Nie uda�o si� utworzy� pliku."
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr " zamontowany"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr "Terminal GNOME"
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr "Program emulacji terminala GNOME"
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr "Domy�lne"
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
 "configuration of the new class?"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "Lewa"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "Prawa"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr ""
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr "Przegl�daj..."
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr "Klasa terminala"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr "Mrugaj�cy kursor"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr "Ukryj pasek menu"
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr ""
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr "Zamie� Del/Backspace"
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 #, fuzzy
 msgid "Image"
 msgstr "Plik z obrazem t�a"
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 #, fuzzy
 msgid "Background type"
 msgstr " T�o "
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 #, fuzzy
 msgid "None"
 msgstr "brak"
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr ""
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr ""
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr ""
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr "Kolor tekstu:"
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr "Kolor t�a:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr "Kolory:"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "Pozycja paska przewijania"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr ""
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr ""
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 #, fuzzy
 msgid "_New terminal"
 msgstr "Terminal GNOME"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 #, fuzzy
 msgid "Creates a new terminal window"
 msgstr "Stw�rz nowy folder"
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 #, fuzzy
 msgid "_Close terminal"
 msgstr "Terminal"
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "Terminal"
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr "_Ukryj pasek menu"
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr "Nazwa klasy terminala"
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+#, fuzzy
+msgid "TCLASS"
 msgstr "KLASA"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr "Nie uruchamiaj pow�ok jako pow�oki startowe"
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr "Uruchamiaj pow�oki jako pow�oki startowe"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr "Kolor tekstu"
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr "Kolor t�a"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 #, fuzzy
 msgid "Update utmp entry"
 msgstr "Cz�stotliwo�� od�wie�ania"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 #, fuzzy
 msgid "Update wtmp entry"
 msgstr "Ilo�� od�wie�e� na sekund�"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr ""
 
@@ -2009,24 +2154,51 @@ msgstr ""
 msgid "save-session: couldn't connect to session manager\n"
 msgstr ""
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr ""
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 #, fuzzy
 msgid "Cancel"
 msgstr " Anuluj "
 
+#: gsm/session-properties.c:258
+msgid "Session"
+msgstr ""
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr " Anuluj "
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "Og�lne w�a�ciwo�ci"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr "Zak�adka"
@@ -2380,15 +2552,15 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr ""
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "Usu� z panela"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr "Przesu� aplet"
 
@@ -2420,7 +2592,7 @@ msgstr "Wy��cz przycisk ukrywania"
 msgid "Enable hidebutton arrow"
 msgstr "Wy��cz strza�k� na przycisku ukrywania"
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "Szuflada"
 
@@ -2428,23 +2600,23 @@ msgstr "Szuflada"
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr ""
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "W�a�ciwo�ci apletu uruchomieniowego"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr "Stw�rz aplet uruchomieniowy"
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "Koniec pracy"
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 #, fuzzy
 msgid "Log out of GNOME"
 msgstr "Koniec pracy"
@@ -2511,270 +2683,252 @@ msgstr ""
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr "Aplety"
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 #, fuzzy
 msgid "Edge panel"
 msgstr "Panel kraw�dziowy"
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 #, fuzzy
 msgid "Corner panel"
 msgstr "Panel naro�ny"
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-#, fuzzy
-msgid "System menus"
-msgstr "Menu systemowe"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 #, fuzzy
 msgid "Debian menus"
 msgstr "Menu g��wne"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 msgid "No Debian menus found!"
 msgstr ""
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-#, fuzzy
-msgid "User menus"
-msgstr "Menu u�ytkownika"
-
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-#, fuzzy
-msgid "Red Hat menus"
-msgstr "Dodaj menu g��wne"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr "Usu� ten panel"
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr "Dodaj aplet"
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr "Dodaj nowy panel"
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 #, fuzzy
 msgid "Convert to corner panel"
 msgstr "Panel naro�ny"
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 #, fuzzy
 msgid "Convert to edge panel"
 msgstr "Panel naro�ny"
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr "Dodaj menu g��wne"
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 #, fuzzy
 msgid "Add drawer"
 msgstr "Szuflada"
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr "Dodaj przycisk \"Koniec pracy\""
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr "Dodaj zagnie�d�on� aplikacj�"
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr "Dodaj nowy aplet uruchomieniowy"
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr "W�a�ciwo�ci tego panela"
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "Globalne w�a�ciwo�ci..."
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr "Panel"
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr "Zabezpiecz ekran"
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr "Informacje o GNOME"
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr ""
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr ""
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 #, fuzzy
 msgid "On the main menu"
 msgstr "Dodaj menu g��wne"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr "W�a�ciwo�ci menu"
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 #, fuzzy
 msgid "Menu type"
 msgstr "Typ menu"
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 #, fuzzy
 msgid "Main menu"
 msgstr "Menu g��wne"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 #, fuzzy
 msgid "Normal menu"
 msgstr "Zwyk�e menu"
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 #, fuzzy
 msgid "System menu: "
 msgstr "Menu systemowe"
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 #, fuzzy
 msgid "User menu: "
 msgstr "Menu u�ytkownika"
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+msgid "AnotherLevel menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr "�cie�ka menu"
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "Pozycja"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "G�ra"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "D�"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 #, fuzzy
 msgid "Minimize options"
 msgstr "Opcje ukrywania"
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 #, fuzzy
 msgid "Auto hide"
 msgstr "Automatyczne ukrywanie"
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 #, fuzzy
 msgid "Enable hidebuttons"
 msgstr "Wy��cz przyciski ukrywania"
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 #, fuzzy
 msgid "Enable hidebutton arrows"
 msgstr "Wy��cz strza�ki na przyciskach ukrywania"
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 #, fuzzy
 msgid "North east"
 msgstr "Prawy g�rny"
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 #, fuzzy
 msgid "South west"
 msgstr "Lewy dolny"
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 #, fuzzy
 msgid "North west"
 msgstr "Lewy g�rny"
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 #, fuzzy
 msgid "South east"
 msgstr "Lewy dolny"
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr "Orientacja"
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "Poziomo"
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "Pionowo"
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-#, fuzzy
-msgid "Hidebutton options"
-msgstr "Opcje przycisk�w ukrywania"
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr "T�o"
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr "Standardowe"
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr "Pixmapa"
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr "Kolor"
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr "Plik z obrazem t�a"
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr "Skaluj obraz do rozmiar�w panela"
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "W�a�ciwo�ci panela"
 
@@ -2953,28 +3107,6 @@ msgstr "Animacja"
 msgid "General icon settings"
 msgstr "Og�lne w�a�ciwo�ci"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr "Rzeczywi�cie zamkn�� sesj�?"
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr "Zapytaj nast�pnym razem"
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr "Utw�rz zagnie�d�on� aplikacj�"
@@ -2991,6 +3123,67 @@ msgstr "Polecenie (opcjonalne)"
 msgid "Height"
 msgstr "Wysoko��"
 
+#~ msgid "Afterstep Clock Applet"
+#~ msgstr "Zegar Afterstep - aplet"
+
+#~ msgid "General Properties"
+#~ msgstr "Og�lne w�a�ciwo�ci"
+
+#, fuzzy
+#~ msgid "Submenu: "
+#~ msgstr "Utw�rz folder:"
+
+#~ msgid "Unable to create file: %s\n"
+#~ msgstr "Nie mo�na utworzy� pliku: %s\n"
+
+#~ msgid "unable to remove .order file: %s\n"
+#~ msgstr "nie mo�na usun�� pliku .order: %s\n"
+
+#~ msgid "File exists."
+#~ msgstr "Plik istnieje."
+
+#, fuzzy
+#~ msgid "Create Submenu:"
+#~ msgstr "Utw�rz folder:"
+
+#~ msgid ""
+#~ "You can't delete that file.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "Nie mo�na usun�� podanego ktalogu.\n"
+#~ "Brak praw dost�pu."
+
+#, fuzzy
+#~ msgid ""
+#~ "You are not allowed to move that item there.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "Nie mo�na usun�� podanego ktalogu.\n"
+#~ "Brak praw dost�pu."
+
+#~ msgid "New"
+#~ msgstr "Nowy"
+
+#~ msgid "Edit selected menu item properties"
+#~ msgstr "Edytuj w�a�ciwo�ci wybranego elementu menu"
+
+#~ msgid "GNOME"
+#~ msgstr "GNOME"
+
+#, fuzzy
+#~ msgid "Red Hat menus"
+#~ msgstr "Dodaj menu g��wne"
+
+#, fuzzy
+#~ msgid "Hidebutton options"
+#~ msgstr "Opcje przycisk�w ukrywania"
+
+#~ msgid "Really log out?"
+#~ msgstr "Rzeczywi�cie zamkn�� sesj�?"
+
+#~ msgid "Ask next time"
+#~ msgstr "Zapytaj nast�pnym razem"
+
 #~ msgid "Gnome Session Properties"
 #~ msgstr "W�a�ciwo�ci sesji GNOME"
 
@@ -3116,9 +3309,6 @@ msgstr "Wysoko��"
 #~ msgid "%s: option `-W %s' doesn't allow an argument\n"
 #~ msgstr "%s: opcja '-W %s' nie pozwal na u�ycie argumentu\n"
 
-#~ msgid " Folder"
-#~ msgstr " Folder"
-
 #~ msgid "ID"
 #~ msgstr "ID"
 
@@ -3172,9 +3362,6 @@ msgstr "Wysoko��"
 #~ msgid "Centered"
 #~ msgstr "Wy�rodkowana"
 
-#~ msgid "Tiled"
-#~ msgstr "Kafelka"
-
 #, fuzzy
 #~ msgid "Specifies the background color"
 #~ msgstr "Kolor t�a"
@@ -3242,9 +3429,6 @@ msgstr "Wysoko��"
 #~ msgid "Slow"
 #~ msgstr "Wolno"
 
-#~ msgid "Threshold"
-#~ msgstr "Pr�g"
-
 #~ msgid "Large"
 #~ msgstr "Du�y"
 
@@ -3332,9 +3516,6 @@ msgstr "Wysoko��"
 #~ msgid "MDI"
 #~ msgstr "MDI"
 
-#~ msgid "New Folder"
-#~ msgstr "Nowy folder"
-
 #~ msgid "Failed to delete the file."
 #~ msgstr "Nie uda�o si� usun�� pliku."
 
diff --git a/po/ru.po b/po/ru.po
index 224051a6..413e3206 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: 1999-01-22 4:18 EST\n"
 "Last-Translator: Sergey Panov <sipan@mit.edu>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -13,106 +13,299 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "� ���������"
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "��������..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr "������ ����� Afterstep"
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "����"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr "��� ������, ��� NeXT �����?"
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "�������� ��������"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr "���������� ����� � 12-�� ������� ������� (��/��)"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr "�����"
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr "������� ����"
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr "���������� ������: ������������ ����� � battery_set_mode"
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "���������� ������� ������!\n"
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "� ���������..."
+
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
+msgstr "GNOME KB ������"
+
+#: applets/battery/battery.c:838
+#, fuzzy
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr "(�) 1998 ���� ���������� ������������ �����������"
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr "��� ����� ��� ������ �������"
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "�������� �������� �������"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "����� ��������"
-
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
 msgstr "������ �������"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
 msgstr "������ �������"
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Update interval
+#: applets/battery/properties.c:102
+#, fuzzy
+msgid "Update Interval (seconds):"
+msgstr "������ ���������� � ��������:"
+
+#. Low battery value
+#: applets/battery/properties.c:116
+msgid "Low Charge Threshold:"
+msgstr ""
+
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
 msgstr "����� �������"
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr "������"
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr "����������"
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr "���� ������� ��� ���������� AC �������:"
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr "���� ������� ��� ����������� AC �������:"
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
-msgstr "��� �������"
+#: applets/battery/properties.c:202
+#, fuzzy
+msgid "Low Battery Color:"
+msgstr "���� ������� ��� ���������� AC �������:"
+
+#: applets/battery/properties.c:262
+#, fuzzy
+msgid "Graph Battery Low Color:"
+msgstr "���� ������� ��� ���������� AC �������:"
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:268
+#, fuzzy
+msgid "Graph Tick Color:"
+msgstr "����������� �������"
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr "����������� �������"
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr "����� �������"
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr "������ ������"
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
@@ -120,20 +313,20 @@ msgstr ""
 "���������� ������� /proc/apm! ��������� ��� ��������� APM �������� � ���� "
 "����.\n"
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr "���������� dup() ���������� ����� APM: %s\n"
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "���������� ������� /proc/apm; ������ �������� ������."
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr "������� ioctl �� ��������� �� /dev/apm."
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr "APM ��������! ���������� ������� ���������� � �������."
 
@@ -161,17 +354,6 @@ msgstr ""
 "������ ��� ������ �������� ���� �� ����������� ����������.������� ��� GNU "
 "General Public Licence."
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr "� ���������..."
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -219,10 +401,6 @@ msgstr "��� (�� ���������)"
 msgid "Clock"
 msgstr "����"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr "���������� ����� � 12-�� ������� ������� (��/��)"
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr "���������� ����� ������������ GMT (��������)"
@@ -247,96 +425,6 @@ msgstr "����� �������� ����� �����:"
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr "����� �����, ��� ������� �������� ���� ��������� ������ (���������)"
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr "�����"
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr "���� ���� (�������):"
@@ -353,7 +441,7 @@ msgstr "������ ������� �� PPP"
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr "������ ��� ������������� � ������ ISP � ������������� PPP ����������."
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr "����"
 
@@ -373,6 +461,11 @@ msgstr "���� ������"
 msgid "Backgroundcolor"
 msgstr "���� ����"
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr "������ �������"
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -386,11 +479,11 @@ msgstr "������� ����������"
 msgid "Diskusage Settings"
 msgstr "�������� ������� ������������� ������"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr "������ ������������� �����"
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
@@ -398,19 +491,19 @@ msgstr ""
 "Released under the GNU general public license.\n"
 "������������ � ����������� �����.."
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr " �����������"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr " �� �����������"
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr "\" ���������:\n"
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
@@ -418,7 +511,7 @@ msgstr ""
 "�������� ������������� ����� �� ������.\n"
 "\""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "�������"
 
@@ -525,9 +618,9 @@ msgstr "��� ����� �����:"
 msgid "The Animation Filename:"
 msgstr "���� � ���������������:"
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr "�����"
 
@@ -580,7 +673,7 @@ msgstr "���� %d"
 msgid "About\t"
 msgstr "�\t"
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr "��������"
 
@@ -762,7 +855,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr "����"
 
@@ -792,81 +885,117 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr "������� �������"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr ""
 "(C) 1998,1999 Red Hat Software, ���� ���������� ������������ �����������"
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr "������� ��� ������������ � GNOME ���������� ����"
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 msgid "Gnome Pager Settings"
 msgstr "�������� �������� GNOME"
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
-msgstr "�����"
-
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
-msgstr "���������� ��� ������ �� ���� ������� ������"
-
-#: applets/gnome-pager/gnomepager_applet.c:216
-msgid "Show tasks"
-msgstr "���������� ������"
+#: applets/gnome-pager/gnomepager_applet.c:220
+#, fuzzy
+msgid "Pager"
+msgstr "�����������"
 
-#: applets/gnome-pager/gnomepager_applet.c:224
+#: applets/gnome-pager/gnomepager_applet.c:222
 msgid "Show pager"
 msgstr "���������� �������"
 
-#: applets/gnome-pager/gnomepager_applet.c:232
+#: applets/gnome-pager/gnomepager_applet.c:229
 msgid "Use small pagers"
 msgstr "��������� ��������"
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
-msgstr "���������� ����������� �����"
+#: applets/gnome-pager/gnomepager_applet.c:241
+#, fuzzy
+msgid "Rows of pagers"
+msgstr "����� ����� ���������"
 
-#: applets/gnome-pager/gnomepager_applet.c:248
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:261
 msgid "Show task list button"
 msgstr "���������� ������ ������ �����"
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
+msgstr "���������� ������"
+
+#: applets/gnome-pager/gnomepager_applet.c:275
+#, fuzzy
+msgid "Show button icons"
+msgstr "���������� ... ������"
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
+msgstr "���������� ������"
+
+#: applets/gnome-pager/gnomepager_applet.c:306
+#, fuzzy
+msgid "Show normal tasks only"
+msgstr "���������� ��� ������ �� ���� ������� ������"
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+#, fuzzy
+msgid "Show minimized tasks only"
+msgstr "���������� ����������� �����"
+
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
+msgstr "���������� ��� ������ �� ���� ������� ������"
+
+#: applets/gnome-pager/gnomepager_applet.c:327
+#, fuzzy
+msgid "Show minimized tasks on all desktops"
+msgstr "���������� ��� ������ �� ���� ������� ������"
+
+#: applets/gnome-pager/gnomepager_applet.c:334
+#, fuzzy
+msgid "Geometry"
+msgstr "��������� ����"
+
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr "������������ ������ ������ �����"
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr "������������ ������ ������ �����"
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr "����� ����� �����"
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr "����� ������� �����"
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr "����� ����� ���������"
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 msgid "Gnome Pager Error"
 msgstr "������ � GNOME ��������"
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -882,27 +1011,27 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr "�� ����"
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 msgid "Show / Hide"
 msgstr "���������� / ��������"
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr "�������� / ����������"
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "�������"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr "����������"
 
@@ -988,7 +1117,7 @@ msgid "History"
 msgstr "�������"
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "�������"
 
@@ -1058,7 +1187,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr "�����"
 
@@ -1305,7 +1434,7 @@ msgstr "(��������� �� �������� ������ �� ���������� ������)"
 msgid "Open new window"
 msgstr "������� ����� ����"
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr "���������"
 
@@ -1329,6 +1458,10 @@ msgstr "�������� ��� �������� ������:"
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr "�������� ��������� (������� ���������):"
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr "�����"
+
 #: applets/slashapp/slashapp.c:152
 msgid "No articles"
 msgstr "��� ������"
@@ -1337,12 +1470,12 @@ msgstr "��� ������"
 msgid "Slashapp article list"
 msgstr "������ ������ Slashapp"
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr "��������� ������� ������������:  %s\n"
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr "���������� ������� ������� ������������: %s\n"
@@ -1432,190 +1565,123 @@ msgstr "���������� ���� �������� ������ ����"
 msgid "Look"
 msgstr "������� ���"
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-msgid "Submenu: "
-msgstr "�������� ����:"
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr "���������� ������� ����: %s\n"
-
-#: gmenu/desktop.c:213
-#, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr "���������� ������� .order ����: %s\n"
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr "���� ����������."
-
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr "������ ������� ����."
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
+#: gmenu/desktop.c:80
+msgid " Folder"
 msgstr ""
-"�� �� ������� �������� ������� � ��� �������� ����.\n"
-"� ��� ��� ����������� ���������� �������."
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr "����� ����"
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr "������� ����� �������� ����"
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr "������� ����� ���-������ �������."
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr "������ ������� �������� ���� �������� ������."
 
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-"������ ������� ���� ����.\n"
-"� ��� ��� ����������� ���������� �������."
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr "������� ���� ������� ����?"
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
-msgstr "������� ������ �������� ����?"
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-"�� ������������� ������ ������� ��� �������� ���� �� ���� ��� �����������?"
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-"��� ��������� �� ���������� � ������������ ��������� ����.\n"
-"�������� ��������� ���� ������ ����������."
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-"���� ���� ���� ��������� ������.\n"
-"� ��� ��� ����������� ���������� �������."
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr "���������"
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr "������������"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr "�������"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+msgid "User menus"
+msgstr "���������������� ����"
 
-#: gmenu/gmenu.c:52
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+msgid "System menus"
+msgstr "��������� ����"
+
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr "����� ����..."
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr "������� ����� �������� ����"
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 msgid "New _Item..."
 msgstr "����� �������..."
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr "������� ����� ������� ����"
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 msgid "_Delete..."
 msgstr "�������..."
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr "����������"
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr "����������� ����������"
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 msgid "_File"
 msgstr "����"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr "����������"
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 msgid "_Help"
 msgstr "�������"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr "����� ����"
+
+#: gmenu/main.c:102
 msgid "New Item"
 msgstr "����� �������"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 msgid "Create a new item"
 msgstr "������� ����� ������� ����"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr "�������"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr "������� ���������� ������� ����"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr "�����"
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr "����������� ���������� ���� �����"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr "����"
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr "����������� ���������� ���� ����"
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr "�������� �������� ����������� �������� ����"
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort Submenu"
 msgstr "����������"
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr "���������� ����������� ��������� ����"
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+#, fuzzy
+msgid "Sort _Recursive"
+msgstr "����������� ����������"
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr "�������� GNOME ����"
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
@@ -1623,66 +1689,111 @@ msgstr ""
 "������� ��� GNU Public License.\n"
 "�������� GNOME ����"
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 msgid "The menu item must have a name"
 msgstr "������� ���� ������ ����� ���"
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr "������� ���� ������ ����� ��� �����"
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 msgid "Save changes?"
 msgstr "��������� ���������?"
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr "��� ��������� �� ���������� � ������������ ��������� ����"
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr "������������ ������������ ������� ����?"
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+"��� ��������� �� ���������� � ������������ ��������� ����.\n"
+"�������� ��������� ���� ������ ����������."
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr "����������� ����..."
 
-#: gmenu/tree.c:418
-msgid "GNOME"
-msgstr ""
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "���������������� ����"
+
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr "������ ����������������� ����"
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr "��������� ����"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr "������ ���������� ����"
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "���������������� ����"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
+msgstr "������ ������� �������� ���� �������� ������."
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
-msgstr "������ ����������������� ����"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr "������� ���� ������� ����?"
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr "������� ������ �������� ����?"
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+"�� ������������� ������ ������� ��� �������� ���� �� ���� ��� �����������?"
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
+msgstr ""
+"�� �� ������� �������� ������� � ��� �������� ����.\n"
+"� ��� ��� ����������� ���������� �������."
+
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+msgid "New Folder"
+msgstr ""
+
+#: gmenu/treenew.c:63
+#, fuzzy
+msgid "Failed to create directory"
+msgstr "������ ������� ����."
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr " �����������"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr "GNOME ��������"
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr "��������� �������� ��������� GNOME"
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 msgid "Default"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
@@ -1692,298 +1803,339 @@ msgstr ""
 "������������ ����� ���� � ������������ � �������������\n"
 "������ ������?"
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr "Linux �������"
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr "������� Xterm"
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr "����� �� ������"
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr "������ �� �����"
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr "������� �� ������"
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr "������ �� ������-������"
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr "������������� �����"
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "�����"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "������"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr "��������"
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr "�����"
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 msgid "Browse..."
 msgstr "�����..."
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Terminal Class"
 msgstr "����� ���������"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr "�������� ������"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 msgid "Hide menu bar"
 msgstr "������ ����"
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr "��������� ������ ���������"
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr "����������� DEL/Backspace"
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr "������ ��� ������ ����"
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 msgid "Image"
 msgstr "�����������"
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 #, fuzzy
 msgid "Background type"
 msgstr "���"
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 msgid "None"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 msgid "Background pixmap"
 msgstr "������� �����������"
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 msgid "Pixmap file:"
 msgstr "���� �����������"
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr "����������"
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr "��� ������ ���� ������� (��������)"
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr "�������:"
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr "���� ������:"
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr "���� ����:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr "�����"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "��������� ������ ���������"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr "������� ��������� (�����)"
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr "��������� ��� �����"
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr "��������� ��� ������"
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr "����� �����"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "_New terminal"
 msgstr "����� ��������"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr "��������� �ݣ ���� ��������"
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 msgid "_Hide menubar"
 msgstr "�������� ����"
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 msgid "_Close terminal"
 msgstr "������� ��������"
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "������� ��������"
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr "������������ ����"
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 msgid "C_olor selector..."
 msgstr "����� �����..."
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr "��� ������ ���������"
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+msgid "TCLASS"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr "������ ��� ������"
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr "�� ��������� shell ��� login shell"
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr "��������� shell ��� login shell"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr "������ ��������� �������� ����"
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr "��������� ��������� ������ shell"
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr "���� ������"
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr "���� ����"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "Update utmp entry"
 msgstr "�������� �������� utmp"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr "�� ��������� �������� utmp"
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "Update wtmp entry"
 msgstr "�������� �������� wtmp"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr "�� ��������� �������� wtmp"
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr "���������� ��������� ����"
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr "������, � �������������, �������� ����������� �������� (0=��������)"
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+#, fuzzy
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr "������, � �������������, �������� ����������� �������� (0=��������)"
+
+#: gsm/main.c:61
 #, fuzzy
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr "������, � �������������, �������� ����������� �������� (0=��������)"
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr "���������� ���������� ������ ������."
 
@@ -1995,24 +2147,52 @@ msgstr "���������� �����"
 msgid "save-session: couldn't connect to session manager\n"
 msgstr "save-session: ���������� �������������� � ���������� ������\n"
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr "���������:"
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 #, fuzzy
 msgid "Cancel"
 msgstr "������"
 
+#: gsm/session-properties.c:258
+#, fuzzy
+msgid "Session"
+msgstr "���������� �����"
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+msgid "Start Session"
+msgstr ""
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr "������"
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "����� ��������� ������"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr "��������"
@@ -2374,15 +2554,15 @@ msgstr ""
 msgid "Ok"
 msgstr "Ok"
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr ""
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "������� � ������"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr "����������� ������"
 
@@ -2412,7 +2592,7 @@ msgstr "��������� ������ ��������"
 msgid "Enable hidebutton arrow"
 msgstr "��������� ������� �� ������� ��������"
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "����"
 
@@ -2420,23 +2600,23 @@ msgstr "����"
 msgid "This launch icon does not specify a program to run"
 msgstr "� ���� ������ �� ���������� ��������� ��� �������"
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr "����."
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "�������� ������ �������"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr "������� ������ �������"
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "��������� ������"
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 msgid "Log out of GNOME"
 msgstr "��������� ������ � GNOME"
 
@@ -2503,249 +2683,236 @@ msgstr "���������� �������� goad_id ��� ������, ������������"
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr "�������"
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 msgid "Edge panel"
 msgstr "������� ������"
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 msgid "Corner panel"
 msgstr "������� ������"
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-msgid "System menus"
-msgstr "��������� ����"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 #, fuzzy
 msgid "Debian menus"
 msgstr "������� ����"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 #, fuzzy
 msgid "No Debian menus found!"
 msgstr "������ �� �������"
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-msgid "User menus"
-msgstr "���������������� ����"
-
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-msgid "Red Hat menus"
-msgstr "Red Hat ����"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr "������� ��� ������"
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr "�������� ������"
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr "�������� ����� ������"
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 msgid "Convert to corner panel"
 msgstr "���������� � ������� ������"
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 msgid "Convert to edge panel"
 msgstr "���������� � ������� ������"
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr "�������� ������� ����"
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 msgid "Add drawer"
 msgstr "�������� ����"
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr "�������� ������ ���������� ������"
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr "�������� ���������� ����������"
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr "�������� ����� ������ �������"
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr "��������� ���� ������..."
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "���������� ���������..."
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr "������"
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr "�������� �����"
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 msgid "About GNOME..."
 msgstr "� Gnome..."
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr "���������� ������� �������, ������������ ������� ����"
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr "� �������� ����"
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 msgid "On the main menu"
 msgstr "� ������� ����"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr "�������� ����"
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr "��� ����"
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 msgid "Main menu"
 msgstr "������� ����"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 msgid "Normal menu"
 msgstr "���������� ����"
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 msgid "System menu: "
 msgstr "��������� ����"
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 msgid "User menu: "
 msgstr "���������������� ����: "
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+#, fuzzy
+msgid "AnotherLevel menu (if found): "
 msgstr "Red Hat ���� (���� ����): "
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 #, fuzzy
 msgid "Debian menu (if found): "
 msgstr "Red Hat ���� (���� ����): "
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr "���� � ����"
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "������������"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "������"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "�����"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 msgid "Minimize options"
 msgstr "�������� �����������"
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 msgid "Auto hide"
 msgstr "�������������� ��������"
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 msgid "Enable hidebuttons"
 msgstr "������ ��������"
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 msgid "Enable hidebutton arrows"
 msgstr "������� �� ������� ��������"
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 msgid "North east"
 msgstr "������-������"
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 msgid "South west"
 msgstr "���-�����"
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 msgid "North west"
 msgstr "������-�����"
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 msgid "South east"
 msgstr "���-������"
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr "����������"
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "������������."
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "����������."
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr "��������� ������ ��������"
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr "���"
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr "�����������"
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr "�����������"
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr "����"
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr "���� �����������"
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr "��������� �������� �� �������� ������"
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "��������� ������"
 
@@ -2915,28 +3082,6 @@ msgstr "��������"
 msgid "General icon settings"
 msgstr "����� ��������� ������"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr "�� ������������� ������ ��������� ������?"
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr "���������� � ��������� ���"
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr "������� ���������� ������"
@@ -2953,6 +3098,68 @@ msgstr "������� (�������������)"
 msgid "Height"
 msgstr "������"
 
+#~ msgid "Afterstep Clock Applet"
+#~ msgstr "������ ����� Afterstep"
+
+#~ msgid "General Properties"
+#~ msgstr "����� ��������"
+
+#~ msgid "Graph Interval:"
+#~ msgstr "��� �������"
+
+#~ msgid "Submenu: "
+#~ msgstr "�������� ����:"
+
+#~ msgid "Unable to create file: %s\n"
+#~ msgstr "���������� ������� ����: %s\n"
+
+#~ msgid "unable to remove .order file: %s\n"
+#~ msgstr "���������� ������� .order ����: %s\n"
+
+#~ msgid "File exists."
+#~ msgstr "���� ����������."
+
+#~ msgid "Create Submenu:"
+#~ msgstr "������� ����� �������� ����"
+
+#~ msgid "You must select something first."
+#~ msgstr "������� ����� ���-������ �������."
+
+#~ msgid ""
+#~ "You can't delete that file.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "������ ������� ���� ����.\n"
+#~ "� ��� ��� ����������� ���������� �������."
+
+#~ msgid ""
+#~ "You are not allowed to move that item there.\n"
+#~ "You do not have the proper permissions."
+#~ msgstr ""
+#~ "���� ���� ���� ��������� ������.\n"
+#~ "� ��� ��� ����������� ���������� �������."
+
+#~ msgid "New"
+#~ msgstr "�������"
+
+#~ msgid "Edit selected menu item properties"
+#~ msgstr "�������� �������� ����������� �������� ����"
+
+#~ msgid "Red Hat menus"
+#~ msgstr "Red Hat ����"
+
+#~ msgid "Red Hat menu (if found): "
+#~ msgstr "Red Hat ���� (���� ����): "
+
+#~ msgid "Hidebutton options"
+#~ msgstr "��������� ������ ��������"
+
+#~ msgid "Really log out?"
+#~ msgstr "�� ������������� ������ ��������� ������?"
+
+#~ msgid "Ask next time"
+#~ msgstr "���������� � ��������� ���"
+
 #~ msgid "Enable gsm debugging"
 #~ msgstr "�������� ������� gsm"
 
@@ -2976,8 +3183,5 @@ msgstr "������"
 #~ msgid "Startup Programs"
 #~ msgstr "����������� ���������"
 
-#~ msgid "Geometry of window"
-#~ msgstr "��������� ����"
-
 #~ msgid "Refersh interval (ms):"
 #~ msgstr "�������� ����� ������������ (�����):"
diff --git a/po/sv.po b/po/sv.po
index ac9fa94e..f2f9ca2d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-core-0.20\n"
-"POT-Creation-Date: 1999-03-13 18:38-0500\n"
+"POT-Creation-Date: 1999-03-26 11:46-0500\n"
 "PO-Revision-Date: 1998-06-16 00:00+0100\n"
 "Last-Translator: Martin Wahlen <mva@sslug.dk>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -13,125 +13,319 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: applets/asclock/asclock.c:155
+#: applets/asclock/asclock.c:587
 #: applets/mini-commander/src/mini-commander_applet.c:259
 msgid "About"
 msgstr "Om"
 
-#: applets/asclock/asclock.c:162 applets/clockmail/clockmail.c:449
-#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:478
+#: applets/asclock/asclock.c:594 applets/clockmail/clockmail.c:449
+#: applets/diskusage/diskusage.c:711 applets/drivemount/drivemount.c:485
 #: applets/esd-manager/esdmanager_applet.c:82 applets/fish/fish.c:514
 #: applets/gen_util/clock.c:303 applets/gen_util/mailcheck.c:793
 #: applets/gen_util/printer.c:411 applets/gkb/gkb.c:506
-#: applets/gnome-pager/gnomepager_applet.c:1420
+#: applets/gnome-pager/gnomepager_applet.c:1491
 #: applets/mini-commander/src/mini-commander_applet.c:246
 #: applets/modemlights/modemlights.c:756 applets/multiload/cpuload.c:64
 #: applets/multiload/memload.c:60 applets/multiload/swapload.c:60
 #: applets/netload/netload.c:346 applets/slashapp/slashapp.c:630
-#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:371 panel/launcher.c:294
-#: panel/menu.c:3460
+#: applets/webcontrol/webcontrol.c:315 panel/drawer.c:375 panel/launcher.c:334
+#: panel/menu.c:3454
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
-#: applets/asclock/dialogs.c:22
-msgid "Afterstep Clock Applet"
-msgstr ""
+#: applets/asclock/dialogs.c:17
+#, fuzzy
+msgid "ASClock"
+msgstr "Klocka"
 
-#: applets/asclock/dialogs.c:25
+#: applets/asclock/dialogs.c:21
 msgid "Who said NeXT is dead?"
 msgstr ""
 
-#: applets/asclock/dialogs.c:112
+#: applets/asclock/dialogs.c:134
+msgid ""
+"Since you are root, would you like to set the system's default timezone?"
+msgstr ""
+
+#: applets/asclock/dialogs.c:136
+#, fuzzy
+msgid "My Title"
+msgstr "Sidtitel"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:284 applets/clockmail/properties.c:295
+msgid "Display time in 12 hour format (AM/PM)"
+msgstr "Visa tid i 12 timmars format (AM/PM)"
+
+#. show ampm toggle button
+#: applets/asclock/dialogs.c:292
+msgid "Blinking elements in clock"
+msgstr ""
+
+#. -- not implemented yet --
+#.
+#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
+#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
+#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+#. gtk_widget_show(frame);
+#.
+#. vbox1 = gtk_vbox_new(FALSE, 1);
+#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
+#. gtk_widget_show(vbox1);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Article index file:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image Server Url:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#. hbox = gtk_hbox_new(FALSE, 0);
+#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
+#. gtk_widget_show(hbox);
+#.
+#. label = gtk_label_new(_("Image path:"));
+#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
+#. gtk_widget_show(label);
+#.
+#. entry = gtk_entry_new_with_max_length(255);
+#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
+#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
+#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
+#. GTK_OBJECT(ad->propwindow));
+#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+#. gtk_widget_set_sensitive(entry, FALSE);
+#. gtk_widget_show(entry);
+#.
+#.
+#. ---
+#: applets/asclock/dialogs.c:331 applets/battery/properties.c:76
+#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
+#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
+#: applets/mini-commander/src/preferences.c:659
+#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
+#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:933
+#: panel/panel_config_global.c:310
+msgid "General"
+msgstr "Generellt"
+
+#: applets/asclock/dialogs.c:336
 msgid "Timezone"
 msgstr ""
 
-#: applets/battery/battery.c:358
+#: applets/battery/battery.c:122
+msgid ""
+"Error querying battery charge.  Make sure that your kernel was built with "
+"APM support."
+msgstr ""
+
+#: applets/battery/battery.c:141
+msgid "The battery is low."
+msgstr ""
+
+#: applets/battery/battery.c:156
+msgid "The battery is fully charged."
+msgstr ""
+
+#: applets/battery/battery.c:558
 msgid "Internal error: invalid mode in battery_set_mode"
 msgstr "Int�rt fel: felaktigt l�ge i battery_set_mode"
 
-#: applets/battery/battery.c:403 applets/gen_util/clock.c:273
+#: applets/battery/battery.c:641 applets/gen_util/clock.c:273
 #: applets/gen_util/mailcheck.c:745 applets/gen_util/printer.c:386
 #: applets/netload/netload.c:321
 msgid "Can't create applet!\n"
 msgstr "Kan inte skapa applet!\n"
 
-#: applets/battery/battery.c:623
+#: applets/battery/battery.c:770 applets/charpick/charpick.c:338
+#: applets/clockmail/clockmail.c:456 applets/dialer/dialer.c:162
+#: applets/drivemount/drivemount.c:491
+#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
+#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1485
+#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
+#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
+#: panel/menu.c:2465
+msgid "About..."
+msgstr "Om..."
+
+#: applets/battery/battery.c:837
+#, fuzzy
+msgid "The GNOME Battery Monitor Applet"
+msgstr "GNOME-fiskapplet"
+
+#: applets/battery/battery.c:838
+#, fuzzy
+msgid " (C) 1997-1998 The Free Software Foundation"
+msgstr "(c) 1998 the Free Software Foundation"
+
+#: applets/battery/battery.c:840
+msgid ""
+"This applet monitors the charge of your laptop's battery.  Click on it to "
+"change display modes."
+msgstr ""
+
+#: applets/battery/battery.c:975
 msgid "Could not allocate space for graph values"
 msgstr "Kan inte allokera utrymme f�r grafv�rden"
 
-#: applets/battery/properties.c:37
+#: applets/battery/properties.c:67
 msgid "Battery Monitor Settings"
 msgstr "Batteri�vervakningsinst�llningar:"
 
-#: applets/battery/properties.c:46
-msgid "General Properties"
-msgstr "�vergripande egenskaper"
-
-#: applets/battery/properties.c:48 applets/diskusage/properties.c:232
-#: applets/fvwm-pager/properties.c:178 applets/netload/properties.c:141
-msgid "Applet Height"
+#. Applet height
+#: applets/battery/properties.c:79
+#, fuzzy
+msgid "Applet Height:"
 msgstr "Applet-h�jd"
 
-#: applets/battery/properties.c:58
-msgid "Applet Width"
+#. Applet width
+#: applets/battery/properties.c:90
+#, fuzzy
+msgid "Applet Width:"
 msgstr "Applet-h�jd"
 
-#: applets/battery/properties.c:68
-msgid "Applet Mode"
+#. Update interval
+#: applets/battery/properties.c:102
+#, fuzzy
+msgid "Update Interval (seconds):"
+msgstr "Uppdatera var (sekunder):"
+
+#. Low battery value
+#: applets/battery/properties.c:116
+#, fuzzy
+msgid "Low Charge Threshold:"
+msgstr "Tr�skel"
+
+#. Applet mode label
+#: applets/battery/properties.c:130
+#, fuzzy
+msgid "Applet Mode:"
 msgstr "Applet-l�ge"
 
-#: applets/battery/properties.c:69
+#: applets/battery/properties.c:131 applets/battery/properties.c:215
 msgid "Graph"
 msgstr "Graf"
 
-#: applets/battery/properties.c:71
+#: applets/battery/properties.c:133 applets/battery/properties.c:159
 msgid "Readout"
 msgstr "Utdata"
 
-#: applets/battery/properties.c:115 applets/battery/properties.c:180
+#: applets/battery/properties.c:190 applets/battery/properties.c:250
 msgid "AC-On Battery Color:"
 msgstr "AC-P� batterif�rg:"
 
-#: applets/battery/properties.c:121 applets/battery/properties.c:186
+#: applets/battery/properties.c:196 applets/battery/properties.c:256
 msgid "AC-Off Battery Color:"
 msgstr "AC-Av batterif�rg:"
 
-#: applets/battery/properties.c:127
-msgid "Graph Interval:"
-msgstr "Grafintervall:"
+#: applets/battery/properties.c:202
+#, fuzzy
+msgid "Low Battery Color:"
+msgstr "AC-P� batterif�rg:"
+
+#: applets/battery/properties.c:262
+#, fuzzy
+msgid "Graph Battery Low Color:"
+msgstr "AC-P� batterif�rg:"
 
-#: applets/battery/properties.c:141
+#: applets/battery/properties.c:268
+#, fuzzy
+msgid "Graph Tick Color:"
+msgstr "Grafriktning:"
+
+#: applets/battery/properties.c:275
 msgid "Graph Direction:"
 msgstr "Grafriktning:"
 
-#: applets/battery/properties.c:144
+#: applets/battery/properties.c:278
 msgid "Left to Right"
 msgstr "V�nster till h�ger"
 
-#: applets/battery/properties.c:146
+#: applets/battery/properties.c:280
 msgid "Right to Left"
 msgstr "H�ger till v�nster"
 
-#: applets/battery/read-battery.c:28
+#: applets/battery/properties.c:300
+msgid "Battery Charge Messages"
+msgstr ""
+
+#: applets/battery/properties.c:303
+msgid "Enable Low Battery Warning"
+msgstr ""
+
+#: applets/battery/properties.c:308
+msgid "Warn if the battery charge dips below:"
+msgstr ""
+
+#: applets/battery/properties.c:322
+msgid "Enable Full-Charge Notification"
+msgstr ""
+
+#: applets/battery/read-battery.c:58
 msgid ""
 "Cannot open /proc/apm!  Make sure that you built APM support into your "
 "kernel.\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:61
+#: applets/battery/read-battery.c:91
 #, c-format
 msgid "Could not dup() APM file descriptor: %s\n"
 msgstr ""
 
-#: applets/battery/read-battery.c:130
+#: applets/battery/read-battery.c:162
 msgid "Cannot open /dev/apm; can't get data."
 msgstr "Kan inte �ppna /proc/apm; f�r inte data."
 
-#: applets/battery/read-battery.c:135
+#: applets/battery/read-battery.c:167
 msgid "ioctl failed on /dev/apm."
 msgstr "ioctl misslyckades p� /dev/apm."
 
-#: applets/battery/read-battery.c:146
+#: applets/battery/read-battery.c:178
 msgid "APM is disabled!  Cannot read battery charge information."
 msgstr "APM �r avst�ngt!  Kan inte l�sa batteriladdnings information."
 
@@ -158,17 +352,6 @@ msgid ""
 "keyboard. Released under GNU General Public Licence."
 msgstr ""
 
-#: applets/charpick/charpick.c:338 applets/clockmail/clockmail.c:456
-#: applets/dialer/dialer.c:162 applets/drivemount/drivemount.c:484
-#: applets/esd-manager/esdmanager_applet.c:75 applets/fifteen/fifteen.c:309
-#: applets/fish/fish.c:506 applets/gen_util/mailcheck.c:800
-#: applets/gkb/gkb.c:498 applets/gnome-pager/gnomepager_applet.c:1414
-#: applets/modemlights/modemlights.c:762 applets/netload/netload.c:339
-#: applets/slashapp/slashapp.c:636 applets/webcontrol/webcontrol.c:307
-#: panel/menu.c:2456
-msgid "About..."
-msgstr "Om..."
-
 #: applets/clockmail/clockmail.c:47 applets/slashapp/slashapp.c:563
 #, c-format
 msgid "%d.%d.%d"
@@ -214,10 +397,6 @@ msgstr ""
 msgid "Clock"
 msgstr "Klocka"
 
-#: applets/clockmail/properties.c:295
-msgid "Display time in 12 hour format (AM/PM)"
-msgstr "Visa tid i 12 timmars format (AM/PM)"
-
 #: applets/clockmail/properties.c:305
 msgid "Display time relative to GMT (Greenwich Mean Time):"
 msgstr ""
@@ -242,96 +421,6 @@ msgstr "K�r n�r ny post levereras:"
 msgid "Amount of mail to consider mailbox full (Kbytes):"
 msgstr ""
 
-#. -- not implemented yet --
-#.
-#. frame = gtk_frame_new(_("Ticker Information (unimplemented)"));
-#. gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
-#. gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-#. gtk_widget_show(frame);
-#.
-#. vbox1 = gtk_vbox_new(FALSE, 1);
-#. gtk_container_add(GTK_CONTAINER(frame), vbox1);
-#. gtk_widget_show(vbox1);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Article index file:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/ultramode.txt");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image Server Url:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "wolfe.slashdot.org");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry ,TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
-#. gtk_widget_show(hbox);
-#.
-#. label = gtk_label_new(_("Image path:"));
-#. gtk_box_pack_start( GTK_BOX(hbox), label, FALSE, FALSE, 0);
-#. gtk_widget_show(label);
-#.
-#. entry = gtk_entry_new_with_max_length(255);
-#. gtk_entry_set_text(GTK_ENTRY(entry), "/images/topics/topic");
-#. gtk_signal_connect_object(GTK_OBJECT(entry), "changed",
-#. GTK_SIGNAL_FUNC(gnome_property_box_changed),
-#. GTK_OBJECT(ad->propwindow));
-#. gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-#. gtk_widget_set_sensitive(entry, FALSE);
-#. gtk_widget_show(entry);
-#.
-#.
-#. ---
-#: applets/clockmail/properties.c:388 applets/diskusage/properties.c:344
-#: applets/drivemount/properties.c:210 applets/fvwm-pager/properties.c:246
-#: applets/mini-commander/src/preferences.c:659
-#: applets/modemlights/properties.c:204 applets/netload/properties.c:280
-#: applets/slashapp/properties.c:347 gnome-terminal/gnome-terminal.c:919
-#: panel/panel_config_global.c:310
-msgid "General"
-msgstr "Generellt"
-
 #: applets/clockmail/properties.c:406
 msgid "Theme file (directory):"
 msgstr ""
@@ -348,7 +437,7 @@ msgstr "PPP uppkopplings applet"
 msgid "A funky PPP dialer, how come no-one has thought of it before!?"
 msgstr "En funky PPP upkopplare, varf�r har ingen t�nkt p� detta f�rut!?"
 
-#: applets/dialer/dialer.c:87 panel/menu.c:3279
+#: applets/dialer/dialer.c:87 panel/menu.c:3273
 msgid "Off"
 msgstr "Av"
 
@@ -368,6 +457,11 @@ msgstr "Textf�rg"
 msgid "Backgroundcolor"
 msgstr "Bakgrundsf�rg"
 
+#: applets/diskusage/properties.c:232 applets/fvwm-pager/properties.c:178
+#: applets/netload/properties.c:141
+msgid "Applet Height"
+msgstr "Applet-h�jd"
+
 #: applets/diskusage/properties.c:238 applets/fvwm-pager/properties.c:184
 #: applets/netload/properties.c:147 panel/swallow.c:246
 msgid "Width"
@@ -381,11 +475,11 @@ msgstr "Uppdateringsfrekvens"
 msgid "Diskusage Settings"
 msgstr "Diskanv�ndnings inst�llningar"
 
-#: applets/drivemount/drivemount.c:71
+#: applets/drivemount/drivemount.c:77
 msgid "Drive Mount Applet"
 msgstr "Enhetsmonterings-applet"
 
-#: applets/drivemount/drivemount.c:74
+#: applets/drivemount/drivemount.c:80
 msgid ""
 "Released under the GNU general public license.\n"
 "Mounts and Unmounts drives.."
@@ -393,25 +487,25 @@ msgstr ""
 "Publicerad under GNUs generella publika licens.\n"
 "Monterar och demonterar enheter.."
 
-#: applets/drivemount/drivemount.c:147
+#: applets/drivemount/drivemount.c:153
 msgid " mounted"
 msgstr " monterad"
 
-#: applets/drivemount/drivemount.c:152
+#: applets/drivemount/drivemount.c:158
 msgid " not mounted"
 msgstr " inte monterad"
 
-#: applets/drivemount/drivemount.c:224
+#: applets/drivemount/drivemount.c:230
 msgid "\" reported:\n"
 msgstr ""
 
-#: applets/drivemount/drivemount.c:226
+#: applets/drivemount/drivemount.c:232
 msgid ""
 "Drivemount command failed.\n"
 "\""
 msgstr ""
 
-#: applets/drivemount/drivemount.c:492
+#: applets/drivemount/drivemount.c:499
 msgid "Eject"
 msgstr "Mataut"
 
@@ -518,9 +612,9 @@ msgstr "Namnet p� din GNOME-fisk:"
 msgid "The Animation Filename:"
 msgstr "Animationshastighet f�r l�da"
 
-#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1072
-#: panel/menu.c:3401 panel/panel-util.c:78 panel/panel-util.c:116
-#: panel/panel-util.c:154 panel/panel_config.c:717 panel/swallow.c:237
+#: applets/fish/fish.c:243 gnome-terminal/gnome-terminal.c:1086
+#: panel/menu.c:3395 panel/panel-util.c:78 panel/panel-util.c:116
+#: panel/panel-util.c:154 panel/panel_config.c:740 panel/swallow.c:237
 msgid "Browse"
 msgstr "Bl�ddra"
 
@@ -573,7 +667,7 @@ msgstr ""
 msgid "About\t"
 msgstr "Om"
 
-#: applets/fvwm-pager/fvwm-pager.c:409 gmenu/gmenu.c:114
+#: applets/fvwm-pager/fvwm-pager.c:409
 msgid "Properties"
 msgstr ""
 
@@ -765,7 +859,7 @@ msgid "Xmodmap"
 msgstr ""
 
 #: applets/gkb/gkb.c:288 panel/menu.c:1723 panel/menu.c:1767 panel/menu.c:1769
-#: panel/menu.c:3061 panel/menu.c:3414
+#: panel/menu.c:3055 panel/menu.c:3408
 msgid "Menu"
 msgstr ""
 
@@ -796,86 +890,119 @@ msgstr ""
 msgid "gkb.xpm"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 msgid "Desktop Pager Applet"
 msgstr "Skrivbordsbl�ddrarapplet"
 
-#: applets/gnome-pager/gnomepager_applet.c:127
+#: applets/gnome-pager/gnomepager_applet.c:130
 #, fuzzy
 msgid "Copyright (C)1998,1999 Red Hat Software, Free Software Foundation"
 msgstr "Upphovsr�tt (C) 1998 the Free Software Foundation"
 
-#: applets/gnome-pager/gnomepager_applet.c:129
+#: applets/gnome-pager/gnomepager_applet.c:132
 msgid "Pager for a GNOME compliant Window Manager"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:203
+#: applets/gnome-pager/gnomepager_applet.c:213
 #, fuzzy
 msgid "Gnome Pager Settings"
 msgstr "Diskanv�ndnings inst�llningar"
 
-#: applets/gnome-pager/gnomepager_applet.c:207
-#: applets/slashapp/properties.c:422
-msgid "Display"
+#: applets/gnome-pager/gnomepager_applet.c:220
+#, fuzzy
+msgid "Pager"
+msgstr "Bildfil"
+
+#: applets/gnome-pager/gnomepager_applet.c:222
+#, fuzzy
+msgid "Show pager"
+msgstr "datum"
+
+#: applets/gnome-pager/gnomepager_applet.c:229
+msgid "Use small pagers"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:208
-msgid "Show all tasks on all desktops"
+#: applets/gnome-pager/gnomepager_applet.c:241
+#, fuzzy
+msgid "Rows of pagers"
+msgstr "datum"
+
+#: applets/gnome-pager/gnomepager_applet.c:259
+msgid "Tasklist"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:216
+#: applets/gnome-pager/gnomepager_applet.c:261
 #, fuzzy
-msgid "Show tasks"
+msgid "Show task list button"
+msgstr "Musknappar"
+
+#: applets/gnome-pager/gnomepager_applet.c:268
+#, fuzzy
+msgid "Show task list"
 msgstr "datum"
 
-#: applets/gnome-pager/gnomepager_applet.c:224
+#: applets/gnome-pager/gnomepager_applet.c:275
 #, fuzzy
-msgid "Show pager"
+msgid "Show button icons"
+msgstr "Musknappar"
+
+#: applets/gnome-pager/gnomepager_applet.c:288
+msgid "Which tasks to show"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:297
+#, fuzzy
+msgid "Show all tasks"
 msgstr "datum"
 
-#: applets/gnome-pager/gnomepager_applet.c:232
-msgid "Use small pagers"
+#: applets/gnome-pager/gnomepager_applet.c:306
+#, fuzzy
+msgid "Show normal tasks only"
+msgstr "datum"
+
+#: applets/gnome-pager/gnomepager_applet.c:313
+msgid "Show minimized tasks only"
+msgstr ""
+
+#: applets/gnome-pager/gnomepager_applet.c:320
+msgid "Show all tasks on all desktops"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:240
-msgid "Show icons in tasks"
+#: applets/gnome-pager/gnomepager_applet.c:327
+msgid "Show minimized tasks on all desktops"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:248
+#: applets/gnome-pager/gnomepager_applet.c:334
 #, fuzzy
-msgid "Show task list button"
-msgstr "Musknappar"
+msgid "Geometry"
+msgstr "F�nstretsgeometri"
 
-#: applets/gnome-pager/gnomepager_applet.c:257
+#: applets/gnome-pager/gnomepager_applet.c:343
 msgid "Tasklist always maximum size"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:270
+#: applets/gnome-pager/gnomepager_applet.c:354
 msgid "Maximum width of horizontal task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:286
+#: applets/gnome-pager/gnomepager_applet.c:368
 msgid "Maximum width of vertical task list"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:300
+#: applets/gnome-pager/gnomepager_applet.c:380
 msgid "Number of rows of horizontal tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:314
+#: applets/gnome-pager/gnomepager_applet.c:392
 msgid "Number of vertical columns of tasks"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:328
-msgid "Number rows of pagers"
-msgstr ""
-
-#: applets/gnome-pager/gnomepager_applet.c:1338
+#: applets/gnome-pager/gnomepager_applet.c:1409
 #, fuzzy
 msgid "Gnome Pager Error"
 msgstr "GNOMEs Hj�lpl�sare"
 
-#: applets/gnome-pager/gnomepager_applet.c:1339
+#: applets/gnome-pager/gnomepager_applet.c:1410
 msgid ""
 "You are not running a GNOME Compliant Window Manager.\n"
 "Please run a GNOME Compliant Window Manager.\n"
@@ -887,28 +1014,28 @@ msgstr ""
 #. XXX: a hackish way to bind events on these buttons so that
 #. we will recieve the right click and such events over them to
 #. display menus and allow dragging over them
-#: applets/gnome-pager/gnomepager_applet.c:1393
+#: applets/gnome-pager/gnomepager_applet.c:1464
 msgid "?"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:1879
+#: applets/gnome-pager/gnomepager_applet.c:1953
 msgid "Sticky"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2323
+#: applets/gnome-pager/gnomepager_applet.c:2400
 #, fuzzy
 msgid "Show / Hide"
 msgstr "datum"
 
-#: applets/gnome-pager/gnomepager_applet.c:2329
+#: applets/gnome-pager/gnomepager_applet.c:2406
 msgid "Shade / Unshade"
 msgstr ""
 
-#: applets/gnome-pager/gnomepager_applet.c:2335 panel/launcher.c:44
+#: applets/gnome-pager/gnomepager_applet.c:2412 panel/launcher.c:44
 msgid "Close"
 msgstr "St�ng"
 
-#: applets/gnome-pager/gnomepager_applet.c:2341
+#: applets/gnome-pager/gnomepager_applet.c:2418
 msgid "Nuke"
 msgstr ""
 
@@ -1003,7 +1130,7 @@ msgid "History"
 msgstr "Historik"
 
 #: applets/mini-commander/src/mini-commander_applet.c:252
-#: gsm/session-properties.c:145 help-browser/window.c:207
+#: gsm/session-properties.c:170 help-browser/window.c:207
 msgid "Help"
 msgstr "Hj�lp"
 
@@ -1074,7 +1201,7 @@ msgstr ""
 
 #. Color
 #: applets/mini-commander/src/preferences.c:581
-#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1117
+#: applets/multiload/load-graph.c:193 gnome-terminal/gnome-terminal.c:1131
 msgid "Colors"
 msgstr "F�rger"
 
@@ -1330,7 +1457,7 @@ msgstr ""
 msgid "Open new window"
 msgstr "�ppna nytt f�nster"
 
-#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1164
+#: applets/slashapp/properties.c:356 gnome-terminal/gnome-terminal.c:1178
 msgid "Scrolling"
 msgstr ""
 
@@ -1354,6 +1481,10 @@ msgstr ""
 msgid "Scroll speed between lines (Smooth scroll):"
 msgstr ""
 
+#: applets/slashapp/properties.c:422
+msgid "Display"
+msgstr ""
+
 #: applets/slashapp/slashapp.c:152
 #, fuzzy
 msgid "No articles"
@@ -1363,12 +1494,12 @@ msgstr "Ingen post."
 msgid "Slashapp article list"
 msgstr ""
 
-#: applets/slashapp/slashapp.c:255 gmenu/utils.c:91
+#: applets/slashapp/slashapp.c:255 gmenu/utils.c:28
 #, c-format
 msgid "creating user directory: %s\n"
 msgstr "skapar anv�ndarkatalog: %s\n"
 
-#: applets/slashapp/slashapp.c:258 gmenu/utils.c:94
+#: applets/slashapp/slashapp.c:258 gmenu/utils.c:31
 #, c-format
 msgid "unable to create user directory: %s\n"
 msgstr "kunde inte skapa anv�ndarkatalog: %s\n"
@@ -1458,567 +1589,590 @@ msgstr "Visa \"�ppna nytt f�nster\" valet"
 msgid "Look"
 msgstr "Titta"
 
-#: gmenu/desktop.c:80 gmenu/desktop.c:96
-#, fuzzy
-msgid "Submenu: "
-msgstr "Ingen post."
-
-#: gmenu/desktop.c:194
-#, c-format
-msgid "Unable to create file: %s\n"
-msgstr "Kan inte skapa fil: %s\n"
-
-#: gmenu/desktop.c:213
-#, fuzzy, c-format
-msgid "unable to remove .order file: %s\n"
-msgstr "Kan inte skapa fil: %s\n"
-
-#: gmenu/dialogs.c:38
-msgid "File exists."
-msgstr ""
+#: gmenu/desktop.c:80
+msgid " Folder"
+msgstr " Folder "
 
-#: gmenu/dialogs.c:46
-msgid "Failed to create file."
-msgstr ""
-
-#: gmenu/dialogs.c:142 gmenu/dialogs.c:179
-msgid ""
-"You can't add an entry to that submenu.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:148 gmenu/gmenu.c:97
-msgid "New Submenu"
-msgstr ""
-
-#: gmenu/dialogs.c:150
-msgid "Create Submenu:"
-msgstr ""
-
-#: gmenu/dialogs.c:233
-msgid "You must select something first."
-msgstr ""
-
-#: gmenu/dialogs.c:239
-msgid "You can not delete a top level submenu."
-msgstr ""
-
-#: gmenu/dialogs.c:247
-msgid ""
-"You can't delete that file.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/dialogs.c:253 gmenu/dialogs.c:273
-msgid "Delete this menu item?"
-msgstr ""
-
-#: gmenu/dialogs.c:262
-msgid "Delete empty submenu?"
-msgstr ""
-
-#: gmenu/dialogs.c:267
-msgid "Are you sure you want to delete this submenu and all its contents?"
-msgstr ""
-
-#: gmenu/dialogs.c:368
-msgid ""
-"This change conflicts with an existing menu item.\n"
-"No two menu items in a submenu can have the same name."
-msgstr ""
-
-#: gmenu/dnd.c:175
-msgid ""
-"You are not allowed to move that item there.\n"
-"You do not have the proper permissions."
-msgstr ""
-
-#: gmenu/edit.c:214
+#: gmenu/edit.c:298
 msgid "Save"
 msgstr "Spara"
 
-#: gmenu/edit.c:231 gsm/session-properties.c:136
+#: gmenu/edit.c:315 gsm/session-properties.c:161
 msgid "Revert"
 msgstr "�terg�"
 
-#: gmenu/edit.c:249
-msgid "New"
-msgstr "Ny"
+#: gmenu/edit.c:352 panel/menu.c:2118 panel/menu.c:2121 panel/menu.c:2849
+#: panel/menu.c:2890 panel/menu.c:2893
+#, fuzzy
+msgid "User menus"
+msgstr "Anv�ndarmenyer"
+
+#: gmenu/edit.c:356 panel/menu.c:2036 panel/menu.c:2040 panel/menu.c:2110
+#: panel/menu.c:2876
+#, fuzzy
+msgid "System menus"
+msgstr "Systemmenyer"
 
-#: gmenu/gmenu.c:52
+#: gmenu/main.c:51 gmenu/main.c:128
 msgid "_New Submenu..."
 msgstr ""
 
-#: gmenu/gmenu.c:53 gmenu/gmenu.c:97
+#: gmenu/main.c:52 gmenu/main.c:98 gmenu/main.c:129
 msgid "Create a new submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:56
+#: gmenu/main.c:55 gmenu/main.c:125
 #, fuzzy
 msgid "New _Item..."
 msgstr "Ny folder..."
 
-#: gmenu/gmenu.c:57
+#: gmenu/main.c:56 gmenu/main.c:126
 msgid "Create a new menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:60
+#: gmenu/main.c:59 gmenu/main.c:134
 #, fuzzy
 msgid "_Delete..."
 msgstr "Radera..."
 
-#: gmenu/gmenu.c:71
+#: gmenu/main.c:70
 msgid "_Sort Submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:74
+#: gmenu/main.c:74
 msgid "Sort Submenu _Recursive"
 msgstr ""
 
-#: gmenu/gmenu.c:86
+#: gmenu/main.c:87
 #, fuzzy
 msgid "_File"
 msgstr "Arkiv"
 
-#: gmenu/gmenu.c:88
+#: gmenu/main.c:89 gmenu/main.c:149
 msgid "_Sort"
 msgstr ""
 
-#: gmenu/gmenu.c:90
+#: gmenu/main.c:91
 #, fuzzy
 msgid "_Help"
 msgstr "Hj�lp"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:98
+msgid "New Submenu"
+msgstr ""
+
+#: gmenu/main.c:102
 #, fuzzy
 msgid "New Item"
 msgstr "Nytt terminalf�nster"
 
-#: gmenu/gmenu.c:100
+#: gmenu/main.c:102
 #, fuzzy
 msgid "Create a new item"
 msgstr "Skapa uppstarts applet"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete"
 msgstr "Radera"
 
-#: gmenu/gmenu.c:104
+#: gmenu/main.c:106
 msgid "Delete selected menu item"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move up"
 msgstr ""
 
-#: gmenu/gmenu.c:107
+#: gmenu/main.c:110 gmenu/main.c:140
 msgid "Move selected menu up"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move down"
 msgstr ""
 
-#: gmenu/gmenu.c:109
+#: gmenu/main.c:113 gmenu/main.c:143
 msgid "Move selected menu down"
 msgstr ""
 
-#: gmenu/gmenu.c:114
-msgid "Edit selected menu item properties"
-msgstr ""
-
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 #, fuzzy
 msgid "Sort Submenu"
 msgstr "Ingen post."
 
-#: gmenu/gmenu.c:119
+#: gmenu/main.c:117
 msgid "Sort selected submenu"
 msgstr ""
 
-#: gmenu/gmenu.c:151 gmenu/gmenu.c:236 gmenu/gmenu.c:308 gmenu/tree.c:387
+#: gmenu/main.c:153
+msgid "Sort _Recursive"
+msgstr ""
+
+#. loading dialog
+#: gmenu/main.c:239 gmenu/main.c:285 gmenu/tree.c:389
 msgid "GNOME menu editor"
 msgstr "GNOME meny �ndrare"
 
-#: gmenu/gmenu.c:311
+#: gmenu/main.c:242
 msgid ""
 "Released under the terms of the GNU Public License.\n"
 "GNOME menu editor."
 msgstr ""
 
-#: gmenu/save.c:52
+#: gmenu/save.c:27 gmenu/save.c:85
 #, fuzzy
 msgid "The menu item must have a name"
 msgstr "Knappar i dialogrutan"
 
-#: gmenu/save.c:58
+#: gmenu/save.c:33
 msgid "The menu entry must have a filename"
 msgstr ""
 
-#: gmenu/save.c:66
+#: gmenu/save.c:40
 #, fuzzy
 msgid "Save changes?"
 msgstr "Spara fil?"
 
-#: gmenu/save.c:83
+#: gmenu/save.c:54
 msgid "This change conflicts with an existing menu item"
 msgstr ""
 
-#: gmenu/save.c:89
+#: gmenu/save.c:61
 msgid "Overwrite existing menu entry?"
 msgstr ""
 
-#: gmenu/tree.c:389
+#: gmenu/save.c:111
+msgid ""
+"This change conflicts with an existing menu item.\n"
+"No two menu items in a submenu can have the same name."
+msgstr ""
+
+#: gmenu/tree.c:391
 msgid "One moment, reading menus..."
 msgstr ""
 
-#: gmenu/tree.c:418
-msgid "GNOME"
-msgstr "GNOME"
+#: gmenu/tree.c:410
+msgid "User Menus"
+msgstr "Anv�ndarmenyer"
+
+#: gmenu/tree.c:411
+msgid "Top of user menus"
+msgstr ""
 
-#. system's menu tree
-#: gmenu/tree.c:427
+#: gmenu/tree.c:418
 msgid "System Menus"
 msgstr "Systemmenyer"
 
-#: gmenu/tree.c:437
+#: gmenu/tree.c:419
 msgid "Top of system menus"
 msgstr "Toppen av systemmenyerna"
 
-#. user's menu tree
-#: gmenu/tree.c:445
-msgid "User Menus"
-msgstr "Anv�ndarmenyer"
+#: gmenu/treedel.c:116
+msgid "You can not delete a top level submenu."
+msgstr ""
 
-#: gmenu/tree.c:455
-msgid "Top of user menus"
+#: gmenu/treedel.c:128 gmenu/treedel.c:151
+msgid "Delete this menu item?"
+msgstr ""
+
+#: gmenu/treedel.c:138
+msgid "Delete empty submenu?"
+msgstr ""
+
+#: gmenu/treedel.c:144
+msgid "Are you sure you want to delete this submenu and all its contents?"
+msgstr ""
+
+#: gmenu/treenew.c:35 gmenu/treenew.c:110
+msgid ""
+"You can't add an entry to that submenu.\n"
+"You do not have the proper permissions."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:147
+#: gmenu/treenew.c:43 gmenu/treenew.c:52 gmenu/treenew.c:73 gmenu/treenew.c:82
+#, fuzzy
+msgid "New Folder"
+msgstr " Folder "
+
+#: gmenu/treenew.c:63
+#, fuzzy
+msgid "Failed to create directory"
+msgstr "kunde inte skapa anv�ndarkatalog: %s\n"
+
+#: gmenu/treenew.c:118 gmenu/treenew.c:127
+msgid "untitled.desktop"
+msgstr ""
+
+#: gmenu/treenew.c:137 gmenu/treenew.c:144
+#, fuzzy
+msgid "untitled"
+msgstr " monterad"
+
+#: gnome-terminal/gnome-terminal.c:161
 msgid "GNOME Terminal"
 msgstr "GNOME terminal"
 
-#: gnome-terminal/gnome-terminal.c:150
+#: gnome-terminal/gnome-terminal.c:164
 msgid "The GNOME terminal emulation program."
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:447 gnome-terminal/gnome-terminal.c:958
-#: gnome-terminal/gnome-terminal.c:968 gnome-terminal/gnome-terminal.c:1804
+#: gnome-terminal/gnome-terminal.c:461 gnome-terminal/gnome-terminal.c:972
+#: gnome-terminal/gnome-terminal.c:982 gnome-terminal/gnome-terminal.c:1850
 #, fuzzy
 msgid "Default"
 msgstr "Radera"
 
-#: gnome-terminal/gnome-terminal.c:618
+#: gnome-terminal/gnome-terminal.c:632
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
 "configuration of the new class?"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:781
+#: gnome-terminal/gnome-terminal.c:795
 msgid "Linux console"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:782
+#: gnome-terminal/gnome-terminal.c:796
 msgid "Color Xterm"
 msgstr "F�rg Xterm"
 
-#: gnome-terminal/gnome-terminal.c:783
+#: gnome-terminal/gnome-terminal.c:797
 msgid "rxvt"
 msgstr "rxvt"
 
-#: gnome-terminal/gnome-terminal.c:788
+#: gnome-terminal/gnome-terminal.c:802
 msgid "White on black"
 msgstr "Vit p� svart"
 
-#: gnome-terminal/gnome-terminal.c:789
+#: gnome-terminal/gnome-terminal.c:803
 msgid "Black on white"
 msgstr "Svart p� vitt"
 
-#: gnome-terminal/gnome-terminal.c:790
+#: gnome-terminal/gnome-terminal.c:804
 msgid "Green on black"
 msgstr "Gr�nt p� svart"
 
-#: gnome-terminal/gnome-terminal.c:791
+#: gnome-terminal/gnome-terminal.c:805
 msgid "Black on light yellow"
 msgstr "Svart p� ljusgult"
 
-#: gnome-terminal/gnome-terminal.c:792
+#: gnome-terminal/gnome-terminal.c:806
 msgid "Custom colors"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:797 panel/panel_config.c:315
+#: gnome-terminal/gnome-terminal.c:811 panel/panel_config.c:317
 msgid "Left"
 msgstr "V�nster"
 
-#: gnome-terminal/gnome-terminal.c:798 panel/panel_config.c:326
+#: gnome-terminal/gnome-terminal.c:812 panel/panel_config.c:328
 msgid "Right"
 msgstr "H�ger"
 
-#: gnome-terminal/gnome-terminal.c:799
+#: gnome-terminal/gnome-terminal.c:813
 msgid "Hidden"
 msgstr "G�md"
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:922
+#: gnome-terminal/gnome-terminal.c:936
 msgid "Font:"
 msgstr "Font:"
 
-#: gnome-terminal/gnome-terminal.c:942
+#: gnome-terminal/gnome-terminal.c:956
 #, fuzzy
 msgid "Browse..."
 msgstr " Bl�ddra... "
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 #, fuzzy
 msgid "Terminal Class"
 msgstr "Terminal"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:978
+#: gnome-terminal/gnome-terminal.c:992
 msgid "Blinking cursor"
 msgstr "Blinkande mark�r"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:987
+#: gnome-terminal/gnome-terminal.c:1001
 #, fuzzy
 msgid "Hide menu bar"
 msgstr "G�m menylist..."
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:996
+#: gnome-terminal/gnome-terminal.c:1010
 msgid "Silence Terminal bell"
 msgstr ""
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:1005
+#: gnome-terminal/gnome-terminal.c:1019
 msgid "Swap DEL/Backspace"
 msgstr ""
 
 #. Word selection class
-#: gnome-terminal/gnome-terminal.c:1014
+#: gnome-terminal/gnome-terminal.c:1028
 msgid "Select-by-word characters"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1032
+#: gnome-terminal/gnome-terminal.c:1046
 #, fuzzy
 msgid "Image"
 msgstr "Bildfil"
 
-#: gnome-terminal/gnome-terminal.c:1034
+#: gnome-terminal/gnome-terminal.c:1048
 #, fuzzy
 msgid "Background type"
 msgstr " Bakgrund "
 
-#: gnome-terminal/gnome-terminal.c:1044
+#: gnome-terminal/gnome-terminal.c:1058
 #, fuzzy
 msgid "None"
 msgstr "ingen"
 
-#: gnome-terminal/gnome-terminal.c:1052
+#: gnome-terminal/gnome-terminal.c:1066
 #, fuzzy
 msgid "Background pixmap"
 msgstr " Bakgrund "
 
-#: gnome-terminal/gnome-terminal.c:1069
+#: gnome-terminal/gnome-terminal.c:1083
 #, fuzzy
 msgid "Pixmap file:"
 msgstr "Pixmap"
 
-#: gnome-terminal/gnome-terminal.c:1085
+#: gnome-terminal/gnome-terminal.c:1099
 msgid "Transparent"
 msgstr ""
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:1104
+#: gnome-terminal/gnome-terminal.c:1118
 msgid "Background should be shaded (slow)"
 msgstr ""
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:1120
+#: gnome-terminal/gnome-terminal.c:1134
 msgid "Color palette:"
 msgstr "F�rgpalett:"
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:1130
+#: gnome-terminal/gnome-terminal.c:1144
 msgid "Foreground color:"
 msgstr "F�rgrundsf�rg:"
 
-#: gnome-terminal/gnome-terminal.c:1139
+#: gnome-terminal/gnome-terminal.c:1153
 msgid "Background color:"
 msgstr "Bakgrundsf�rg:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:1151
+#: gnome-terminal/gnome-terminal.c:1165
 msgid "Colors:"
 msgstr "F�rger:"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:1167
+#: gnome-terminal/gnome-terminal.c:1181
 msgid "Scrollbar position"
 msgstr "Position f�r rullningslist"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1178
+#: gnome-terminal/gnome-terminal.c:1192
 msgid "Scrollback lines"
 msgstr ""
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1190
+#: gnome-terminal/gnome-terminal.c:1204
 msgid "Scroll on keystroke"
 msgstr ""
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1199
+#: gnome-terminal/gnome-terminal.c:1213
 msgid "Scroll on output"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1234
+#: gnome-terminal/gnome-terminal.c:1248
 msgid "Color selector"
 msgstr "F�rgv�ljare"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 #, fuzzy
 msgid "_New terminal"
 msgstr "Nytt terminalf�nster"
 
-#: gnome-terminal/gnome-terminal.c:1283 gnome-terminal/gnome-terminal.c:1293
-#: gnome-terminal/gnome-terminal.c:1300
+#: gnome-terminal/gnome-terminal.c:1312 gnome-terminal/gnome-terminal.c:1322
+#: gnome-terminal/gnome-terminal.c:1333
 msgid "Creates a new terminal window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1285 gnome-terminal/gnome-terminal.c:1295
+#: gnome-terminal/gnome-terminal.c:1314 gnome-terminal/gnome-terminal.c:1324
 #, fuzzy
 msgid "_Hide menubar"
 msgstr "G�m menylist..."
 
-#: gnome-terminal/gnome-terminal.c:1287
+#: gnome-terminal/gnome-terminal.c:1316
 #, fuzzy
 msgid "_Close terminal"
 msgstr "St�ng terminalf�nster"
 
-#: gnome-terminal/gnome-terminal.c:1302
+#: gnome-terminal/gnome-terminal.c:1326 gnome-terminal/gnome-terminal.c:1337
+#: gnome-terminal/gnome-terminal.c:1357
+#, fuzzy
+msgid "_Reset Terminal"
+msgstr "St�ng terminalf�nster"
+
+#: gnome-terminal/gnome-terminal.c:1327 gnome-terminal/gnome-terminal.c:1338
+#: gnome-terminal/gnome-terminal.c:1358
+msgid "Reset and _Clear"
+msgstr ""
+
+#: gnome-terminal/gnome-terminal.c:1335
 msgid "_Show menubar"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1319
+#: gnome-terminal/gnome-terminal.c:1360
 #, fuzzy
 msgid "C_olor selector..."
 msgstr "F�rgv�ljare"
 
-#: gnome-terminal/gnome-terminal.c:1942
+#: gnome-terminal/gnome-terminal.c:1988
 msgid "Terminal class name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1942
-msgid "CLASS"
+#: gnome-terminal/gnome-terminal.c:1988
+msgid "TCLASS"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "Specifies font name"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1945
+#: gnome-terminal/gnome-terminal.c:1991
 msgid "FONT"
 msgstr "FONT"
 
-#: gnome-terminal/gnome-terminal.c:1948
+#: gnome-terminal/gnome-terminal.c:1994
 msgid "Do not start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1951
+#: gnome-terminal/gnome-terminal.c:1997
 msgid "Start up shells as logins shells"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "Specifies the geometry for the main window"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1954
+#: gnome-terminal/gnome-terminal.c:2000
 msgid "GEOMETRY"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "Execute this program instead of a shell"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1957
+#: gnome-terminal/gnome-terminal.c:2003
 msgid "COMMAND"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1960
+#: gnome-terminal/gnome-terminal.c:2006
 msgid "Foreground color"
 msgstr "F�rgrundsf�rg"
 
-#: gnome-terminal/gnome-terminal.c:1960 gnome-terminal/gnome-terminal.c:1963
+#: gnome-terminal/gnome-terminal.c:2006 gnome-terminal/gnome-terminal.c:2009
 msgid "COLOR"
 msgstr "F�RG"
 
-#: gnome-terminal/gnome-terminal.c:1963 panel/panel_config.c:740
+#: gnome-terminal/gnome-terminal.c:2009 panel/panel_config.c:763
 msgid "Background color"
 msgstr "Bakgrundsf�rg"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 #, fuzzy
 msgid "Update utmp entry"
 msgstr "Uppdateringsfrekvens"
 
-#: gnome-terminal/gnome-terminal.c:1966
+#: gnome-terminal/gnome-terminal.c:2012
 msgid "UTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "Do not update utmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1969
+#: gnome-terminal/gnome-terminal.c:2015
 msgid "NOUTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 #, fuzzy
 msgid "Update wtmp entry"
 msgstr "Updateras per sekund"
 
-#: gnome-terminal/gnome-terminal.c:1972
+#: gnome-terminal/gnome-terminal.c:2018
 msgid "WTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "Do not update wtmp entry"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1975
+#: gnome-terminal/gnome-terminal.c:2021
 msgid "NOWTMP"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "Set the window title"
 msgstr ""
 
-#: gnome-terminal/gnome-terminal.c:1978
+#: gnome-terminal/gnome-terminal.c:2024
 msgid "TITLE"
 msgstr ""
 
-#: gsm/main.c:44
+#: gsm/main.c:56
+msgid "Start chooser and pick the session"
+msgstr ""
+
+#: gsm/main.c:57
+msgid "Disable normal operation by saving into the Trash session"
+msgstr ""
+
+#: gsm/main.c:58
+msgid "Only read saved sessions from the default.session file"
+msgstr ""
+
+#: gsm/main.c:59
 msgid "Millisecond period spent waiting for clients to register (0=forever)"
 msgstr ""
 
-#: gsm/main.c:45
+#: gsm/main.c:60
+msgid "Millisecond period spent waiting for clients to respond (0=forever)"
+msgstr ""
+
+#: gsm/main.c:61
 msgid "Millisecond period spent waiting for clients to die (0=forever)"
 msgstr ""
 
-#: gsm/manager.c:358
+#: gsm/manager.c:374
 msgid "Wait abandoned due to conflict."
 msgstr ""
 
-#: gsm/manager.c:1094
+#: gsm/manager.c:816
+#, c-format
+msgid "No response to the %s command."
+msgstr ""
+
+#: gsm/manager.c:817
+msgid "The program may be slow, stopped or broken."
+msgstr ""
+
+#: gsm/manager.c:818
+msgid "You may wait for it to respond or remove it."
+msgstr ""
+
+#: gsm/manager.c:1345
 msgid "Respawn abandoned due to failures."
 msgstr ""
 
-#: gsm/manager.c:1260
+#: gsm/manager.c:1513
 msgid "A session shutdown is in progress."
 msgstr ""
 
@@ -2030,24 +2184,53 @@ msgstr "Avbryt session"
 msgid "save-session: couldn't connect to session manager\n"
 msgstr "save-session: kunde inte koppla till sessionshanteraren\n"
 
-#: gsm/session-properties.c:102
+#: gsm/session-properties.c:125
 msgid "Program:"
 msgstr ""
 
 #. buttons
-#: gsm/session-properties.c:133
+#: gsm/session-properties.c:158
 msgid "Try"
 msgstr ""
 
-#: gsm/session-properties.c:139
+#: gsm/session-properties.c:164
 msgid "OK"
 msgstr ""
 
-#: gsm/session-properties.c:142
+#: gsm/session-properties.c:167
 #, fuzzy
 msgid "Cancel"
 msgstr "Panel"
 
+#: gsm/session-properties.c:258
+#, fuzzy
+msgid "Session"
+msgstr "Avbryt session"
+
+#. app
+#: gsm/session-properties.c:312
+msgid "Session Chooser"
+msgstr ""
+
+#: gsm/session-properties.c:315
+#, fuzzy
+msgid "Start Session"
+msgstr "Avbryt sessionen"
+
+#: gsm/session-properties.c:318
+#, fuzzy
+msgid "Cancel Login"
+msgstr "Panel"
+
+#: gsm/session-properties.c:344
+#, fuzzy
+msgid "Initialize session settings"
+msgstr "�vergripande egenskaper"
+
+#: gsm/session-properties.c:345
+msgid "Only display warnings."
+msgstr ""
+
 #: help-browser/bookmarks.c:220
 msgid "Bookmark"
 msgstr "Bokm�rke"
@@ -2405,15 +2588,15 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: panel/applet.c:271
+#: panel/applet.c:273
 msgid "???"
 msgstr "???"
 
-#: panel/applet.c:298
+#: panel/applet.c:300
 msgid "Remove from panel"
 msgstr "Tag bort fr�n panelen"
 
-#: panel/applet.c:305
+#: panel/applet.c:307
 msgid "Move applet"
 msgstr "Flytta applet"
 
@@ -2446,7 +2629,7 @@ msgstr "Knappar i dialogrutan"
 msgid "Enable hidebutton arrow"
 msgstr "Knappar i dialogrutan"
 
-#: panel/drawer.c:160 panel/drawer.c:238
+#: panel/drawer.c:160 panel/drawer.c:242
 msgid "Drawer"
 msgstr "L�da"
 
@@ -2454,23 +2637,23 @@ msgstr "L�da"
 msgid "This launch icon does not specify a program to run"
 msgstr ""
 
-#: panel/launcher.c:146
+#: panel/launcher.c:171
 msgid "App"
 msgstr "Applikation"
 
-#: panel/launcher.c:232
+#: panel/launcher.c:272
 msgid "Launcher properties"
 msgstr "Egenskaper f�r uppstartaren"
 
-#: panel/launcher.c:317
+#: panel/launcher.c:357
 msgid "Create launcher applet"
 msgstr "Skapa uppstarts applet"
 
-#: panel/logout.c:49 panel/menu.c:2180 panel/menu.c:2480
+#: panel/logout.c:51 panel/menu.c:2183 panel/menu.c:2489
 msgid "Log out"
 msgstr "Logga ut"
 
-#: panel/logout.c:51
+#: panel/logout.c:53
 #, fuzzy
 msgid "Log out of GNOME"
 msgstr "Logga ut"
@@ -2538,269 +2721,252 @@ msgstr ""
 msgid " (empty)"
 msgstr ""
 
-#: panel/menu.c:1880
+#: panel/menu.c:1882
 msgid "Applets"
 msgstr "Appleter"
 
-#: panel/menu.c:2007 panel/panel_config.c:866
+#: panel/menu.c:2010 panel/panel_config.c:890
 #, fuzzy
 msgid "Edge panel"
 msgstr "Kantpanel"
 
-#: panel/menu.c:2014 panel/panel_config.c:872
+#: panel/menu.c:2017 panel/panel_config.c:896
 #, fuzzy
 msgid "Corner panel"
 msgstr "H�rnpanel"
 
-#: panel/menu.c:2033 panel/menu.c:2037 panel/menu.c:2107 panel/menu.c:2878
-#, fuzzy
-msgid "System menus"
-msgstr "Systemmenyer"
-
-#: panel/menu.c:2080 panel/menu.c:2084 panel/menu.c:2148 panel/menu.c:2933
+#: panel/menu.c:2083 panel/menu.c:2087 panel/menu.c:2151 panel/menu.c:2924
 #, fuzzy
 msgid "Debian menus"
 msgstr "L�gg till huvudmeny"
 
-#: panel/menu.c:2089
+#: panel/menu.c:2092
 msgid "No Debian menus found!"
 msgstr ""
 
-#: panel/menu.c:2115 panel/menu.c:2118 panel/menu.c:2851 panel/menu.c:2892
-#: panel/menu.c:2895
-#, fuzzy
-msgid "User menus"
-msgstr "Anv�ndarmenyer"
-
-#: panel/menu.c:2127 panel/menu.c:2131 panel/menu.c:2817 panel/menu.c:2858
-#: panel/menu.c:2907 panel/menu.c:2917
-#, fuzzy
-msgid "Red Hat menus"
-msgstr "L�gg till huvudmeny"
+#: panel/menu.c:2130 panel/menu.c:2134 panel/menu.c:2856 panel/menu.c:2905
+#: panel/menu.c:2908
+msgid "AnotherLevel menus"
+msgstr ""
 
-#: panel/menu.c:2165
+#: panel/menu.c:2168
 msgid "Remove this panel"
 msgstr "Tag bort denna panel"
 
-#: panel/menu.c:2314
+#: panel/menu.c:2323
 msgid "Add applet"
 msgstr "L�gg till applet"
 
-#: panel/menu.c:2323
+#: panel/menu.c:2332
 msgid "Add new panel"
 msgstr "L�gg till ny panel"
 
-#: panel/menu.c:2331
+#: panel/menu.c:2340
 #, fuzzy
 msgid "Convert to corner panel"
 msgstr "H�rnpanel"
 
-#: panel/menu.c:2339
+#: panel/menu.c:2348
 #, fuzzy
 msgid "Convert to edge panel"
 msgstr "H�rnpanel"
 
-#: panel/menu.c:2347
+#: panel/menu.c:2356
 msgid "Add main menu"
 msgstr "L�gg till huvudmeny"
 
-#: panel/menu.c:2355
+#: panel/menu.c:2364
 #, fuzzy
 msgid "Add drawer"
 msgstr "L�da"
 
-#: panel/menu.c:2364
+#: panel/menu.c:2373
 msgid "Add log out button"
 msgstr "L�gg till utloggningsknapp"
 
-#: panel/menu.c:2373
+#: panel/menu.c:2382
 msgid "Add swallowed app"
 msgstr "L�gg till svald applikation"
 
-#: panel/menu.c:2380
+#: panel/menu.c:2389
 msgid "Add new launcher"
 msgstr "L�gg till ny uppstartare"
 
-#: panel/menu.c:2392
+#: panel/menu.c:2401
 msgid "This panel properties..."
 msgstr "Denna panels inst�llningar..."
 
-#: panel/menu.c:2402
+#: panel/menu.c:2411
 msgid "Global properties..."
 msgstr "Globala egenskaper..."
 
-#: panel/menu.c:2436
+#: panel/menu.c:2445
 msgid "Panel"
 msgstr "Panel"
 
-#: panel/menu.c:2447
+#: panel/menu.c:2456
 msgid "Lock screen"
 msgstr "L�s sk�rmen"
 
-#: panel/menu.c:2468
+#: panel/menu.c:2477
 #, fuzzy
 msgid "About GNOME..."
 msgstr "Om..."
 
-#: panel/menu.c:3153
+#: panel/menu.c:3147
 msgid "Can't open directory, using main menu!"
 msgstr ""
 
-#: panel/menu.c:3291
+#: panel/menu.c:3285
 msgid "In a submenu"
 msgstr ""
 
-#: panel/menu.c:3303
+#: panel/menu.c:3297
 #, fuzzy
 msgid "On the main menu"
 msgstr "L�gg till huvudmeny"
 
-#: panel/menu.c:3327
+#: panel/menu.c:3321
 msgid "Menu properties"
 msgstr ""
 
-#: panel/menu.c:3334
+#: panel/menu.c:3328
 msgid "Menu type"
 msgstr ""
 
-#: panel/menu.c:3341 panel/menu.c:3361
+#: panel/menu.c:3335 panel/menu.c:3355
 #, fuzzy
 msgid "Main menu"
 msgstr "L�gg till huvudmeny"
 
-#: panel/menu.c:3352 panel/menu.c:3388
+#: panel/menu.c:3346 panel/menu.c:3382
 #, fuzzy
 msgid "Normal menu"
 msgstr "Ingen post."
 
-#: panel/menu.c:3372
+#: panel/menu.c:3366
 #, fuzzy
 msgid "System menu: "
 msgstr "Systemmenyer"
 
-#: panel/menu.c:3376
+#: panel/menu.c:3370
 #, fuzzy
 msgid "User menu: "
 msgstr "Anv�ndarmenyer"
 
-#: panel/menu.c:3380
-msgid "Red Hat menu (if found): "
+#: panel/menu.c:3374
+msgid "AnotherLevel menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3384
+#: panel/menu.c:3378
 msgid "Debian menu (if found): "
 msgstr ""
 
-#: panel/menu.c:3398
+#: panel/menu.c:3392
 msgid "Menu path"
 msgstr ""
 
 #. Position frame
-#: panel/panel_config.c:281 panel/panel_config.c:448
+#: panel/panel_config.c:283 panel/panel_config.c:462
 msgid "Position"
 msgstr "Position"
 
 #. Top Position
-#: panel/panel_config.c:293
+#: panel/panel_config.c:295
 msgid "Top"
 msgstr "�verst"
 
-#: panel/panel_config.c:304
+#: panel/panel_config.c:306
 msgid "Bottom"
 msgstr "Nederst"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:354
+#: panel/panel_config.c:356 panel/panel_config.c:570
 #, fuzzy
 msgid "Minimize options"
 msgstr "Minimeringsalternativ"
 
 #. Auto-hide
-#: panel/panel_config.c:364
+#: panel/panel_config.c:366 panel/panel_config.c:580
 #, fuzzy
 msgid "Auto hide"
 msgstr "G�m automatiskt"
 
 #. Hidebuttons enable
-#: panel/panel_config.c:374 panel/panel_config.c:567
+#: panel/panel_config.c:376 panel/panel_config.c:590
 #, fuzzy
 msgid "Enable hidebuttons"
 msgstr "Knappar i dialogrutan"
 
 #. Arrow enable
-#: panel/panel_config.c:384 panel/panel_config.c:577
+#: panel/panel_config.c:386 panel/panel_config.c:600
 #, fuzzy
 msgid "Enable hidebutton arrows"
 msgstr "Knappar i dialogrutan"
 
 #. North East Position
-#: panel/panel_config.c:460
+#: panel/panel_config.c:474
 #, fuzzy
 msgid "North east"
 msgstr "Nord�st"
 
-#: panel/panel_config.c:471
+#: panel/panel_config.c:485
 #, fuzzy
 msgid "South west"
 msgstr "Sydv�st"
 
-#: panel/panel_config.c:482
+#: panel/panel_config.c:496
 #, fuzzy
 msgid "North west"
 msgstr "Nordv�st"
 
-#: panel/panel_config.c:493
+#: panel/panel_config.c:507
 #, fuzzy
 msgid "South east"
 msgstr "Sydv�st"
 
 #. Orientation frame
-#: panel/panel_config.c:524
+#: panel/panel_config.c:538
 msgid "Orientation"
 msgstr "Placering"
 
 #. Horizontal
-#: panel/panel_config.c:534
+#: panel/panel_config.c:548
 msgid "Horizontal"
 msgstr "Horisontell"
 
-#: panel/panel_config.c:546
+#: panel/panel_config.c:560
 msgid "Vertical"
 msgstr "Vertikal"
 
-#. Hidebuttons frame
-#: panel/panel_config.c:556
-msgid "Hidebutton options"
-msgstr ""
-
 #. selector frame
-#: panel/panel_config.c:673 panel/panel_config.c:885
+#: panel/panel_config.c:696 panel/panel_config.c:909
 msgid "Background"
 msgstr "Bakgrund"
 
 #. standard background
-#: panel/panel_config.c:682
+#: panel/panel_config.c:705
 msgid "Standard"
 msgstr "Standard"
 
-#: panel/panel_config.c:689
+#: panel/panel_config.c:712
 msgid "Pixmap"
 msgstr "Pixmap"
 
-#: panel/panel_config.c:696
+#: panel/panel_config.c:719
 msgid "Color"
 msgstr "F�rg"
 
 #. image frame
-#: panel/panel_config.c:701
+#: panel/panel_config.c:724
 msgid "Image file"
 msgstr "Bildfil"
 
-#: panel/panel_config.c:728
+#: panel/panel_config.c:751
 msgid "Scale image to fit panel"
 msgstr "Anpassa bildstorleken till panelen"
 
-#: panel/panel_config.c:855
+#: panel/panel_config.c:879
 msgid "Panel properties"
 msgstr "Panelegenskaper"
 
@@ -2986,28 +3152,6 @@ msgstr "Applikation"
 msgid "General icon settings"
 msgstr "�vergripande egenskaper"
 
-#: panel/session.c:635
-msgid ""
-"Are you sure you want to just terminate the panel?\n"
-"\n"
-"If you need to restart the panel after terminating it here, you will need to "
-"type panel in a terminal window\n"
-"\n"
-"Press OK to terminate the panel!"
-msgstr ""
-
-#: panel/session.c:696
-msgid "Really log out?"
-msgstr "Verkligen logga ut?"
-
-#: panel/session.c:701
-msgid "Only terminate panel"
-msgstr ""
-
-#: panel/session.c:715
-msgid "Ask next time"
-msgstr "Fr�ga n�sta g�ng"
-
 #: panel/swallow.c:211
 msgid "Create swallow applet"
 msgstr "Skapa sv�ljande applet"
@@ -3025,6 +3169,43 @@ msgstr "Kommando (valfri)"
 msgid "Height"
 msgstr "H�g."
 
+#, fuzzy
+#~ msgid "Low Battery Warning"
+#~ msgstr "L�g och laddas."
+
+#~ msgid "General Properties"
+#~ msgstr "�vergripande egenskaper"
+
+#~ msgid "Graph Interval:"
+#~ msgstr "Grafintervall:"
+
+#, fuzzy
+#~ msgid "Submenu: "
+#~ msgstr "Ingen post."
+
+#~ msgid "Unable to create file: %s\n"
+#~ msgstr "Kan inte skapa fil: %s\n"
+
+#, fuzzy
+#~ msgid "unable to remove .order file: %s\n"
+#~ msgstr "Kan inte skapa fil: %s\n"
+
+#~ msgid "New"
+#~ msgstr "Ny"
+
+#~ msgid "GNOME"
+#~ msgstr "GNOME"
+
+#, fuzzy
+#~ msgid "Red Hat menus"
+#~ msgstr "L�gg till huvudmeny"
+
+#~ msgid "Really log out?"
+#~ msgstr "Verkligen logga ut?"
+
+#~ msgid "Ask next time"
+#~ msgstr "Fr�ga n�sta g�ng"
+
 #~ msgid "Gnome Session Properties"
 #~ msgstr "GNOME sessionsegenskaper"
 
@@ -3032,9 +3213,6 @@ msgstr "H�g."
 #~ msgid "Startup Programs"
 #~ msgstr "Uppstart"
 
-#~ msgid "Geometry of window"
-#~ msgstr "F�nstretsgeometri"
-
 #~ msgid "Can't open /proc/apm; can't get data."
 #~ msgstr "Kan inte �ppna /proc/apm; f�r inte data."
 
@@ -3053,9 +3231,6 @@ msgstr "H�g."
 #~ msgid "High."
 #~ msgstr "H�g."
 
-#~ msgid "Low and charging."
-#~ msgstr "L�g och laddas."
-
 #~ msgid "Low."
 #~ msgstr "L�g."
 
@@ -3151,16 +3326,10 @@ msgstr "H�g."
 #~ msgid "Failed to retrieve workspace property."
 #~ msgstr "Misslykades h�mta skrivbordsegenskap."
 
-#~ msgid " Folder"
-#~ msgstr " Folder "
-
 #, fuzzy
 #~ msgid "Config"
 #~ msgstr "Inst�llning"
 
-#~ msgid "Discard session"
-#~ msgstr "Avbryt sessionen"
-
 #~ msgid "ID"
 #~ msgstr "ID"
 
@@ -3306,9 +3475,6 @@ msgstr "H�g."
 #~ msgid "Slow"
 #~ msgstr "L�ngsamt"
 
-#~ msgid "Threshold"
-#~ msgstr "Tr�skel"
-
 #~ msgid "Large"
 #~ msgstr "Stor"