diff --git a/po/ca.po b/po/ca.po
index 78539165f..13c103205 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1452,20 +1452,20 @@ msgstr ""
 msgid "Control Center"
 msgstr "Centre de Control"
 
-#~ msgid "Category"
-#~ msgstr "Categoria"
-
-#~ msgid " Settings"
-#~ msgstr ": configuració"
-
-#~ msgid "Session Chooser"
-#~ msgstr "Selector de sessions"
-
-#~ msgid "Cancel Login"
-#~ msgstr "Cancel·lar l'entrada"
+#~ msgid "Default Gtk setting"
+#~ msgstr "Configuració per defecte de GTK"
 
 #~ msgid "GNOME sound support"
 #~ msgstr "Suport de so de GNOME"
 
-#~ msgid "Default Gtk setting"
-#~ msgstr "Configuració per defecte de GTK"
+#~ msgid "Cancel Login"
+#~ msgstr "Cancel·lar l'entrada"
+
+#~ msgid "Session Chooser"
+#~ msgstr "Selector de sessions"
+
+#~ msgid " Settings"
+#~ msgstr ": configuració"
+
+#~ msgid "Category"
+#~ msgstr "Categoria"
diff --git a/po/da.po b/po/da.po
index 98e4e5b00..1128186ed 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1508,8 +1508,8 @@ msgstr ""
 msgid "Control Center"
 msgstr "Kontrolcenter"
 
-#~ msgid "Category"
-#~ msgstr "Kategori"
-
 #~ msgid "Extension: "
 #~ msgstr "Endelse: "
+
+#~ msgid "Category"
+#~ msgstr "Kategori"
diff --git a/po/fr.po b/po/fr.po
index 37ca166e0..d92f7b637 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 1.0.40\n"
-"POT-Creation-Date: 1999-09-20 19:14-0400\n"
+"POT-Creation-Date: 1999-11-06 14:40+0100\n"
 "PO-Revision-Date: 1998-02-28 19:34+0100\n"
 "Last-Translator: Vincent Renardias <vincent@ldsol.com>\n"
 "Language-Team: Gnome French Team <gnomefr@gnomefr.traduc.org>\n"
@@ -15,14 +15,14 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/background-properties/app-background.c:13
-msgid "Set background image."
-msgstr "Changer l'image de fond."
-
 #: capplets/background-properties/app-background.c:13
 msgid "IMAGE-FILE"
 msgstr "FICHIER-IMAGE"
 
+#: capplets/background-properties/app-background.c:13
+msgid "Set background image."
+msgstr "Changer l'image de fond."
+
 #: capplets/background-properties/app-background.c:34
 msgid ""
 "an initialization error occurred while starting "
@@ -116,12 +116,12 @@ msgstr "Mosa
 #: capplets/gnome-edit-properties/gnome-edit-properties.c:179
 #: capplets/keyboard-properties/keyboard-properties.c:81
 #: capplets/mouse-properties/mouse-properties.c:111
-#: capplets/screensaver-properties/callbacks.c:804
-#: capplets/session-properties/session-properties.c:296
+#: capplets/screensaver-properties/callbacks.c:802
+#: capplets/session-properties/session-properties.c:300
 #: capplets/sound-properties/sound-properties.c:690
 #: capplets/theme-switcher/gui.c:362
-#: capplets/ui-properties/ui-properties.c:513
-#: capplets/wm-properties/wm-properties-capplet.c:623
+#: capplets/ui-properties/ui-properties.c:514
+#: capplets/wm-properties/wm-properties-capplet.c:639
 msgid ""
 "No help is available/installed for these settings. Please make sure you\n"
 "have the GNOME User's Guide installed on your system."
@@ -134,14 +134,14 @@ msgstr ""
 #: capplets/gnome-edit-properties/gnome-edit-properties.c:181
 #: capplets/keyboard-properties/keyboard-properties.c:83
 #: capplets/mouse-properties/mouse-properties.c:113
-#: capplets/screensaver-properties/callbacks.c:806
-#: capplets/session-properties/session-properties.c:298
+#: capplets/screensaver-properties/callbacks.c:804
+#: capplets/session-properties/session-properties.c:302
 #: capplets/sound-properties/sound-properties.c:692
 #: capplets/sound-properties/sound-properties.c:753
 #: capplets/theme-switcher/gui.c:364
-#: capplets/ui-properties/ui-properties.c:515
-#: capplets/wm-properties/wm-properties-capplet.c:625
-#: control-center/callbacks.c:74 control-center/capplet-widget.c:263
+#: capplets/ui-properties/ui-properties.c:516
+#: capplets/wm-properties/wm-properties-capplet.c:641
+#: control-center/callbacks.c:75 control-center/capplet-widget.c:263
 msgid "Close"
 msgstr "Fermer"
 
@@ -174,14 +174,14 @@ msgstr "Sp
 msgid "Specifies end background color for gradient"
 msgstr "Spéficie la couleur de fin de gradient pour la couleur de fond"
 
-#: capplets/background-properties/property-background.c:1496
-msgid "ORIENT"
-msgstr "ORIENTATION"
-
 #: capplets/background-properties/property-background.c:1496
 msgid "Gradient orientation: vertical or horizontal"
 msgstr "Orientation du dégradé : vertical ou horizontal"
 
+#: capplets/background-properties/property-background.c:1496
+msgid "ORIENT"
+msgstr "ORIENTATION"
+
 #: capplets/background-properties/property-background.c:1497
 msgid "Use a solid fill for the background"
 msgstr "Utiliser une couleur uniforme pour le fond d'écran"
@@ -190,15 +190,15 @@ msgstr "Utiliser une couleur uniforme pour le fond d'
 msgid "Use a gradient fill for the background"
 msgstr "Utiliser un dégradé de couleur pour le fond d'écran"
 
-#: capplets/background-properties/property-background.c:1499
-msgid "MODE"
-msgstr "MODE"
-
 #: capplets/background-properties/property-background.c:1499
 msgid "Display wallpaper: tiled, centered, scaled or ratio"
 msgstr ""
 "Affichage du papier peint: mosaique, centré, redimentionné ou aux proportions"
 
+#: capplets/background-properties/property-background.c:1499
+msgid "MODE"
+msgstr "MODE"
+
 #: capplets/bell-properties/bell-properties.c:178
 msgid "Keyboard Bell"
 msgstr "Clic Clavier"
@@ -215,11 +215,11 @@ msgstr "Niveau (Hz)"
 msgid "Duration (ms)"
 msgstr "Durée (ms)"
 
-#: capplets/bell-properties/bell-properties.c:225
+#: capplets/bell-properties/bell-properties.c:219
 msgid "Test"
 msgstr "Test"
 
-#: capplets/bell-properties/bell-properties.c:247
+#: capplets/bell-properties/bell-properties.c:241
 msgid ""
 "an initialization error occurred while starting 'bell-properties-capplet'.\n"
 "aborting...\n"
@@ -426,19 +426,19 @@ msgstr ""
 
 #: capplets/mime-type/mime-type-capplet.c:79
 #: capplets/session-properties/session-properties.c:198
-#: capplets/wm-properties/wm-properties-capplet.c:1067
+#: capplets/wm-properties/wm-properties-capplet.c:1084
 msgid "Delete"
 msgstr "Effacer"
 
 #: capplets/mime-type/mime-type-capplet.c:89
 #: capplets/session-properties/session-properties.c:188
-#: capplets/wm-properties/wm-properties-capplet.c:1057
+#: capplets/wm-properties/wm-properties-capplet.c:1074
 msgid "Add..."
 msgstr "Ajouter..."
 
 #: capplets/mime-type/mime-type-capplet.c:93
 #: capplets/session-properties/session-properties.c:193
-#: capplets/wm-properties/wm-properties-capplet.c:1062
+#: capplets/wm-properties/wm-properties-capplet.c:1079
 msgid "Edit..."
 msgstr "Editer..."
 
@@ -515,10 +515,6 @@ msgstr "Rapide"
 msgid "Slow"
 msgstr "Lente"
 
-#: capplets/mouse-properties/mouse-properties.c:325
-msgid "Threshold"
-msgstr "Réactivité"
-
 #: capplets/mouse-properties/mouse-properties.c:325
 msgid "Large"
 msgstr "Importante"
@@ -527,6 +523,10 @@ msgstr "Importante"
 msgid "Small"
 msgstr "Faible"
 
+#: capplets/mouse-properties/mouse-properties.c:325
+msgid "Threshold"
+msgstr "Réactivité"
+
 #: capplets/mouse-properties/mouse-properties.c:349
 msgid ""
 "an initialization error occurred while starting 'mouse-properties-capplet'.\n"
@@ -551,17 +551,17 @@ msgstr "Pas d'
 msgid "Random Screensaver"
 msgstr "Economiseur d'écran aléatoire"
 
-#: capplets/screensaver-properties/callbacks.c:484
+#: capplets/screensaver-properties/callbacks.c:483
 #: capplets/screensaver-properties/screensaver-properties-capplet.c:54
 msgid "Settings..."
 msgstr "Paramètres..."
 
 #. we need to special case random
-#: capplets/screensaver-properties/callbacks.c:492
+#: capplets/screensaver-properties/callbacks.c:491
 msgid "Random Settings"
 msgstr "Paramètres aléatoires"
 
-#: capplets/screensaver-properties/callbacks.c:502
+#: capplets/screensaver-properties/callbacks.c:501
 #, c-format
 msgid "%s Settings..."
 msgstr "Paramètres de %s..."
@@ -769,7 +769,7 @@ msgstr "Tu
 msgid "Always started on every login."
 msgstr "Toujours démarré à chaque nouvelle session."
 
-#: capplets/session-properties/gsm-protocol.c:503
+#: capplets/session-properties/gsm-protocol.c:500
 msgid "Remove Program"
 msgstr "Enlever Programme"
 
@@ -805,7 +805,7 @@ msgstr "Commande"
 msgid "Browse Currently Running Programs..."
 msgstr "Voir les programmes en cours d'exécution..."
 
-#: capplets/session-properties/session-properties.c:389
+#: capplets/session-properties/session-properties.c:393
 msgid "Only display warnings."
 msgstr "Afficher seulement les avertissements."
 
@@ -915,14 +915,14 @@ msgstr "Toto"
 msgid "Meenie"
 msgstr "Pipo"
 
-#: capplets/theme-switcher/demo.c:53
-msgid "Mynie"
-msgstr "Penguin"
-
 #: capplets/theme-switcher/demo.c:53
 msgid "Moe"
 msgstr "Phanny"
 
+#: capplets/theme-switcher/demo.c:53
+msgid "Mynie"
+msgstr "Penguin"
+
 #: capplets/theme-switcher/demo.c:54
 msgid "Catcha"
 msgstr "Vincent"
@@ -1317,70 +1317,99 @@ msgstr ""
 "Vous pouvez le faire en sélectionnant \"Exécuter...\"\n"
 "dans le menu GNOME\n"
 
-#: capplets/wm-properties/wm-properties-capplet.c:509
-msgid ""
-"Your current window manager has been changed. In order for\n"
-"this change to be saved, you will need to save your current\n"
-"session. This can be done either selecting \"Save Current Session\"\n"
-"under \"Settings\" in the main menu, or by turning on\n"
-"\"Save Current Setup\" when you log out.\n"
-msgstr "Votre gestionnaire de fenêtre a été changé. Pour que le\n"
-"changement soit enregistré, vous devez enregistrer la session actuelle.\n"
-"Cela peut être fait en sélectionnant \"Enregistrer la session courante\"\n"
-"sous l'entrée \"Paramétres\" du menu principal ou en activant\n"
-"l'option \"Enregistrer la configuration actuelle\" à la fin de votre session.\n"
-
-#: capplets/wm-properties/wm-properties-capplet.c:729
-msgid "Add New Window Manager"
-msgstr "Ajouter un nouveau gestionnaire de fenêtres"
-
-#: capplets/wm-properties/wm-properties-capplet.c:730
-#: capplets/wm-properties/wm-properties-capplet.c:838
-#: capplets/wm-properties/wm-properties-capplet.c:845
-#: capplets/wm-properties/wm-properties-capplet.c:990
-#: control-center/capplet-manager.c:180
+#: capplets/wm-properties/wm-properties-capplet.c:496
+#: capplets/wm-properties/wm-properties-capplet.c:746
+#: capplets/wm-properties/wm-properties-capplet.c:854
+#: capplets/wm-properties/wm-properties-capplet.c:861
+#: capplets/wm-properties/wm-properties-capplet.c:1007
+#: control-center/capplet-manager.c:181
 msgid "OK"
 msgstr "OK"
 
-#: capplets/wm-properties/wm-properties-capplet.c:730
-#: control-center/capplet-manager.c:185
+#: capplets/wm-properties/wm-properties-capplet.c:514
+#, fuzzy
+msgid ""
+"Your current window manager has been changed. In order for\n"
+"this change to be saved, you will need to save your current\n"
+"session. You can do so immediately by selecting the \"Save session\n"
+"now\" below, or you can save your session later.  This can be\n"
+"done either selecting \"Save Current Session\" under \"Settings\"\n"
+"in the main menu, or by turning on \"Save Current Setup\" when\n"
+"you log out.\n"
+msgstr ""
+"Votre gestionnaire de fenêtre a été changé. Pour que le\n"
+"changement soit enregistré, vous devez enregistrer la session actuelle.\n"
+"Cela peut être fait en sélectionnant \"Enregistrer la session courante\"\n"
+"sous l'entrée \"Paramétres\" du menu principal ou en activant\n"
+"l'option \"Enregistrer la configuration actuelle\" à la fin de votre "
+"session.\n"
+
+#: capplets/wm-properties/wm-properties-capplet.c:521
+msgid "Save Session Later"
+msgstr "Enregistrer la session maintenant"
+
+#: capplets/wm-properties/wm-properties-capplet.c:521
+msgid "Save Session Now"
+msgstr "Enregistrer la session plus tard"
+
+#: capplets/wm-properties/wm-properties-capplet.c:524
+msgid ""
+"Your current window manager has been changed. In order for\n"
+"this change to be saved, you will need to save your current\n"
+"session. This can be done by either selecting \"Save Current Session\"\n"
+"under \"Settings\" in the main menu, or by turning on\n"
+"\"Save Current Setup\" when you log out.\n"
+msgstr ""
+"Votre gestionnaire de fenêtre a été changé. Pour que le\n"
+"changement soit enregistré, vous devez enregistrer la session actuelle.\n"
+"Cela peut être fait en sélectionnant \"Enregistrer la session courante\"\n"
+"sous l'entrée \"Paramétres\" du menu principal ou en activant\n"
+"l'option \"Enregistrer la configuration actuelle\" à la fin de votre "
+"session.\n"
+
+#: capplets/wm-properties/wm-properties-capplet.c:745
+msgid "Add New Window Manager"
+msgstr "Ajouter un nouveau gestionnaire de fenêtres"
+
+#: capplets/wm-properties/wm-properties-capplet.c:746
+#: control-center/capplet-manager.c:186
 msgid "Cancel"
 msgstr "Annuler"
 
-#: capplets/wm-properties/wm-properties-capplet.c:741
+#: capplets/wm-properties/wm-properties-capplet.c:757
 msgid "Name:"
 msgstr "Nom :"
 
-#: capplets/wm-properties/wm-properties-capplet.c:754
+#: capplets/wm-properties/wm-properties-capplet.c:770
 msgid "Command:"
 msgstr "Commande :"
 
-#: capplets/wm-properties/wm-properties-capplet.c:767
+#: capplets/wm-properties/wm-properties-capplet.c:783
 msgid "Configuration Command:"
 msgstr "Commande de configuration :"
 
-#: capplets/wm-properties/wm-properties-capplet.c:786
+#: capplets/wm-properties/wm-properties-capplet.c:802
 msgid "Window manager is session managed"
 msgstr "Le gestionnaire de fenêtres est géré par la session"
 
-#: capplets/wm-properties/wm-properties-capplet.c:836
+#: capplets/wm-properties/wm-properties-capplet.c:852
 msgid "Name cannot be empty"
 msgstr "Le champs du nom ne doit pas être vide"
 
-#: capplets/wm-properties/wm-properties-capplet.c:843
+#: capplets/wm-properties/wm-properties-capplet.c:859
 msgid "Command cannot be empty"
 msgstr "La champs de la commande ne peut pas être vide"
 
-#: capplets/wm-properties/wm-properties-capplet.c:892
-#: capplets/wm-properties/wm-properties-capplet.c:934
+#: capplets/wm-properties/wm-properties-capplet.c:908
+#: capplets/wm-properties/wm-properties-capplet.c:950
 msgid "Edit Window Manager"
 msgstr "Editer le gestionnaire de fenêtres"
 
-#: capplets/wm-properties/wm-properties-capplet.c:989
+#: capplets/wm-properties/wm-properties-capplet.c:1006
 msgid "You cannot delete the current Window Manager"
 msgstr "Vous ne pouvez pas supprimer le gestionnaire de fenêtres actuel"
 
-#: capplets/wm-properties/wm-properties-capplet.c:1102
+#: capplets/wm-properties/wm-properties-capplet.c:1119
 msgid ""
 "an initialization error occurred while starting 'wm-properties-capplet'.\n"
 "aborting...\n"
@@ -1388,7 +1417,7 @@ msgstr ""
 "Une erreur d'initialisation a eu lieu lors du démarrage\n"
 "de 'wm-properties-capplet'. Abandon...\n"
 
-#: control-center/callbacks.c:72
+#: control-center/callbacks.c:73
 msgid ""
 "No help is available/installed. Please make sure you\n"
 "have the GNOME User's Guide installed on your system."
@@ -1396,42 +1425,42 @@ msgstr ""
 "Aucune aide n'est disponible. Assurez-vous que\n"
 "le Guide de l'utilisateur GNOME est installé."
 
-#: control-center/callbacks.c:94
+#: control-center/callbacks.c:95
 msgid "GNOME Control Center"
 msgstr "Centre de contrôle GNOME"
 
-#: control-center/callbacks.c:97
+#: control-center/callbacks.c:98
 msgid "Desktop Properties manager."
 msgstr "Gestionnaires des propriétés du bureau."
 
-#: control-center/capplet-manager.c:170
+#: control-center/capplet-manager.c:171
 msgid "Try"
 msgstr "Essayer"
 
-#: control-center/capplet-manager.c:175
+#: control-center/capplet-manager.c:176
 msgid "Revert"
 msgstr "Revenir"
 
-#: control-center/capplet-manager.c:188 control-center/main.c:31
+#: control-center/capplet-manager.c:189 control-center/main.c:31
 msgid "Help"
 msgstr "Aide"
 
-#: control-center/capplet-widget-libs.c:46
-msgid "id of the capplet -- assigned by the control-center"
-msgstr "id de la capplet -- assignée par le centre de contrôle"
-
 #: control-center/capplet-widget-libs.c:46
 msgid "ID"
 msgstr "ID"
 
-#: control-center/capplet-widget-libs.c:47
-msgid "Multi-capplet id."
-msgstr "ID multi-capplet"
+#: control-center/capplet-widget-libs.c:46
+msgid "id of the capplet -- assigned by the control-center"
+msgstr "id de la capplet -- assignée par le centre de contrôle"
 
 #: control-center/capplet-widget-libs.c:47
 msgid "CAPID"
 msgstr "CAPID"
 
+#: control-center/capplet-widget-libs.c:47
+msgid "Multi-capplet id."
+msgstr "ID multi-capplet"
+
 #: control-center/capplet-widget-libs.c:48
 msgid "X ID of the socket it's plugged into"
 msgstr "X ID de la socket associée"
@@ -1440,14 +1469,14 @@ msgstr "X ID de la socket associ
 msgid "XID"
 msgstr "XID"
 
-#: control-center/capplet-widget-libs.c:49
-msgid "IOR of the control-center"
-msgstr "IOR du centre de contrôle"
-
 #: control-center/capplet-widget-libs.c:49
 msgid "IOR"
 msgstr "IOR"
 
+#: control-center/capplet-widget-libs.c:49
+msgid "IOR of the control-center"
+msgstr "IOR du centre de contrôle"
+
 #: control-center/capplet-widget-libs.c:50
 msgid "Initialize session settings"
 msgstr "Initialise les paramètres de session"
@@ -1462,27 +1491,27 @@ msgstr ""
 msgid "Sorry, no help is available for these settings."
 msgstr "Désolé, aucune aide n'est disponible pour ces paramétres."
 
-#: control-center/corba-glue.c:75
-msgid "capplet-command to be run."
-msgstr "capplet-command à lancer."
-
 #: control-center/corba-glue.c:75
 msgid "CAPPLET"
 msgstr "CAPPLET"
 
+#: control-center/corba-glue.c:75
+msgid "capplet-command to be run."
+msgstr "capplet-command à lancer."
+
 #: control-center/main.c:31
 msgid "Help with the GNOME control-center."
 msgstr "Aide du centre de contrôle GNOME."
 
+#: control-center/main.c:59
+msgid "Discard all changes"
+msgstr "Annuler tous les changements"
+
 #. we create the widgets
 #: control-center/main.c:59
 msgid "Warning:"
 msgstr "Avertissement :"
 
-#: control-center/main.c:59
-msgid "Discard all changes"
-msgstr "Annuler tous les changements"
-
 #. ...labels, etc
 #: control-center/main.c:68
 msgid ""