Release 2.1.2

2002-11-02  Jody Goldberg <jody@gnome.org>

	* Release 2.1.2

75 files changed, 15672 insertions, 9217 deletions

diff --git a/ChangeLog b/ChangeLog
index 44214b9c0..420caf91f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
+2002-10-25  Rajkumar Sivasamy <rajkumar.siva@wipro.com>
+
+	* configure.in: Check for GDK_PIXBUF_CSOURCE
+
 2002-10-25  Marco Pesenti Gritti  <marco@it.gnome.org>
             Jorn Baayen  <jorn@nl.linux.org>
 
diff --git a/archiver/ChangeLog b/archiver/ChangeLog
index 5a6c1d757..fc0b2f12b 100644
--- a/archiver/ChangeLog
+++ b/archiver/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/archiver/tests/ChangeLog b/archiver/tests/ChangeLog
index 9d6a96f89..650f89722 100644
--- a/archiver/tests/ChangeLog
+++ b/archiver/tests/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog
index c26cc719c..de3b78c3e 100644
--- a/capplets/accessibility/keyboard/ChangeLog
+++ b/capplets/accessibility/keyboard/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* accessibility-keyboard.c : Merge in Calum's new layout
+	* gnome-accessibility-keyboard-properties.glade : ditto.
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/capplets/accessibility/keyboard/accessibility-keyboard.c b/capplets/accessibility/keyboard/accessibility-keyboard.c
index de7b661cc..544a48ec0 100644
--- a/capplets/accessibility/keyboard/accessibility-keyboard.c
+++ b/capplets/accessibility/keyboard/accessibility-keyboard.c
@@ -45,28 +45,32 @@ static struct {
 	char const * const image_file;
 	char const * const gconf_key;
 	char const * const content [3];
+	gboolean always_enabled;
 } const features [] = {
+	{ "repeatkeys_enable", "repeatkeys_image", IDIR "keyboard-repeat.png",
+		"/desktop/gnome/peripherals/keyboard/repeat",
+		{ "repeatkeys_table", NULL, NULL }, TRUE },
 	{ "bouncekeys_enable", "bouncekeys_image", IDIR "accessibility-keyboard-bouncekey.png",
 		CONFIG_ROOT "/bouncekeys_enable",
-		{ "bouncekey_table", NULL, NULL } },
+		{ "bouncekey_table", NULL, NULL }, FALSE },
 	{ "slowkeys_enable", "slowkeys_image", IDIR "accessibility-keyboard-slowkey.png",
 		CONFIG_ROOT "/slowkeys_enable",
-		{ "slowkeys_table", NULL, NULL } },
+		{ "slowkeys_table", NULL, NULL }, FALSE },
 	{ "mousekeys_enable", "mousekeys_image", IDIR "accessibility-keyboard-mousekey.png",
 		CONFIG_ROOT "/mousekeys_enable",
-		{ "mousekeys_table", NULL, NULL } },
+		{ "mousekeys_table", NULL, NULL }, FALSE },
 	{ "stickykeys_enable", "stickykeys_image", IDIR "accessibility-keyboard-stickykey.png",
 		CONFIG_ROOT "/stickykeys_enable",
-		{ "stickeykeys_table", NULL, NULL } },
+		{ "stickeykeys_table", NULL, NULL }, FALSE },
 	{ "togglekeys_enable", "togglekeys_image", IDIR "accessibility-keyboard-togglekey.png",
 		CONFIG_ROOT "/togglekeys_enable",
-		{ NULL, NULL, NULL } },
+		{ NULL, NULL, NULL }, FALSE },
 	{ "timeout_enable", NULL, NULL,
 		CONFIG_ROOT "/timeout_enable",
-		{ "timeout_slide", "timeout_spin", "timeout_label" } },
+		{ "timeout_slide", "timeout_spin", "timeout_label" }, FALSE },
 	{ "feature_state_change_beep", NULL, NULL,
 		CONFIG_ROOT "/feature_state_change_beep",
-		{ NULL, NULL, NULL } }
+		{ NULL, NULL, NULL }, FALSE }
 };
 
 static struct {
@@ -78,6 +82,10 @@ static struct {
 	int step_size;
 	char const * const gconf_key;
 } const ranges [] = {
+	{ "repeatkeys_delay_slide",	"repeatkeys_delay_spin",     500, 100, 1500,   10,
+	  "/desktop/gnome/peripherals/keyboard/delay" },
+	{ "repeatkeys_rate_slide",	"repeatkeys_rate_spin",      90,   10,  210,   10,
+	  "/desktop/gnome/peripherals/keyboard/rate" },
 	{ "bouncekeys_delay_slide",	"bouncekeys_delay_spin",     300,  10,  900,   10,
 	  CONFIG_ROOT "/bouncekeys_delay" },
 	{ "slowkeys_delay_slide",	"slowkeys_delay_spin",	     300,  10,  500,   10,
@@ -221,12 +229,12 @@ setup_images (GladeXML *dialog)
 }
 
 static void
-cb_launch_keyboard_capplet (GtkButton *button, GtkWidget *dialog)
+cb_launch_mouse_capplet (GtkButton *button, GtkWidget *dialog)
 {
 	GError *err = NULL;
-	if (!g_spawn_command_line_async ("gnome-keyboard-properties", &err))
+	if (!g_spawn_command_line_async ("gnome-mouse-properties", &err))
 		capplet_error_dialog (GTK_WINDOW (gtk_widget_get_toplevel (dialog)),
-			_("There was an error launching the keyboard capplet : %s"),
+			_("There was an error launching the mouse preferences dialog: %s"),
 			err);
 }
 
@@ -238,9 +246,11 @@ cb_master_enable_toggle (GtkToggleButton *btn, GladeXML *dialog)
 	GtkWidget *w;
 
 	while (i-- > 0) {
-		w = WID (features [i].checkbox);
-		gtk_widget_set_sensitive (w, flag);
-		cb_feature_toggled (GTK_TOGGLE_BUTTON (w), GINT_TO_POINTER (i));
+		if (!features [i].always_enabled) {
+			w = WID (features [i].checkbox);
+			gtk_widget_set_sensitive (w, flag);
+			cb_feature_toggled (GTK_TOGGLE_BUTTON (w), GINT_TO_POINTER (i));
+		}
 	}
 }
 
@@ -493,9 +503,9 @@ setup_accessX_dialog (GConfChangeSet *changeset)
 	g_signal_connect (G_OBJECT (WID ("load_CDE_file")),
 		"clicked",
 		G_CALLBACK (cb_load_CDE_file), toplevel);
-	g_signal_connect (G_OBJECT (WID ("launch_keyboard_capplet")),
+	g_signal_connect (G_OBJECT (WID ("launch_mouse_capplet")),
 		"clicked",
-		G_CALLBACK (cb_launch_keyboard_capplet), toplevel);
+		G_CALLBACK (cb_launch_mouse_capplet), toplevel);
 
 	return toplevel;
 }
diff --git a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade
index de2859775..cdbcd8864 100644
--- a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade
+++ b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade
@@ -36,72 +36,6 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="load_CDE_file">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">1</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment4">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox4">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image2">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-revert-to-saved</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label35">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Import CDE AccessX file...</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
 	    <widget class="GtkButton" id="close_button">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
@@ -122,632 +56,1562 @@
       </child>
 
       <child>
-	<widget class="GtkTable" id="table1">
-	  <property name="border_width">5</property>
+	<widget class="GtkVBox" id="vbox1">
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
-	  <property name="n_rows">4</property>
-	  <property name="n_columns">2</property>
 	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">5</property>
-	  <property name="column_spacing">5</property>
+	  <property name="spacing">3</property>
 
 	  <child>
-	    <widget class="GtkFrame" id="frame1">
+	    <widget class="GtkCheckButton" id="master_enable">
 	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow1">
-		  <property name="border_width">4</property>
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <widget class="GtkTextView" id="textview1">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="justification">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap_mode">GTK_WRAP_CHAR</property>
-		      <property name="cursor_visible">True</property>
-		      <property name="pixels_above_lines">0</property>
-		      <property name="pixels_below_lines">0</property>
-		      <property name="pixels_inside_wrap">0</property>
-		      <property name="left_margin">0</property>
-		      <property name="right_margin">0</property>
-		      <property name="indent">0</property>
-		      <property name="text" translatable="yes"></property>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label36">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Testing Area</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="type">label_item</property>
-		</packing>
-	      </child>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">_Enable keyboard accessibility features</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="active">True</property>
+	      <property name="inconsistent">False</property>
+	      <property name="draw_indicator">True</property>
 	    </widget>
 	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
 	    </packing>
 	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkNotebook" id="notebook1">
+	  <property name="border_width">6</property>
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <property name="show_tabs">True</property>
+	  <property name="show_border">True</property>
+	  <property name="tab_pos">GTK_POS_TOP</property>
+	  <property name="scrollable">False</property>
+	  <property name="enable_popup">False</property>
 
 	  <child>
-	    <widget class="GtkFrame" id="frame2">
+	    <widget class="GtkVBox" id="vbox8">
 	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
 
 	      <child>
-		<widget class="GtkTable" id="table3">
-		  <property name="border_width">3</property>
+		<widget class="GtkTable" id="table4">
 		  <property name="visible">True</property>
-		  <property name="n_rows">2</property>
-		  <property name="n_columns">2</property>
+		  <property name="n_rows">3</property>
+		  <property name="n_columns">1</property>
 		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">3</property>
-		  <property name="column_spacing">3</property>
+		  <property name="row_spacing">6</property>
+		  <property name="column_spacing">6</property>
 
 		  <child>
-		    <widget class="GtkImage" id="togglekeys_image">
+		    <widget class="GtkFrame" id="frame9">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0</property>
-		      <property name="xpad">5</property>
-		      <property name="ypad">5</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox6">
+			  <property name="border_width">6</property>
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkHBox" id="timeout_box">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkCheckButton" id="timeout_enable">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">_Disable if unused for:</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="active">True</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkHScale" id="timeout_slide">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="draw_value">False</property>
+				  <property name="value_pos">GTK_POS_TOP</property>
+				  <property name="digits">1</property>
+				  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+				  <property name="inverted">False</property>
+				  <property name="adjustment">0 0 0 0 0 0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkSpinButton" id="timeout_spin">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="climb_rate">1</property>
+				  <property name="digits">0</property>
+				  <property name="numeric">False</property>
+				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+				  <property name="snap_to_ticks">False</property>
+				  <property name="wrap">False</property>
+				  <property name="adjustment">0 0 100 1 10 10</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="timeout_label">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">seconds</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">5</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="feature_state_change_beep">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Beep when a _feature is turned on or off</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkHBox" id="hbox10">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkFixed" id="fixed1">
+				  <property name="visible">True</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkButton" id="load_CDE_file">
+				  <property name="visible">True</property>
+				  <property name="can_default">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+
+				  <child>
+				    <widget class="GtkAlignment" id="alignment4">
+				      <property name="visible">True</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xscale">0</property>
+				      <property name="yscale">0</property>
+
+				      <child>
+					<widget class="GtkHBox" id="hbox4">
+					  <property name="visible">True</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">2</property>
+
+					  <child>
+					    <widget class="GtkImage" id="image2">
+					      <property name="visible">True</property>
+					      <property name="stock">gtk-revert-to-saved</property>
+					      <property name="icon_size">4</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkLabel" id="label35">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes">_Import Feature Settings...</property>
+					      <property name="use_underline">True</property>
+					      <property name="use_markup">False</property>
+					      <property name="justify">GTK_JUSTIFY_LEFT</property>
+					      <property name="wrap">False</property>
+					      <property name="selectable">False</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+					</widget>
+				      </child>
+				    </widget>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label61">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Features</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">0</property>
 		      <property name="right_attach">1</property>
 		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
+		      <property name="bottom_attach">1</property>
 		      <property name="y_options">fill</property>
 		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkCheckButton" id="togglekeys_enable">
+		    <widget class="GtkFrame" id="frame10">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Beep when an LED is turned on and two beeps when one is turned off.</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">E_nable Toggle Keys</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="active">True</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkTable" id="repeatkeys_table">
+			  <property name="border_width">6</property>
+			  <property name="visible">True</property>
+			  <property name="n_rows">4</property>
+			  <property name="n_columns">4</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">0</property>
+			  <property name="column_spacing">3</property>
+
+			  <child>
+			    <widget class="GtkImage" id="repeatkeys_image">
+			      <property name="visible">True</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0</property>
+			      <property name="xpad">5</property>
+			      <property name="ypad">5</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">4</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="label78">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Del_ay:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">4</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="label77">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">S_peed:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">4</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkHScale" id="repeatkeys_delay_slide">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="draw_value">False</property>
+			      <property name="value_pos">GTK_POS_TOP</property>
+			      <property name="digits">1</property>
+			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+			      <property name="inverted">False</property>
+			      <property name="adjustment">0 0 0 0 0 0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkHScale" id="repeatkeys_rate_slide">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="draw_value">False</property>
+			      <property name="value_pos">GTK_POS_TOP</property>
+			      <property name="digits">1</property>
+			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+			      <property name="inverted">False</property>
+			      <property name="adjustment">0 0 0 0 0 0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">3</property>
+			      <property name="bottom_attach">4</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkSpinButton" id="repeatkeys_rate_spin">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="climb_rate">1</property>
+			      <property name="digits">0</property>
+			      <property name="numeric">False</property>
+			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+			      <property name="snap_to_ticks">False</property>
+			      <property name="wrap">False</property>
+			      <property name="adjustment">0 0 100 1 10 10</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">2</property>
+			      <property name="right_attach">3</property>
+			      <property name="top_attach">3</property>
+			      <property name="bottom_attach">4</property>
+			      <property name="x_options"></property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkSpinButton" id="repeatkeys_delay_spin">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="climb_rate">1</property>
+			      <property name="digits">0</property>
+			      <property name="numeric">False</property>
+			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+			      <property name="snap_to_ticks">False</property>
+			      <property name="wrap">False</property>
+			      <property name="adjustment">0 0 100 1 10 10</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">2</property>
+			      <property name="right_attach">3</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options"></property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="label79">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">milliseconds</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">3</property>
+			      <property name="right_attach">4</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="label80">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">characters/second</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">3</property>
+			      <property name="right_attach">4</property>
+			      <property name="top_attach">3</property>
+			      <property name="bottom_attach">4</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="repeatkeys_enable">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">_Repeat Keys</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
 		    </widget>
 		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
+		      <property name="left_attach">0</property>
+		      <property name="right_attach">1</property>
+		      <property name="top_attach">2</property>
+		      <property name="bottom_attach">3</property>
 		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
+		      <property name="y_options">fill</property>
 		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkButton" id="launch_keyboard_capplet">
+		    <widget class="GtkFrame" id="frame3">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Repeat Key Pre_ferences...</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkTable" id="stickeykeys_table">
+			  <property name="border_width">6</property>
+			  <property name="visible">True</property>
+			  <property name="n_rows">2</property>
+			  <property name="n_columns">2</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">6</property>
+			  <property name="column_spacing">6</property>
+
+			  <child>
+			    <widget class="GtkImage" id="stickykeys_image">
+			      <property name="visible">True</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0</property>
+			      <property name="xpad">5</property>
+			      <property name="ypad">5</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="stickykeys_modifier_beep">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Beep when _modifier is pressed</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="active">True</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="stickykeys_two_key_off">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Disa_ble if two keys pressed together</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="active">True</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="stickykeys_enable">
+			  <property name="visible">True</property>
+			  <property name="tooltip" translatable="yes">Perform multiple simultaneous key press operations by pressing modifier keys in sequence.</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Enable _Sticky Keys</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="active">True</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
 		    </widget>
 		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
+		      <property name="left_attach">0</property>
+		      <property name="right_attach">1</property>
 		      <property name="top_attach">1</property>
 		      <property name="bottom_attach">2</property>
 		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
+		      <property name="y_options">fill</property>
 		    </packing>
 		  </child>
 		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkLabel" id="label37">
+		<widget class="GtkHBox" id="hbox11">
+		  <property name="border_width">6</property>
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Toggle and Repeat Keys</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="label70">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Type to test settings:</property>
+		      <property name="use_underline">True</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="mnemonic_widget">basic_test_entry</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkViewport" id="viewport1">
+		      <property name="border_width">6</property>
+		      <property name="visible">True</property>
+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+		      <child>
+			<widget class="GtkEntry" id="basic_test_entry">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="editable">True</property>
+			  <property name="visibility">True</property>
+			  <property name="max_length">0</property>
+			  <property name="text" translatable="yes"></property>
+			  <property name="has_frame">True</property>
+			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="activates_default">False</property>
+			</widget>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
 		</widget>
 		<packing>
-		  <property name="type">label_item</property>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
 		</packing>
 	      </child>
 	    </widget>
 	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label55">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Basic</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
 	    </packing>
 	  </child>
 
 	  <child>
-	    <widget class="GtkFrame" id="frame3">
+	    <widget class="GtkVBox" id="vbox9">
 	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
 
 	      <child>
-		<widget class="GtkTable" id="stickeykeys_table">
+		<widget class="GtkTable" id="table1">
 		  <property name="visible">True</property>
-		  <property name="n_rows">2</property>
+		  <property name="n_rows">3</property>
 		  <property name="n_columns">2</property>
 		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">0</property>
-		  <property name="column_spacing">0</property>
+		  <property name="row_spacing">6</property>
+		  <property name="column_spacing">6</property>
 
 		  <child>
-		    <widget class="GtkCheckButton" id="stickykeys_modifier_beep">
+		    <widget class="GtkFrame" id="frame4">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Beep when modifier is pressed</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="active">True</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkTable" id="slowkeys_table">
+			  <property name="border_width">6</property>
+			  <property name="visible">True</property>
+			  <property name="n_rows">3</property>
+			  <property name="n_columns">4</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">0</property>
+			  <property name="column_spacing">6</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="slowkeys_title">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Only accept keys held for:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">slowkeys_delay_spin</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">4</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkHScale" id="slowkeys_delay_slide">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="draw_value">False</property>
+			      <property name="value_pos">GTK_POS_TOP</property>
+			      <property name="digits">1</property>
+			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+			      <property name="inverted">False</property>
+			      <property name="adjustment">0 0 0 0 0 0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkImage" id="slowkeys_image">
+			      <property name="visible">True</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0</property>
+			      <property name="xpad">5</property>
+			      <property name="ypad">5</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkTable" id="table6">
+			      <property name="visible">True</property>
+			      <property name="n_rows">3</property>
+			      <property name="n_columns">2</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">0</property>
+			      <property name="column_spacing">6</property>
+
+			      <child>
+				<widget class="GtkCheckButton" id="slowkeys_beep_press">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">_pressed</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="active">True</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkCheckButton" id="slowkeys_beep_accept">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">_accepted</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="active">True</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkCheckButton" id="slowkeys_beep_reject">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">_rejected</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="active">True</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="label14">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Beep when key is:</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">3</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkSpinButton" id="slowkeys_delay_spin">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="climb_rate">1</property>
+			      <property name="digits">0</property>
+			      <property name="numeric">True</property>
+			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+			      <property name="snap_to_ticks">True</property>
+			      <property name="wrap">False</property>
+			      <property name="adjustment">1 0 100 1 10 10</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">2</property>
+			      <property name="right_attach">3</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options"></property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="slowkeys_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">milliseconds</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">2</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">3</property>
+			      <property name="right_attach">4</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="slowkeys_enable">
+			  <property name="visible">True</property>
+			  <property name="tooltip" translatable="yes">Only accept keys after they have been pressed and held for a user adjustable amount of time.</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Enable Slo_w Keys</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="active">True</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
 		    </widget>
 		    <packing>
-		      <property name="left_attach">1</property>
+		      <property name="left_attach">0</property>
 		      <property name="right_attach">2</property>
 		      <property name="top_attach">0</property>
 		      <property name="bottom_attach">1</property>
 		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
+		      <property name="y_options">fill</property>
 		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkCheckButton" id="stickykeys_two_key_off">
+		    <widget class="GtkFrame" id="frame5">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Turn off Sticky Keys when
-two keys pressed simultaneously</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="active">True</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkTable" id="bouncekey_table">
+			  <property name="border_width">6</property>
+			  <property name="visible">True</property>
+			  <property name="n_rows">3</property>
+			  <property name="n_columns">4</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">0</property>
+			  <property name="column_spacing">6</property>
+
+			  <child>
+			    <widget class="GtkImage" id="bouncekeys_image">
+			      <property name="visible">True</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0</property>
+			      <property name="xpad">5</property>
+			      <property name="ypad">5</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="bouncekeys_title">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">I_gnore duplicate keypresses within:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">bouncekeys_delay_spin</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">4</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkHScale" id="bouncekeys_delay_slide">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="draw_value">False</property>
+			      <property name="value_pos">GTK_POS_TOP</property>
+			      <property name="digits">1</property>
+			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+			      <property name="inverted">False</property>
+			      <property name="adjustment">0 0 0 0 0 0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkSpinButton" id="bouncekeys_delay_spin">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="climb_rate">1</property>
+			      <property name="digits">0</property>
+			      <property name="numeric">False</property>
+			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+			      <property name="snap_to_ticks">False</property>
+			      <property name="wrap">False</property>
+			      <property name="adjustment">0 0 100 1 10 10</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">2</property>
+			      <property name="right_attach">3</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options"></property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="bouncekeys_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">milliseconds</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">2</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">3</property>
+			      <property name="right_attach">4</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="bouncekeys_beep_reject">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Beep if key is re_jected</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">4</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="y_padding">6</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="bouncekeys_enable">
+			  <property name="visible">True</property>
+			  <property name="tooltip" translatable="yes">Ignore all subsequent presses of the SAME key if they happen within a user selectable period of time.</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Enable Bo_unce Keys</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="active">True</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
 		    </widget>
 		    <packing>
-		      <property name="left_attach">1</property>
+		      <property name="left_attach">0</property>
 		      <property name="right_attach">2</property>
 		      <property name="top_attach">1</property>
 		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
+		      <property name="y_options">fill</property>
 		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkImage" id="stickykeys_image">
+		    <widget class="GtkFrame" id="frame8">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0</property>
-		      <property name="xpad">5</property>
-		      <property name="ypad">5</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox8">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkImage" id="togglekeys_image">
+			      <property name="visible">True</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">5</property>
+			      <property name="ypad">5</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="togglekeys_enable">
+			      <property name="border_width">6</property>
+			      <property name="visible">True</property>
+			      <property name="tooltip" translatable="yes">Beep when an LED is turned on and two beeps when one is turned off.</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">E_nable Toggle Keys</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="active">True</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label37">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Toggle Keys</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
+		      <property name="right_attach">2</property>
+		      <property name="top_attach">2</property>
+		      <property name="bottom_attach">3</property>
+		      <property name="y_options">fill</property>
 		    </packing>
 		  </child>
 		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkCheckButton" id="stickykeys_enable">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Perform multiple simultaneous key press operations by pressing modifier keys in sequence.</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Enable _Sticky Keys</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="active">True</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
 		<packing>
-		  <property name="type">label_item</property>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkFrame" id="frame4">
-	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 
 	      <child>
-		<widget class="GtkTable" id="slowkeys_table">
+		<widget class="GtkHBox" id="hbox12">
+		  <property name="border_width">6</property>
 		  <property name="visible">True</property>
-		  <property name="n_rows">3</property>
-		  <property name="n_columns">2</property>
 		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">0</property>
-		  <property name="column_spacing">0</property>
+		  <property name="spacing">0</property>
 
 		  <child>
-		    <widget class="GtkImage" id="slowkeys_image">
+		    <widget class="GtkLabel" id="label71">
 		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0</property>
-		      <property name="xpad">5</property>
-		      <property name="ypad">5</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">3</property>
-		      <property name="x_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="slowkeys_title">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Only accept keypress after:</property>
+		      <property name="label" translatable="yes">_Type to test settings:</property>
 		      <property name="use_underline">True</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
 		      <property name="wrap">False</property>
 		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
+		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
-		      <property name="xpad">9</property>
+		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">slowkeys_delay_spin</property>
+		      <property name="mnemonic_widget">filters_test_entry</property>
 		    </widget>
 		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
 		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkHBox" id="slowkeys_delay">
+		    <widget class="GtkViewport" id="viewport2">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		      <child>
-			<widget class="GtkHScale" id="slowkeys_delay_slide">
+			<widget class="GtkEntry" id="filters_test_entry">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="draw_value">False</property>
-			  <property name="value_pos">GTK_POS_TOP</property>
-			  <property name="digits">1</property>
-			  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			  <property name="inverted">False</property>
-			  <property name="adjustment">0 0 0 0 0 0</property>
-			  <accessibility>
-			    <atkrelation target="slowkeys_delay_spin" type="controller-for"/>
-			  </accessibility>
+			  <property name="editable">True</property>
+			  <property name="visibility">True</property>
+			  <property name="max_length">0</property>
+			  <property name="text" translatable="yes"></property>
+			  <property name="has_frame">True</property>
+			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="activates_default">False</property>
 			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
 		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label54">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Filters</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox5">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkFrame" id="frame6">
+		  <property name="border_width">6</property>
+		  <property name="visible">True</property>
+		  <property name="label_xalign">0</property>
+		  <property name="label_yalign">0.5</property>
+		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		  <child>
+		    <widget class="GtkTable" id="mousekeys_table">
+		      <property name="border_width">6</property>
+		      <property name="visible">True</property>
+		      <property name="n_rows">6</property>
+		      <property name="n_columns">4</property>
+		      <property name="homogeneous">False</property>
+		      <property name="row_spacing">3</property>
+		      <property name="column_spacing">6</property>
 
 		      <child>
-			<widget class="GtkSpinButton" id="slowkeys_delay_spin">
+			<widget class="GtkLabel" id="mousekeys_max_speed_title">
 			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">1</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">True</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">True</property>
+			  <property name="label" translatable="yes">Ma_ximum pointer speed:</property>
+			  <property name="use_underline">True</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">1 0 100 1 10 10</property>
-			  <accessibility>
-			    <atkrelation target="slowkeys_title" type="labelled-by"/>
-			    <atkrelation target="slowkeys_label" type="labelled-by"/>
-			    <atkrelation target="slowkeys_delay_slide" type="controlled-by"/>
-			  </accessibility>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="mnemonic_widget">mousekeys_max_speed_spin</property>
 			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">4</property>
+			  <property name="top_attach">0</property>
+			  <property name="bottom_attach">1</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkLabel" id="slowkeys_label">
+			<widget class="GtkLabel" id="mousekeys_init_delay_title">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">msecs</property>
-			  <property name="use_underline">False</property>
+			  <property name="label" translatable="yes">Delay between keypress and pointer mo_vement:</property>
+			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
 			  <property name="wrap">False</property>
 			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
+			  <property name="xalign">0</property>
 			  <property name="yalign">0.5</property>
-			  <property name="xpad">2</property>
+			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
-			  <accessibility>
-			    <atkrelation target="slowkeys_delay_spin" type="label-for"/>
-			  </accessibility>
+			  <property name="mnemonic_widget">mousekeys_init_delay_spin</property>
 			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">4</property>
+			  <property name="top_attach">4</property>
+			  <property name="bottom_attach">5</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="slowkeys_table2">
-		      <property name="visible">True</property>
-		      <property name="n_rows">3</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">0</property>
-		      <property name="column_spacing">0</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label14">
+			<widget class="GtkLabel" id="mousekeys_accel_time_title">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Beep when:</property>
-			  <property name="use_underline">False</property>
+			  <property name="label" translatable="yes">Time to acce_lerate to maximum speed:</property>
+			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
 			  <property name="wrap">False</property>
 			  <property name="selectable">False</property>
 			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
+			  <property name="yalign">0</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="mnemonic_widget">mousekeys_accel_time_spin</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">4</property>
+			  <property name="top_attach">2</property>
+			  <property name="bottom_attach">3</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkImage" id="mousekeys_image">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0</property>
+			  <property name="xpad">5</property>
+			  <property name="ypad">5</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">0</property>
 			  <property name="right_attach">1</property>
 			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
+			  <property name="bottom_attach">6</property>
 			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
+			  <property name="y_options">fill</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkCheckButton" id="slowkeys_beep_press">
+			<widget class="GtkSpinButton" id="mousekeys_max_speed_spin">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">key is _pressed</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="active">True</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
+			  <property name="climb_rate">1</property>
+			  <property name="digits">0</property>
+			  <property name="numeric">True</property>
+			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+			  <property name="snap_to_ticks">True</property>
+			  <property name="wrap">False</property>
+			  <property name="adjustment">100 0 1000 1 10 10</property>
 			</widget>
 			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
+			  <property name="left_attach">2</property>
+			  <property name="right_attach">3</property>
+			  <property name="top_attach">1</property>
+			  <property name="bottom_attach">2</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkCheckButton" id="slowkeys_beep_accept">
+			<widget class="GtkHScale" id="mousekeys_max_speed_slide">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">key is _accepted</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="active">True</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
+			  <property name="draw_value">False</property>
+			  <property name="value_pos">GTK_POS_TOP</property>
+			  <property name="digits">1</property>
+			  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+			  <property name="inverted">False</property>
+			  <property name="adjustment">0 0 0 0 0 0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">1</property>
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">1</property>
 			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkCheckButton" id="slowkeys_beep_reject">
+			<widget class="GtkHScale" id="mousekeys_accel_time_slide">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">key is _rejected</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="active">True</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
+			  <property name="draw_value">False</property>
+			  <property name="value_pos">GTK_POS_TOP</property>
+			  <property name="digits">1</property>
+			  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+			  <property name="inverted">False</property>
+			  <property name="adjustment">0 0 0 0 0 0</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">1</property>
 			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">2</property>
-		      <property name="bottom_attach">3</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkCheckButton" id="slowkeys_enable">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Only accept keys after they have been pressed and held for a user adjustable amount of time.</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Enable Slo_w Keys</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="active">True</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-		<packing>
-		  <property name="type">label_item</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkFrame" id="frame5">
-	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	      <child>
-		<widget class="GtkTable" id="bouncekey_table">
-		  <property name="visible">True</property>
-		  <property name="n_rows">3</property>
-		  <property name="n_columns">2</property>
-		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">0</property>
-		  <property name="column_spacing">0</property>
-
-		  <child>
-		    <widget class="GtkImage" id="bouncekeys_image">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0</property>
-		      <property name="xpad">5</property>
-		      <property name="ypad">5</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">3</property>
-		      <property name="x_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="bouncekeys_title">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">I_gnore keypresses within:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">10</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">bouncekeys_delay_spin</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox13">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkHScale" id="bouncekeys_delay_slide">
+			<widget class="GtkHScale" id="mousekeys_init_delay_slide">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
 			  <property name="draw_value">False</property>
@@ -756,45 +1620,112 @@ two keys pressed simultaneously</property>
 			  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
 			  <property name="inverted">False</property>
 			  <property name="adjustment">0 0 0 0 0 0</property>
-			  <accessibility>
-			    <atkrelation target="bouncekeys_delay_spin" type="controller-for"/>
-			  </accessibility>
 			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">5</property>
+			  <property name="bottom_attach">6</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkSpinButton" id="mousekeys_accel_time_spin">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="climb_rate">1</property>
+			  <property name="digits">0</property>
+			  <property name="numeric">True</property>
+			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+			  <property name="snap_to_ticks">True</property>
+			  <property name="wrap">False</property>
+			  <property name="adjustment">100 0 1000 1 10 10</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">2</property>
+			  <property name="right_attach">3</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
+			  <property name="x_options"></property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkSpinButton" id="bouncekeys_delay_spin">
+			<widget class="GtkSpinButton" id="mousekeys_init_delay_spin">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
 			  <property name="climb_rate">1</property>
 			  <property name="digits">0</property>
-			  <property name="numeric">False</property>
+			  <property name="numeric">True</property>
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">False</property>
+			  <property name="snap_to_ticks">True</property>
+			  <property name="wrap">False</property>
+			  <property name="adjustment">1000 0 1000 1 10 10</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">2</property>
+			  <property name="right_attach">3</property>
+			  <property name="top_attach">5</property>
+			  <property name="bottom_attach">6</property>
+			  <property name="x_options"></property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="mousekeys_max_speed_label">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">pixels/second</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">2</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">3</property>
+			  <property name="right_attach">4</property>
+			  <property name="top_attach">1</property>
+			  <property name="bottom_attach">2</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="mousekeys_accel_time_label">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">milliseconds</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">1 0 100 1 10 10</property>
-			  <accessibility>
-			    <atkrelation target="bouncekeys_title" type="labelled-by"/>
-			    <atkrelation target="bouncekeys_label" type="labelled-by"/>
-			    <atkrelation target="bouncekeys_delay_slide" type="controlled-by"/>
-			  </accessibility>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">2</property>
+			  <property name="ypad">0</property>
 			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
+			  <property name="left_attach">3</property>
+			  <property name="right_attach">4</property>
+			  <property name="top_attach">3</property>
+			  <property name="bottom_attach">4</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkLabel" id="bouncekeys_label">
+			<widget class="GtkLabel" id="mousekeys_init_delay_label">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">msecs</property>
+			  <property name="label" translatable="yes">milliseconds</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -804,619 +1735,226 @@ two keys pressed simultaneously</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">2</property>
 			  <property name="ypad">0</property>
-			  <accessibility>
-			    <atkrelation target="bouncekeys_delay_spin" type="label-for"/>
-			  </accessibility>
+			  <property name="mnemonic_widget">mousekeys_init_delay_spin</property>
 			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
+			  <property name="left_attach">3</property>
+			  <property name="right_attach">4</property>
+			  <property name="top_attach">5</property>
+			  <property name="bottom_attach">6</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
-		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkCheckButton" id="bouncekeys_beep_reject">
+		    <widget class="GtkCheckButton" id="mousekeys_enable">
 		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Turn the numeric keypad into a mouse control pad.</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Beep when key is re_jected</property>
+		      <property name="label" translatable="yes">Enable _Mouse Keys</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="active">False</property>
+		      <property name="active">True</property>
 		      <property name="inconsistent">False</property>
 		      <property name="draw_indicator">True</property>
 		    </widget>
 		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">2</property>
-		      <property name="bottom_attach">3</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
+		      <property name="type">label_item</property>
 		    </packing>
 		  </child>
 		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkCheckButton" id="bouncekeys_enable">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Ignore all subsequent presses of the SAME key if they happen within a user selectable period of time.</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Enable Bo_unce Keys</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="active">True</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
 		<packing>
-		  <property name="type">label_item</property>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkFrame" id="frame6">
-	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 
 	      <child>
-		<widget class="GtkTable" id="mousekeys_table">
+		<widget class="GtkFrame" id="frame11">
+		  <property name="border_width">6</property>
 		  <property name="visible">True</property>
-		  <property name="n_rows">6</property>
-		  <property name="n_columns">4</property>
-		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">0</property>
-		  <property name="column_spacing">0</property>
+		  <property name="label_xalign">0</property>
+		  <property name="label_yalign">0.5</property>
+		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="mousekeys_max_speed_title">
+		    <widget class="GtkTable" id="table7">
+		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Ma_ximum pointer speed:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">mousekeys_max_speed_spin</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">4</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
+		      <property name="n_rows">1</property>
+		      <property name="n_columns">2</property>
+		      <property name="homogeneous">False</property>
+		      <property name="row_spacing">0</property>
+		      <property name="column_spacing">3</property>
 
-		  <child>
-		    <widget class="GtkLabel" id="mousekeys_init_delay_title">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Start mo_ving this long after keypress:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">mousekeys_init_delay_spin</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">4</property>
-		      <property name="top_attach">4</property>
-		      <property name="bottom_attach">5</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
+		      <child>
+			<widget class="GtkImage" id="mouse_capplet_image">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0</property>
+			  <property name="xpad">5</property>
+			  <property name="ypad">5</property>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">0</property>
+			  <property name="bottom_attach">1</property>
+			  <property name="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
 
-		  <child>
-		    <widget class="GtkLabel" id="mousekeys_max_speed_label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">pixels/sec</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">2</property>
-		      <property name="ypad">0</property>
-		      <accessibility>
-			<atkrelation target="mousekeys_max_speed_spin" type="label-for"/>
-		      </accessibility>
+		      <child>
+			<widget class="GtkHBox" id="hbox15">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkFixed" id="fixed3">
+			      <property name="visible">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkButton" id="launch_mouse_capplet">
+			      <property name="visible">True</property>
+			      <property name="can_default">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+
+			      <child>
+				<widget class="GtkAlignment" id="alignment6">
+				  <property name="visible">True</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xscale">0</property>
+				  <property name="yscale">0</property>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox16">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">2</property>
+
+				      <child>
+					<widget class="GtkImage" id="image5">
+					  <property name="visible">True</property>
+					  <property name="stock">gtk-jump-to</property>
+					  <property name="icon_size">4</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkLabel" id="label73">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">Mouse _Preferences...</property>
+					  <property name="use_underline">True</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				  </child>
+				</widget>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">0</property>
+			  <property name="bottom_attach">1</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
 		    </widget>
-		    <packing>
-		      <property name="left_attach">3</property>
-		      <property name="right_attach">4</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
-		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="mousekeys_accel_time_label">
+		    <widget class="GtkLabel" id="label74">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">msecs</property>
+		      <property name="label" translatable="yes">Mouse</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
 		      <property name="wrap">False</property>
 		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">2</property>
-		      <property name="ypad">0</property>
-		      <accessibility>
-			<atkrelation target="mousekeys_accel_time_spin" type="label-for"/>
-		      </accessibility>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">3</property>
-		      <property name="right_attach">4</property>
-		      <property name="top_attach">3</property>
-		      <property name="bottom_attach">4</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSpinButton" id="mousekeys_max_speed_spin">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="climb_rate">1</property>
-		      <property name="digits">0</property>
-		      <property name="numeric">True</property>
-		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		      <property name="snap_to_ticks">True</property>
-		      <property name="wrap">False</property>
-		      <property name="adjustment">1 0 100 1 10 10</property>
-		      <accessibility>
-			<atkrelation target="mousekeys_accel_time_slide" type="controlled-by"/>
-			<atkrelation target="mousekeys_max_speed_title" type="labelled-by"/>
-			<atkrelation target="mousekeys_max_speed_label" type="labelled-by"/>
-		      </accessibility>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">2</property>
-		      <property name="right_attach">3</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHScale" id="mousekeys_max_speed_slide">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="draw_value">False</property>
-		      <property name="value_pos">GTK_POS_TOP</property>
-		      <property name="digits">1</property>
-		      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-		      <property name="inverted">False</property>
-		      <property name="adjustment">0 0 0 0 0 0</property>
-		      <accessibility>
-			<atkrelation target="mousekeys_max_speed_spin" type="controller-for"/>
-		      </accessibility>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="mousekeys_accel_time_title">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Time to acce_lerate to max speed:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
+		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">mousekeys_accel_time_spin</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">4</property>
-		      <property name="top_attach">2</property>
-		      <property name="bottom_attach">3</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSpinButton" id="mousekeys_init_delay_spin">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="climb_rate">1</property>
-		      <property name="digits">0</property>
-		      <property name="numeric">True</property>
-		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		      <property name="snap_to_ticks">True</property>
-		      <property name="wrap">False</property>
-		      <property name="adjustment">1 0 100 1 10 10</property>
-		      <accessibility>
-			<atkrelation target="mousekeys_init_delay_slide" type="controlled-by"/>
-			<atkrelation target="mousekeys_init_delay_title" type="labelled-by"/>
-			<atkrelation target="mousekeys_init_delay_label" type="labelled-by"/>
-		      </accessibility>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">2</property>
-		      <property name="right_attach">3</property>
-		      <property name="top_attach">5</property>
-		      <property name="bottom_attach">6</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSpinButton" id="mousekeys_accel_time_spin">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="climb_rate">1</property>
-		      <property name="digits">0</property>
-		      <property name="numeric">True</property>
-		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		      <property name="snap_to_ticks">True</property>
-		      <property name="wrap">False</property>
-		      <property name="adjustment">1 0 100 1 10 10</property>
-		      <accessibility>
-			<atkrelation target="mousekeys_max_speed_slide" type="controlled-by"/>
-			<atkrelation target="mousekeys_accel_time_title" type="labelled-by"/>
-			<atkrelation target="mousekeys_accel_time_label" type="labelled-by"/>
-		      </accessibility>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">2</property>
-		      <property name="right_attach">3</property>
-		      <property name="top_attach">3</property>
-		      <property name="bottom_attach">4</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHScale" id="mousekeys_accel_time_slide">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="draw_value">False</property>
-		      <property name="value_pos">GTK_POS_TOP</property>
-		      <property name="digits">1</property>
-		      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-		      <property name="inverted">False</property>
-		      <property name="adjustment">0 0 0 0 0 0</property>
-		      <accessibility>
-			<atkrelation target="mousekeys_accel_time_spin" type="controller-for"/>
-		      </accessibility>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">3</property>
-		      <property name="bottom_attach">4</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHScale" id="mousekeys_init_delay_slide">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="draw_value">False</property>
-		      <property name="value_pos">GTK_POS_TOP</property>
-		      <property name="digits">1</property>
-		      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-		      <property name="inverted">False</property>
-		      <property name="adjustment">0 0 0 0 0 0</property>
-		      <accessibility>
-			<atkrelation target="mousekeys_init_delay_spin" type="controller-for"/>
-		      </accessibility>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">5</property>
-		      <property name="bottom_attach">6</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="mousekeys_init_delay_label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">msecs</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">2</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">mousekeys_init_delay_spin</property>
 		    </widget>
 		    <packing>
-		      <property name="left_attach">3</property>
-		      <property name="right_attach">4</property>
-		      <property name="top_attach">5</property>
-		      <property name="bottom_attach">6</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
+		      <property name="type">label_item</property>
 		    </packing>
 		  </child>
-
-		  <child>
-		    <widget class="GtkImage" id="mousekeys_image">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0</property>
-		      <property name="xpad">5</property>
-		      <property name="ypad">5</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">6</property>
-		      <property name="x_options">fill</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkCheckButton" id="mousekeys_enable">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Turn the numeric keypad into a mouse control pad.</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Enable _Mouse Keys</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="active">True</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
 		</widget>
 		<packing>
-		  <property name="type">label_item</property>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
 		</packing>
 	      </child>
 	    </widget>
 	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
 	    </packing>
 	  </child>
 
 	  <child>
-	    <widget class="GtkFrame" id="frame7">
+	    <widget class="GtkLabel" id="label60">
 	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox1">
-		  <property name="border_width">15</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">10</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="master_enable">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Enable keyboard accessibility</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="active">True</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment3">
-		      <property name="visible">True</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0</property>
-		      <property name="xscale">0</property>
-		      <property name="yscale">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="feature_state_change_beep">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Beep when enabling/disabling _keyboard accessibility features</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="timeout_box">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="timeout_enable">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Disable if unused for </property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="active">True</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHScale" id="timeout_slide">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="draw_value">False</property>
-			  <property name="value_pos">GTK_POS_TOP</property>
-			  <property name="digits">1</property>
-			  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			  <property name="inverted">False</property>
-			  <property name="adjustment">0 0 0 0 0 0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkSpinButton" id="timeout_spin">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">1</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">False</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">False</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">1 0 100 1 10 10</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="timeout_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">seconds</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">5</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label53">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">General</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="type">label_item</property>
-		</packing>
-	      </child>
+	      <property name="label" translatable="yes">Mouse</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
 	    </widget>
 	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
+	      <property name="type">tab</property>
 	    </packing>
 	  </child>
 	</widget>
diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index 4e6f52cfb..78f367999 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index b78ca5a95..c9fa9e65e 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 Fri Nov  1 11:03:34 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* gnome-theme-info.[ch]: Moved theme-common, and gave more
diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index e6027457c..d38176d40 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/capplets/desktop-links/ChangeLog b/capplets/desktop-links/ChangeLog
index edd922209..c7614e4ee 100644
--- a/capplets/desktop-links/ChangeLog
+++ b/capplets/desktop-links/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog
index 35c15931d..03c3159d1 100644
--- a/capplets/file-types/ChangeLog
+++ b/capplets/file-types/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog
index 98837fcd9..5c8e650ca 100644
--- a/capplets/font/ChangeLog
+++ b/capplets/font/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 Fri Nov  1 18:21:22 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* main.c: remove the duplicate #defined key.
diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog
index bc0a82678..ee22dc533 100644
--- a/capplets/keybindings/ChangeLog
+++ b/capplets/keybindings/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
+2002-09-27  Jody Goldberg <jody@gnome.org>
+
+	* gnome-keybinding-properties.c (cb_check_for_uniqueness) : new.
+	(accel_edited_callback) : don't let a user enter duplicate
+	  accelerators for different actions.
+
 Fri Nov  1 17:46:06 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* gnome-keybinding-properties.c: move to use gnome-theme-info
diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c
index ffb2e8265..485359d0c 100644
--- a/capplets/keybindings/gnome-keybinding-properties.c
+++ b/capplets/keybindings/gnome-keybinding-properties.c
@@ -523,6 +523,31 @@ key_theme_changed (GConfClient *client,
 }
 
 
+static gboolean
+cb_check_for_uniqueness (GtkTreeModel *model,
+			 GtkTreePath  *path,
+			 GtkTreeIter  *iter,
+			 gpointer      user_data)
+{
+  KeyEntry *key_entry;
+  KeyEntry *tmp_key_entry;
+
+  key_entry = (KeyEntry *)user_data;
+  gtk_tree_model_get (key_entry->model, iter,
+		      KEYENTRY_COLUMN, &tmp_key_entry,
+		      -1);
+
+  if (tmp_key_entry != NULL &&
+      key_entry->keyval == tmp_key_entry->keyval &&
+      key_entry->mask   == tmp_key_entry->mask)
+    {
+      key_entry->editable = FALSE;
+      key_entry->gconf_key = tmp_key_entry->gconf_key;
+      return TRUE;
+    }
+  return FALSE;
+}
+
 static void
 accel_edited_callback (GtkCellRendererText *cell,
                        const char          *path_string,
@@ -535,7 +560,7 @@ accel_edited_callback (GtkCellRendererText *cell,
   GtkTreeModel *model;
   GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
   GtkTreeIter iter;
-  KeyEntry *key_entry;
+  KeyEntry *key_entry, tmp_key;
   GError *err = NULL;
   char *str;
 
@@ -547,7 +572,34 @@ accel_edited_callback (GtkCellRendererText *cell,
 
   /* sanity check */
   if (key_entry == NULL)
+    {
+      gtk_tree_path_free (path);
+      return;
+    }
+
+  tmp_key.model  = model;
+  tmp_key.keyval = keyval;
+  tmp_key.mask   = mask;
+  tmp_key.editable = TRUE; /* kludge to stuff in a return flag */
+  gtk_tree_model_foreach (model, cb_check_for_uniqueness, &tmp_key);
+
+  /* flag to see if the new accelerator was in use by something */
+  if (!tmp_key.editable)
+    {
+      GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))),
+				       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+				       GTK_MESSAGE_WARNING,
+				       GTK_BUTTONS_OK,
+				       _("That accelerator key is already in use by: %s\n"),
+				       key_entry->gconf_key);
+      gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_destroy (dialog);
+
+      egg_cell_renderer_keys_set_accelerator (EGG_CELL_RENDERER_KEYS (cell),
+					      key_entry->keyval, key_entry->mask);
+      gtk_tree_path_free (path);
     return;
+    }
 
   str = binding_name (keyval, mask, FALSE);
 
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index eff0967d0..8b7da9c4f 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/capplets/mime-type/ChangeLog b/capplets/mime-type/ChangeLog
index ea8545b20..17966c2a6 100644
--- a/capplets/mime-type/ChangeLog
+++ b/capplets/mime-type/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index 5a6315e8e..e7657741c 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
+2002-10-25  Rajkumar Sivasamy <rajkumar.siva@wipro.com>
+
+	* gnome-mouse-properties.c: Register mouse double click images
+	as stock icons, so that they are themable.
+	Fixes bug 96081
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index eb989266e..349978fb1 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -37,7 +37,20 @@ desktopdir = $(GNOMECC_DESKTOP_DIR)
 Desktop_in_files = mouse.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
+IMAGES = double-click-maybe.png double-click-off.png double-click-on.png
+
+VARIABLES=mouse_dblclck_maybe_data $(srcdir)/double-click-maybe.png \
+	mouse_dblclck_on_data $(srcdir)/double-click-on.png \
+	mouse_dblclck_off_data $(srcdir)/double-click-off.png
+
+BUILT_SOURCES = inlinepixbufs.h
+CLEANFILES = inlinepixbufs.h
+
+inlinepixbufs.h: $(IMAGES)
+	$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
+
+$(OBJECTS): inlinepixbufs.h
+
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA)
-
+EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA) $(IMAGES)
diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c
index b065326be..1571f2a15 100644
--- a/capplets/mouse/gnome-mouse-properties.c
+++ b/capplets/mouse/gnome-mouse-properties.c
@@ -37,11 +37,23 @@
 #include "capplet-util.h"
 #include "gconf-property-editor.h"
 #include "activate-settings-daemon.h"
+#include "inlinepixbufs.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
 
+#define MOUSE_DBLCLCK_MAYBE "mouse-dblclck-maybe"
+#define MOUSE_DBLCLCK_ON    "mouse-dblclck-on"
+#define MOUSE_DBLCLCK_OFF   "mouse-dblclck-off"
+
+#define MOUSE_CAPPLET_DEFAULT_ICON_SIZE 100 
+
+static void mouse_init_stock_icons (void);
+static void register_mouse_stock_icons (GtkIconFactory *factory);
+
+static GtkIconSize mouse_capplet_icon_size = 0;
+
 /******************************************************************************/
 /* A quick custom widget to ensure that the left handed toggle works no matter
  * which button is pressed.
@@ -102,9 +114,6 @@ enum
 
 GdkPixbuf *left_handed_pixbuf;
 GdkPixbuf *right_handed_pixbuf;
-GdkPixbuf *double_click_on_pixbuf;
-GdkPixbuf *double_click_maybe_pixbuf;
-GdkPixbuf *double_click_off_pixbuf;
 GConfClient *client;
 /* State in testing the double-click speed. Global for a great deal of
  * convenience
@@ -262,7 +271,9 @@ static gboolean
 test_maybe_timeout (struct test_data_t *data)
 {
 	double_click_state = DOUBLE_CLICK_TEST_OFF;
-	gtk_image_set_from_pixbuf (GTK_IMAGE (data->image), double_click_off_pixbuf);
+
+	gtk_image_set_from_stock (GTK_IMAGE (data->image), 
+				  MOUSE_DBLCLCK_OFF, mouse_capplet_icon_size);
 
 	*data->timeout_id = 0;
 
@@ -282,9 +293,8 @@ event_box_button_press_event (GtkWidget   *widget,
 	static guint               test_on_timeout_id     = 0;
 	static guint               test_maybe_timeout_id  = 0;
 	static guint32             double_click_timestamp = 0;
-	GtkWidget                 *image;
-	GdkPixbuf                 *pixbuf = NULL;
-	
+	GtkWidget                  *image;
+
 	if (event->type != GDK_BUTTON_PRESS)
 		return FALSE;
 
@@ -324,18 +334,19 @@ event_box_button_press_event (GtkWidget   *widget,
 
 	switch (double_click_state) {
 	case DOUBLE_CLICK_TEST_ON:
-		pixbuf = double_click_on_pixbuf;
+		gtk_image_set_from_stock (GTK_IMAGE (image), 
+					  MOUSE_DBLCLCK_ON, mouse_capplet_icon_size);
 		break;
 	case DOUBLE_CLICK_TEST_MAYBE:
-		pixbuf = double_click_maybe_pixbuf;
+		gtk_image_set_from_stock (GTK_IMAGE (image), 
+					  MOUSE_DBLCLCK_MAYBE, mouse_capplet_icon_size);
 		break;
 	case DOUBLE_CLICK_TEST_OFF:
-		pixbuf = double_click_off_pixbuf;
+		gtk_image_set_from_stock (GTK_IMAGE (image), 
+					  MOUSE_DBLCLCK_OFF, mouse_capplet_icon_size);
 		break;
 	}
 
-	gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
-
 	return TRUE;
 }
 
@@ -377,18 +388,6 @@ load_pixbufs (void)
 	right_handed_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
 	g_free (filename);
 
-	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "double-click-on.png", TRUE, NULL);
-	double_click_on_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-	g_free (filename);
-
-	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "double-click-maybe.png", TRUE, NULL);
-	double_click_maybe_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-	g_free (filename);
-
-	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "double-click-off.png", TRUE, NULL);
-	double_click_off_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-	g_free (filename);
-
 	called = TRUE;
 }
 
@@ -542,11 +541,11 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
 	gconf_value_free (value);
 
 	/* Double-click time */
-	gtk_image_set_from_pixbuf (GTK_IMAGE (WID ("double_click_image")), double_click_off_pixbuf);
+	gtk_image_set_from_stock (GTK_IMAGE (WID ("double_click_image")), MOUSE_DBLCLCK_OFF, mouse_capplet_icon_size);
 	g_object_set_data (G_OBJECT (WID ("double_click_eventbox")), "image", WID ("double_click_image"));
 	g_signal_connect (WID ("double_click_eventbox"), "button_press_event",
 			  G_CALLBACK (event_box_button_press_event), changeset);
-	
+
 	/* Cursors page */
 	tree_view = WID ("cursor_tree");
 	cursor_font = read_cursor_font ();
@@ -763,6 +762,8 @@ main (int argc, char **argv)
 			    GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
 			    NULL);
 
+	mouse_init_stock_icons ();
+
 	activate_settings_daemon ();
 
 	client = gconf_client_get_default ();
@@ -788,3 +789,51 @@ main (int argc, char **argv)
 
 	return 0;
 }
+
+typedef struct
+{
+	char *stock_id;
+	const guint8 *icon_data;
+} MouseStockIcon;
+
+static void
+register_mouse_stock_icons (GtkIconFactory *factory)
+{
+	gint i;
+	MouseStockIcon items[] =
+	{
+		{ MOUSE_DBLCLCK_MAYBE, mouse_dblclck_maybe_data },
+		{ MOUSE_DBLCLCK_ON, mouse_dblclck_on_data },
+		{ MOUSE_DBLCLCK_OFF, mouse_dblclck_off_data }
+	};
+
+	for (i = 0; i < G_N_ELEMENTS(items); ++i) {
+		GtkIconSet *icon_set;
+		GdkPixbuf *pixbuf;
+		pixbuf = gdk_pixbuf_new_from_inline (-1, items[i].icon_data,
+						     FALSE, NULL);
+
+		icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+		gtk_icon_factory_add (factory, items[i].stock_id, icon_set);
+
+		gtk_icon_set_unref (icon_set);
+		g_object_unref (G_OBJECT (pixbuf));
+	}
+}
+
+static void
+mouse_init_stock_icons (void)
+{
+	GtkIconFactory *factory;
+
+	factory = gtk_icon_factory_new ();
+	gtk_icon_factory_add_default (factory);
+
+	register_mouse_stock_icons (factory);
+
+	mouse_capplet_icon_size = gtk_icon_size_register ("mouse-capplet-icon",
+						  MOUSE_CAPPLET_DEFAULT_ICON_SIZE,
+						  MOUSE_CAPPLET_DEFAULT_ICON_SIZE);
+
+	g_object_unref (factory);
+}
diff --git a/capplets/network/ChangeLog b/capplets/network/ChangeLog
index 4fe0a1b54..316e3ec7e 100644
--- a/capplets/network/ChangeLog
+++ b/capplets/network/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/capplets/rollback/ChangeLog b/capplets/rollback/ChangeLog
index 728116f51..04b94438b 100644
--- a/capplets/rollback/ChangeLog
+++ b/capplets/rollback/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index 918ccb37f..dd8ccfcec 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog
index 33fc73850..d303248e9 100644
--- a/capplets/theme-switcher/ChangeLog
+++ b/capplets/theme-switcher/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Makefile.am : Add missing file
+
 Fri Nov  1 11:01:16 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* gnome-theme-manager.c: Rewrote to handle metathemes and icon
diff --git a/capplets/theme-switcher/Makefile.am b/capplets/theme-switcher/Makefile.am
index 8df1db6dc..e17d6ffcf 100644
--- a/capplets/theme-switcher/Makefile.am
+++ b/capplets/theme-switcher/Makefile.am
@@ -6,7 +6,8 @@ gnome_theme_manager_LDADD = 						\
 
 gnome_theme_manager_SOURCES =	\
 	gnome-theme-manager.c	\
-	gnome-theme-installer.c
+	gnome-theme-installer.c	\
+	gnome-theme-installer.h
 
 gnome_theme_manager_LDFLAGS = -export-dynamic
 
diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog
index 3bd0a4b43..347651dc0 100644
--- a/capplets/ui-properties/ChangeLog
+++ b/capplets/ui-properties/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/capplets/url-properties/ChangeLog b/capplets/url-properties/ChangeLog
index f75be8d10..74b3b6e95 100644
--- a/capplets/url-properties/ChangeLog
+++ b/capplets/url-properties/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog
index 5b6d8ad05..653e9e004 100644
--- a/capplets/windows/ChangeLog
+++ b/capplets/windows/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-26  Havoc Pennington  <hp@pobox.com>
 
 	* gnome-window-properties.c: rewrite
diff --git a/capplets/wm-properties/ChangeLog b/capplets/wm-properties/ChangeLog
index f1db92b1a..a1c53968c 100644
--- a/capplets/wm-properties/ChangeLog
+++ b/capplets/wm-properties/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/configure.in b/configure.in
index 6b07f3547..9898bed64 100644
--- a/configure.in
+++ b/configure.in
@@ -116,6 +116,13 @@ else
 fi
 AC_SUBST(ESD_SERVER)
 
+AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
+
+if test x"$GDK_PIXBUF_CSOURCE" = xno; then
+  AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK])
+fi 
+  
+AC_SUBST(GDK_PIXBUF_CSOURCE)
 
 dnl ==============================================
 dnl Special GConf section 
diff --git a/control-center/ChangeLog b/control-center/ChangeLog
index 404a13509..6db71eed1 100644
--- a/control-center/ChangeLog
+++ b/control-center/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 9f6bb5438..ecccc8f6e 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-31  Jody Goldberg <jody@gnome.org>
 
 	* gnome-settings-accessibility-keyboard.c
diff --git a/help/ChangeLog b/help/ChangeLog
index b0be373ab..9cb6448c1 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/libbackground/ChangeLog b/libbackground/ChangeLog
index 59b96584a..6a948dad5 100644
--- a/libbackground/ChangeLog
+++ b/libbackground/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/libwindow-settings/ChangeLog b/libwindow-settings/ChangeLog
index b01987ce5..10bf1c253 100644
--- a/libwindow-settings/ChangeLog
+++ b/libwindow-settings/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 Thu Oct 31 17:52:31 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* metacity-window-manager.c (metacity_get_theme_list): Get the
diff --git a/po/ChangeLog b/po/ChangeLog
index 9f1b3499c..2ccfcc803 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-02  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.1.2
+
 2002-10-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.1
diff --git a/po/ar.po b/po/ar.po
index 77dcb5223..60a0f15bf 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-05-31 17:39-0300\n"
 "Last-Translator: Isam Bayazidi <bayazidi@arabeyes.org>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -15,19 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "لم أتمكن من أستيراد أعدادات AccessX من الملف '%s'"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "اختر ملف CDE AccessX"
 
@@ -49,57 +48,91 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "صافرة عند تشغيل أحد أضواء لوحة المفاتيح LED و صافرتان عند تعطيل أحدها."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "صافرة عند تشغيل و تعطيل مزايا الإعانة للوحة المفاتيح"
+msgid "Basic"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
 #, fuzzy
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr "مفتاح مرفوض"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "صافرة عند:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "صافرة عند الضعط على مفتاح محول"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "صافرة عند تشغيل أحد أضواء لوحة المفاتيح LED و صافرتان عند تعطيل أحدها."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "مفتاح مرفوض"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "التأخير (بالثواني):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "تفعيل مفاتيح تغيير الحالة"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "تفعيل مفاتيح الإرتداد"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "تفعيل المفاتيح البطيئة"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "تفعيل مفاتيح الفأرة"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "تفعيل المفاتيح اللاصقة"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "General"
-msgstr "عام"
+msgid "Filters"
+msgstr "ملف"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "تجاهل ضغطات المفاتيح خلال  :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -107,23 +140,33 @@ msgstr ""
 "أهمل كل التلاحقات من الضغط على نفس المفتاح إذا حدثت خلال الوقت المختار من "
 "المستخدم."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "تعريفات الإعانة للوحة المفاتيح (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "السرعة القصوى للمؤشر"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "الفأرة"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "تفضيلات الفأرة"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
 msgstr "فقط أقبل المفاتيح التي ضغطت و أبقي عليها للفترة المحددة من المستخدم."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -131,85 +174,84 @@ msgstr ""
 "نفذ العمليات التي تحتاج ضغط عدد من المفاتيح بوقت واحد عند الضعط على مفاتيح "
 "التحويل بالتتالي."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "خصائص لوحة المفاتيح"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "إبدا بالحركة بعد هذه الفترة من الضغط على المفتاح:"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr ""
+msgid "S_peed:"
+msgstr "السرعة"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "الوقت اللازم للتسارع للسرعة القصوى:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr ""
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "تفعيل مفاتيح تغيير الحالة"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "حول لوحة الأرقام إلى لوحة تحكم بالفأرة."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "صافرة عند الضعط على مفتاح محول"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "تعطيل عند عدم الإستخدام لمدة "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "تفعيل الإعانة للوحة المفاتيح"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "استورد ملف CDE AccessX"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "إقبل الضغط على المفتاح بعد :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "تسارع التكرار"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"عطّل الملفاتيح اللاصقة عند\n"
-"الضغط على مفتاحين في وقت واحد"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "مفتاح مقبول"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "مفتاح مضغوط"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "مفتاح مرفوض"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "م.ثانية"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "ثواني"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "بكسل/ثانية"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "ثواني"
 
@@ -270,7 +312,7 @@ msgstr "اختر محرر:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "أسترجع و خزن أعدادات الموروث"
@@ -558,14 +600,6 @@ msgstr "يعرّف التصرف الافتراضي لتطبيقات جينوم"
 msgid "Please specify a name and a command for this editor."
 msgstr "رجاء حدد اسم وأمر هذا المحرر"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "يقبل عناوين URL"
@@ -774,6 +808,7 @@ msgid "Minimizing and Maximizing"
 msgstr "تكبير و تصغير"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1336,23 +1371,28 @@ msgstr "سطح المكتب"
 msgid "Window Management"
 msgstr "إدارة النوافذ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "حدث خطأ أثناء تعيين مسرع جديد في قاعدة بيانات الإعدادات: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 "تعذر العثور على أي تيمة للوحة المفاتيح. هذا يعني أن تنصيبك إلى GTK+ لم يكتمل."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "فعل"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "اختصار"
 
@@ -1378,6 +1418,11 @@ msgstr "اختصارات سطح المكتب"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr ""
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "الإعانة"
@@ -1446,11 +1491,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "تسارع التكرار"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "السرعة"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "الإعانة..."
@@ -1492,7 +1532,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "خصائص لوحة المفاتيح"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1501,7 +1541,7 @@ msgstr ""
 "<b>مؤشر مجهول</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1509,7 +1549,7 @@ msgstr ""
 "<b> المؤشر الافتراضي - الحالي</b>\n"
 "المؤشر الافتراضي المشحون مع إكس"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1517,7 +1557,7 @@ msgstr ""
 "<b> المؤشر الافتراضي</b>\n"
 "المؤشر الافتراضي المشحون مع إكس"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1525,7 +1565,7 @@ msgstr ""
 "<b> مؤشر أبيض - الحالي</b>\n"
 "المؤشر الافتراضي ولكن معكوس"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1533,7 +1573,7 @@ msgstr ""
 "<b> مؤشر أبيض</b>\n"
 "المؤشر الافتراضي ولكن معكوس"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1541,7 +1581,7 @@ msgstr ""
 "<b> مؤشر كبير - الحالي</b>\n"
 "إصدارة كبيرة من المؤشر الاعتيادي"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1549,7 +1589,7 @@ msgstr ""
 "<b> مؤشر كبير</b>\n"
 "إصدارة كبيرة من المؤشر الاعتيادي"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1557,7 +1597,7 @@ msgstr ""
 "<b> مؤشر أبيض كبير - الحالي</b>\n"
 "إصدارة كبيرة من المؤشر الأبيض"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1687,10 +1727,6 @@ msgstr "أظهر موقع المؤشر حينما يتم كبس زر التحك�
 msgid "_Threshold:"
 msgstr "العتبة:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "الفأرة"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1706,40 +1742,79 @@ msgstr "الشبكة"
 msgid "Network proxy preferences"
 msgstr "تفضيلات الشبكة"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "تفضيلات الشبكة"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "تفضيلات الشبكة"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "المنفذ:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "كلمة السر:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-#, fuzzy
-msgid "Pro_xy requires username and password"
-msgstr "يحتاج البروكسي لاسم المستخدم وكلمة المرور"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "اسم المستخدم:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "أمر التعريف:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "المكان:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "إعدادات بروكسي HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "تفضيلات الشبكة"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "المنفذ:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "استخدم بروكسي HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
 msgstr "استخدم بروكسي HTTP"
 
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "كلمة السر:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "استخدم بروكسي HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "اسم المستخدم:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "تفضيلات الصوت"
@@ -1748,6 +1823,11 @@ msgstr "تفضيلات الصوت"
 msgid "E_nable sound server startup"
 msgstr "فعّل بدء تشغيل خادم الصوت"
 
+#: capplets/sound/sound-properties.glade.h:2
+#, fuzzy
+msgid "General"
+msgstr "عام"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1821,32 +1901,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr ""
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "التيمة"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "يمكن تثبيت تيمات جديدة عن طريق سحبها للنافذة."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "خلفية"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
 #, fuzzy
-msgid "Theme Preferences"
-msgstr "تفضيلات تيمة Gtk+"
+msgid "Apply _Font"
+msgstr "طبّق اﻷن"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "التحكم في الواجهة الرسومية"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "مظهر حدود النافذة"
+msgid "Icons"
+msgstr "أيقونات فقط"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "يمكن تثبيت تيمات جديدة عن طريق سحبها للنافذة."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+#, fuzzy
+msgid "Theme Preferences"
+msgstr "تفضيلات تيمة Gtk+"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "مظهر حدود النافذة"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "انطلق لمجلد التيمة"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "ثبت تيمة جديدة..."
@@ -2005,30 +2102,57 @@ msgstr ""
 msgid "_Save"
 msgstr "تكبير"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "تفضيلات النافذة"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "التحكم في الواجهة الرسومية"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "النوع"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "السرعة"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "طبّق اﻷن"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "اختر النوافذ حينما تتحرك الفأرة فوقهم."
+msgid "Window Preferences"
+msgstr "تفضيلات النافذة"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "خط شريط العنوان"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "مظهر حدود النافذة"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "مدير النوافذ:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "اختر النوافذ حينما تتحرك الفأرة فوقهم."
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2173,7 +2297,7 @@ msgstr "لا تظهر هذه الرسالة مرة أخرى"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "تعذر تحميل ملف الصوت %s كمثال %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "مفتاح GConf وهو %s نوعه %s بينما النوع المتوقع كان %s\n"
@@ -2251,59 +2375,102 @@ msgstr "تشغيل"
 msgid "Select sound file"
 msgstr "اختر ملف صوت"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"البدء %s\n"
-"(%d ثوان متبقية قبل انتهاء مدة العملية)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: لم أستطع تهيئة مدير النوافذ.\n"
-"\tمدير نوافذ آخر يعمل مسبقا ولا يمكن إنهاؤه\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "صافرة عند تشغيل و تعطيل مزايا الإعانة للوحة المفاتيح"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: لم أستطع تهيئة مدير النوافذ.\n"
-"\tلم يبدأ '%s'\n"
+#~ msgid "Beep when:"
+#~ msgstr "صافرة عند:"
+
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "خصائص لوحة المفاتيح"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "لم يمت مدير النوافذ السابق\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "إبدا بالحركة بعد هذه الفترة من الضغط على المفتاح:"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"لم أستطع بدء '%s'.\n"
-"الرجوع لمدير النوافذ السابق '%s'\n"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "استورد ملف CDE AccessX"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"تعذر بدء مدير النوافذ الرجوعي.\n"
-"فضلا شغل مدير نوافذ يدويا. باستطاعتك فعل ذلك باختيار \"شغل البرنامج\" في\n"
-"القائمة السفلى\n"
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "عطّل الملفاتيح اللاصقة عند\n"
+#~ "الضغط على مفتاحين في وقت واحد"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "موافق"
+#~ msgid "msecs"
+#~ msgstr "م.ثانية"
+
+#~ msgid "Network Preferences"
+#~ msgstr "تفضيلات الشبكة"
+
+#, fuzzy
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "يحتاج البروكسي لاسم المستخدم وكلمة المرور"
+
+#~ msgid "_Location:"
+#~ msgstr "المكان:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "خط شريط العنوان"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "مظهر حدود النافذة"
+
+#~ msgid "Window Manager:"
+#~ msgstr "مدير النوافذ:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "البدء %s\n"
+#~ "(%d ثوان متبقية قبل انتهاء مدة العملية)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: لم أستطع تهيئة مدير النوافذ.\n"
+#~ "\tمدير نوافذ آخر يعمل مسبقا ولا يمكن إنهاؤه\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: لم أستطع تهيئة مدير النوافذ.\n"
+#~ "\tلم يبدأ '%s'\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "لم يمت مدير النوافذ السابق\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "لم أستطع بدء '%s'.\n"
+#~ "الرجوع لمدير النوافذ السابق '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "تعذر بدء مدير النوافذ الرجوعي.\n"
+#~ "فضلا شغل مدير نوافذ يدويا. باستطاعتك فعل ذلك باختيار \"شغل البرنامج\" في\n"
+#~ "القائمة السفلى\n"
+
+#~ msgid "OK"
+#~ msgstr "موافق"
 
 #, fuzzy
 #~ msgid "Add:"
@@ -2536,9 +2703,6 @@ msgstr "موافق"
 #~ msgid "Mouse Properties"
 #~ msgstr "خصائص الفأرة"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "إعدادات بروكسي HTTP"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "عرّف استخدام الصوت في جينوم"
 
@@ -2853,9 +3017,6 @@ msgstr "موافق"
 #~ msgid "Command:"
 #~ msgstr "الأمر:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "أمر التعريف:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "مدير النوافذ يدار بالجلسة"
 
@@ -2910,9 +3071,6 @@ msgstr "موافق"
 #~ msgid "Icons and Text"
 #~ msgstr "أيقونات ونص"
 
-#~ msgid "Only Icons"
-#~ msgstr "أيقونات فقط"
-
 #~ msgid "Only Text"
 #~ msgstr "نص فقط"
 
diff --git a/po/az.po b/po/az.po
index 36ef5f20c..47b245320 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 1.5.7\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2001-12-26 19:08GMT+0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
@@ -16,19 +16,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 #, fuzzy
 msgid "Select CDE AccessX file"
 msgstr "Səs faylı seç"
@@ -51,152 +50,197 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr ""
+#, fuzzy
+msgid "Basic"
+msgstr "Braid"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
+msgid "Beep when _modifier is pressed"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
-msgid "E_nable Toggle Keys"
+msgid "Beep when a _feature is turned on or off"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
-msgid "Enable Bo_unce Keys"
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
-msgid "Enable Slo_w Keys"
+msgid "Beep when key is:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
-msgid "Enable _Mouse Keys"
-msgstr ""
+#, fuzzy
+msgid "Del_ay:"
+msgstr "Çal"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
-msgid "Enable _Sticky Keys"
-msgstr ""
+#, fuzzy
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr "Labirintin hər addımında gecik."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Ümumi"
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+msgid "E_nable Toggle Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
+msgid "Enable Bo_unce Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
-#, fuzzy
-msgid "Keyboard Accessibility Preferences (AccessX)"
-msgstr "Klaviatura Seçənəkləri"
+msgid "Enable Slo_w Keys"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
-msgid "Ma_ximum pointer speed:"
+msgid "Enable _Mouse Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
-msgid ""
-"Only accept keys after they have been pressed and held for a user adjustable "
-"amount of time."
+msgid "Enable _Sticky Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
-msgstr ""
+#, fuzzy
+msgid "Features"
+msgstr "Dişli Çarxlar"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Klaviatura Seçənəkləri"
+msgid "Filters"
+msgstr "Alov"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
+msgid ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
-msgstr ""
+#, fuzzy
+msgid "Keyboard Accessibility Preferences (AccessX)"
+msgstr "Klaviatura Seçənəkləri"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
+msgid "Ma_ximum pointer speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Turn the numeric keypad into a mouse control pad."
-msgstr ""
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Siçan"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr ""
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Arxa plan xassələri"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-#, fuzzy
-msgid "_Enable keyboard accessibility"
-msgstr "Klaviatura Seçənəkləri"
+msgid ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "Səs faylı seç"
+msgid "S_peed:"
+msgstr "Sür'ət"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+msgid "Toggle Keys"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+msgid "_Disable if unused for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
-msgstr ""
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
+msgstr "Klaviatura Seçənəkləri"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+msgid "_Import Feature Settings..."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-#, fuzzy
-msgid "msecs"
-msgstr "saniyə"
+msgid "_Only accept keys held for:"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
-msgstr ""
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Penetrate"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+msgid "_accepted"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
+msgstr "Sür'ət"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
+msgstr "Deluxe"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "saniyə"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
+msgstr "saniyə"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "saniyə"
 
@@ -258,7 +302,7 @@ msgstr "Editor Seç"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Miras qurğularını al və saxla"
@@ -539,14 +583,6 @@ msgstr "Əsas Proqramlar"
 msgid "Please specify a name and a command for this editor."
 msgstr "Xahiş edirik, editoru başlatmaq üçün aşaǧıdakı əmr sətirini girin."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr ""
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 #, fuzzy
 msgid "Acce_pts URLs"
@@ -779,6 +815,7 @@ msgid "Minimizing and Maximizing"
 msgstr ""
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr ""
 
@@ -1342,23 +1379,28 @@ msgstr ""
 msgid "Window Management"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 #, fuzzy
 msgid "Action"
 msgstr "Dağ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 #, fuzzy
 msgid "Shortcut"
 msgstr "Qısa"
@@ -1387,6 +1429,11 @@ msgstr "Qısa"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr ""
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 #, fuzzy
 msgid "_Accessibility"
@@ -1457,11 +1504,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Penetrate"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Sür'ət"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 #, fuzzy
 msgid "_Accessibility..."
@@ -1504,56 +1546,56 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Klaviatura Seçənəkləri"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
 "%s"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1683,10 +1725,6 @@ msgstr ""
 msgid "_Threshold:"
 msgstr ""
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Siçan"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1702,42 +1740,74 @@ msgstr "Arxa plan xassələri"
 msgid "Network proxy preferences"
 msgstr "Arxa plan xassələri"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-#, fuzzy
-msgid "Network Preferences"
-msgstr "Arxa plan xassələri"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Arxa plan xassələri"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-#, fuzzy
-msgid "P_ort:"
-msgstr "Nöqtə:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
+msgid "<b>_Manual proxy configuration</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
+msgid "<b>_Use authentication</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
+msgid "Autoconfiguration _URL:"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-#, fuzzy
-msgid "_Location:"
-msgstr "Dağ"
+msgid "HTTP Proxy Details"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Arxa plan xassələri"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "Nöqtə:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
 msgstr ""
 
+#: capplets/network/gnome-network-preferences.glade.h:12
+#, fuzzy
+msgid "_Details"
+msgstr "Quyruqlar"
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+msgid "_FTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+msgid "_HTTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+msgid "_Password:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+msgid "_Secure HTTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Ad:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 #, fuzzy
 msgid "Sound preferences"
@@ -1748,6 +1818,10 @@ msgstr "Arxa plan xassələri"
 msgid "E_nable sound server startup"
 msgstr "Səsli başlanǧıcı fəallaşdır"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Ümumi"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1821,32 +1895,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr ""
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Arxa Plan"
+
+#: capplets/theme-switcher/theme-properties.glade.h:2
+msgid "Apply _Font"
+msgstr ""
+
+#: capplets/theme-switcher/theme-properties.glade.h:3
+#, fuzzy
+msgid "Controls"
+msgstr "UI İdarəsi"
+
+#: capplets/theme-switcher/theme-properties.glade.h:4
+#, fuzzy
+msgid "Icons"
+msgstr "Saniyə"
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
 msgid "New themes can also be installed by dragging them into the window."
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:7
 #, fuzzy
 msgid "Theme Preferences"
 msgstr "Arxa plan xassələri"
 
-#: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
-
-#: capplets/theme-switcher/theme-properties.glade.h:4
+#: capplets/theme-switcher/theme-properties.glade.h:8
 #, fuzzy
-msgid "Window Border Theme"
+msgid "Window Border"
 msgstr "Arxa plan xassələri"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr ""
 
@@ -2002,30 +2092,57 @@ msgstr ""
 msgid "_Save"
 msgstr "Ad:"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
 #, fuzzy
-msgid "Window Preferences"
-msgstr "Arxa plan xassələri"
+msgid "Control"
+msgstr "UI İdarəsi"
+
+#: capplets/windows/gnome-window-properties.c:580
+#, fuzzy
+msgid "Alt"
+msgstr "Ant"
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Hyperball"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Sphere"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
+msgid "To _move windows, click while holding down:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+#, fuzzy
+msgid "Window Preferences"
+msgstr "Arxa plan xassələri"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
+msgid "_Double-click window titles to:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
+msgid "_Raise selected windows after a short time"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
 msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
@@ -2167,7 +2284,7 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2250,52 +2367,30 @@ msgstr "Çal"
 msgid "Select sound file"
 msgstr "Səs faylı seç"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
-msgstr ""
-
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Klaviatura Seçənəkləri"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "Səs faylı seç"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
+#, fuzzy
+#~ msgid "msecs"
+#~ msgstr "saniyə"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr ""
+#, fuzzy
+#~ msgid "Network Preferences"
+#~ msgstr "Arxa plan xassələri"
 
 #, fuzzy
-#~ msgid "_Delete"
-#~ msgstr "Deluxe"
+#~ msgid "_Location:"
+#~ msgstr "Dağ"
 
 #, fuzzy
 #~ msgid "_Name"
@@ -2811,9 +2906,6 @@ msgstr ""
 #~ "their path. Then, as they pass over changed pixels, their behavior is "
 #~ "influenced. Written by David Bagley."
 
-#~ msgid "Ant"
-#~ msgstr "Ant"
-
 #~ msgid "Four Sided cells"
 #~ msgstr "Dört Yan-Yana hücrə"
 
@@ -2918,9 +3010,6 @@ msgstr ""
 #~ msgid "Splines"
 #~ msgstr "Splinlər"
 
-#~ msgid "Tails"
-#~ msgstr "Quyruqlar"
-
 #~ msgid "Threshold of repulsion"
 #~ msgstr "Pulsasiya aralıǧı"
 
@@ -2994,9 +3083,6 @@ msgstr ""
 #~ msgid "Use red/blue 3d seperation."
 #~ msgstr "Qırmızı/göy 3d separasiyası işlət."
 
-#~ msgid "Braid"
-#~ msgstr "Braid"
-
 #~ msgid ""
 #~ "Draws random color-cycling inter-braided concentric circles. Written by "
 #~ "John Neil."
@@ -3323,9 +3409,6 @@ msgstr ""
 #~ msgid "Epicycle"
 #~ msgstr "Episikl"
 
-#~ msgid "Seconds"
-#~ msgstr "Saniyə"
-
 #~ msgid ""
 #~ "This program draws the path traced out by a point on the edge of a "
 #~ "circle. That circle rotates around a point on the rim of another circle, "
@@ -3437,9 +3520,6 @@ msgstr ""
 #~ "to the, uh, four winds or something. Originally an Amiga program by Uli "
 #~ "Siegmund."
 
-#~ msgid "Gears"
-#~ msgstr "Dişli Çarxlar"
-
 #~ msgid ""
 #~ "This draws sets of turning, interlocking gears, rotating in three "
 #~ "dimensions. Another GL hack, by Danny Sung, Brian Paul, Ed Mackey, and "
@@ -3594,9 +3674,6 @@ msgstr ""
 #~ "plane, from a 1986 Scientific American article. Mostly written by Patrick "
 #~ "Naughton."
 
-#~ msgid "Hyperball"
-#~ msgstr "Hyperball"
-
 #~ msgid ""
 #~ "Hyperball is to hypercube as dodecahedron is to cube: this displays a 2D "
 #~ "projection of the sequence of 3D objects which are the projections of the "
@@ -3849,9 +3926,6 @@ msgstr ""
 #~ msgid "Delay between drawing the maze and starting the solution."
 #~ msgstr "Labirint çəkilməsi ilə həlli arasında fasilə ver."
 
-#~ msgid "Delay between each step in the maze."
-#~ msgstr "Labirintin hər addımında gecik."
-
 #~ msgid "Delay between finishing the maze and starting a new one."
 #~ msgstr "Labirint sonlanmsı ilə yenisinin başladılması arasında fasilə ver."
 
@@ -4368,9 +4442,6 @@ msgstr ""
 #~ "shaded spheres in multiple colors. This hack traces its lineage back to "
 #~ "Tom Duff in 1982."
 
-#~ msgid "Sphere"
-#~ msgstr "Sphere"
-
 #~ msgid ""
 #~ "Moving circular patterns, by Peter Schmitzberger. Moving circular "
 #~ "patterns means moire; interference patterns, of course."
diff --git a/po/bg.po b/po/bg.po
index 9a91a5c8d..94439428f 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-06-24 08:10+0200\n"
 "Last-Translator: Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>\n"
 "Language-Team: Bulgarian GNOME translation team <dict@linux.zonebg.com>\n"
@@ -15,19 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Има грешка при стартирането на контролния панел за клавиатурата : %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Разрешава импортиране на AccessX настройки от файл '%s'"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Избор на CDE AccessX файл"
 
@@ -49,57 +48,91 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Издава звук и LED светва и два звука когато се изключва."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
-"_Издава звук когато избора за достъпност на клавиши е превключен на разрешен/"
-"забранен"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Звук, когато клавиша е от_хвърлен"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Звук когато:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "Изда_ва звук при натиснат модификатор"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "Издава звук и LED светва и два звука когато се изключва."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Звук, когато клавиша е от_хвърлен"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Задръжка (сек):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Разрешава П_ревключващи Клавиши"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Рзрешава _Подскачащи Клавиши"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Разрешава _Бавни Клавиши"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Разрешава Клави_ши на Мишка"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Разрешава _Прилепени Клавиши"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Основни"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "_Файл"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Игнорира натиснат клавиш в :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -107,24 +140,34 @@ msgstr ""
 "Игнорира всички следващи натискания на СЪШИЯТ клавиш ако се случи в избран "
 "период от време."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Конфигурация на Клавишна Достъпност (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "_Максимална скорост на курсора:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Мишка"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Настройка на Мишка"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
 msgstr ""
 "Само приема клавиши след като са натиснати и задържа за зададено време."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -132,85 +175,84 @@ msgstr ""
 "Позволява операции на много последователно натиснати клавиши чрез натискане "
 "на клавиши за модификация."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Настройки за повтарение на клавиш"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "С_тартира продължително преместване след натискане на клавиш;"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Поле за тестване"
+msgid "S_peed:"
+msgstr "Скорост"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Време за _ускоряване до максимална скорост:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Клавиши за Превключване и Повторение"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Разрешава П_ревключващи Клавиши"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Използване на блока цифрови клавиши за управление на мишката."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "Изда_ва звук при натиснат модификатор"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Забранява ако не се използва за"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "Разрешава достъпност на клавиатура"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "_Импорт на CDE AccessX файл"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "_Само приема натиснат клавиш след :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Степен на Повторение"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"_Изключва Прилепен Клавиш когато\n"
-"Два клавиша са натиснати едновременно"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "клавиша е пр_иет"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "клавиша е _натиснат"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "клавиша е _отхвърлен"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "мсек"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "секунди"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "пиксела/сек"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "секунди"
 
@@ -265,7 +307,7 @@ msgstr "И_збор на картинка:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Получава и запазва стари настройки"
@@ -559,14 +601,6 @@ msgstr "Задава шрифт за приложения"
 msgid "Please specify a name and a command for this editor."
 msgstr "Моля задайте име и команда за този редактор."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Пр_иема URL"
@@ -775,6 +809,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Минимизация и Максимизация"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Мета"
 
@@ -1338,13 +1373,18 @@ msgstr "Работно място"
 msgid "Window Management"
 msgstr "Мениджър на Прозорци"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Грешка при задаване на нов ускорител в конфигурационната база данни: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1352,11 +1392,11 @@ msgstr ""
 "Не мога да намеря клавишни теми. Това означава че вашата инсталация на GTK+ "
 "не е пълна."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Действие"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Препратка"
 
@@ -1382,6 +1422,11 @@ msgstr "_Препратки на Работно място:"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Има грешка при стартирането на контролния панел за клавиатурата : %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Достъпност"
@@ -1449,11 +1494,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Степен на Повторение"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Скорост"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Достъпност..."
@@ -1495,7 +1535,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Клавиатурни Настройки"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1504,7 +1544,7 @@ msgstr ""
 "<b>Неизвестен Показалец</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1512,7 +1552,7 @@ msgstr ""
 "<b>Подразбиращ се Показалец - Текущ</b>\n"
 "Подразбиращият се показалец предлаган с X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1520,7 +1560,7 @@ msgstr ""
 "<b>Подразбиращ се Показалец</b>\n"
 "Подразбиращият се показалец предлаган с X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1528,7 +1568,7 @@ msgstr ""
 "<b>Бял Показалец - Текущ</b>\n"
 "Подразбиращият се показалец е инвертран"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1536,7 +1576,7 @@ msgstr ""
 "<b>Бял Показалец</b>\n"
 "Подразбиращият се показалец е инвертран"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1544,7 +1584,7 @@ msgstr ""
 "<b>Голям Показалец - Текущ</b>\n"
 "Голяма версия на нормален покзалец"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1552,7 +1592,7 @@ msgstr ""
 "<b>Голям Показалец</b>\n"
 "Голяма версия на нормален покзалец"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1560,7 +1600,7 @@ msgstr ""
 "<b>Голям Бял Показалец - Текущ</b>\n"
 "Голяма версия на бял показалец"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1696,10 +1736,6 @@ msgstr "_ПОказва позицията на показалеца когат�
 msgid "_Threshold:"
 msgstr "П_раг:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Мишка"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1715,40 +1751,79 @@ msgstr "Мрежа"
 msgid "Network proxy preferences"
 msgstr "Настройка на Мрежа"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Настройка на Мрежа"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Настройка на Мрежа"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "_Порт:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "П_арола:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-#, fuzzy
-msgid "Pro_xy requires username and password"
-msgstr "П_рокси изисква име и парола"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "Име на по_требител:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Конфигурационна Команда:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Местоположение:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Настройка на HTTP Прокси"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Настройка на Мрежа"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "_Порт:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
 msgstr "_Използва HTTP прокси"
 
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Използва HTTP прокси"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "П_арола:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "_Използва HTTP прокси"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Име на по_требител:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Настройка за звук"
@@ -1757,6 +1832,10 @@ msgstr "Настройка за звук"
 msgid "E_nable sound server startup"
 msgstr "_Разрешава звъков сървър при стартиране"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Основни"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1831,32 +1910,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Задава шрифт за иконите на работното място"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Тема"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Нови теми могат също да бъдат инсталирани като се извлачат в прозореца"
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Фон"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
 #, fuzzy
-msgid "Theme Preferences"
-msgstr "Gtk+ Предпочитания за тема"
+msgid "Apply _Font"
+msgstr "Използвай Сега"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "UI Контрол"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Поява Рамките на Прозорец"
+msgid "Icons"
+msgstr "Само Икони"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Нови теми могат също да бъдат инсталирани като се извлачат в прозореца"
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+#, fuzzy
+msgid "Theme Preferences"
+msgstr "Gtk+ Предпочитания за тема"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Поява Рамките на Прозорец"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Отива в папката с тема"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "_Инсталира нова тема..."
@@ -2017,30 +2113,57 @@ msgstr ""
 msgid "_Save"
 msgstr "_Мащабируем"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Предпочитания за Прозорец"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "UI Контрол"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Тип"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Скорост"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Използвай Сега"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Избира прозорците когато мишката преминава над тях"
+msgid "Window Preferences"
+msgstr "Предпочитания за Прозорец"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Шрифт на Заглавната лента"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Поява Рамките на Прозорец"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Мениджър на Прозорци:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Избира прозорците когато мишката преминава над тях"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2187,7 +2310,7 @@ msgstr "_Не показва това съобщение отново"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Не мога да заредя звъков файл %s като %s "
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "Клавиша на GConf %s е зададен за тип %s, но се очакваше тип %s\n"
@@ -2266,60 +2389,112 @@ msgstr "_Свири"
 msgid "Select sound file"
 msgstr "Избор на звуков файл"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Стартира %s\n"
-"(%d секунди остават преди операцията да приключи поради изтичане на времето)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Немога да инициализирам мениджъра на прозорци.\n"
-"\tДруг мениджър вече се изпълнява и не можа да бъде убит\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr ""
+#~ "_Издава звук когато избора за достъпност на клавиши е превключен на "
+#~ "разрешен/забранен"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Не мога да инициализирам мениджъра на прозорци.\n"
-"\t'%s' не е стартиран\n"
+#~ msgid "Beep when:"
+#~ msgstr "Звук когато:"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Предишният мениджър на прозорци не е умрял\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Настройки за повтарение на клавиш"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Не мога да стартирам '%s'.\n"
-"Връщам се на предишният мениджър на прозорци '%s'\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "С_тартира продължително преместване след натискане на клавиш;"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Не мога да стартирам мениджъра на прозорци.\n"
-"Моля стартирайте мениджъра ръчно. Вие може да направите това\n"
-"като изберете \"Изпълнение на Програма\" в основното\n"
-"меню\n"
+#~ msgid "Testing Area"
+#~ msgstr "Поле за тестване"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Клавиши за Превключване и Повторение"
+
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Импорт на CDE AccessX файл"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "_Изключва Прилепен Клавиш когато\n"
+#~ "Два клавиша са натиснати едновременно"
+
+#~ msgid "msecs"
+#~ msgstr "мсек"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Настройка на Мрежа"
+
+#, fuzzy
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "П_рокси изисква име и парола"
+
+#~ msgid "_Location:"
+#~ msgstr "_Местоположение:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Шрифт на Заглавната лента"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Поява Рамките на Прозорец"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Мениджър на Прозорци:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Стартира %s\n"
+#~ "(%d секунди остават преди операцията да приключи поради изтичане на "
+#~ "времето)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Немога да инициализирам мениджъра на прозорци.\n"
+#~ "\tДруг мениджър вече се изпълнява и не можа да бъде убит\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Не мога да инициализирам мениджъра на прозорци.\n"
+#~ "\t'%s' не е стартиран\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Предишният мениджър на прозорци не е умрял\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Не мога да стартирам '%s'.\n"
+#~ "Връщам се на предишният мениджър на прозорци '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Не мога да стартирам мениджъра на прозорци.\n"
+#~ "Моля стартирайте мениджъра ръчно. Вие може да направите това\n"
+#~ "като изберете \"Изпълнение на Програма\" в основното\n"
+#~ "меню\n"
+
+#~ msgid "OK"
+#~ msgstr "OK"
 
 #, fuzzy
 #~ msgid "Add:"
@@ -2532,9 +2707,6 @@ msgstr "OK"
 #~ msgid "Mouse Properties"
 #~ msgstr "Настройка на Мишка"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Настройка на HTTP Прокси"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Конфигуриране на ГНОМЕ за използване на звук"
 
@@ -2878,9 +3050,6 @@ msgstr "OK"
 #~ msgid "Command:"
 #~ msgstr "Команда:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Конфигурационна Команда:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Мениджъра на прозорци управлява сесия"
 
diff --git a/po/ca.po b/po/ca.po
index 3c67ce59d..8ab1590ad 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.0.0\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-07-22 12:46+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <gnome@softcatala.net>\n"
@@ -15,19 +15,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "S'ha produït un error a l'executar la capplet del teclat: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Impossible d'importar els ajustaments d'AccessX des del fitxer «%s»"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Seleccioneu el fitxer AccesX CDE"
 
@@ -48,59 +47,92 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Fes «beep» quan un LED s'encén i dos «beep» quan s'apaga."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
-# Xiulet? jm
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
-"Fes «_beep» quan s'habiliten/deshabiliten les característiques "
-"d'accesibiltat del teclat"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Fes «beep» quan la tecla és de_negada"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Fes «beep» quan:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "Fes «beep» quan el modificador és pressionat"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "Fes «beep» quan un LED s'encén i dos «beep» quan s'apaga."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Fes «beep» quan la tecla és de_negada"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Retard:"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Habilita les tecles de commutació"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Habilita les tecles de sa_lts"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Habilita les tecles len_tes"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Habilita les tecles del _ratolí"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Habilita les tecles en_ganxoses"
 
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
+
 #
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "General"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "_Fitxer"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Ignora les pressions de tecla entre:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -109,17 +141,27 @@ msgstr ""
 "d'un perio de de temps seleccionable per l'usuari."
 
 #
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Configuració d'accesibilitat del teclat (AcessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Velocitat mà_xima del punter:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Ratolí"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Preferències del ratolí"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -127,7 +169,7 @@ msgstr ""
 "Accepta solament les tecles després de que hagin estat pressionades i "
 "mantingudes per a una quantitat de temps ajustable per l'usuari."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -135,87 +177,84 @@ msgstr ""
 "Realitza operacions de pressió de tecla simultània múltiple pressionant les "
 "tecles modificadores en seqüència."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Preferències de repetició de tecles"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-#, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr ""
-"Comença a mo_ure després d'aquest interval posterior a la polsació de la "
-"tecla:"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Àrea de proves"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr "_Velocitat:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Temps per a _accelerar a velocitat màxima:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Tecles de commutació i repetició"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Habilita les tecles de commutació"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Converteix el teclat numèric en un teclat de control de ratolí."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "Fes «beep» quan el modificador és pressionat"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Deshabilita si no s'utilitza durant "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Habilita l'accesibilitat del teclat"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "_Importa un fitxer AccessX de CDE"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "N_omés accepta pressions de tecla després de:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Repetició de tecles"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"_Desactiva les tecles enganxoses quan\n"
-"dues tecles siguin pressionades simultàniament"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "la tecla és _acceptada"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "la tecla és _pressionada"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "la tecla és _denegada"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "miliseg."
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "segons"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "pixels/seg."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "segons"
 
@@ -274,7 +313,7 @@ msgstr "Seleccioneu una ima_tge:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Recupera i desa els paràmetres originals"
@@ -577,14 +616,6 @@ msgstr "Seleccioneu les aplicacions per defecte"
 msgid "Please specify a name and a command for this editor."
 msgstr "Si us plau, especifiqueu un nom i una ordre per a aquest editor."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
@@ -826,6 +857,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Minimització i Maximització"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1415,14 +1447,19 @@ msgstr "Escriptori"
 msgid "Window Management"
 msgstr "Gestió de finestres"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Error al establir un nou accelerador en la base de dades de la configuració: "
 "%s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1431,12 +1468,12 @@ msgstr ""
 "+ és incompleta."
 
 #
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Acció"
 
 #
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Drecera"
 
@@ -1461,6 +1498,11 @@ msgstr "Dreceres d'edició de _text:"
 msgid "Assign shortcut keys to commands"
 msgstr "Assigna dreceres a ordres"
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "S'ha produït un error a l'executar la capplet del teclat: %s"
+
 #
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
@@ -1529,10 +1571,6 @@ msgstr "«Click» en polsar tecles"
 msgid "Repeat Keys"
 msgstr "Repetició de tecles"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr "_Velocitat:"
-
 #
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
@@ -1571,7 +1609,7 @@ msgstr "baix"
 msgid "Set your keyboard preferences"
 msgstr "Estableix les preferències del teclat"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1580,7 +1618,7 @@ msgstr ""
 "<b>Cursor desconegut</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1588,7 +1626,7 @@ msgstr ""
 "<b>Cursor per defecte - Actual</b>\n"
 "El cursor per defecte que s'envia amb X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1596,7 +1634,7 @@ msgstr ""
 "<b>Cursor per defecte</b>\n"
 "El cursor per defecte que s'envia amb X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1604,7 +1642,7 @@ msgstr ""
 "<b>Cursor blanc - Actual</b>\n"
 "El cursor per defecte invertit"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1612,7 +1650,7 @@ msgstr ""
 "<b>Cursor blanc</b>\n"
 "El cursor per defecte invertit"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1620,7 +1658,7 @@ msgstr ""
 "<b>Cursor gran - Actual</b>\n"
 "La versió gran del cursor normal"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1628,7 +1666,7 @@ msgstr ""
 "<b>Cursor gran</b>\n"
 "La versió gran del cursor normal"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1636,7 +1674,7 @@ msgstr ""
 "<b>Cursor blanc gran - Actual</b>\n"
 "La versió gran del cursor blanc"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1773,10 +1811,6 @@ msgstr "_Mostra la posició del cursor quan la tecla Control és pressionada"
 msgid "_Threshold:"
 msgstr "_Llindar:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Ratolí"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Estableix les preferències del ratolí"
@@ -1791,38 +1825,79 @@ msgstr "Servidor intermediari de xarxa"
 msgid "Network proxy preferences"
 msgstr "Preferències del servidor intermediari de xarxa"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Preferències de la xarxa"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Preferències del servidor intermediari de xarxa"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "Contrasen_ya:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "El servidor intermediari requerei_x un nom d'usuari i contrasenya"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "_Nom d'usuari:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Ordre de configuració:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Lloc:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Servidor intermediari d'HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Preferències del servidor intermediari de xarxa"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
 msgstr "_Utilitza servidor intermediari d'HTTP"
 
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Utilitza servidor intermediari d'HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "Contrasen_ya:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "_Utilitza servidor intermediari d'HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "_Nom d'usuari:"
+
 #
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
@@ -1834,6 +1909,11 @@ msgid "E_nable sound server startup"
 msgstr "Habilita l'i_nici del servidor de so"
 
 #
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "General"
+
+#
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1909,32 +1989,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Selecciona els temes per a varies parts de l'escriptori"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Tema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Es poden instal·lar nou temes arrossegant-los a la finestra."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Propietats del fons"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-msgid "Theme Preferences"
-msgstr "Preferències dels temes"
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Aplica ara"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Control d'interfície d'usuari"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Aparença del cantó de les finestres"
+msgid "Icons"
+msgstr "Només icones"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Es poden instal·lar nou temes arrossegant-los a la finestra."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+msgid "Theme Preferences"
+msgstr "Preferències dels temes"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Aparença del cantó de les finestres"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Vés a la carpeta de temes"
 
 #
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "_Instal·la un nou tema..."
 
@@ -2096,32 +2193,58 @@ msgstr "_Surt"
 msgid "_Save"
 msgstr "_Desa"
 
-#
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Preferències de les finestres"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Control d'interfície d'usuari"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Tipus"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Velocitat"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Aplica ara"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
+#
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Selecciona les finestres quan el ratolí pasa per damunt"
+msgid "Window Preferences"
+msgstr "Preferències de les finestres"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Tipus de lletra del les barres de títol"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Aparença del cantó de les finestres"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
-#
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Gestor de finestres:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Selecciona les finestres quan el ratolí pasa per damunt"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #
 #: capplets/windows/window-properties.desktop.in.h:1
@@ -2276,7 +2399,7 @@ msgstr "_No mostrar aquest missatge de nou"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "No s'ha pogut carregar el fitxer de so %s com a event %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2359,60 +2482,117 @@ msgstr "Re_produeix"
 msgid "Select sound file"
 msgstr "Seleccioneu un fitxer de so"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"S'està iniciant %s\n"
-"(queden %d segons abans que l'operació excedeixi el temps)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: No s'ha pogut inicialitzar el gestor de finestres.\n"
-"\tJa s'està executant un altre gestor de finestres que no s'ha pogut matar\n"
+# Xiulet? jm
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr ""
+#~ "Fes «_beep» quan s'habiliten/deshabiliten les característiques "
+#~ "d'accesibiltat del teclat"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: No s'ha pogut inicialitzar el gestor de finestres.\n"
-"\t«%s» no s'ha iniciat\n"
+#~ msgid "Beep when:"
+#~ msgstr "Fes «beep» quan:"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "El gestor de finestres anterior no va morir\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Preferències de repetició de tecles"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"No s'ha pogut iniciar «%s».\n"
-"S'està tornant al gestor de finestres anterior, «%s»\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr ""
+#~ "Comença a mo_ure després d'aquest interval posterior a la polsació de la "
+#~ "tecla:"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"No s'ha pogut iniciar el gestor de finestres anterior.\n"
-"Si us plau, executeu un gestor de finestres manualment. Podeu \n"
-"fer-ho seleccionant «Executa un programa» al\n"
-"menú al peu\n"
+#~ msgid "Testing Area"
+#~ msgstr "Àrea de proves"
+
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Tecles de commutació i repetició"
+
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Importa un fitxer AccessX de CDE"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "_Desactiva les tecles enganxoses quan\n"
+#~ "dues tecles siguin pressionades simultàniament"
+
+#~ msgid "msecs"
+#~ msgstr "miliseg."
+
+#~ msgid "Network Preferences"
+#~ msgstr "Preferències de la xarxa"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "El servidor intermediari requerei_x un nom d'usuari i contrasenya"
+
+#~ msgid "_Location:"
+#~ msgstr "_Lloc:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Tipus de lletra del les barres de títol"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Aparença del cantó de les finestres"
+
+#
+#~ msgid "Window Manager:"
+#~ msgstr "Gestor de finestres:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "S'està iniciant %s\n"
+#~ "(queden %d segons abans que l'operació excedeixi el temps)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: No s'ha pogut inicialitzar el gestor de "
+#~ "finestres.\n"
+#~ "\tJa s'està executant un altre gestor de finestres que no s'ha pogut "
+#~ "matar\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: No s'ha pogut inicialitzar el gestor de "
+#~ "finestres.\n"
+#~ "\t«%s» no s'ha iniciat\n"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "D'acord"
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "El gestor de finestres anterior no va morir\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "No s'ha pogut iniciar «%s».\n"
+#~ "S'està tornant al gestor de finestres anterior, «%s»\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "No s'ha pogut iniciar el gestor de finestres anterior.\n"
+#~ "Si us plau, executeu un gestor de finestres manualment. Podeu \n"
+#~ "fer-ho seleccionant «Executa un programa» al\n"
+#~ "menú al peu\n"
+
+#~ msgid "OK"
+#~ msgstr "D'acord"
 
 #
 #~ msgid "Add:"
@@ -2697,9 +2877,6 @@ msgstr "D'acord"
 #~ msgid "Mouse Properties"
 #~ msgstr "Propietats del ratolí"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Servidor intermediari d'HTTP"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Configura els sons del GNOME"
 
@@ -3038,9 +3215,6 @@ msgstr "D'acord"
 #~ msgid "Command:"
 #~ msgstr "Ordre:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Ordre de configuració:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "El gestor de finestres està gestionat per la sessió"
 
diff --git a/po/cs.po b/po/cs.po
index 215d9bedf..f0d53ee5e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 1.0.5\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2000-10-11 13:47+02:00\n"
 "Last-Translator: David Sauer <davids@penguin.cz>\n"
 "Language-Team: czech <cs@li.org>\n"
@@ -14,19 +14,18 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, fuzzy, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Stala se chyba p�i ukazov�n� n�pov�dy: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 #, fuzzy
 msgid "Select CDE AccessX file"
 msgstr "V�b�r souboru se zvukem"
@@ -49,153 +48,196 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
 #, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "P�p�n� kl�ves"
+msgid "Basic"
+msgstr "Mal�"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
+msgid "Beep when _modifier is pressed"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
-msgid "E_nable Toggle Keys"
+msgid "Beep when a _feature is turned on or off"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
-msgid "Enable Bo_unce Keys"
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
-msgid "Enable Slo_w Keys"
+msgid "Beep when key is:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
-msgid "Enable _Mouse Keys"
-msgstr ""
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Zpo�d�n� (vte�in):"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
-msgid "Enable _Sticky Keys"
+msgid "Delay between keypress and pointer mo_vement:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-#, fuzzy
-msgid "General"
-msgstr "Obecn�"
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+msgid "E_nable Toggle Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
+msgid "Enable Bo_unce Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
-#, fuzzy
-msgid "Keyboard Accessibility Preferences (AccessX)"
-msgstr "Vlastnosti kl�vesnice"
+msgid "Enable Slo_w Keys"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
-msgid "Ma_ximum pointer speed:"
+msgid "Enable _Mouse Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
-msgid ""
-"Only accept keys after they have been pressed and held for a user adjustable "
-"amount of time."
+msgid "Enable _Sticky Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
+msgid "Features"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Vlastnosti kl�vesnice"
+msgid "Filters"
+msgstr "_Soubor"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
+msgid ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
-msgstr ""
+#, fuzzy
+msgid "Keyboard Accessibility Preferences (AccessX)"
+msgstr "Vlastnosti kl�vesnice"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
+msgid "Ma_ximum pointer speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Turn the numeric keypad into a mouse control pad."
-msgstr ""
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "My�"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr ""
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Vlastnosti my�i"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-#, fuzzy
-msgid "_Enable keyboard accessibility"
-msgstr "P�p�n� kl�ves"
+msgid ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "V�b�r souboru se zvukem"
+msgid "S_peed:"
+msgstr "Rychlost"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+msgid "Toggle Keys"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+msgid "_Disable if unused for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
-msgstr ""
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
+msgstr "P�p�n� kl�ves"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+msgid "_Import Feature Settings..."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "msek"
+msgid "_Only accept keys held for:"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
-msgstr ""
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Prodleva opakov�n�"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#, fuzzy
+msgid "_Type to test settings:"
+msgstr "Test nastaven�"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+msgid "_accepted"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
+msgstr "Rychlost"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
+msgstr "Vymazat"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "vte�in"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
+msgstr "vte�in"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "vte�in"
 
@@ -256,7 +298,7 @@ msgstr "V�b�r ikony..."
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr ""
@@ -530,14 +572,6 @@ msgstr "Standardn� nastaven� Gtk"
 msgid "Please specify a name and a command for this editor."
 msgstr "Tento sloupec ur�uje p��kaz pou�it� pro start programu."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Akce_ptuje URL"
@@ -756,6 +790,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Minimalizace a maximalizace"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1314,22 +1349,27 @@ msgstr "Plocha"
 msgid "Window Management"
 msgstr "Spr�va oken"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Akce"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Zkratka"
 
@@ -1355,6 +1395,11 @@ msgstr "Zkratky _plochy:"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, fuzzy, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Stala se chyba p�i ukazov�n� n�pov�dy: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 #, fuzzy
 msgid "_Accessibility"
@@ -1425,11 +1470,6 @@ msgstr "P�p�n� kl�ves"
 msgid "Repeat Keys"
 msgstr "Prodleva opakov�n�"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Rychlost"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 #, fuzzy
 msgid "_Accessibility..."
@@ -1472,7 +1512,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Vlastnosti kl�vesnice"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1481,7 +1521,7 @@ msgstr ""
 "<b>Nezn�m� kursor</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1489,7 +1529,7 @@ msgstr ""
 "<b>Implicitn� kursor - nyn�j��</b>\n"
 "Implicitn� kursor X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1497,7 +1537,7 @@ msgstr ""
 "<b>Implicitn� kursor</b>\n"
 "Implicitn� kursor X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1505,7 +1545,7 @@ msgstr ""
 "<b>B�l� kursor - nyn�j��</b>\n"
 "Invertovan� implicitn� kursor"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1513,7 +1553,7 @@ msgstr ""
 "<b>B�l� kursor</b>\n"
 "Invertovan� implicitn� kursor"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1521,7 +1561,7 @@ msgstr ""
 "<b>Velk� kursor - nyn�j��</b>\n"
 "Velk� verze implicitn�ho kursoru"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1529,7 +1569,7 @@ msgstr ""
 "<b>Velk� kursor</b>\n"
 "Velk� verze implicitn�ho kursoru"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1537,7 +1577,7 @@ msgstr ""
 "<b>Velk� b�l� kursor - nyn�j��</b>\n"
 "Velk� verze b�l�ho kursoru"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1666,10 +1706,6 @@ msgstr ""
 msgid "_Threshold:"
 msgstr "Zpo�d�n� _za��tku pohybu"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "My�"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1685,39 +1721,80 @@ msgstr "S��"
 msgid "Network proxy preferences"
 msgstr "Vlastnosti s��e"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Vlastnosti s��e"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Vlastnosti s��e"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "_Heslo:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
+msgid "<b>_Use authentication</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "_U�ivatel:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Konfigura�n� p��kaz:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "Po_loha:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Nastaven� proxy HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Vlastnosti s��e"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+#, fuzzy
+msgid "_Details"
+msgstr "Dla�dice"
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "Pou��t HTTP _proxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
 msgstr "Pou��t HTTP _proxy"
 
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "_Heslo:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "Pou��t HTTP _proxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "_U�ivatel:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Vlastnosti zvuku"
@@ -1726,6 +1803,11 @@ msgstr "Vlastnosti zvuku"
 msgid "E_nable sound server startup"
 msgstr "_Povolit start zvukov�ho serveru"
 
+#: capplets/sound/sound-properties.glade.h:2
+#, fuzzy
+msgid "General"
+msgstr "Obecn�"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1800,32 +1882,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Nastavit fornt pro ikony na plo�e"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "T�ma"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Pozad�"
+
+#: capplets/theme-switcher/theme-properties.glade.h:2
+msgid "Apply _Font"
+msgstr ""
+
+#: capplets/theme-switcher/theme-properties.glade.h:3
+#, fuzzy
+msgid "Controls"
+msgstr "Kontakty"
+
+#: capplets/theme-switcher/theme-properties.glade.h:4
+#, fuzzy
+msgid "Icons"
+msgstr "V�b�r ikony..."
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
 msgid "New themes can also be installed by dragging them into the window."
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:7
 #, fuzzy
 msgid "Theme Preferences"
 msgstr "Vlastnosti t�ma Gtk+"
 
-#: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
-
-#: capplets/theme-switcher/theme-properties.glade.h:4
+#: capplets/theme-switcher/theme-properties.glade.h:8
 #, fuzzy
-msgid "Window Border Theme"
+msgid "Window Border"
 msgstr "Vlastnosti oken"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "_Instalovat nov� t�ma..."
@@ -1983,30 +2081,56 @@ msgstr ""
 msgid "_Save"
 msgstr "P�izp�_soben�"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Vlastnosti oken"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Norm�ln�"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Typ"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Rychlost"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
+msgid "To _move windows, click while holding down:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+msgid "Window Preferences"
+msgstr "Vlastnosti oken"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
+msgid "_Double-click window titles to:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
+msgid "_Raise selected windows after a short time"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Spr�vce oken:"
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 #, fuzzy
@@ -2148,7 +2272,7 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2227,59 +2351,78 @@ msgstr "_P�ehr�t"
 msgid "Select sound file"
 msgstr "V�b�r souboru se zvukem"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Startuje se %s\n"
-"(zb�v� %d sekund)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Nelze inicializovat spr�vce oken.\n"
-"\tJi� b�� jin� spr�vce oken a nem��e b�t ukon�en\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "P�p�n� kl�ves"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Nelze inicializovat spr�vce oken.\n"
-"\t'%s' neodstratoval.\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Vlastnosti kl�vesnice"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "P�edchoz� spr�vce oken nebyl ukon�en.\n"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "V�b�r souboru se zvukem"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Nelze odstartovat '%s'.\n"
-"Zkou�� se p�edchoz� spr�vce oken '%s'\n"
+#~ msgid "msecs"
+#~ msgstr "msek"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Nelze odstartovat standardn� (ev. p�edchoz�) spr�vce oken.\n"
-"Spust� pros�m spr�vce oken z p��kazov� ��dky. Lze to ud�lat\n"
-"t�eba z menu polo�kou \"Spustit program\".\n"
+#~ msgid "Network Preferences"
+#~ msgstr "Vlastnosti s��e"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "Budi�"
+#~ msgid "_Location:"
+#~ msgstr "Po_loha:"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Spr�vce oken:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Startuje se %s\n"
+#~ "(zb�v� %d sekund)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Nelze inicializovat spr�vce oken.\n"
+#~ "\tJi� b�� jin� spr�vce oken a nem��e b�t ukon�en\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Nelze inicializovat spr�vce oken.\n"
+#~ "\t'%s' neodstratoval.\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "P�edchoz� spr�vce oken nebyl ukon�en.\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Nelze odstartovat '%s'.\n"
+#~ "Zkou�� se p�edchoz� spr�vce oken '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Nelze odstartovat standardn� (ev. p�edchoz�) spr�vce oken.\n"
+#~ "Spust� pros�m spr�vce oken z p��kazov� ��dky. Lze to ud�lat\n"
+#~ "t�eba z menu polo�kou \"Spustit program\".\n"
+
+#~ msgid "OK"
+#~ msgstr "Budi�"
 
 #, fuzzy
 #~ msgid "Add:"
@@ -2288,10 +2431,6 @@ msgstr "Budi�"
 #~ msgid "_Category"
 #~ msgstr "_Kategorie"
 
-#, fuzzy
-#~ msgid "_Delete"
-#~ msgstr "Vymazat"
-
 #~ msgid "_Name"
 #~ msgstr "_Jm�no"
 
@@ -2366,9 +2505,6 @@ msgstr "Budi�"
 #~ msgid "Calendar"
 #~ msgstr "Kalend��"
 
-#~ msgid "Contacts"
-#~ msgstr "Kontakty"
-
 #~ msgid "Packages"
 #~ msgstr "Bal��ky"
 
@@ -2445,9 +2581,6 @@ msgstr "Budi�"
 #~ msgid "Mouse Properties"
 #~ msgstr "Vlastnosti my�i"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Nastaven� proxy HTTP"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Konfigurace zvukov�ch parametr� Gnome"
 
@@ -2753,9 +2886,6 @@ msgstr "Budi�"
 #~ msgid "Command:"
 #~ msgstr "P��kaz:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Konfigura�n� p��kaz:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Spr�vce oken podl�h� spr�v� sezen� (session managed)"
 
@@ -3086,18 +3216,10 @@ msgstr "Budi�"
 #~ msgstr "D�lka (ms)"
 
 #, fuzzy
-#~ msgid "Balls"
-#~ msgstr "Mal�"
-
-#, fuzzy
 #~ msgid "Lines"
 #~ msgstr "minuty"
 
 #, fuzzy
-#~ msgid "Tails"
-#~ msgstr "Dla�dice"
-
-#, fuzzy
 #~ msgid "Blaster"
 #~ msgstr "Rychle"
 
@@ -3110,10 +3232,6 @@ msgstr "Budi�"
 #~ msgstr "Pomalu"
 
 #, fuzzy
-#~ msgid "Coral"
-#~ msgstr "Norm�ln�"
-
-#, fuzzy
 #~ msgid "Denser"
 #~ msgstr "Obecn�"
 
@@ -3150,10 +3268,6 @@ msgstr "Budi�"
 #~ msgstr "Odstranit"
 
 #, fuzzy
-#~ msgid "Seconds"
-#~ msgstr "V�b�r ikony..."
-
-#, fuzzy
 #~ msgid "Extrusion"
 #~ msgstr "Roz���en�"
 
@@ -3425,10 +3539,6 @@ msgstr "Budi�"
 #~ msgid "...a"
 #~ msgstr "P�idat..."
 
-#, fuzzy
-#~ msgid "Type here to test setting"
-#~ msgstr "Test nastaven�"
-
 #~ msgid "Enable"
 #~ msgstr "Povolit"
 
diff --git a/po/da.po b/po/da.po
index e2db81700..2e3924d8b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-07-13 15:32+0200\n"
 "Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
 "Language-Team: danish <dansk@klid.dk>\n"
@@ -27,19 +27,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Der opstod en fejl ved kørsel af tastaturindstillingsvinduet: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Kunne ikke importere AccessX-indstillinger fra filen '%s'"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Vælg CDE AccessX-fil"
 
@@ -60,55 +59,91 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Bip når en tastaturlampe tændes og bip to gange når en lampe slukkes"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "_Bip ved aktivering/deaktivering af tastaturtilgængelighed"
+msgid "Basic"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Bib når tast afv_ises"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Bip når:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "B_ip når der trykkes på modifikationstast"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "Bip når en tastaturlampe tændes og bip to gange når en lampe slukkes"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Bib når tast afv_ises"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Ventetid (sek.):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Aktivér _skiftetaster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Aktivér _rystetaster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Aktivér _langsomme taster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Aktivér _musetaster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Aktivér _klæbrige taster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Generelt"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "Filters"
+msgstr "_Fil"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#, fuzzy
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Ignorér tastetryk inden for:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -116,17 +151,27 @@ msgstr ""
 "Ignorér alle efterfølgende tryk på den samme tast hvis de sker inden for et "
 "givet tidsrum"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Konfiguration af tastaturtilgængelighed"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Ma_ksimal markørfart:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Mus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Indstillinger for mus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -134,7 +179,7 @@ msgstr ""
 "Acceptér kun tastatur efter de har været trykket og holdt nede for et givet "
 "tidsrum"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -142,85 +187,84 @@ msgstr ""
 "Udfør flere simultane tastetryk ved at trykke på modifikationstasterne efter "
 "hinanden"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Indstillinger for gentagelse"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "Start _bevægelse dette tidsrum efter tastetryk:"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Testområde"
+msgid "S_peed:"
+msgstr "Hastighed"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Tid før _accelerering til topfart:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Skifte- og gentagelsestaster"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Aktivér _skiftetaster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Lav det numeriske tastatur om til en musekontrol"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "B_ip når der trykkes på modifikationstast"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Deaktivér hvis ubenyttet i "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Aktivér tastaturtilgængelighed"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "_Importér CDE AccessX-fil"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "_Acceptér kun tastetryk efter:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Gentagelseshastighed"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"Slå klæbrige taster _fra\n"
-"når to taster holdes nede samtidigt"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "tast _accepteres"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "tast _holdes ned"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "tast af_vises"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "millisek"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "sekunder"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "punkter/sek"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "sekunder"
 
@@ -276,7 +320,7 @@ msgstr "Vælg _billede:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Fremskaf og gem gamle indstillinger"
@@ -573,14 +617,6 @@ msgstr "Vælg hvilke programmer der foreslås som standard"
 msgid "Please specify a name and a command for this editor."
 msgstr "Angiv et navn og en kommando til dette redigeringsprogram"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Acce_pterer URL'er"
@@ -790,6 +826,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Maksimering/minimering"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1347,12 +1384,17 @@ msgstr "Skrivebord"
 msgid "Window Management"
 msgstr "Vindueshåndtering"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Fejl ved anbringelse af ny genvej i konfigurationsdatabasen: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1360,11 +1402,11 @@ msgstr ""
 "Kunne ikke finde nogen tastaturtemaer. Dette betyder at Gtk+-installationen "
 "er ufuldstændig."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Handling"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Genvej"
 
@@ -1389,6 +1431,11 @@ msgstr "_Tekstredigeringsgenveje:"
 msgid "Assign shortcut keys to commands"
 msgstr "Tildel genvejstaster til kommandoer"
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Der opstod en fejl ved kørsel af tastaturindstillingsvinduet: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Tilgængelighed"
@@ -1458,11 +1505,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Gentagelseshastighed"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Hastighed"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Tilgængelighed..."
@@ -1503,7 +1545,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Vælg indstillinger for tastaturet"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1512,7 +1554,7 @@ msgstr ""
 "<b>Ukendt markør</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1520,7 +1562,7 @@ msgstr ""
 "<b>Standardmarkør - nuværende</b>\n"
 "Den standardmarkør der følger med X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1528,7 +1570,7 @@ msgstr ""
 "<b>Standardmarkør</b>\n"
 "Den standardmarkør der følger med X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1536,7 +1578,7 @@ msgstr ""
 "<b>Hvid markør - nuværende</b>\n"
 "Inverteret standardmarkør"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1544,7 +1586,7 @@ msgstr ""
 "<b>Hvid markør</b>\n"
 "Inverteret standardmarkør"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1552,7 +1594,7 @@ msgstr ""
 "<b>Stor markør - nuværende</b>\n"
 "Stor udgave af den normale markør"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1560,7 +1602,7 @@ msgstr ""
 "<b>Stor markør</b>\n"
 "Stor udgave af den normale markør"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1568,7 +1610,7 @@ msgstr ""
 "<b>Stor hvid markør - nuværende</b>\n"
 "Stor udgave af den hvide markør"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1701,10 +1743,6 @@ msgstr "_Vis positionen af markøren ved tryk på Ctrl-tasten "
 msgid "_Threshold:"
 msgstr "_Tærskel:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Mus"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Vælg indstillinger for mus"
@@ -1719,38 +1757,79 @@ msgstr "Netværksmellemvært"
 msgid "Network proxy preferences"
 msgstr "Indstillinger for netværksmellemvært"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Netværksindstillinger"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Indstillinger for netværksmellemvært"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "_Adgangskode:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "Mellem_vært kræver brugernavn og adgangskode"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "Bruger_navn:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Konfigurationskommando:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Placering:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Indstillinger for HTTP-mellemvært"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Indstillinger for netværksmellemvært"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "_Benyt HTTP-mellemvært"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Benyt HTTP-mellemvært"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "_Adgangskode:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "_Benyt HTTP-mellemvært"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Bruger_navn:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Lydindstillinger"
@@ -1759,6 +1838,10 @@ msgstr "Lydindstillinger"
 msgid "E_nable sound server startup"
 msgstr "A_ktivér lydserveropstart"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Generelt"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1831,31 +1914,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Vælg temaer for forskellige dele af skrivebordet"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Tema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Nye temaer kan installeres ved at trække dem ind i vinduet"
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Baggrund"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-msgid "Theme Preferences"
-msgstr "Temaindstillinger"
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Anvend nu"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Grænsefladekontrol"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Udseende af vindueskanter"
+msgid "Icons"
+msgstr "Kun ikoner"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Nye temaer kan installeres ved at trække dem ind i vinduet"
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+msgid "Theme Preferences"
+msgstr "Temaindstillinger"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Udseende af vindueskanter"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Gå til temamappen"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "_Installér nyt tema..."
 
@@ -2013,30 +2113,57 @@ msgstr ""
 msgid "_Save"
 msgstr "_Skaleret"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Indstillinger for vinduer"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Grænsefladekontrol"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Type"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Hastighed"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Anvend nu"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Vælg vinduer når musen bevæger sig over dem"
+msgid "Window Preferences"
+msgstr "Indstillinger for vinduer"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Skrifttype til titellinje"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Udseende af vindueskanter"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Vindueshåndtering:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Vælg vinduer når musen bevæger sig over dem"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2183,7 +2310,7 @@ msgstr "_Vis ikke denne besked igen"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Kunne ikke indlæse lydfilen %s som lydklip %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "GConf-nøglen %s er sat til typen %s, men dens forventede type var %s\n"
@@ -2262,59 +2389,107 @@ msgstr "_Afspil"
 msgid "Select sound file"
 msgstr "Vælg en lydfil"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Starter %s\n"
-"(%d sek. tilbage før tiden løber ud)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Kunne ikke klargøre vindueshåndteringen.\n"
-"\tEn anden vindueshåndtering kører allerede og kan ikke dræbes.\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "_Bip ved aktivering/deaktivering af tastaturtilgængelighed"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Kunne ikke klargøre vindueshåndteringen.\n"
-"\t'%s' startede ikke.\n"
+#~ msgid "Beep when:"
+#~ msgstr "Bip når:"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Foregående vindueshåndtering døde ikke\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Indstillinger for gentagelse"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Kunne ikke starte '%s'.\n"
-"Falder tilbage til den tidligere vindueshåndtering '%s'\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Start _bevægelse dette tidsrum efter tastetryk:"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Kunne ikke starte reservevindueshåndteringen.\n"
-"Kør venligst en vindueshåndtering manuelt. Du kan\n"
-"gøre dette ved at vælge \"Kør program\" i fodmenuen.\n"
+#~ msgid "Testing Area"
+#~ msgstr "Testområde"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "O.k."
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Skifte- og gentagelsestaster"
+
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Importér CDE AccessX-fil"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "Slå klæbrige taster _fra\n"
+#~ "når to taster holdes nede samtidigt"
+
+#~ msgid "msecs"
+#~ msgstr "millisek"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Netværksindstillinger"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Mellem_vært kræver brugernavn og adgangskode"
+
+#~ msgid "_Location:"
+#~ msgstr "_Placering:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Skrifttype til titellinje"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Udseende af vindueskanter"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Vindueshåndtering:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Starter %s\n"
+#~ "(%d sek. tilbage før tiden løber ud)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Kunne ikke klargøre vindueshåndteringen.\n"
+#~ "\tEn anden vindueshåndtering kører allerede og kan ikke dræbes.\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Kunne ikke klargøre vindueshåndteringen.\n"
+#~ "\t'%s' startede ikke.\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Foregående vindueshåndtering døde ikke\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Kunne ikke starte '%s'.\n"
+#~ "Falder tilbage til den tidligere vindueshåndtering '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Kunne ikke starte reservevindueshåndteringen.\n"
+#~ "Kør venligst en vindueshåndtering manuelt. Du kan\n"
+#~ "gøre dette ved at vælge \"Kør program\" i fodmenuen.\n"
+
+#~ msgid "OK"
+#~ msgstr "O.k."
 
 #, fuzzy
 #~ msgid "Add:"
@@ -2593,9 +2768,6 @@ msgstr "O.k."
 #~ msgid "Mouse Properties"
 #~ msgstr "Indstillinger for mus"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Indstillinger for HTTP-mellemvært"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Konfigurér brugen af lyd i Gnome"
 
@@ -2873,9 +3045,6 @@ msgstr "O.k."
 #~ msgid "Command:"
 #~ msgstr "Kommando:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Konfigurationskommando:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Vindueshåndtering er sessionshåndteret"
 
@@ -2942,9 +3111,6 @@ msgstr "O.k."
 #~ msgid "Icons and Text"
 #~ msgstr "Ikoner og tekst"
 
-#~ msgid "Only Icons"
-#~ msgstr "Kun ikoner"
-
 #~ msgid "Only Text"
 #~ msgstr "Kun tekst"
 
diff --git a/po/de.po b/po/de.po
index e8d05ff24..a1fad9fee 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 1.4.x\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-07-02 18:55+0200\n"
 "Last-Translator: Manuel Borchers <webmaster@matronix.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -17,19 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Es trat ein Fehler beim Starten des Tastatur-Capplets auf : %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Einstellungen für AccessX konnten nicht aus '%s' importiert werden"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Wählen Sie eine CDE-AccessX-Datei aus"
 
@@ -51,55 +50,91 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "Tastaturglocke beim Ein-/Ausschalten der Tastaturhilfe-Funktionen"
+msgid "Basic"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Beep-Ton erzeugen, wenn Taste ab_gewiesen"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr ""
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "Beep-Ton erzeugen, wenn Taste ab_gewiesen"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Beep-Ton erzeugen, wenn Taste ab_gewiesen"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Verzögerung (Sek.):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Tastatur_verzögerung aktivieren"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Tastatur_verzögerung aktivieren"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Tastatur_verzögerung aktivieren"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Allgemein"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "Filters"
+msgstr "_Datei"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#, fuzzy
+msgid "I_gnore duplicate keypresses within:"
 msgstr "Tastenanschläge _ignorieren innerhalb von :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -107,105 +142,116 @@ msgstr ""
 "Fortlaufende Tastenanschäge der selben Taste innerhalb einer "
 "benutzerdefinierten Zeit ignorieren."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Allgemeine Tastaturhilfen-Eigenschaften (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Ma_ximale Geschwindigkeit des Mauszeigers:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Maus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Maus-Eigenschaften"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
 msgstr ""
 "Tasten nur akzeptieren wenn sie eine benutzerdefinierte Zeit gedrückt wurden."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Eigenschaften der Tastenwiederholung"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
-msgstr ""
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr ""
+msgid "S_peed:"
+msgstr "Geschwindigkeit"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr ""
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Tastatur_verzögerung aktivieren"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Den Nummernblock zur Maussteuerung verwenden."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "Beep-Ton erzeugen, wenn Taste ab_gewiesen"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Deaktivieren, wenn ungenutz für "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
 #, fuzzy
-msgid "_Enable keyboard accessibility"
+msgid "_Enable keyboard accessibility features"
 msgstr "Eigenschaften der Tastaturhilfen"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "CDE AccessX-Datei _importieren"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "Tastenanschlag _nur akzeptieren nach :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Wiederholrate"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "Taste _akzeptiert"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "Taste _gedrückt"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "Taste zu_rückgewiesen"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "Millisekunden"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "Sekunden"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "Pixel/Sekunde"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -260,7 +306,7 @@ msgstr "_Grafik wählen:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr ""
@@ -544,14 +590,6 @@ msgstr "Schrift für Anwendungen setzen"
 msgid "Please specify a name and a command for this editor."
 msgstr "Bitte Namen und Befehl für diesen Editor angeben."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Akz_petiert URLs"
@@ -760,6 +798,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Minimieren und Maximieren"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1321,12 +1360,17 @@ msgstr "Desktop"
 msgid "Window Management"
 msgstr "Fenstermanagement"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1334,11 +1378,11 @@ msgstr ""
 "Keyboard-Themen konnten nicht gefunden werden. Das bedeutet, dass GTK+ nicht "
 "richtig installiert wurde."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Aktion"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Kürzel"
 
@@ -1364,6 +1408,11 @@ msgstr "_Desktopkürzel:"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Es trat ein Fehler beim Starten des Tastatur-Capplets auf : %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Eingabehilfen"
@@ -1431,11 +1480,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Wiederholrate"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Geschwindigkeit"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Eingabehilfen..."
@@ -1477,7 +1521,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Tastatur-Eigenschaften"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1486,7 +1530,7 @@ msgstr ""
 "<b>Unbekannter Cursor</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1494,7 +1538,7 @@ msgstr ""
 "<b>Standard Cursor - Aktuell</b>\n"
 "Die Vorgabe von X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1502,7 +1546,7 @@ msgstr ""
 "<b>Standard Cursor</b>\n"
 "Die Vorgabe von X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1510,7 +1554,7 @@ msgstr ""
 "<b>Weißer Cursor - Aktuell</b>\n"
 "Der invertierte Standard Cursor"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1518,7 +1562,7 @@ msgstr ""
 "<b>Weißer Cursor</b>\n"
 "Der invertierte Standard Cursor"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1526,7 +1570,7 @@ msgstr ""
 "<b>Großer Cursor - Aktuell</b>\n"
 "Die vergrößerte Version des normalen Cursors"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1534,7 +1578,7 @@ msgstr ""
 "<b>Großer Cursor</b>\n"
 "Die vergrößerte Version des normalen Cursors"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1542,7 +1586,7 @@ msgstr ""
 "<b>Großer weißer Cursor - Aktuell</b>\n"
 "Die vergrößerte Version des weißen Cursors"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1679,10 +1723,6 @@ msgstr "Die Cursor-Position _zeigen wenn \"Strg\" gedrückt wird"
 msgid "_Threshold:"
 msgstr "_Schwellwert:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Maus"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1698,40 +1738,78 @@ msgstr "Netzwerk"
 msgid "Network proxy preferences"
 msgstr "Netzwerk-Eigenschaften"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Netzwerk-Eigenschaften"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Netzwerk-Eigenschaften"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "Pass_wort:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-#, fuzzy
-msgid "Pro_xy requires username and password"
-msgstr "Pro_xy erfordert Benutzername und Passwort"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "Benutzer_name:"
+msgid "Autoconfiguration _URL:"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Adresse:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "HTTP-Proxy-Einstellungen"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Netzwerk-Eigenschaften"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
 msgstr "HTTP-Proxy _verwenden"
 
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "HTTP-Proxy _verwenden"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "Pass_wort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "HTTP-Proxy _verwenden"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Benutzer_name:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Audio-Eigenschaften"
@@ -1740,6 +1818,10 @@ msgstr "Audio-Eigenschaften"
 msgid "E_nable sound server startup"
 msgstr "_Starten des Soundservers aktivieren"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Allgemein"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1814,34 +1896,51 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Schrift für Symbole auf dem Desktop setzen"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Thema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Hintergrund"
+
+#: capplets/theme-switcher/theme-properties.glade.h:2
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Jetzt anwenden"
+
+#: capplets/theme-switcher/theme-properties.glade.h:3
+#, fuzzy
+msgid "Controls"
+msgstr "Kontakte"
+
+#: capplets/theme-switcher/theme-properties.glade.h:4
+#, fuzzy
+msgid "Icons"
+msgstr "Nur Symbole"
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
 msgid "New themes can also be installed by dragging them into the window."
 msgstr ""
 "Neue Themen können installiert werden, indem Sie diese in dieses Fenster "
 "ziehen."
 
-#: capplets/theme-switcher/theme-properties.glade.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:7
 #, fuzzy
 msgid "Theme Preferences"
 msgstr "Einstellungen des Gtk+-Themas"
 
-#: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
-
-#: capplets/theme-switcher/theme-properties.glade.h:4
+#: capplets/theme-switcher/theme-properties.glade.h:8
 #, fuzzy
-msgid "Window Border Theme"
+msgid "Window Border"
 msgstr "Aussehen der Fensterrahmen"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "Ins Themenverzeichnis _gehen"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "Neues Thema _installieren..."
@@ -1999,30 +2098,56 @@ msgstr ""
 msgid "_Save"
 msgstr "_Skaliert"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Fenster-Eigenschaften"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+msgid "Control"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Typ"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Geschwindigkeit"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Jetzt anwenden"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Fenster auswählen wenn Maus darüber fährt"
+msgid "Window Preferences"
+msgstr "Fenster-Eigenschaften"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Schrift für Titelleiste"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Aussehen der Fensterrahmen"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Fenstermanager:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Fenster auswählen wenn Maus darüber fährt"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2173,7 +2298,7 @@ msgstr "_Diese Nachricht nicht noch einmal zeigen"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Konnte Audiodatei %s als Beispiel %s nicht laden"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "GConf-Schlüssel %s ist vom Type %s, aber erwartet wurde %s\n"
@@ -2251,59 +2376,89 @@ msgstr "_Abspielen"
 msgid "Select sound file"
 msgstr "Wählen Sie eine Audio-Datei aus"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"%s wird gestartet\n"
-"(%d Sekunden, bis abgebrochen wird)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Fenstermanager konnte nicht initialisiert werden.\n"
-"\tEin anderer Fenstermanager läuft bereits und konnte nicht gestoppt werden\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "Tastaturglocke beim Ein-/Ausschalten der Tastaturhilfe-Funktionen"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Fenstermanager konnte nicht initialisiert werden.\n"
-"\t'%s' startete nicht\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Eigenschaften der Tastenwiederholung"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Vorheriger Fenstermanager wurde nicht getötet\n"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "CDE AccessX-Datei _importieren"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"'%s' konnte nicht gestartet werden.\n"
-"Vorherigen Fenstermanager '%s' wird verwendet\n"
+#~ msgid "msecs"
+#~ msgstr "Millisekunden"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Vorherigen Fenstermanager konnte nicht gestartet werden.\n"
-"Bitte starten Sie manuell einen Fenstermanager, indem\n"
-"Sie im Haupmenü auf \"Ausführen\" klicken\n"
+#~ msgid "Network Preferences"
+#~ msgstr "Netzwerk-Eigenschaften"
+
+#, fuzzy
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Pro_xy erfordert Benutzername und Passwort"
+
+#~ msgid "_Location:"
+#~ msgstr "_Adresse:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Schrift für Titelleiste"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Aussehen der Fensterrahmen"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Fenstermanager:"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "%s wird gestartet\n"
+#~ "(%d Sekunden, bis abgebrochen wird)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Fenstermanager konnte nicht initialisiert werden.\n"
+#~ "\tEin anderer Fenstermanager läuft bereits und konnte nicht gestoppt "
+#~ "werden\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Fenstermanager konnte nicht initialisiert werden.\n"
+#~ "\t'%s' startete nicht\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Vorheriger Fenstermanager wurde nicht getötet\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "'%s' konnte nicht gestartet werden.\n"
+#~ "Vorherigen Fenstermanager '%s' wird verwendet\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Vorherigen Fenstermanager konnte nicht gestartet werden.\n"
+#~ "Bitte starten Sie manuell einen Fenstermanager, indem\n"
+#~ "Sie im Haupmenü auf \"Ausführen\" klicken\n"
+
+#~ msgid "OK"
+#~ msgstr "OK"
 
 #~ msgid "_Category"
 #~ msgstr "_Kategorie"
@@ -2384,9 +2539,6 @@ msgstr "OK"
 #~ msgid "Calendar"
 #~ msgstr "Kalender"
 
-#~ msgid "Contacts"
-#~ msgstr "Kontakte"
-
 #~ msgid "Packages"
 #~ msgstr "Pakete"
 
@@ -2494,9 +2646,6 @@ msgstr "OK"
 #~ msgid "Mouse Properties"
 #~ msgstr "Maus-Eigenschaften"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "HTTP-Proxy-Einstellungen"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Audioeinstellungen von GNOME einrichten"
 
diff --git a/po/el.po b/po/el.po
index 01677bf1f..ce197a143 100644
--- a/po/el.po
+++ b/po/el.po
@@ -22,7 +22,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.0.0\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-08-06 14:31+0100\n"
 "Last-Translator: Nikos Charonitakis <charosn@her.forthnet.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -30,19 +30,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Επιλογή αρχείου AccessX του CDE"
 
@@ -63,156 +62,197 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
-"Ή_χηση κατά την ενεργοποίηση/απενεργοποίηση των χαρακτηριστικών "
-"προσβασιμότητας"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Ήχος όταν:"
+msgid "Beep when _modifier is pressed"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
-#, fuzzy
-msgid "E_nable Toggle Keys"
-msgstr "Ενεργοποίηση Πλήκτρων _Ενναλλαγής"
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
-#, fuzzy
-msgid "Enable Bo_unce Keys"
-msgstr "Ενεργοποίηση Πλήκτρων Για Ποντίκι"
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
-msgid "Enable Slo_w Keys"
-msgstr "Ενεργοποίηση Αρ_γών Πλήκτρων"
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Ήχος όταν:"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
-msgid "Enable _Mouse Keys"
-msgstr "Ενεργοποίηση Πλήκτρων Για Ποντίκι"
+#, fuzzy
+msgid "Del_ay:"
+msgstr "Καθυ_στέρηση:"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
-msgid "Enable _Sticky Keys"
-msgstr "Ενεργοποίηση _Κολλημένων Πλήκτρων"
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Γενικά"
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
-msgstr ""
+#, fuzzy
+msgid "E_nable Toggle Keys"
+msgstr "Ενεργοποίηση Πλήκτρων _Ενναλλαγής"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
-msgstr ""
+#, fuzzy
+msgid "Enable Bo_unce Keys"
+msgstr "Ενεργοποίηση Πλήκτρων Για Ποντίκι"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
-#, fuzzy
-msgid "Keyboard Accessibility Preferences (AccessX)"
-msgstr "Ρύθμιση Προσβασιμότητας πληκτρολογίου (AccessX)"
+msgid "Enable Slo_w Keys"
+msgstr "Ενεργοποίηση Αρ_γών Πλήκτρων"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
-msgid "Ma_ximum pointer speed:"
-msgstr ""
+msgid "Enable _Mouse Keys"
+msgstr "Ενεργοποίηση Πλήκτρων Για Ποντίκι"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
-msgid ""
-"Only accept keys after they have been pressed and held for a user adjustable "
-"amount of time."
-msgstr ""
+msgid "Enable _Sticky Keys"
+msgstr "Ενεργοποίηση _Κολλημένων Πλήκτρων"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
+msgid "Features"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Προτιμήσεις Επανάληψης Πλήκτρων"
+msgid "Filters"
+msgstr "_Αρχείο"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
+msgid ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
-msgstr ""
+#, fuzzy
+msgid "Keyboard Accessibility Preferences (AccessX)"
+msgstr "Ρύθμιση Προσβασιμότητας πληκτρολογίου (AccessX)"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
+msgid "Ma_ximum pointer speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Turn the numeric keypad into a mouse control pad."
-msgstr ""
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Ρυθμίσεις Ποντικιού"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr ""
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Προτιμήσεις Ποντικιού"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-#, fuzzy
-msgid "_Enable keyboard accessibility"
-msgstr "Ενεργοποίηση Κλίκ Πληκτρολογίου"
+msgid ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "Εισαγω_γή αρχείου CDE AccessX"
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr "Τα_χύτητα:"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Ενεργοποίηση Πλήκτρων _Ενναλλαγής"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+msgid "_Disable if unused for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
-msgstr ""
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
+msgstr "Ενεργοποίηση Κλίκ Πληκτρολογίου"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+msgid "_Import Feature Settings..."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "εκατοστά δευτερολέπτου"
+msgid "_Only accept keys held for:"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
-msgstr "εικονοστοιχεία/δευτερόλεπτο"
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Επανάληψη Πλήκτρων"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+msgid "_accepted"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
+msgstr "Τα_χύτητα:"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
+msgstr "Διαγρα_φή"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "δευτερόλεπτα"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
+msgstr "εικονοστοιχεία/δευτερόλεπτο"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
@@ -268,7 +308,7 @@ msgstr "Επιλογή ει_κόνας:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr ""
@@ -536,14 +576,6 @@ msgstr "Καθορισμός των εξ ορισμού εφαρμογών"
 msgid "Please specify a name and a command for this editor."
 msgstr "Παρακαλώ εισαγάγετε όνομα και εντολή για αυτόν τον επεξεργαστή."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Δέχεται URL"
@@ -751,6 +783,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Μεγιστοποίηση και Ελαχιστοποίηση"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Μετά-ρύθμιση"
 
@@ -1296,22 +1329,27 @@ msgstr "Επιφάνεια εργασίας"
 msgid "Window Management"
 msgstr "Διαχείριση παραθύρων"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Ενέργεια"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Συντόμευση"
 
@@ -1336,6 +1374,11 @@ msgstr "Συντομεύσεις επεξεργα_σίας κειμένου:"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr ""
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Προσβασιμότητα"
@@ -1400,10 +1443,6 @@ msgstr "Ήχηση στο Πάτημα Πλήκτρων"
 msgid "Repeat Keys"
 msgstr "Επανάληψη Πλήκτρων"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr "Τα_χύτητα:"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Προσβασιμότητα..."
@@ -1440,7 +1479,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Καθορισμός των προτιμήσεων πληκτρολογίου"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1449,7 +1488,7 @@ msgstr ""
 "<b>Άγνωστος Δρομέας</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1457,7 +1496,7 @@ msgstr ""
 "<b>Εξ ορισμού Δρομέας - Τρέχων</b>\n"
 "The default cursor that ships with X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1465,7 +1504,7 @@ msgstr ""
 "<b>Εξ ορισμού Δρομέας</b>\n"
 "The default cursor that ships with X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1473,7 +1512,7 @@ msgstr ""
 "<b>Λευκός Δρομέας - Τρέχων</b>\n"
 "The default cursor inverted"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1481,7 +1520,7 @@ msgstr ""
 "<b>Λευκός Δρομέας</b>\n"
 "The default cursor inverted"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1489,7 +1528,7 @@ msgstr ""
 "<b>Μεγάλος Δρομέας - Τρέχων</b>\n"
 "Large version of normal cursor"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1497,7 +1536,7 @@ msgstr ""
 "<b>Μεγάλος Δρομέας</b>\n"
 "Large version of normal cursor"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1505,7 +1544,7 @@ msgstr ""
 "<b>Μεγάλος Λευκός Δρομέας - Τρέχων</b>\n"
 "Large version of white cursor"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1634,10 +1673,6 @@ msgstr ""
 msgid "_Threshold:"
 msgstr "_Κατώφλι:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Ρυθμίσεις Ποντικιού"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Καθορισμός προτιμήσεων ποντικιού"
@@ -1652,38 +1687,74 @@ msgstr "Διαμεσολαβητής Δικτύου"
 msgid "Network proxy preferences"
 msgstr "Προτιμήσεις Διαμεσολαβητή Δικτύου"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Προτιμήσεις Δικτύου"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Προτιμήσεις Διαμεσολαβητή Δικτύου"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "Θ_ύρα:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "Κωδικός _πρόσβασης:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
+msgid "<b>_Use authentication</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "Όνομα _χρήστη"
+msgid "Autoconfiguration _URL:"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Τοποθεσία"
+msgid "HTTP Proxy Details"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Προτιμήσεις Διαμεσολαβητή Δικτύου"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "Θ_ύρα:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+msgid "_FTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+msgid "_HTTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "Κωδικός _πρόσβασης:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+msgid "_Secure HTTP proxy:"
 msgstr ""
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Όνομα _χρήστη"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Προτιμήσεις ήχου"
@@ -1692,6 +1763,10 @@ msgstr "Προτιμήσεις ήχου"
 msgid "E_nable sound server startup"
 msgstr "Ενεργοποίηση εκκίνησης εξυπηρετητή ήχων"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Γενικά"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1766,31 +1841,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr ""
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Θέμα"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr ""
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Παρασκήνιο"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-msgid "Theme Preferences"
-msgstr "Προτιμήσεις Θέματος"
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Εφαρμογή Τώρα"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Επαφές"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Προτιμήσεις Παραθύρων"
+msgid "Icons"
+msgstr "Εικονίδια Μόνο"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr ""
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+msgid "Theme Preferences"
+msgstr "Προτιμήσεις Θέματος"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Προτιμήσεις Παραθύρων"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Μετάβαση στον φάκελο θεμάτων"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "_Εγκατάσταση Νέου Θέματος..."
 
@@ -1940,30 +2032,55 @@ msgstr "_Τερματισμός"
 msgid "_Save"
 msgstr "_Αποθήκευση"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Προτιμήσεις Παραθύρων"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+msgid "Control"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Τύπος"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Ταχύτητα"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Εφαρμογή Τώρα"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+msgid "Window Preferences"
+msgstr "Προτιμήσεις Παραθύρων"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Γραμματοσειρά Μπάρας Τίτλου"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
+msgid "_Raise selected windows after a short time"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Διαχειριστής Παραθύρων:"
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2104,7 +2221,7 @@ msgstr "_Να μην εμφανιστεί ξανά αυτό το μήνυμα "
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2181,67 +2298,88 @@ msgstr "_Αναπαραγωγή"
 msgid "Select sound file"
 msgstr "Επιλογή αρχείου ήχου"
 
-#: libwindow-settings/gnome-wm-manager.c:171
-#, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
-msgstr ""
-"Έναρξη %s\n"
-"(λήξη απόπειρας σε %d δευτερόλεπτα)"
-
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Αρχικοποίηση διαχειριστή παραθύρων αδύνατη.\n"
-"\tΟ τερματισμός του ήδη υπάρχοντος διαχειριστή δεν ήταν δυνατός\n"
-
-#: libwindow-settings/gnome-wm-manager.c:329
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"wm-properties-capplet: Αρχικοποίηση διαχειριστή παραθύρων αδύνατη.\n"
-"\tανεπιτυχής εκκίνηση του '%s' \n"
-
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Ο προηγούμενος διαχειριστής παραθύρων δεν τερματίστηκε\n"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Εκκίνηση του '%s' ανεπιτυχής.\n"
-"Επαναφορά του προηγούμενου διαχειριστή παραθύρων '%s'\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr ""
+#~ "Ή_χηση κατά την ενεργοποίηση/απενεργοποίηση των χαρακτηριστικών "
+#~ "προσβασιμότητας"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Απόπειρες εκκίνησης διαχειριστή παραθύρων απέτυχαν.\n"
-"Παρακαλώ εκτελέστε κάποιο διαχειριστή. Αυτό μπορείτε να\n"
-"το κάνετε επιλέγοντας \"Εκτέλεση προγράμματος\" από το\n"
-"κεντρικό μενού του GNOME\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Προτιμήσεις Επανάληψης Πλήκτρων"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "Εντάξει"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "Εισαγω_γή αρχείου CDE AccessX"
+
+#~ msgid "msecs"
+#~ msgstr "εκατοστά δευτερολέπτου"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Προτιμήσεις Δικτύου"
+
+#~ msgid "_Location:"
+#~ msgstr "_Τοποθεσία"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Γραμματοσειρά Μπάρας Τίτλου"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Διαχειριστής Παραθύρων:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Έναρξη %s\n"
+#~ "(λήξη απόπειρας σε %d δευτερόλεπτα)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Αρχικοποίηση διαχειριστή παραθύρων αδύνατη.\n"
+#~ "\tΟ τερματισμός του ήδη υπάρχοντος διαχειριστή δεν ήταν δυνατός\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Αρχικοποίηση διαχειριστή παραθύρων αδύνατη.\n"
+#~ "\tανεπιτυχής εκκίνηση του '%s' \n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Ο προηγούμενος διαχειριστής παραθύρων δεν τερματίστηκε\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Εκκίνηση του '%s' ανεπιτυχής.\n"
+#~ "Επαναφορά του προηγούμενου διαχειριστή παραθύρων '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Απόπειρες εκκίνησης διαχειριστή παραθύρων απέτυχαν.\n"
+#~ "Παρακαλώ εκτελέστε κάποιο διαχειριστή. Αυτό μπορείτε να\n"
+#~ "το κάνετε επιλέγοντας \"Εκτέλεση προγράμματος\" από το\n"
+#~ "κεντρικό μενού του GNOME\n"
+
+#~ msgid "OK"
+#~ msgstr "Εντάξει"
 
 #~ msgid "_Category"
 #~ msgstr "_Κατηγορία"
 
-#~ msgid "_Delete"
-#~ msgstr "Διαγρα_φή"
-
 #~ msgid "_Name"
 #~ msgstr "_Όνομα"
 
@@ -2290,9 +2428,6 @@ msgstr "Εντάξει"
 #~ msgid "Calendar"
 #~ msgstr "Ημερολόγιο"
 
-#~ msgid "Contacts"
-#~ msgstr "Επαφές"
-
 #~ msgid "Packages"
 #~ msgstr "Πακέτα"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index b24404def..70d781c97 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-centre CVS\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2000-07-15\n"
 "Last-Translator: Robert Brady <rwb197@ecs.soton.ac.uk>\n"
 "Language-Team: \n"
@@ -13,19 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr ""
 
@@ -46,149 +45,186 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
+msgid "Beep when _modifier is pressed"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
-msgid "E_nable Toggle Keys"
+msgid "Beep when a _feature is turned on or off"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
-msgid "Enable Bo_unce Keys"
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
-msgid "Enable Slo_w Keys"
+msgid "Beep when key is:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
-msgid "Enable _Mouse Keys"
+msgid "Del_ay:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
-msgid "Enable _Sticky Keys"
+msgid "Delay between keypress and pointer mo_vement:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
+msgid "Disa_ble if two keys pressed together"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+msgid "E_nable Toggle Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
+msgid "Enable Bo_unce Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
-#, fuzzy
-msgid "Keyboard Accessibility Preferences (AccessX)"
-msgstr "Control Centre"
+msgid "Enable Slo_w Keys"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
-msgid "Ma_ximum pointer speed:"
+msgid "Enable _Mouse Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
-msgid ""
-"Only accept keys after they have been pressed and held for a user adjustable "
-"amount of time."
+msgid "Enable _Sticky Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
+msgid "Features"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Control Centre"
+msgid "Filters"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
+msgid ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
-msgstr ""
+#, fuzzy
+msgid "Keyboard Accessibility Preferences (AccessX)"
+msgstr "Control Centre"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
+msgid "Ma_ximum pointer speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Turn the numeric keypad into a mouse control pad."
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr ""
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Control Centre"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+msgid ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-msgid "_Import CDE AccessX file..."
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+msgid "Toggle Keys"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+msgid "_Disable if unused for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
-msgstr ""
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
+msgstr "Control Centre"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+msgid "_Import Feature Settings..."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
+msgid "_Only accept keys held for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+msgid "_Repeat Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+msgid "_accepted"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+msgid "_pressed"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+msgid "_rejected"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+msgid "milliseconds"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+msgid "pixels/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr ""
 
@@ -249,7 +285,7 @@ msgstr ""
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr ""
@@ -523,14 +559,6 @@ msgstr ""
 msgid "Please specify a name and a command for this editor."
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr ""
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr ""
@@ -738,6 +766,7 @@ msgid "Minimizing and Maximizing"
 msgstr ""
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr ""
 
@@ -1262,22 +1291,27 @@ msgstr ""
 msgid "Window Management"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr ""
 
@@ -1302,6 +1336,11 @@ msgstr ""
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr ""
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr ""
@@ -1367,10 +1406,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr ""
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr ""
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr ""
@@ -1408,56 +1443,56 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Control Centre"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
 "%s"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1583,10 +1618,6 @@ msgstr ""
 msgid "_Threshold:"
 msgstr ""
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr ""
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1602,38 +1633,69 @@ msgstr "Control Centre"
 msgid "Network proxy preferences"
 msgstr "Control Centre"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-#, fuzzy
-msgid "Network Preferences"
-msgstr "Control Centre"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Control Centre"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
+msgid "<b>_Direct internet connection</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
+msgid "<b>_Manual proxy configuration</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
+msgid "<b>_Use authentication</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
+msgid "Autoconfiguration _URL:"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
+msgid "HTTP Proxy Details"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Control Centre"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+msgid "Port:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+msgid "_FTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+msgid "_HTTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+msgid "_Password:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+msgid "_Secure HTTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+msgid "_Username:"
 msgstr ""
 
 #: capplets/sound/sound-properties-capplet.c:180
@@ -1645,6 +1707,10 @@ msgstr "Control Centre"
 msgid "E_nable sound server startup"
 msgstr ""
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr ""
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1717,32 +1783,45 @@ msgid "Select themes for various parts of the desktop"
 msgstr ""
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
+msgid "Apply _Background"
 msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-#, fuzzy
-msgid "Theme Preferences"
-msgstr "Control Centre"
+msgid "Apply _Font"
+msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
+msgid "Controls"
 msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
+msgid "Icons"
+msgstr ""
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr ""
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
 #, fuzzy
-msgid "Window Border Theme"
+msgid "Theme Preferences"
 msgstr "Control Centre"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Control Centre"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr ""
 
@@ -1888,30 +1967,53 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-#, fuzzy
-msgid "Window Preferences"
-msgstr "Control Centre"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+msgid "Control"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+msgid "Hyper"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:593
+msgid "Super"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
+msgid "To _move windows, click while holding down:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+#, fuzzy
+msgid "Window Preferences"
+msgstr "Control Centre"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
+msgid "_Double-click window titles to:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
+msgid "_Raise selected windows after a short time"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
 msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
@@ -2052,7 +2154,7 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2126,52 +2228,32 @@ msgstr ""
 msgid "Select sound file"
 msgstr ""
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Unable to initialise window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Unable to initialise window manager.\n"
-"\t'%s' didn't start\n"
-
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Control Centre"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Network Preferences"
+#~ msgstr "Control Centre"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Unable to initialise window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr ""
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Unable to initialise window manager.\n"
+#~ "\t'%s' didn't start\n"
 
 #, fuzzy
 #~ msgid "Global panel properties"
diff --git a/po/es.po b/po/es.po
index 01f658bf7..ff260588b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 1.3.10\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-06-09 20:45+0200\n"
 "Last-Translator: Lucas Di Pentima <lucas@lunix.com.ar>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
@@ -18,19 +18,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, fuzzy, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Ocurrió un error al mostrar la ayuda: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "No se puede importar la configuración de AccessX del archivo '%s'"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Seleccione un archivo AccessX de CDE"
 
@@ -52,59 +51,91 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Emitir un pitido cuando se enciende un LED y dos cuando se apaga."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
-"_Emitir pitido cuando se activen/desactiven las características de "
-"accesibilidad del teclado"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
 #, fuzzy
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr "la tecla se ha re_chazado"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Emitir un pitido cuando:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "E_mitir un pitido cuando se pulsa una tecla modificadora"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "Emitir un pitido cuando se enciende un LED y dos cuando se apaga."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "la tecla se ha re_chazado"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Retraso (segs):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Habilitar teclas de _conmutación"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Habilitar teclas de _rebote"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Habilitar teclas _lentas"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Habilitar teclas de _ratón"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Habilitar Teclas _adheribles"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "General"
-msgstr "_General"
+msgid "Filters"
+msgstr "_Archivo"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Ignorar pulsaciones de teclas durante:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -112,17 +143,27 @@ msgstr ""
 "Ignorar las pulsaciones subsiguientes de la MISMA tecla si tienen lugar "
 "dentro de un intervalo de tiempo seleccionado por el usuario."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Configuración de accesibilidad del teclado (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Velocidad má_xima del puntero:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Ratón"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Preferencias del ratón"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -130,7 +171,7 @@ msgstr ""
 "Aceptar únicamente las teclas después de que se hayan pulsado y mantenido "
 "pulsadas durante un intervalo de tiempo seleccionado por el usuario."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -138,86 +179,84 @@ msgstr ""
 "Efectuar varias operaciones de pulsación de tecla simultáneas mediante la "
 "pulsación secuencial de teclas modificadoras."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Propiedades del teclado"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr ""
-"Empezar a mo_ver después de este intervalo posterior a la pulsación de tecla:"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr ""
+msgid "S_peed:"
+msgstr "Velocidad"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Tiempo para _acelerar a velocidad máxima:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr ""
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Habilitar teclas de _conmutación"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Convertir el teclado numérico en un teclado de control de ratón."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "E_mitir un pitido cuando se pulsa una tecla modificadora"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Inhabilitar si no se utiliza durante "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Activar accesibilidad del teclado"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "_Importar archivo de AccessX de CDE"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "Aceptar pulsación de tecla _sólo después de:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Velocidad de repetición de las teclas"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"_Desactivar teclas adheribles cuando\n"
-"se pulsen dos teclas simultáneamente"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "la tecla se _acepta"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "la tecla se ha _pulsado"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "la tecla se ha _rechazado"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "milisegundos"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "segundos"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "píxels/segundo"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "segundos"
 
@@ -278,7 +317,7 @@ msgstr "_Seleccione un editor:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Obtener y almacenar opciones heredadas"
@@ -577,14 +616,6 @@ msgstr "Definir la tipografía para las aplicaciones"
 msgid "Please specify a name and a command for this editor."
 msgstr "Por favor especifique un nombre y un comando para este editor."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Ace_pta URLs"
@@ -795,6 +826,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Minimizar y maximizar"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1360,13 +1392,18 @@ msgstr "Escritorio"
 msgid "Window Management"
 msgstr "Gestor de ventanas"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Error definiendo nuevo acelerador en la base de datos de configuración: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1374,11 +1411,11 @@ msgstr ""
 "No se pueden encontrar temas de teclado.  Esto significa que la instalación "
 "de GTK+ está incompleta."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Acción"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Combinación de teclas"
 
@@ -1404,6 +1441,11 @@ msgstr "Combinación de teclas _del escritorio:"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, fuzzy, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Ocurrió un error al mostrar la ayuda: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Accesibilidad"
@@ -1473,11 +1515,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Velocidad de repetición de las teclas"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Velocidad"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Accesibilidad..."
@@ -1519,7 +1556,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Propiedades del teclado"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1528,7 +1565,7 @@ msgstr ""
 "<b>Cursor desconocido</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1536,7 +1573,7 @@ msgstr ""
 "<b>Cursor predeterminado - Actual</b>\n"
 "El cursor predeterminado que incorpora X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1544,7 +1581,7 @@ msgstr ""
 "<b>Cursor predeterminado</b>\n"
 "El cursor predeterminado que incorpora X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1552,7 +1589,7 @@ msgstr ""
 "<b>Cursor blanco - Actual</b>\n"
 "El cursor predeterminado invertido"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1560,7 +1597,7 @@ msgstr ""
 "<b>Cursor blanco</b>\n"
 "El cursor predeterminado invertido"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1568,7 +1605,7 @@ msgstr ""
 "<b>Cursor grande - Actual</b>\n"
 "Versión de gran tamaño del cursor normal"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1576,7 +1613,7 @@ msgstr ""
 "<b>Cursor grande - Actual</b>\n"
 "Versión de gran tamaño del cursor normal"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1584,7 +1621,7 @@ msgstr ""
 "<b>Cursor blanco grande - Actual</b>\n"
 "Versión de gran tamaño del cursor blanco"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1721,10 +1758,6 @@ msgstr "_Mostrar la posición del cursor cuando se pulsa la tecla Control"
 msgid "_Threshold:"
 msgstr "_Umbral:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Ratón"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1740,40 +1773,79 @@ msgstr "Red"
 msgid "Network proxy preferences"
 msgstr "Preferencias de la red"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Preferencias de la red"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Preferencias de la red"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "Puert_o:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "_Contraseña:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-#, fuzzy
-msgid "Pro_xy requires username and password"
-msgstr "El pro_xy requiere un nombre de usuario y contraseña"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "_Nombre de usuario:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Comando de configuración:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Ubicación:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Configuración de proxy HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Preferencias de la red"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "Puert_o:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
 msgstr "_Usar proxy HTTP"
 
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Usar proxy HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "_Contraseña:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "_Usar proxy HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "_Nombre de usuario:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Preferencias de sonido"
@@ -1782,6 +1854,11 @@ msgstr "Preferencias de sonido"
 msgid "E_nable sound server startup"
 msgstr "_Activar el servidor de sonido al inicio"
 
+#: capplets/sound/sound-properties.glade.h:2
+#, fuzzy
+msgid "General"
+msgstr "_General"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1856,33 +1933,50 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Definir la tipografía para los iconos en el escritorio"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Tema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Tapiz"
+
+#: capplets/theme-switcher/theme-properties.glade.h:2
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Aplicar ahora"
+
+#: capplets/theme-switcher/theme-properties.glade.h:3
+#, fuzzy
+msgid "Controls"
+msgstr "Control de interfaz de usuario"
+
+#: capplets/theme-switcher/theme-properties.glade.h:4
+#, fuzzy
+msgid "Icons"
+msgstr "Sólo iconos"
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
 msgid "New themes can also be installed by dragging them into the window."
 msgstr ""
 "Los nuevos temas pueden ser instalados arrastrándolos dentro de la ventana."
 
-#: capplets/theme-switcher/theme-properties.glade.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:7
 #, fuzzy
 msgid "Theme Preferences"
 msgstr "Preferencias del tema GTK+"
 
-#: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
-
-#: capplets/theme-switcher/theme-properties.glade.h:4
+#: capplets/theme-switcher/theme-properties.glade.h:8
 #, fuzzy
-msgid "Window Border Theme"
+msgid "Window Border"
 msgstr "Apariencia del borde de la ventana"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "Ir a la carpeta de _temas"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "_Instalar nuevo tema..."
@@ -2040,30 +2134,57 @@ msgstr ""
 msgid "_Save"
 msgstr "_Escalado"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Preferencias de ventana"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Control de interfaz de usuario"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Tipo"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Velocidad"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Aplicar ahora"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Seleccionar las ventanas cuando el ratón se mueve sobre ellas"
+msgid "Window Preferences"
+msgstr "Preferencias de ventana"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Tipografía de la barra de título"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Apariencia del borde de la ventana"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Gestor de ventanas:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Seleccionar las ventanas cuando el ratón se mueve sobre ellas"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2217,7 +2338,7 @@ msgstr "_No mostrar este mensaje otra vez"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "No se pudo cargar el archivo de sonido %s como evento %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2302,61 +2423,108 @@ msgstr "_Reproducir"
 msgid "Select sound file"
 msgstr "Seleccione un archivo de sonido"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Iniciando %s\n"
-"(quedan %d segundos antes de que se agote el tiempo de espera máximo de la "
-"operación)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: No se puede inicializar el gestor de ventanas.\n"
-"\tHay otro gestor de ventanas ejecutándose y no es posible eliminarlo\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr ""
+#~ "_Emitir pitido cuando se activen/desactiven las características de "
+#~ "accesibilidad del teclado"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: No se puede inicializar el gestor de ventanas.\n"
-"\t'%s' no se ha iniciado\n"
+#~ msgid "Beep when:"
+#~ msgstr "Emitir un pitido cuando:"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "El gestor de ventanas anterior no ha finalizado\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Propiedades del teclado"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"No se ha podido iniciar '%s'.\n"
-"Se va a volver al gestor de ventanas anterior '%s'\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr ""
+#~ "Empezar a mo_ver después de este intervalo posterior a la pulsación de "
+#~ "tecla:"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"No se ha podido iniciar el gestor de ventanas predeterminado.\n"
-"Ejecute un gestor de ventanas manualmente. Para ello puede\n"
-"seleccionar \"Ejecutar programa\" en el\n"
-"menú inferior\n"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Importar archivo de AccessX de CDE"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "Aceptar"
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "_Desactivar teclas adheribles cuando\n"
+#~ "se pulsen dos teclas simultáneamente"
+
+#~ msgid "msecs"
+#~ msgstr "milisegundos"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Preferencias de la red"
+
+#, fuzzy
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "El pro_xy requiere un nombre de usuario y contraseña"
+
+#~ msgid "_Location:"
+#~ msgstr "_Ubicación:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Tipografía de la barra de título"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Apariencia del borde de la ventana"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Gestor de ventanas:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Iniciando %s\n"
+#~ "(quedan %d segundos antes de que se agote el tiempo de espera máximo de "
+#~ "la operación)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: No se puede inicializar el gestor de ventanas.\n"
+#~ "\tHay otro gestor de ventanas ejecutándose y no es posible eliminarlo\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: No se puede inicializar el gestor de ventanas.\n"
+#~ "\t'%s' no se ha iniciado\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "El gestor de ventanas anterior no ha finalizado\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "No se ha podido iniciar '%s'.\n"
+#~ "Se va a volver al gestor de ventanas anterior '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "No se ha podido iniciar el gestor de ventanas predeterminado.\n"
+#~ "Ejecute un gestor de ventanas manualmente. Para ello puede\n"
+#~ "seleccionar \"Ejecutar programa\" en el\n"
+#~ "menú inferior\n"
+
+#~ msgid "OK"
+#~ msgstr "Aceptar"
 
 #, fuzzy
 #~ msgid "Add:"
@@ -2598,9 +2766,6 @@ msgstr "Aceptar"
 #~ msgid "Mouse Properties"
 #~ msgstr "Propiedades del ratón"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Configuración de proxy HTTP"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Configurar los sonidos de GNOME"
 
@@ -2922,9 +3087,6 @@ msgstr "Aceptar"
 #~ msgid "Command:"
 #~ msgstr "Comando:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Comando de configuración:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "La sesión gestiona el gestor de ventanas"
 
diff --git a/po/et.po b/po/et.po
index a74eb7e38..16393d747 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 2.0.0\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-07-17 21:15+0300\n"
 "Last-Translator: Tõivo Leedjärv <toivo@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -14,19 +14,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Klaviatuuri häälestuse käivitamisel tekkis viga : %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Ei saa AccessX sätteid failist '%s' importida"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Vali CDE AccessX fail"
 
@@ -47,56 +46,93 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
-"Tee piiks klaviatuuri valgusdioodi (LED) sisselülitamisel ning kaks piiksu "
-"väljalülitamisel."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Tee piiks, kui klahv _hüljatakse"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Tee piiks kui:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "Tee _piiks muuteklahvi vajutamisel"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr ""
+"Tee piiks klaviatuuri valgusdioodi (LED) sisselülitamisel ning kaks piiksu "
+"väljalülitamisel."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Tee piiks, kui klahv _hüljatakse"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Viivitus:"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Luba _Lülitavad Klahvid"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Luba _Põrkeklahvid"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Luba Ae_glased Klahvid"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Luba _Hiire Klahvid"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Luba _Kleepuvad Klahvid"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Üldine"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "_Fail"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Ignoreeri klahvivajutusi selle aja sees :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -104,17 +140,27 @@ msgstr ""
 "Ignoreeri järjestikuseid SAMA klahvi vajutusi, kui need toimuvad kasutaja "
 "määratud perioodi jooksul."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Klaviatuuri häälestus"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "_Maksimaalne kursori kiirus :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Hiir"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Hiire häälestus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -122,91 +168,89 @@ msgstr ""
 "Aktsepteeri ainult klahvivajutused, mis kestavad kauem kui kasutaja määratud "
 "aeg."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
 msgstr "Koosta klahvikombinatsioonid, vajutades muuteklahve järjest ükshaaval."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Klahvi kordamise häälestus"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-#, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "L_iigu, kui klahvivajutusest on möödunud :"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Katsetamise koht"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr "_Kiirus:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Maksimaalse kiiruseni kiirendamise _aeg :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Lülitavad ja kordavad klahvid"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Luba _Lülitavad Klahvid"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Muuda numbriklaviatuur hiire juhtklahvideks."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "Tee _piiks muuteklahvi vajutamisel"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Lülita välja kui kasutamata "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
+msgstr "Klaviatuuri häälestus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "_Impordi CDE AccessX fail"
+msgid "_Only accept keys held for:"
+msgstr "_Aktsepteeri klahvivajutus peale :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
 #, fuzzy
-msgid "_Only accept keypress after:"
-msgstr "_Aktsepteeri klahvivajutus peale :"
+msgid "_Repeat Keys"
+msgstr "Klahvide kordamine"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"L_ülita Kleepuvad Klahvid kahe\n"
-"klahvi koosvajutamisel välja"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "klahv _aktsepteeriti"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "klahvi _vajutati"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "klahv hül_jati"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "millisek."
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "sekundit"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "pikslit/sek"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "sekundit"
 
@@ -261,7 +305,7 @@ msgstr "_Vali pilt:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr ""
@@ -540,14 +584,6 @@ msgstr "Vali vaikimisi kasutatavad rakendused"
 msgid "Please specify a name and a command for this editor."
 msgstr "Palun määra selle redaktori nimi ja käsk."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Võtab _URLe vastu"
@@ -754,6 +790,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Minimeerimine ja maksimeerimine"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1309,22 +1346,27 @@ msgstr "Töölaud"
 msgid "Window Management"
 msgstr "Akende haldus"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Tegevus"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Kiirklahv"
 
@@ -1349,6 +1391,11 @@ msgstr "_Teksti redigeerimise kiirklahvid:"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Klaviatuuri häälestuse käivitamisel tekkis viga : %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr ""
@@ -1413,10 +1460,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Klahvide kordamine"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr "_Kiirus:"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr ""
@@ -1453,7 +1496,7 @@ msgstr "vaikne"
 msgid "Set your keyboard preferences"
 msgstr "Klaviatuuri häälestus"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1462,7 +1505,7 @@ msgstr ""
 "<b>Tundmatu kursor</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1470,7 +1513,7 @@ msgstr ""
 "<b>Vaikimisi kursor - praegune</b>\n"
 "X-i vaikimisi kursor"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1478,7 +1521,7 @@ msgstr ""
 "<b>Vaikimisi kursor</b>\n"
 "X-i vaikimisi kursor"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1486,7 +1529,7 @@ msgstr ""
 "<b>Valge kursor - praegune</b>\n"
 "Vaikimisi kursor negatiivis"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1494,7 +1537,7 @@ msgstr ""
 "<b>Valge kursor</b>\n"
 "Vaikimisi kursor negatiivis"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1502,7 +1545,7 @@ msgstr ""
 "<b>Suur kursor - praegune</b>\n"
 "Tavalise kursori suurem versioon"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1510,7 +1553,7 @@ msgstr ""
 "<b>Suur kursor</b>\n"
 "Tavalise kursori suurem versioon"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1518,7 +1561,7 @@ msgstr ""
 "<b>Suur valge kursor - praegune</b>\n"
 "Valge kursori suurem versioon"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1650,10 +1693,6 @@ msgstr "_Näita Control-klahvi vajutamisel hiirekursori asukohta"
 msgid "_Threshold:"
 msgstr "_Lävi:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Hiir"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Hiire häälestus"
@@ -1668,38 +1707,78 @@ msgstr "Võrguproksi"
 msgid "Network proxy preferences"
 msgstr "Võrguproksi häälestus"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Võrgu häälestus"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Võrguproksi häälestus"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "_Parool:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "Proks_i vajab kasutajanime ja parooli"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "Kasutaja_nimi:"
+msgid "Autoconfiguration _URL:"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Asukoht:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "HTTP proksi sätted"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Võrguproksi häälestus"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "_Kasuta HTTP proksit"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
 msgstr "_Kasuta HTTP proksit"
 
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "_Parool:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "_Kasuta HTTP proksit"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Kasutaja_nimi:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Heli häälestus"
@@ -1708,6 +1787,10 @@ msgstr "Heli häälestus"
 msgid "E_nable sound server startup"
 msgstr "_Luba heliserveri käivitamine"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Üldine"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1779,31 +1862,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Vali teemad töölaua erinevatele osadele"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Teema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Uusi teemasid saab ka installida neid siia aknasse tirides."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Taust"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-msgid "Theme Preferences"
-msgstr "Teema häälestus"
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Rakenda kohe"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Kontaktid"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Akna äärise välimus"
+msgid "Icons"
+msgstr "Ainult ikoonid"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Uusi teemasid saab ka installida neid siia aknasse tirides."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+msgid "Theme Preferences"
+msgstr "Teema häälestus"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Akna äärise välimus"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Ava teemade kataloog"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "_Installi uus teema..."
 
@@ -1957,30 +2057,55 @@ msgstr "vaikne"
 msgid "_Save"
 msgstr "_Suurendatud"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Akende häälestus"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+msgid "Control"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Tüüp"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Kiirus"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Rakenda kohe"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+msgid "Window Preferences"
+msgstr "Akende häälestus"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
+msgid "_Double-click window titles to:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Akna äärise välimus"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Aknahaldur:"
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2127,7 +2252,7 @@ msgstr "_Ära näita seda teadet uuesti"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2205,60 +2330,101 @@ msgstr "_Mängi"
 msgid "Select sound file"
 msgstr "Vali helifail"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Käivitatakse %s\n"
-"(taimaut %d sekundi pärast)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Ei saa aknahaldurit käivitada.\n"
-"\tTeine aknahaldur juba töötab ja seda ei olnud võimalik lõpetada\n"
+#~ msgid "Beep when:"
+#~ msgstr "Tee piiks kui:"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Ei saa aknahaldurit käivitada.\n"
-"\t'%s' ei käivitunud\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Klahvi kordamise häälestus"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Eelmine aknahaldur ei lõpetanud\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "L_iigu, kui klahvivajutusest on möödunud :"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Ei saa '%s' käivitada.\n"
-"Kasutusele läheb eelmine aknahaldur '%s'\n"
+#~ msgid "Testing Area"
+#~ msgstr "Katsetamise koht"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Ei saa eelmist aknahaldurit käivitada.\n"
-"Palun käivita aknahaldur ise. Seda saad\n"
-"sa teha, valides \"Käivita programm\"\n"
-"\"jala\"-menüüst\n"
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Lülitavad ja kordavad klahvid"
+
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Impordi CDE AccessX fail"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "L_ülita Kleepuvad Klahvid kahe\n"
+#~ "klahvi koosvajutamisel välja"
+
+#~ msgid "msecs"
+#~ msgstr "millisek."
+
+#~ msgid "Network Preferences"
+#~ msgstr "Võrgu häälestus"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Proks_i vajab kasutajanime ja parooli"
+
+#~ msgid "_Location:"
+#~ msgstr "_Asukoht:"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Akna äärise välimus"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Aknahaldur:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Käivitatakse %s\n"
+#~ "(taimaut %d sekundi pärast)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Ei saa aknahaldurit käivitada.\n"
+#~ "\tTeine aknahaldur juba töötab ja seda ei olnud võimalik lõpetada\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Ei saa aknahaldurit käivitada.\n"
+#~ "\t'%s' ei käivitunud\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Eelmine aknahaldur ei lõpetanud\n"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "Olgu"
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Ei saa '%s' käivitada.\n"
+#~ "Kasutusele läheb eelmine aknahaldur '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Ei saa eelmist aknahaldurit käivitada.\n"
+#~ "Palun käivita aknahaldur ise. Seda saad\n"
+#~ "sa teha, valides \"Käivita programm\"\n"
+#~ "\"jala\"-menüüst\n"
+
+#~ msgid "OK"
+#~ msgstr "Olgu"
 
 #~ msgid "Add:"
 #~ msgstr "Lisa:"
@@ -2324,9 +2490,6 @@ msgstr "Olgu"
 #~ msgid "Calendar"
 #~ msgstr "Kalender"
 
-#~ msgid "Contacts"
-#~ msgstr "Kontaktid"
-
 #~ msgid "Packages"
 #~ msgstr "Paketid"
 
@@ -2488,9 +2651,6 @@ msgstr "Olgu"
 #~ msgid "Mouse Properties"
 #~ msgstr "Hiire häälestus"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "HTTP proksi sätted"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "GNOME helide häälestus"
 
@@ -2697,9 +2857,6 @@ msgstr "Olgu"
 #~ msgid "Icons and Text"
 #~ msgstr "Ikoonid ja tekst"
 
-#~ msgid "Only Icons"
-#~ msgstr "Ainult ikoonid"
-
 #~ msgid "Only Text"
 #~ msgstr "Ainult tekst"
 
diff --git a/po/fi.po b/po/fi.po
index 03aa46aae..93fe55f86 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -21,7 +21,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 1.99.0\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-10-02 22:27+0300\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@hut.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -29,19 +29,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Näppäimistön hallintasovelman käynnistys epäonnistui: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "AccessX-asetusten tuonti tiedostosta \"%s\" epäonnistui"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Valitse CDE AccessX -tiedosto"
 
@@ -64,53 +63,89 @@ msgstr ""
 "esteettömyysominaisuudet eivät toimi ilman sitä."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Piippaa kerran kun näppäimistön valo syttyy ja kahdesti kun sammuu."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
-"_Piippaa, kun näppäimistön esteettömyysominaisuudet otetaan tai poistetaan "
-"käytöstä"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Piippaa kun painallus h_ylätään"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Piippaa kun:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "P_iippaa, kun muunnosnäppäin on painettu"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "Piippaa kerran kun näppäimistön valo syttyy ja kahdesti kun sammuu."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Piippaa kun painallus h_ylätään"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Viive:"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 msgid "E_nable Toggle Keys"
 msgstr "Käytä _vipunäppäimiä"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 msgid "Enable Bo_unce Keys"
 msgstr "Käytä _kimmonäppäimiä"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Käytä _hitaita näppäimiä"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Käytä _hiirinäppäimiä"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Käytä _tarttuvia näppäimiä"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Yleistä"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "_Tiedosto"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#, fuzzy
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Sivuuta näppäilyt aikana:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -118,21 +153,31 @@ msgstr ""
 "Sivuuta kaikki peräkkäiset saman näppäimen painallukset, jotka tapahtuvat "
 "säädettävän ajan kuluessa."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Näppäimistön esteettömyysasetukset (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 msgid "Ma_ximum pointer speed:"
 msgstr "S_uurin osoittimen nopeus:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Hiiri"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Hiiriasetukset"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
 msgstr "Hyväksy vain määritellyn ajan pohjassa olleet näppäinten painallukset"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -140,79 +185,83 @@ msgstr ""
 "Jäljittele monen näppäimen painamista samaan aikaan näppäilemällä "
 "muunnosnäppäimiä peräkkäin."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-msgid "Repeat Key Pre_ferences..."
-msgstr "Näppäimistön _toistoasetukset"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
-msgstr "Aloita _liike, kun painalluksesta on kulunut:"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Koealue"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr "_Nopeus:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#, fuzzy
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "_Suurimpaan nopeuteen kiihtymisaika:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Toisto ja vipunäppäimet"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Käytä _vipunäppäimiä"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Tee numeronäppäimistöstä hiiren ohjauspainikkeet."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr "P_iippaa, kun muunnosnäppäin on painettu"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
+#, fuzzy
+msgid "_Disable if unused for:"
 msgstr "_Poista käytöstä jos käyttämättömänä "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Käytä esteetöntä näppäimistöä"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-msgid "_Import CDE AccessX file..."
-msgstr "_Tuo CDE AccessX -tiedosto"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
+#, fuzzy
+msgid "_Only accept keys held for:"
 msgstr "_Hyväksy näppäimen painallus kun on kulunut:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Näppäinten toisto"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"_Poista tarttuvat näppäimet käytöstä\n"
-"kun kahta näppäintä painetaan samalla"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "näppäin on _hyväksytty"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "näppäin on _painettu"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "näppäin on h_ylätty"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "ms"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "sekuntia"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "kuvapistettä/s"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -267,7 +316,7 @@ msgstr "Valitse _kuva:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Hae ja tallenna aikaisempien versioiden asetukset"
@@ -556,14 +605,6 @@ msgstr "Valitse oletusohjelmasi"
 msgid "Please specify a name and a command for this editor."
 msgstr "Anna tämän editorin nimi ja komento."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "_Hyväksyy URL:eja"
@@ -770,6 +811,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Pienennys ja suurennus"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Asetusohjelma"
 
@@ -1309,12 +1351,17 @@ msgstr "Työpöytä"
 msgid "Window Management"
 msgstr "Ikkunointi"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Virhe asettaessa uutta pikanäppäintä asetustietokantaan: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1322,11 +1369,11 @@ msgstr ""
 "Ei löytänyt näppäimistöteemoja. Tämä merkitsee, että GTK+ on asennettu "
 "puutteellisesti."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Toiminto"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Pikanäppäin"
 
@@ -1351,6 +1398,11 @@ msgstr "Pikanäppäimet _tekstin muokkaamiseksi"
 msgid "Assign shortcut keys to commands"
 msgstr "Liitä pikanäppäimiä komentoihin"
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Näppäimistön hallintasovelman käynnistys epäonnistui: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Esteettömyys"
@@ -1417,10 +1469,6 @@ msgstr "Ääni näppäintä painettaessa"
 msgid "Repeat Keys"
 msgstr "Näppäinten toisto"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr "_Nopeus:"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Esteettömyys..."
@@ -1457,7 +1505,7 @@ msgstr "hiljainen"
 msgid "Set your keyboard preferences"
 msgstr "Muuta näppäimistöasetuksia"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1466,7 +1514,7 @@ msgstr ""
 "<b>Tuntematon osoitin</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1474,7 +1522,7 @@ msgstr ""
 "<b>Oletusosoitin - nykyinen</b>\n"
 "X:n mukana tuleva oletusosoitin"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1482,7 +1530,7 @@ msgstr ""
 "<b>Oletusosoitin</b>\n"
 "X:n mukana tuleva oletusosoitin"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1490,7 +1538,7 @@ msgstr ""
 "<b>Valkoinen osoitin - nykyinen</b>\n"
 "Oletusosoitin käänteisin värein"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1498,7 +1546,7 @@ msgstr ""
 "<b>Valkoinen osoitin</b>\n"
 "Oletusosoitin käänteisin värein"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1506,7 +1554,7 @@ msgstr ""
 "<b>Suuri osoitin - nykyinen</b>\n"
 "Suuri versio tavallisesta osoittimesta"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1514,7 +1562,7 @@ msgstr ""
 "<b>Suuri osoitin</b>\n"
 "Suuri versio tavallisesta osoittimesta"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1522,7 +1570,7 @@ msgstr ""
 "<b>Suuri valkoinen osoitin - nykyinen</b>\n"
 "Suuri versio valkoisesta osoittimesta"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1657,10 +1705,6 @@ msgstr "_Näytä osoittimen sijainti control-näppäintä painettaessa"
 msgid "_Threshold:"
 msgstr "_Kynnys:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Hiiri"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Muuta hiiriasetuksia"
@@ -1673,38 +1717,78 @@ msgstr "Välipalvelin"
 msgid "Network proxy preferences"
 msgstr "Välipalvelinasetukset"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Verkkoasetukset"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Välipalvelinasetukset"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ortti:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "_Salasana:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "_Välipalvelin vaatii tunnuksen ja salasanan"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "_Tunnus:"
+msgid "Autoconfiguration _URL:"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "Si_jainti:"
+msgid "HTTP Proxy Details"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Välipalvelinasetukset"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ortti:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+#, fuzzy
+msgid "_Details"
+msgstr "_Lisätiedot..."
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "_Käytä HTTP-välipalvelinta"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
 msgstr "_Käytä HTTP-välipalvelinta"
 
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "_Salasana:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "_Käytä HTTP-välipalvelinta"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "_Tunnus:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Ääniasetukset"
@@ -1713,6 +1797,10 @@ msgstr "Ääniasetukset"
 msgid "E_nable sound server startup"
 msgstr "_Ota äänipalvelin käyttöön käynnistyessä"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Yleistä"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1784,30 +1872,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Valitse työpöydän eri osien teemat"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Teema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Uusia teemoja voi asentaa myös pudottamalla ne tähän ikkunaan."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Tausta"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-msgid "Theme Preferences"
-msgstr "Teema-asetukset"
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Totetuta nyt"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr "Säätimien teema"
+#, fuzzy
+msgid "Controls"
+msgstr "Käyttöliittymäsäädin"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
-msgid "Window Border Theme"
-msgstr "Ikkunan reunojen teema"
+#, fuzzy
+msgid "Icons"
+msgstr "Vain kuvakkeet"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Uusia teemoja voi asentaa myös pudottamalla ne tähän ikkunaan."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+msgid "Theme Preferences"
+msgstr "Teema-asetukset"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Ikkunan reunojen teema"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Siirry teemahakemistoon"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "_Asenna uusi teema..."
 
@@ -1952,30 +2058,58 @@ msgstr "_Lopeta"
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Ikkuna-asetukset"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Käyttöliittymäsäädin"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Tyyppi"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Nopeus"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Totetuta nyt"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Valitse ikkunat kun hiiri liikkuu niiden päälle"
+msgid "Window Preferences"
+msgstr "Ikkuna-asetukset"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Otsikkopalkin kirjasin"
+#, fuzzy
+msgid "_Double-click window titles to:"
+msgstr "_Ikkunoiden otsikon kirjasin:"
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Ikkunan reunan ulkonäkö"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Ikkunointiohjelma:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Valitse ikkunat kun hiiri liikkuu niiden päälle"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2122,7 +2256,7 @@ msgstr "_Älä näytä tätä viestiä uudestaan"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Ei voinut ladata äänitiedostoa %s ääneksi %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "GConf-avain %s on tyyppiä %s, vaikka ohjelma odotti tyyppiä %s\n"
@@ -2202,58 +2336,107 @@ msgstr "_Soita"
 msgid "Select sound file"
 msgstr "Valitse äänitiedosto"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
-msgstr ""
-"%s käynnistyy\n"
-"(%d sekuntia jäljellä ennen aikarajaa)"
-
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Ei voinut käynnistää ikkunointiohjelmaa.\n"
-"\tToinen ikkunointiohjelma on jo käynnissä eikä sitä voinut sulkea.\n"
-
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Ei voinut käynnistää ikkunointiohjelmaa \"%s\".\n"
-
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Edellinen ikkunointiohjelma ei sulkeutunut.\n"
-
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Ei voinut käynnistää ohjelmaa \"%s\".\n"
-"Palaa edelliseen ikkunointiohjelmaan \"%s\".\n"
-
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Ei voinut käynnistää varaikkunointiohjelmaa, joten\n"
-"ikkunointiohjelma täytyy käynnistää käsin.\n"
-"Voit tehdä tämän valitsemalla päävalikosta \"Suorita...\".\n"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr ""
+#~ "_Piippaa, kun näppäimistön esteettömyysominaisuudet otetaan tai "
+#~ "poistetaan käytöstä"
+
+#~ msgid "Beep when:"
+#~ msgstr "Piippaa kun:"
+
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Näppäimistön _toistoasetukset"
+
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Aloita _liike, kun painalluksesta on kulunut:"
+
+#~ msgid "Testing Area"
+#~ msgstr "Koealue"
+
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Toisto ja vipunäppäimet"
+
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Tuo CDE AccessX -tiedosto"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "_Poista tarttuvat näppäimet käytöstä\n"
+#~ "kun kahta näppäintä painetaan samalla"
+
+#~ msgid "msecs"
+#~ msgstr "ms"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Verkkoasetukset"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "_Välipalvelin vaatii tunnuksen ja salasanan"
+
+#~ msgid "_Location:"
+#~ msgstr "Si_jainti:"
+
+#~ msgid "Widget Theme"
+#~ msgstr "Säätimien teema"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Otsikkopalkin kirjasin"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Ikkunan reunan ulkonäkö"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Ikkunointiohjelma:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "%s käynnistyy\n"
+#~ "(%d sekuntia jäljellä ennen aikarajaa)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Ei voinut käynnistää ikkunointiohjelmaa.\n"
+#~ "\tToinen ikkunointiohjelma on jo käynnissä eikä sitä voinut sulkea.\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Ei voinut käynnistää ikkunointiohjelmaa \"%s\".\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Edellinen ikkunointiohjelma ei sulkeutunut.\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Ei voinut käynnistää ohjelmaa \"%s\".\n"
+#~ "Palaa edelliseen ikkunointiohjelmaan \"%s\".\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Ei voinut käynnistää varaikkunointiohjelmaa, joten\n"
+#~ "ikkunointiohjelma täytyy käynnistää käsin.\n"
+#~ "Voit tehdä tämän valitsemalla päävalikosta \"Suorita...\".\n"
+
+#~ msgid "OK"
+#~ msgstr "OK"
 
 #~ msgid "_Category"
 #~ msgstr "_Luokka"
diff --git a/po/fr.po b/po/fr.po
index 77008fe58..2a74fe847 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 2.0.0\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-07-21 15:15+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <christophe@merlet.net>\n"
 "Language-Team: Gnome French Team <gnomefr@traduc.org>\n"
@@ -18,19 +18,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Il y a eu une erreur lors du lancement de la capplet clavier : %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Incapable d'importer les paramètres AccessX à partir du fichier « %s »"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Sélectionnez le fichier CDE AccessX"
 
@@ -51,58 +50,92 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
-"Émettre un bip quand une LED s'allume et deux bips quand une LED s'éteint."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
-"_Bip quand vous activez/désactivez les fonctionnalités d'accessibilité du "
-"clavier"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Bip quand la touche est re_jetée"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Émettre un bip lorsque :"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "Émettre un _bip lorsque la touche de modification est appuyée"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr ""
+"Émettre un bip quand une LED s'allume et deux bips quand une LED s'éteint."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Bip quand la touche est re_jetée"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Délai :"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Activer _Toggle Keys"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Activer _Bounce Keys"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Activer Slo_w Keys"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Activer _Mouse Keys"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Activer _Sticky Keys"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Général"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "Filters"
+msgstr "_Fichier"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#, fuzzy
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Ignorer l'enfoncement des touches survenues entre : "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -110,17 +143,27 @@ msgstr ""
 "Ignorer toutes les pressions succesives de la MÊME touche si elles arrivent "
 "dans une période de temps sélectionnable par l'utilisateur."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Configuration de l'accessibilité du clavier (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Vitesse ma_ximale du pointeur: "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Souris"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Préférences de la souris"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -128,7 +171,7 @@ msgstr ""
 "Ne répondre à l'enfoncement d'une touche que lorsque celle-ci a été tenu "
 "enfoncée durant une période de temps fixé par l'utilisateur."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -136,84 +179,83 @@ msgstr ""
 "Effectue des opérations de pressage de touches simultanées en pressant un "
 "modificateur de touche en séquance."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Préférences de répétition des touches"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-#, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "Commencer à bouger après ce lapse de temps : "
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Aire de test"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr "_Vitesse :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Temps qu'il faut pour accélerer jusqu'à la vitesse maximale: "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Touches de bascule et de répétition"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Activer _Toggle Keys"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Bascule le clavier numérique en un clavier de contrôle de la souris."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "Émettre un _bip lorsque la touche de modification est appuyée"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Désactiver si non-utilisé pour"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Activer l'accessibilité au clavier"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "_Importer le fichier CDE AccessX"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "N'accepter les touches enfoncés qu'après : "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Touches de répétition"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"_Désactiver Sticky Keys lorsque deux touches sont enfoncées simultanément"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "la touche est _acceptée"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "la touche est _enfoncée"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "la touche est _rejetée"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "millisecondes"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "secondes"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "pixels/sec"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "secondes"
 
@@ -268,7 +310,7 @@ msgstr "_Sélectionnez une image :"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Recupérer et enregistrer une configuration antérieure"
@@ -565,14 +607,6 @@ msgstr "Sélectionne vos applications par défaut"
 msgid "Please specify a name and a command for this editor."
 msgstr "Veuillez spécifier un nom et une commande pour cette éditeur."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Accepte les _URLs"
@@ -784,6 +818,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Maximisation et minimisation"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1343,14 +1378,19 @@ msgstr "Bureau"
 msgid "Window Management"
 msgstr "Gestion des fenêtres"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Erreur lors de la définition du nouvel accélérateur dans la base de données "
 "de configuration : %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1358,11 +1398,11 @@ msgstr ""
 "Impossible de trouver un seul thème de clavier.  Cela veut dire que votre "
 "installation de GT+ est vraisemblablement incomplète."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Action"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Raccourci"
 
@@ -1387,6 +1427,11 @@ msgstr "Raccourcis d'édition de _texte :"
 msgid "Assign shortcut keys to commands"
 msgstr "Assigner les touches de raccourcis aux commandes"
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Il y a eu une erreur lors du lancement de la capplet clavier : %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Accessibilité"
@@ -1453,10 +1498,6 @@ msgstr "Clique au pressage de touche"
 msgid "Repeat Keys"
 msgstr "Touches de répétition"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr "_Vitesse :"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Accessibilité..."
@@ -1493,7 +1534,7 @@ msgstr "silence"
 msgid "Set your keyboard preferences"
 msgstr "Défini vos préférences du clavier"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1502,7 +1543,7 @@ msgstr ""
 "<b>Curseur inconnu</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1510,7 +1551,7 @@ msgstr ""
 "<b>Curseur par défaut - Courant</b>\n"
 "Le curseur  par défaut distribuer avec X Window"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1518,7 +1559,7 @@ msgstr ""
 "<b>Curseur par défaut</b>\n"
 "Le curseur par défaut distribué avec X Window"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1526,7 +1567,7 @@ msgstr ""
 "<b>Curseur blanc - Courrant</b>\n"
 "Le curseur par défaut inversé"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1534,7 +1575,7 @@ msgstr ""
 "<b>Curseur blanc</b>\n"
 "Le curseur par défaut inversé"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1542,7 +1583,7 @@ msgstr ""
 "<b>Grand curseur - Courant</b>\n"
 "Version agrandi du curseur par défaut"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1550,7 +1591,7 @@ msgstr ""
 "<b>Grand curseur</b>\n"
 "Version agrandi du curseur par défaut"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1558,7 +1599,7 @@ msgstr ""
 "<b>Grand curseur blanc - Courant</b>\n"
 "Version agrandi du curseur blanc"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1694,10 +1735,6 @@ msgstr ""
 msgid "_Threshold:"
 msgstr "_Réactivité :"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Souris"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Défini vos préférences de souris"
@@ -1712,38 +1749,79 @@ msgstr "Proxy réseau"
 msgid "Network proxy preferences"
 msgstr "Préférences du proxy réseau"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Préférences du réseau"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Préférences du proxy réseau"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ort :"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "Mot de _passe :"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "Le Pro_xy nécessite un identifiant et un mot de passe"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "_Identifiant :"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Commande de configuration :"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Emplacement :"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Réglages du proxy HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Préférences du proxy réseau"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort :"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "_Utiliser un proxy HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Utiliser un proxy HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "Mot de _passe :"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "_Utiliser un proxy HTTP"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "_Identifiant :"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Préférences du son"
@@ -1752,6 +1830,10 @@ msgstr "Préférences du son"
 msgid "E_nable sound server startup"
 msgstr "_Activer le serveur de sons au démarrage"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Général"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1823,33 +1905,50 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Sélectionne les thèmes pour les diverses parties du bureau"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Thème"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Arrière-plan"
+
+#: capplets/theme-switcher/theme-properties.glade.h:2
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Appliquer tout de suite"
+
+#: capplets/theme-switcher/theme-properties.glade.h:3
+#, fuzzy
+msgid "Controls"
+msgstr "Contrôle de l'interface utilisateur"
+
+#: capplets/theme-switcher/theme-properties.glade.h:4
+#, fuzzy
+msgid "Icons"
+msgstr "Icônes seulement"
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
 msgid "New themes can also be installed by dragging them into the window."
 msgstr ""
 "Vous pouvez aussi installer des nouveaux thèmes en les faisant glisser dans "
 "cette fenêtre"
 
-#: capplets/theme-switcher/theme-properties.glade.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:7
 msgid "Theme Preferences"
 msgstr "Préférences du thème"
 
-#: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
-
-#: capplets/theme-switcher/theme-properties.glade.h:4
+#: capplets/theme-switcher/theme-properties.glade.h:8
 #, fuzzy
-msgid "Window Border Theme"
+msgid "Window Border"
 msgstr "Apparence des bordures de fenêtres"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Va au répertoire de théme"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "_Installer un nouveau thème..."
 
@@ -1998,30 +2097,57 @@ msgstr "_Quitter"
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Paramètres des fenêtres"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Contrôle de l'interface utilisateur"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Type"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Vitesse"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Appliquer tout de suite"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Sélectionne les fenêtres quand la souris est au dessus d'elles"
+msgid "Window Preferences"
+msgstr "Paramètres des fenêtres"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Police de la barre de titre"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Apparence des bordures de fenêtres"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Gestionnaire de fenêtres :"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Sélectionne les fenêtres quand la souris est au dessus d'elles"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2169,7 +2295,7 @@ msgstr "_Ne plus jamais afficher ce message"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Impossible de charger le fichier %s comme échantillon %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "La clé GConf %s est défini au type %s mais le type attendu est %s\n"
@@ -2249,63 +2375,112 @@ msgstr "_Jouer"
 msgid "Select sound file"
 msgstr "Sélectionnez le fichier son"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Démarrage de %s\n"
-"(%d secondes avant expiration du temps imparti)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet : Impossible d'initialiser le\n"
-"gestionnaire de fenêtres.\n"
-"\tUn autre gestionnaire de fenêtres est déjà en cours d'exécution et ne peux "
-"pas être terminé\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr ""
+#~ "_Bip quand vous activez/désactivez les fonctionnalités d'accessibilité du "
+#~ "clavier"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet : Impossible d'initialiser le gestionnaire de "
-"fenêtres.\n"
-"\t« %s » a pas démarré\n"
+#~ msgid "Beep when:"
+#~ msgstr "Émettre un bip lorsque :"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Le gestionnaire de fenêtres précédent fonctionne toujours\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Préférences de répétition des touches"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"N'a pas pu démarrer « %s ».\n"
-"Retourne au gestionnaire de fenêtres prédédent « %s »\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Commencer à bouger après ce lapse de temps : "
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"N'a pas pu démarrer le gestionnaire de fenêtres précédent.\n"
-"Démarrez un gestionnaire de fenêtres manuellement.\n"
-"Vous pouvez le faire en sélectionnant « Exécuter... »\n"
-"dans le menu GNOME\n"
+#~ msgid "Testing Area"
+#~ msgstr "Aire de test"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "Valider"
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Touches de bascule et de répétition"
+
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Importer le fichier CDE AccessX"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "_Désactiver Sticky Keys lorsque deux touches sont enfoncées simultanément"
+
+#~ msgid "msecs"
+#~ msgstr "millisecondes"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Préférences du réseau"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Le Pro_xy nécessite un identifiant et un mot de passe"
+
+#~ msgid "_Location:"
+#~ msgstr "_Emplacement :"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Police de la barre de titre"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Apparence des bordures de fenêtres"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Gestionnaire de fenêtres :"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Démarrage de %s\n"
+#~ "(%d secondes avant expiration du temps imparti)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet : Impossible d'initialiser le\n"
+#~ "gestionnaire de fenêtres.\n"
+#~ "\tUn autre gestionnaire de fenêtres est déjà en cours d'exécution et ne "
+#~ "peux pas être terminé\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet : Impossible d'initialiser le gestionnaire de "
+#~ "fenêtres.\n"
+#~ "\t« %s » a pas démarré\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Le gestionnaire de fenêtres précédent fonctionne toujours\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "N'a pas pu démarrer « %s ».\n"
+#~ "Retourne au gestionnaire de fenêtres prédédent « %s »\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "N'a pas pu démarrer le gestionnaire de fenêtres précédent.\n"
+#~ "Démarrez un gestionnaire de fenêtres manuellement.\n"
+#~ "Vous pouvez le faire en sélectionnant « Exécuter... »\n"
+#~ "dans le menu GNOME\n"
+
+#~ msgid "OK"
+#~ msgstr "Valider"
 
 #~ msgid "Add:"
 #~ msgstr "Ajouter :"
@@ -2545,9 +2720,6 @@ msgstr "Valider"
 #~ msgid "Mouse Properties"
 #~ msgstr "Configuration des propriétés de la souris"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Réglages du proxy HTTP"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Configuration des effets sonores de GNOME"
 
@@ -2855,9 +3027,6 @@ msgstr "Valider"
 #~ msgid "Command:"
 #~ msgstr "Commande :"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Commande de configuration :"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Le gestionnaire de fenêtres est géré par la session"
 
@@ -2931,9 +3100,6 @@ msgstr "Valider"
 #~ msgid "Icons and Text"
 #~ msgstr "Icônes et texte"
 
-#~ msgid "Only Icons"
-#~ msgstr "Icônes seulement"
-
 #~ msgid "Only Text"
 #~ msgstr "Texte seulement"
 
diff --git a/po/ga.po b/po/ga.po
index 5ec99bec7..c49233907 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center CVS\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2000-03-11 01:02+0000\n"
 "Last-Translator:Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Alastair McKinstry <mckinstry@computer.org>\n"
@@ -13,19 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 #, fuzzy
 msgid "Select CDE AccessX file"
 msgstr "T�g comhad..."
@@ -49,154 +48,196 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
 #, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr " Miarchlar "
+msgid "Basic"
+msgstr "Beag"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
+msgid "Beep when _modifier is pressed"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
-msgid "E_nable Toggle Keys"
+msgid "Beep when a _feature is turned on or off"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
-msgid "Enable Bo_unce Keys"
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
-msgid "Enable Slo_w Keys"
+msgid "Beep when key is:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
-msgid "Enable _Mouse Keys"
+msgid "Del_ay:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
-msgid "Enable _Sticky Keys"
+msgid "Delay between keypress and pointer mo_vement:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-#, fuzzy
-msgid "General"
-msgstr "tada"
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+msgid "E_nable Toggle Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
+msgid "Enable Bo_unce Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
-#, fuzzy
-msgid "Keyboard Accessibility Preferences (AccessX)"
-msgstr "Cumramocht painial go leor"
+msgid "Enable Slo_w Keys"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
-msgid "Ma_ximum pointer speed:"
+msgid "Enable _Mouse Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
-msgid ""
-"Only accept keys after they have been pressed and held for a user adjustable "
-"amount of time."
+msgid "Enable _Sticky Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
-msgstr ""
+#, fuzzy
+msgid "Features"
+msgstr "Cluich�"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "�baltachta� Cniog"
+msgid "Filters"
+msgstr "Comhad"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
+msgid ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
-msgstr ""
+#, fuzzy
+msgid "Keyboard Accessibility Preferences (AccessX)"
+msgstr "Cumramocht painial go leor"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
+msgid "Ma_ximum pointer speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Turn the numeric keypad into a mouse control pad."
-msgstr ""
+#: capplets/mouse/mouse.desktop.in.h:1
+#, fuzzy
+msgid "Mouse"
+msgstr "Claireanna"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr ""
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "�baltachta� C�lra"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-#, fuzzy
-msgid "_Enable keyboard accessibility"
-msgstr " Miarchlar "
+msgid ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "T�g comhad..."
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+msgid "Toggle Keys"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+msgid "_Disable if unused for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
-msgstr ""
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
+msgstr " Miarchlar "
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+msgid "_Import Feature Settings..."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
+msgid "_Only accept keys held for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
-msgstr ""
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Moill atriallach"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
 #, fuzzy
+msgid "_Type to test settings:"
+msgstr "Cumriagh"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+msgid "_accepted"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+msgid "_pressed"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
+msgstr "Dealaigh"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "T�g dealbh..."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
+msgstr "T�g dealbh..."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
+#, fuzzy
 msgid "seconds"
 msgstr "T�g dealbh..."
 
@@ -259,7 +300,7 @@ msgstr "T�g dealbh..."
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr ""
@@ -543,14 +584,6 @@ msgstr ""
 msgid "Please specify a name and a command for this editor."
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr ""
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr ""
@@ -782,6 +815,7 @@ msgid "Minimizing and Maximizing"
 msgstr ""
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr ""
 
@@ -1350,23 +1384,28 @@ msgstr ""
 msgid "Window Management"
 msgstr "Rogha Paipiar balla"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 #, fuzzy
 msgid "Action"
 msgstr "Roghnachais"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 #, fuzzy
 msgid "Shortcut"
 msgstr "Mallaigh"
@@ -1395,6 +1434,11 @@ msgstr "Mallaigh"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr ""
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 #, fuzzy
 msgid "_Accessibility"
@@ -1466,10 +1510,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Moill atriallach"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr ""
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 #, fuzzy
 msgid "_Accessibility..."
@@ -1510,56 +1550,56 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "�baltachta� Cniog"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
 "%s"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1692,11 +1732,6 @@ msgstr ""
 msgid "_Threshold:"
 msgstr "Tairseach"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-#, fuzzy
-msgid "Mouse"
-msgstr "Claireanna"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1712,42 +1747,75 @@ msgstr "�baltachta� C�lra"
 msgid "Network proxy preferences"
 msgstr "�baltachta� C�lra"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-#, fuzzy
-msgid "Network Preferences"
-msgstr "�baltachta� C�lra"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "�baltachta� C�lra"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-#, fuzzy
-msgid "P_ort:"
-msgstr "Leathfhocail Dialog"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
+msgid "<b>_Manual proxy configuration</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
+msgid "<b>_Use authentication</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr ""
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Cumramocht painial go leor"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-#, fuzzy
-msgid "_Location:"
-msgstr "Brost�"
+msgid "HTTP Proxy Details"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Cumramocht painial go leor"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "Leathfhocail Dialog"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+#, fuzzy
+msgid "_Details"
+msgstr "Leacaithe"
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+msgid "_FTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+msgid "_HTTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+msgid "_Password:"
 msgstr ""
 
+#: capplets/network/gnome-network-preferences.glade.h:16
+msgid "_Secure HTTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Ainm"
+
 #: capplets/sound/sound-properties-capplet.c:180
 #, fuzzy
 msgid "Sound preferences"
@@ -1757,6 +1825,11 @@ msgstr "�baltachta� C�lra"
 msgid "E_nable sound server startup"
 msgstr ""
 
+#: capplets/sound/sound-properties.glade.h:2
+#, fuzzy
+msgid "General"
+msgstr "tada"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1833,32 +1906,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr ""
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
+#, fuzzy
+msgid "Apply _Background"
+msgstr "C�lra�"
+
+#: capplets/theme-switcher/theme-properties.glade.h:2
+msgid "Apply _Font"
+msgstr ""
+
+#: capplets/theme-switcher/theme-properties.glade.h:3
+#, fuzzy
+msgid "Controls"
+msgstr "Gn�th"
+
+#: capplets/theme-switcher/theme-properties.glade.h:4
+#, fuzzy
+msgid "Icons"
+msgstr "Dealbh:"
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
 msgid "New themes can also be installed by dragging them into the window."
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:7
 #, fuzzy
 msgid "Theme Preferences"
 msgstr "�baltachta� C�lra"
 
-#: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
-
-#: capplets/theme-switcher/theme-properties.glade.h:4
+#: capplets/theme-switcher/theme-properties.glade.h:8
 #, fuzzy
-msgid "Window Border Theme"
+msgid "Window Border"
 msgstr "�baltachta� C�lra"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr ""
 
@@ -2021,32 +2110,55 @@ msgstr ""
 msgid "_Save"
 msgstr "Ainm"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
 #, fuzzy
-msgid "Window Preferences"
-msgstr "�baltachta� C�lra"
+msgid "Control"
+msgstr "Gn�th"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+msgid "Hyper"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:593
+msgid "Super"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
+msgid "To _move windows, click while holding down:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+#, fuzzy
+msgid "Window Preferences"
+msgstr "�baltachta� C�lra"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
+msgid "_Double-click window titles to:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
+msgid "_Raise selected windows after a short time"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-#, fuzzy
-msgid "Window Manager:"
-msgstr "Rogha Paipiar balla"
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 #, fuzzy
@@ -2187,7 +2299,7 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2266,56 +2378,45 @@ msgstr ""
 msgid "Select sound file"
 msgstr "T�g comhad..."
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr " Miarchlar "
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "�baltachta� Cniog"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr ""
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "T�g comhad..."
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Network Preferences"
+#~ msgstr "�baltachta� C�lra"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Network Proxy Preferences"
+#~ msgstr "�baltachta� C�lra"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "Ceart go Leor"
+#, fuzzy
+#~ msgid "_Location:"
+#~ msgstr "Brost�"
 
 #, fuzzy
-#~ msgid "Add:"
-#~ msgstr "Suim"
+#~ msgid "Window Manager:"
+#~ msgstr "Rogha Paipiar balla"
+
+#~ msgid "OK"
+#~ msgstr "Ceart go Leor"
 
 #, fuzzy
-#~ msgid "_Delete"
-#~ msgstr "Dealaigh"
+#~ msgid "Add:"
+#~ msgstr "Suim"
 
 #, fuzzy
 #~ msgid "_Name"
@@ -2725,18 +2826,10 @@ msgstr "Ceart go Leor"
 #~ msgstr "Tsg iomha"
 
 #, fuzzy
-#~ msgid "Balls"
-#~ msgstr "Beag"
-
-#, fuzzy
 #~ msgid "Color Contrast"
 #~ msgstr "Xterm Dath"
 
 #, fuzzy
-#~ msgid "Tails"
-#~ msgstr "Leacaithe"
-
-#, fuzzy
 #~ msgid "Blaster"
 #~ msgstr "Gluaisigh"
 
@@ -2749,10 +2842,6 @@ msgstr "Ceart go Leor"
 #~ msgstr "M�r"
 
 #, fuzzy
-#~ msgid "Coral"
-#~ msgstr "Gn�th"
-
-#, fuzzy
 #~ msgid "Critical"
 #~ msgstr "Ingearach"
 
@@ -2797,10 +2886,6 @@ msgstr "Ceart go Leor"
 #~ msgstr "Triail"
 
 #, fuzzy
-#~ msgid "Gears"
-#~ msgstr "Cluich�"
-
-#, fuzzy
 #~ msgid "GLText"
 #~ msgstr "Cl�"
 
@@ -2939,22 +3024,10 @@ msgstr "Ceart go Leor"
 #~ msgstr "Suimigh..."
 
 #, fuzzy
-#~ msgid "Type here to test setting"
-#~ msgstr "Cumriagh"
-
-#, fuzzy
 #~ msgid "Create..."
 #~ msgstr "Abaltachta�..."
 
 #, fuzzy
-#~ msgid "Restore configuration from"
-#~ msgstr "Cumramocht painial go leor"
-
-#, fuzzy
-#~ msgid "Restore old configuration"
-#~ msgstr "Cumramocht painial go leor"
-
-#, fuzzy
 #~ msgid "Icon List"
 #~ msgstr "Iomha"
 
@@ -3100,9 +3173,6 @@ msgstr "Ceart go Leor"
 #~ msgid "GNOME Fish Properties"
 #~ msgstr "Albachta� Iasc go GNOME"
 
-#~ msgid "Icon:"
-#~ msgstr "Dealbh:"
-
 #~ msgid "Backgroundcolor"
 #~ msgstr "Dath C�lra"
 
diff --git a/po/gl.po b/po/gl.po
index 3c1db9547..eab281be2 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center (Gnome 2.0.0) 1.5.1\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-06-20 12:53+0200\n"
 "Last-Translator: Xabi García <xabigf@gmx.net>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -15,19 +15,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, fuzzy, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Ocorreu un erro mentres se amosaba a axuda: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Imposible importa-las configuracións de AccessX do ficheiro '%s'"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Seleccionar ficheiro AccessX de CDE"
 
@@ -49,59 +48,92 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
-"Emitir un sinal sonoro cando se acenda un LED e dous sinais cando se apague."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
-"_Emitir unha sinal sonora cando se habiliten ou inhabiliten características "
-"de accesibilidade do teclado"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
 #, fuzzy
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr "Re_xéitase a tecla"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Emitir unha sinal sonora cando:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "_Emitir un sinal sonoro cando se prema unha tecla modificadora"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr ""
+"Emitir un sinal sonoro cando se acenda un LED e dous sinais cando se apague."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Re_xéitase a tecla"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Retardo (seg):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Activar teclas de _conmutación"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Activar teclas de _rebote"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Activar teclas _lentas"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Activar teclas de r_ato"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Activar teclas _adheribles"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Xeral"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "_Ficheiro"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "I_gnorar premas de teclas durante  :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -109,17 +141,27 @@ msgstr ""
 "Ignorar tódolas premas seguintes dunha mesma tecla se ocorren dentro dun "
 "período de tempo seleccionable polo usuario."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Configuración de accesibilidade do teclado (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Velocidade _máxima do punteiro :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Rato"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Preferencias do rato"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -127,7 +169,7 @@ msgstr ""
 "Só aceptar teclas despois de que se premeran e mantiveran durante un período "
 "de tempo axustable."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -135,86 +177,84 @@ msgstr ""
 "Efectuar premas simultáneas de teclas premendo secuencialmente teclas "
 "modificadoras."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Preferencias do teclado"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "Comezar a mo_ver despois de este período posterior á prema da tecla :"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr ""
+msgid "S_peed:"
+msgstr "Velocidade"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Tempo de a_celeración á máxima velocidade :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr ""
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Activar teclas de _conmutación"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Coverte-lo teclado numérico nun teclado de control do rato."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "_Emitir un sinal sonoro cando se prema unha tecla modificadora"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Inhabilitar se non se emprega durante "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
 #, fuzzy
-msgid "_Enable keyboard accessibility"
+msgid "_Enable keyboard accessibility features"
 msgstr "Propiedades de accesibilidade do teclado"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "Im_portar ficheiro AccessX de CDE"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "S_ó aceptar premas de teclas despois de :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Velocidade de repetición"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"_Desactivar teclas de conmutación cando\n"
-"dús teclas se preman simultáneamente"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "Acéptase a tecla"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "Prémese a tecla"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "Rexéitase a tecla"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "milisegundos"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "segundos"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "píxels/segundo"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "segundos"
 
@@ -275,7 +315,7 @@ msgstr "_Seleccionar un editor:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Obter e almacenar opcións heredadas"
@@ -569,14 +609,6 @@ msgstr "Escolle-la fonte para as aplicacións"
 msgid "Please specify a name and a command for this editor."
 msgstr "Especificar un nome e un comando para este editor."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "_Aceptar URLs"
@@ -786,6 +818,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Maximizar e minimizar"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1348,13 +1381,18 @@ msgstr "Escritorio"
 msgid "Window Management"
 msgstr "Administración das fiestras"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Erro na posta dun novo acelerador na base de datos da configuración: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1362,11 +1400,11 @@ msgstr ""
 "Imposible atopar ningún tema de teclado. Isto indica que a instalación de Gtk"
 "+ é incompleta."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Acción"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Combinación de teclas"
 
@@ -1392,6 +1430,11 @@ msgstr "Combinacións de teclas do _escritorio"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, fuzzy, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Ocorreu un erro mentres se amosaba a axuda: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Accesibilidade"
@@ -1461,11 +1504,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Velocidade de repetición"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Velocidade"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Accesibilidade..."
@@ -1507,7 +1545,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Preferencias do teclado"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1516,7 +1554,7 @@ msgstr ""
 "<b>Punteiro descoñecido</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1524,7 +1562,7 @@ msgstr ""
 "<b>Punteiro por defecto - Actual</b>\n"
 "O punteiro por defecto que incorporan as X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1532,7 +1570,7 @@ msgstr ""
 "<b>Punteiro por defecto</b>\n"
 "O punteiro por defecto que incorporan as X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1540,7 +1578,7 @@ msgstr ""
 "<b>Punteiro branco - Actual</b>\n"
 "O punteiro por defecto invertido"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1548,7 +1586,7 @@ msgstr ""
 "<b>Punteiro branco</b>\n"
 "O punteiro por defecto invertido"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1556,7 +1594,7 @@ msgstr ""
 "<b>Punteiro grande - Actual</b>\n"
 "Versión grande do punteiro normal"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1564,7 +1602,7 @@ msgstr ""
 "<b>Punteiro grande</b>\n"
 "Versión grande do punteiro normal"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1572,7 +1610,7 @@ msgstr ""
 "<b>Punteiro grande e branco - Actual</b>\n"
 "Versión grande do punteiro branco"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1706,10 +1744,6 @@ msgstr ""
 msgid "_Threshold:"
 msgstr "_Umbral"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Rato"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1725,40 +1759,78 @@ msgstr "Rede"
 msgid "Network proxy preferences"
 msgstr "Preferencias da rede"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Preferencias da rede"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Preferencias da rede"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "_Porto"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "_Contrasinal:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-#, fuzzy
-msgid "Pro_xy requires username and password"
-msgstr "O pro_xy require un nome de usuario e un contrasinal"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "_Nome de usuario:"
+msgid "Autoconfiguration _URL:"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Localizacióin:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Configuración do proxy HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Preferencias da rede"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "_Porto"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
 msgstr "_Empregar proxy HTTP"
 
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Empregar proxy HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "_Contrasinal:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "_Empregar proxy HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "_Nome de usuario:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Preferencias de son"
@@ -1767,6 +1839,10 @@ msgstr "Preferencias de son"
 msgid "E_nable sound server startup"
 msgstr "_Activa-lo servidor de son ó inicio"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Xeral"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1841,32 +1917,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Escolle-la fonte para os iconos do escritorio"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Tema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Novos temas poden ser instalados arrastrándoos á fiestra."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Fondo"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
 #, fuzzy
-msgid "Theme Preferences"
-msgstr "Preferencias do tema de Gtk+"
+msgid "Apply _Font"
+msgstr "Aplicar agora"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Control da interface de usuario"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Apariencia do borde da fiestra"
+msgid "Icons"
+msgstr "Só iconos"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Novos temas poden ser instalados arrastrándoos á fiestra."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+#, fuzzy
+msgid "Theme Preferences"
+msgstr "Preferencias do tema de Gtk+"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Apariencia do borde da fiestra"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "Ir ó _directorio do tema"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "_Instalar novo tema..."
@@ -2026,30 +2119,57 @@ msgstr ""
 msgid "_Save"
 msgstr "Esca_lado"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Preferencias das fiestras"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Control da interface de usuario"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Tipo"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Velocidade"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Aplicar agora"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Seleccionar as fiestras cando o rato se mova sobre elas"
+msgid "Window Preferences"
+msgstr "Preferencias das fiestras"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Fonte da barra de título"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Apariencia do borde da fiestra"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Xestor de fiestras:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Seleccionar as fiestras cando o rato se mova sobre elas"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2198,7 +2318,7 @@ msgstr "_Non amosar esta mensaxe outra vez"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Non se puido carga-lo ficheiro de son %s como evento de %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2280,60 +2400,107 @@ msgstr "_Reproducir"
 msgid "Select sound file"
 msgstr "Seleccionar ficheiro de son"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Estase a iniciar %s\n"
-"(quedan %d segundos antes de que se agote o tempo de espera máximo da "
-"operación)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Non se puido incia-lo xestor de fiestras.\n"
-"\tOutro xestor de fiestras está correndo por debaixo e non puido ser cesado\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr ""
+#~ "_Emitir unha sinal sonora cando se habiliten ou inhabiliten "
+#~ "características de accesibilidade do teclado"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Non se puido inicia-lo xestor de fiestras.\n"
-"\t'%s' non se iniciou\n"
+#~ msgid "Beep when:"
+#~ msgstr "Emitir unha sinal sonora cando:"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "O xestor de fiestras previo non cesou\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Preferencias do teclado"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Non se puido iniciar '%s'.\n"
-"Retornarase ó xestor de fiestras anterior '%s'\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr ""
+#~ "Comezar a mo_ver despois de este período posterior á prema da tecla :"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Non se puido executa-lo xestor de fiestras previo.\n"
-"Execútese o xestor manualmente. Isto pódese facer\n"
-"seleccionando \"Executar programa\" no menú inferior\n"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "Im_portar ficheiro AccessX de CDE"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "_Desactivar teclas de conmutación cando\n"
+#~ "dús teclas se preman simultáneamente"
+
+#~ msgid "msecs"
+#~ msgstr "milisegundos"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Preferencias da rede"
+
+#, fuzzy
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "O pro_xy require un nome de usuario e un contrasinal"
+
+#~ msgid "_Location:"
+#~ msgstr "_Localizacióin:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Fonte da barra de título"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Apariencia do borde da fiestra"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "Aceptar"
+#~ msgid "Window Manager:"
+#~ msgstr "Xestor de fiestras:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Estase a iniciar %s\n"
+#~ "(quedan %d segundos antes de que se agote o tempo de espera máximo da "
+#~ "operación)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Non se puido incia-lo xestor de fiestras.\n"
+#~ "\tOutro xestor de fiestras está correndo por debaixo e non puido ser "
+#~ "cesado\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Non se puido inicia-lo xestor de fiestras.\n"
+#~ "\t'%s' non se iniciou\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "O xestor de fiestras previo non cesou\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Non se puido iniciar '%s'.\n"
+#~ "Retornarase ó xestor de fiestras anterior '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Non se puido executa-lo xestor de fiestras previo.\n"
+#~ "Execútese o xestor manualmente. Isto pódese facer\n"
+#~ "seleccionando \"Executar programa\" no menú inferior\n"
+
+#~ msgid "OK"
+#~ msgstr "Aceptar"
 
 #~ msgid "_Category"
 #~ msgstr "_Categoría"
@@ -2536,9 +2703,6 @@ msgstr "Aceptar"
 #~ msgid "Mouse Properties"
 #~ msgstr "Propiedades do rato"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Configuración do proxy HTTP"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Configura-lo uso do son de GNOME"
 
diff --git a/po/hr.po b/po/hr.po
index 67f1d2ded..df6f8c125 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 1.5.5\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: Mon Dec 20 1999 21:34:11+0200\n"
 "Last-Translator: Vladimir Vuksan <vuksan@veus.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -14,19 +14,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KTranslator v 0.5.0\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 #, fuzzy
 msgid "Select CDE AccessX file"
 msgstr "Izaberi datoteku sa zvukom"
@@ -49,154 +48,196 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
 #, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "Omogu�i auto-ponavljanje"
+msgid "Basic"
+msgstr "Malo"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
+msgid "Beep when _modifier is pressed"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
-msgid "E_nable Toggle Keys"
+msgid "Beep when a _feature is turned on or off"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
-msgid "Enable Bo_unce Keys"
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
-msgid "Enable Slo_w Keys"
+msgid "Beep when key is:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
-msgid "Enable _Mouse Keys"
-msgstr ""
+#, fuzzy
+msgid "Del_ay:"
+msgstr "Sviraj"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
-msgid "Enable _Sticky Keys"
+msgid "Delay between keypress and pointer mo_vement:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-#, fuzzy
-msgid "General"
-msgstr "Op�enito"
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+msgid "E_nable Toggle Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
+msgid "Enable Bo_unce Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
-#, fuzzy
-msgid "Keyboard Accessibility Preferences (AccessX)"
-msgstr "Omogu�i auto-ponavljanje"
+msgid "Enable Slo_w Keys"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
-msgid "Ma_ximum pointer speed:"
+msgid "Enable _Mouse Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
-msgid ""
-"Only accept keys after they have been pressed and held for a user adjustable "
-"amount of time."
+msgid "Enable _Sticky Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
+msgid "Features"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Izabire boju pozadine"
+msgid "Filters"
+msgstr "Poplo�ano"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
+msgid ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
-msgstr ""
+#, fuzzy
+msgid "Keyboard Accessibility Preferences (AccessX)"
+msgstr "Omogu�i auto-ponavljanje"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
+msgid "Ma_ximum pointer speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Turn the numeric keypad into a mouse control pad."
-msgstr ""
+#: capplets/mouse/mouse.desktop.in.h:1
+#, fuzzy
+msgid "Mouse"
+msgstr "Zatvori"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr ""
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Izabire boju pozadine"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-#, fuzzy
-msgid "_Enable keyboard accessibility"
-msgstr "Omogu�i auto-ponavljanje"
+msgid ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "Izaberi datoteku sa zvukom"
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+msgid "Toggle Keys"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+msgid "_Disable if unused for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
-msgstr ""
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
+msgstr "Omogu�i auto-ponavljanje"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+msgid "_Import Feature Settings..."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
+msgid "_Only accept keys held for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
-msgstr ""
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Razmak ponavljanja"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
 #, fuzzy
+msgid "_Type to test settings:"
+msgstr "Isku�aj postavke"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+msgid "_accepted"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+msgid "_pressed"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
+msgstr "Obri�i"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "Izaberi ikonu..."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
+msgstr "Izaberi ikonu..."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
+#, fuzzy
 msgid "seconds"
 msgstr "Izaberi ikonu..."
 
@@ -260,7 +301,7 @@ msgstr "Izaberi ikonu..."
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr ""
@@ -541,14 +582,6 @@ msgstr ""
 msgid "Please specify a name and a command for this editor."
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr ""
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr ""
@@ -780,6 +813,7 @@ msgid "Minimizing and Maximizing"
 msgstr ""
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr ""
 
@@ -1350,23 +1384,28 @@ msgstr ""
 msgid "Window Management"
 msgstr "Izbor pozadinske slike"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 #, fuzzy
 msgid "Action"
 msgstr "Postavke"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 #, fuzzy
 msgid "Shortcut"
 msgstr "Sporo"
@@ -1395,6 +1434,11 @@ msgstr "Sporo"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr ""
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 #, fuzzy
 msgid "_Accessibility"
@@ -1464,10 +1508,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Razmak ponavljanja"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr ""
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 #, fuzzy
 msgid "_Accessibility..."
@@ -1509,56 +1549,56 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Izabire boju pozadine"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
 "%s"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1691,11 +1731,6 @@ msgstr ""
 msgid "_Threshold:"
 msgstr "Prag"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-#, fuzzy
-msgid "Mouse"
-msgstr "Zatvori"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1711,42 +1746,74 @@ msgstr "Izabire boju pozadine"
 msgid "Network proxy preferences"
 msgstr "Izabire boju pozadine"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-#, fuzzy
-msgid "Network Preferences"
-msgstr "Izabire boju pozadine"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Izabire boju pozadine"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-#, fuzzy
-msgid "P_ort:"
-msgstr "Prioritet:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
+msgid "<b>_Manual proxy configuration</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
+msgid "<b>_Use authentication</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
+msgid "Autoconfiguration _URL:"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-#, fuzzy
-msgid "_Location:"
-msgstr "Ubrzanje"
+msgid "HTTP Proxy Details"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Izabire boju pozadine"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "Prioritet:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+#, fuzzy
+msgid "_Details"
+msgstr "Poplo�ano"
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+msgid "_FTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+msgid "_HTTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+msgid "_Password:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+msgid "_Secure HTTP proxy:"
 msgstr ""
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Ime:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 #, fuzzy
 msgid "Sound preferences"
@@ -1756,6 +1823,11 @@ msgstr "Izabire boju pozadine"
 msgid "E_nable sound server startup"
 msgstr ""
 
+#: capplets/sound/sound-properties.glade.h:2
+#, fuzzy
+msgid "General"
+msgstr "Op�enito"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1831,32 +1903,47 @@ msgid "Select themes for various parts of the desktop"
 msgstr ""
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
+msgid "Apply _Background"
 msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-#, fuzzy
-msgid "Theme Preferences"
-msgstr "Izabire boju pozadine"
+msgid "Apply _Font"
+msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Normalno"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Izabire boju pozadine"
+msgid "Icons"
+msgstr "Postavke"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr ""
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+#, fuzzy
+msgid "Theme Preferences"
+msgstr "Izabire boju pozadine"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Izabire boju pozadine"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr ""
@@ -2024,32 +2111,56 @@ msgstr ""
 msgid "_Save"
 msgstr "U mjerilu"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
 #, fuzzy
-msgid "Window Preferences"
-msgstr "Izabire boju pozadine"
+msgid "Control"
+msgstr "Normalno"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Mime tip"
+
+#: capplets/windows/gnome-window-properties.c:593
+msgid "Super"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
+msgid "To _move windows, click while holding down:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+#, fuzzy
+msgid "Window Preferences"
+msgstr "Izabire boju pozadine"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
+msgid "_Double-click window titles to:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
+msgid "_Raise selected windows after a short time"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-#, fuzzy
-msgid "Window Manager:"
-msgstr "Izbor pozadinske slike"
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 #, fuzzy
@@ -2191,7 +2302,7 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2271,57 +2382,45 @@ msgstr "Sviraj"
 msgid "Select sound file"
 msgstr "Izaberi datoteku sa zvukom"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "Omogu�i auto-ponavljanje"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Izabire boju pozadine"
 
-#: libwindow-settings/gnome-wm-manager.c:378
 #, fuzzy
-msgid "Previous window manager did not die\n"
-msgstr "Uklju�i �tednju energije"
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "Izaberi datoteku sa zvukom"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Network Preferences"
+#~ msgstr "Izabire boju pozadine"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
+#, fuzzy
+#~ msgid "_Location:"
+#~ msgstr "Ubrzanje"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "U redu"
+#, fuzzy
+#~ msgid "Window Manager:"
+#~ msgstr "Izbor pozadinske slike"
 
 #, fuzzy
-#~ msgid "Add:"
-#~ msgstr "Dodaj"
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Uklju�i �tednju energije"
+
+#~ msgid "OK"
+#~ msgstr "U redu"
 
 #, fuzzy
-#~ msgid "_Delete"
-#~ msgstr "Obri�i"
+#~ msgid "Add:"
+#~ msgstr "Dodaj"
 
 #, fuzzy
 #~ msgid "_Name"
@@ -2833,18 +2932,10 @@ msgstr "U redu"
 #~ msgstr "Trajanje (ms)"
 
 #, fuzzy
-#~ msgid "Balls"
-#~ msgstr "Malo"
-
-#, fuzzy
 #~ msgid "Lines"
 #~ msgstr " minuta."
 
 #, fuzzy
-#~ msgid "Tails"
-#~ msgstr "Poplo�ano"
-
-#, fuzzy
 #~ msgid "Blaster"
 #~ msgstr "Brzo"
 
@@ -2853,10 +2944,6 @@ msgstr "U redu"
 #~ msgstr "Sporo"
 
 #, fuzzy
-#~ msgid "Coral"
-#~ msgstr "Normalno"
-
-#, fuzzy
 #~ msgid "Denser"
 #~ msgstr "Op�enito"
 
@@ -3072,10 +3159,6 @@ msgstr "U redu"
 #~ msgid "...a"
 #~ msgstr "Dodavanje..."
 
-#, fuzzy
-#~ msgid "Type here to test setting"
-#~ msgstr "Isku�aj postavke"
-
 #~ msgid "Enable"
 #~ msgstr "Uklju�i"
 
diff --git a/po/hu.po b/po/hu.po
index ecd6f0e54..03cbfdd9c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 2.1.0\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-10-12 16:21+0200\n"
 "Last-Translator: Andras Timar <timar@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -14,19 +14,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Hiba történt a billentyűzet capplet indításakor: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Nem sikerült betölteni az AccessX beállításokat a '%s' fájlból"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "CDE AccessX fájl kiválasztása"
 
@@ -49,51 +48,90 @@ msgstr ""
 "lehetőségeit nem lehet használni. "
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Egy csengetés, ha egy LED ki vagy be lett kapcsolva."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "_Csengetés a kisegítő lehetőségek bekapcsolásakor/kikapcsolásakor"
+#, fuzzy
+msgid "Basic"
+msgstr "Rövid"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "billentyű _elutasításakor"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Csengetés:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "Cs_engetés, ha módosító le lett nyomva"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "Egy csengetés, ha egy LED ki vagy be lett kapcsolva."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "billentyű _elutasításakor"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Késleltetés:"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 msgid "E_nable Toggle Keys"
 msgstr "_Váltóbillentyűk figyelése"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 msgid "Enable Bo_unce Keys"
 msgstr "_Billentyűszűrés engedélyezése"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "_Lassú billentyűk engedélyezése"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "_Egérbillentyűk engedélyezése"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "_Ragadós billentyűk engedélyezése"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Alap"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "_Fájl"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#, fuzzy
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Leütések figyelmen kívül hagyása ezen belül:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -101,15 +139,25 @@ msgstr ""
 "Hagyja figyelmen kívül UGYANAZON billentyű többszöri lenyomását a "
 "felhasználó által meghatározható időszakon belül."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Billentyűzet kisegítő lehetőségeinek beállításai (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 msgid "Ma_ximum pointer speed:"
 msgstr "Egérmutató max_imális sebessége:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Egér"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Egér tulajdonságai"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -117,7 +165,7 @@ msgstr ""
 "Csak a lenyomott és a felhasználó által beállítható ideig nyomva tartott "
 "billentyűleütéseket fogadja el."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -125,79 +173,84 @@ msgstr ""
 "Szimultán billentyűlenyomások elvégzése a módosító billentyűk egymás utáni "
 "lenyomásával."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-msgid "Repeat Key Pre_ferences..."
-msgstr "_Billentyűk ismétlésének beállításai..."
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
-msgstr "Billentyűlenyomás után ennyi idővel kezd _mozogni:"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Tesztterület"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr "_Sebesség:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#, fuzzy
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Maximális sebességre _gyorsítás ideje:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Váltóbillentyűk és ismétlődés"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "_Váltóbillentyűk figyelése"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "A numerikus billentyűzet egérvezérlővé alakítása."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr "Cs_engetés, ha módosító le lett nyomva"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
+#, fuzzy
+msgid "_Disable if unused for:"
 msgstr "_Letiltás, ha ennyi ideig használaton kívül van"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "Billentyűzet kisegítő lehetőségeinek _engedélyezése"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-msgid "_Import CDE AccessX file..."
-msgstr "CDE AccessX fájl _importálása"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
+#, fuzzy
+msgid "_Only accept keys held for:"
 msgstr "Leütések _elfogadása ez után:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
-msgstr ""
-"Ragadós billentyűk _kikapcsolása ha \n"
-"két billentyű egyszerre le lett nyomva"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Billentyűk ismétlése"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#, fuzzy
+msgid "_Type to test settings:"
+msgstr "Beállítások kipróbálása"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "billentyű _elfogadásakor"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "billentyűle_nyomáskor"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "billentyű _visszautasításakor"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "ms"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "másodperc"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "pixel/sec"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "másodperc"
 
@@ -252,7 +305,7 @@ msgstr "_Kép kiválasztása:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Az örökölt beállítások betöltése és tárolása"
@@ -535,14 +588,6 @@ msgstr "Alapértelmezett alkalmazások kiválasztása"
 msgid "Please specify a name and a command for this editor."
 msgstr "Adj meg egy nevet és parancsot ehhez a szerkesztőhöz."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "_Elfogad URL-t"
@@ -751,6 +796,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Ablakok minimalizálása/maximalizálása"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1282,23 +1328,28 @@ msgstr "Munkaasztal"
 msgid "Window Management"
 msgstr "Ablakkezelés"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Hiba történt a %s gyorsbillentyű beállításakor a konfigurációs adatbázisban\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr "Nem találhatóak a billentyűtémák. A GTK+ helytelenül lett telepítve."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Esemény"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Gyorsbillentyű"
 
@@ -1323,6 +1374,11 @@ msgstr "_Szövegszerkesztő gyorsbillentyűi:"
 msgid "Assign shortcut keys to commands"
 msgstr "Gyorsbillentyűk parancsokhoz rendelése"
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Hiba történt a billentyűzet capplet indításakor: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Kisegítő lehetőségek"
@@ -1389,10 +1445,6 @@ msgstr "Kattanás billentyűlenyomáskor"
 msgid "Repeat Keys"
 msgstr "Billentyűk ismétlése"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr "_Sebesség:"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Kisegítő lehetőségek..."
@@ -1429,7 +1481,7 @@ msgstr "csendes"
 msgid "Set your keyboard preferences"
 msgstr "Billentyűzet beállításai"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1438,7 +1490,7 @@ msgstr ""
 "<b>Ismeretlen kurzor</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1446,7 +1498,7 @@ msgstr ""
 "<b>Alapértelmezett kurzor - Jelenlegi</b>\n"
 "Az X-ben található alapértelmezett kurzor"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1454,7 +1506,7 @@ msgstr ""
 "<b>Alapértelmezett kurzor</b>\n"
 "Az X-ben található alapértelmezett kurzor"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1462,7 +1514,7 @@ msgstr ""
 "<b>Fehér kurzor - Jelenlegi</b>\n"
 "Az alapértelmezett kurzor invertálva"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1470,7 +1522,7 @@ msgstr ""
 "<b>Fehér kurzor</b>\n"
 "Az alapértelmezett kurzor invertálva"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1478,7 +1530,7 @@ msgstr ""
 "<b>Nagy kurzor - Jelenlegi</b>\n"
 "Az alapértelmezett kurzor nagyobb verziója"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1486,7 +1538,7 @@ msgstr ""
 "<b>Nagy kurzor</b>\n"
 "Az alapértelmezett kurzor nagyobb verziója"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1494,7 +1546,7 @@ msgstr ""
 "<b>Nagy fehér kurzor - Jelenlegi</b>\n"
 "Az fehér kurzor nagyobb verziója"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1627,10 +1679,6 @@ msgstr "A _kurzor pozíciójának megjelenítése a Control billentyű lenyomás
 msgid "_Threshold:"
 msgstr "_Küszöbszint:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Egér"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Egér beállításai"
@@ -1643,38 +1691,80 @@ msgstr "Proxy"
 msgid "Network proxy preferences"
 msgstr "Proxy tulajdonságai"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Hálózat tulajdonságai"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Proxy tulajdonságai"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "_Jelszó:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "A pro_xy használatához felhasználónévre és jelszóra van szükség"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "Felhasználó_név:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Konfigurációs parancs:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Hely:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "HTTP Proxy beállítások"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Proxy tulajdonságai"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+#, fuzzy
+msgid "_Details"
+msgstr "_Részletek..."
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "HTTP-proxy _használata"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "HTTP-proxy _használata"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "_Jelszó:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "HTTP-proxy _használata"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Felhasználó_név:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Hangok tulajdonságai"
@@ -1683,6 +1773,10 @@ msgstr "Hangok tulajdonságai"
 msgid "E_nable sound server startup"
 msgstr "Ha_ngszerver elindításának engedélyezése"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Alap"
+
 #: capplets/sound/sound-properties.glade.h:3
 msgid "Sound Events"
 msgstr "Események hangjai"
@@ -1753,30 +1847,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Az asztal különböző részeihez témák kiválasztása"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Téma"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Új témák úgy is telepíthetők, ha az ablakba dobjuk őket."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Háttér"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-msgid "Theme Preferences"
-msgstr "Témák beállításai"
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Alkalmazás most"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr "Widget-téma"
+#, fuzzy
+msgid "Controls"
+msgstr "Felhasználói felület eleme"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
-msgid "Window Border Theme"
-msgstr "Ablakkeret témája"
+#, fuzzy
+msgid "Icons"
+msgstr "másodperc"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Új témák úgy is telepíthetők, ha az ablakba dobjuk őket."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+msgid "Theme Preferences"
+msgstr "Témák beállításai"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Ablakkeret témája"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Témák mappájának böngészése"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "Új téma _telepítése..."
 
@@ -1921,30 +2033,58 @@ msgstr "_Kilépés"
 msgid "_Save"
 msgstr "_Mentés"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Az ablak beállításai"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Felhasználói felület eleme"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Típus"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Sebesség"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Alkalmazás most"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Ablakok kiválasztása, ha az egér föléjük ér"
+msgid "Window Preferences"
+msgstr "Az ablak beállításai"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Címsor betűkészlete"
+#, fuzzy
+msgid "_Double-click window titles to:"
+msgstr "_Ablak címsorának betűkészlete:"
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Ablakkeret megjelenése"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Ablakkezelő:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Ablakok kiválasztása, ha az egér föléjük ér"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2092,7 +2232,7 @@ msgstr "_Ne mutassa ezt többet"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Nem sikerült betölteni a %s fájlt a %s hangmintához"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "A GConf kulcs (%s) típusa %s, de a várt típusa %s volt\n"
@@ -2171,60 +2311,107 @@ msgstr "_Lejátszás"
 msgid "Select sound file"
 msgstr "Hangfájl kiválasztása"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Indítom %s-t\n"
-"(%d másodperc telt el az előző művelet out)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Nem sikerült elindítani az ablakkezelőt.\n"
-"\tMásik ablakkezelő fut, és nem lehet kilőni.\n"
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "_Csengetés a kisegítő lehetőségek bekapcsolásakor/kikapcsolásakor"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Nem sikerült elindítani az ablakkezelőt.\n"
-"\t'%s' nem indul.\n"
+#~ msgid "Beep when:"
+#~ msgstr "Csengetés:"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Az előző ablakkezelő nem halt meg.\n"
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "_Billentyűk ismétlésének beállításai..."
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Nem sikerült indítani '%s'-t.\n"
-"Visszatérés az előző ablakkezelőhöz: '%s'.\n"
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Billentyűlenyomás után ennyi idővel kezd _mozogni:"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Nem sikerült elindítani az előző ablakkezelőt.\n"
-"Kérlek futtass manuálisan egy ablakkezelőt. \n"
-"Megteheted ezt a 'Program futtatása' menüpont\n"
-"segítségével.\n"
+#~ msgid "Testing Area"
+#~ msgstr "Tesztterület"
+
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Váltóbillentyűk és ismétlődés"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "CDE AccessX fájl _importálása"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "Ragadós billentyűk _kikapcsolása ha \n"
+#~ "két billentyű egyszerre le lett nyomva"
+
+#~ msgid "msecs"
+#~ msgstr "ms"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Hálózat tulajdonságai"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "A pro_xy használatához felhasználónévre és jelszóra van szükség"
+
+#~ msgid "_Location:"
+#~ msgstr "_Hely:"
+
+#~ msgid "Widget Theme"
+#~ msgstr "Widget-téma"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Címsor betűkészlete"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Ablakkeret megjelenése"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Ablakkezelő:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Indítom %s-t\n"
+#~ "(%d másodperc telt el az előző művelet out)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Nem sikerült elindítani az ablakkezelőt.\n"
+#~ "\tMásik ablakkezelő fut, és nem lehet kilőni.\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Nem sikerült elindítani az ablakkezelőt.\n"
+#~ "\t'%s' nem indul.\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Az előző ablakkezelő nem halt meg.\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Nem sikerült indítani '%s'-t.\n"
+#~ "Visszatérés az előző ablakkezelőhöz: '%s'.\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Nem sikerült elindítani az előző ablakkezelőt.\n"
+#~ "Kérlek futtass manuálisan egy ablakkezelőt. \n"
+#~ "Megteheted ezt a 'Program futtatása' menüpont\n"
+#~ "segítségével.\n"
+
+#~ msgid "OK"
+#~ msgstr "OK"
 
 #~ msgid "_Category"
 #~ msgstr "_Kategória"
@@ -2624,9 +2811,6 @@ msgstr "OK"
 #~ msgid "Command:"
 #~ msgstr "_Parancs:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Konfigurációs parancs:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Az ablakkezelő munkamenet-vezérelt"
 
@@ -2881,10 +3065,6 @@ msgstr "OK"
 #~ msgstr "Hozzáadás..."
 
 #, fuzzy
-#~ msgid "Type here to test setting"
-#~ msgstr "Beállítások kipróbálása"
-
-#, fuzzy
 #~ msgid "Mouse Configuration"
 #~ msgstr "Egér helyezkedése"
 
@@ -2922,10 +3102,6 @@ msgstr "OK"
 #~ msgstr "Szín"
 
 #, fuzzy
-#~ msgid "Balls"
-#~ msgstr "Rövid"
-
-#, fuzzy
 #~ msgid "Lines"
 #~ msgstr " perccel."
 
@@ -2962,10 +3138,6 @@ msgstr "OK"
 #~ msgstr "Mégsem"
 
 #, fuzzy
-#~ msgid "Seconds"
-#~ msgstr "másodperc"
-
-#, fuzzy
 #~ msgid "Use a gradient of colors between circles."
 #~ msgstr "Használj gradiens feltöltést a háttérhez"
 
@@ -3705,9 +3877,6 @@ msgstr "OK"
 #~ msgid "_Delay before repeating:"
 #~ msgstr "_Késleltetés ismétlés előtt:"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "HTTP Proxy beállítások"
-
 #~ msgid "Change the appearance of buttons, scrollbars, etc"
 #~ msgstr "A gombok, görgetősávok, stb. megjelenésének cseréje"
 
diff --git a/po/it.po b/po/it.po
index 008ac6c4b..88b0b9da8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 1.0.6\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2001-07-09 16:43+02:00\n"
 "Last-Translator: Christopher R. Gabriel <cgabriel@pluto.linux.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
@@ -13,19 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 #, fuzzy
 msgid "Select CDE AccessX file"
 msgstr "Seleziona un file..."
@@ -48,153 +47,196 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "Abilita suono della tastiera"
+msgid "Basic"
+msgstr "Base"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
+msgid "Beep when _modifier is pressed"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
-msgid "E_nable Toggle Keys"
+msgid "Beep when a _feature is turned on or off"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
-msgid "Enable Bo_unce Keys"
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
-msgid "Enable Slo_w Keys"
+msgid "Beep when key is:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
-msgid "Enable _Mouse Keys"
-msgstr ""
+#, fuzzy
+msgid "Del_ay:"
+msgstr "Suona"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
-msgid "Enable _Sticky Keys"
-msgstr ""
+#, fuzzy
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr "Ritardo tra ciascun passo nel labirinto."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Impostazioni generali"
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+msgid "E_nable Toggle Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
+msgid "Enable Bo_unce Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
-#, fuzzy
-msgid "Keyboard Accessibility Preferences (AccessX)"
-msgstr "Impostazioni della tastiera"
+msgid "Enable Slo_w Keys"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
-msgid "Ma_ximum pointer speed:"
+msgid "Enable _Mouse Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
-msgid ""
-"Only accept keys after they have been pressed and held for a user adjustable "
-"amount of time."
+msgid "Enable _Sticky Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
+msgid "Features"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Impostazioni della tastiera"
+msgid "Filters"
+msgstr "File"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
+msgid ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
-msgstr ""
+#, fuzzy
+msgid "Keyboard Accessibility Preferences (AccessX)"
+msgstr "Impostazioni della tastiera"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
+msgid "Ma_ximum pointer speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Turn the numeric keypad into a mouse control pad."
-msgstr ""
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Mouse"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr ""
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Preferenze"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-#, fuzzy
-msgid "_Enable keyboard accessibility"
-msgstr "Abilita suono della tastiera"
+msgid ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "Seleziona un file..."
+msgid "S_peed:"
+msgstr "Velocit�"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+msgid "Toggle Keys"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+msgid "_Disable if unused for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
-msgstr ""
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
+msgstr "Abilita suono della tastiera"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+msgid "_Import Feature Settings..."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-#, fuzzy
-msgid "msecs"
-msgstr "secondi"
+msgid "_Only accept keys held for:"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
-msgstr ""
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Ritardo di ripetizione"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#, fuzzy
+msgid "_Type to test settings:"
+msgstr "Digita qui per provare le impostazioni"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+msgid "_accepted"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
+msgstr "Velocit�"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
+msgstr "Rimuovi"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "secondi"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
+msgstr "secondi"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "secondi"
 
@@ -258,7 +300,7 @@ msgstr "Seleziona un'icona..."
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr ""
@@ -538,14 +580,6 @@ msgstr ""
 msgid "Please specify a name and a command for this editor."
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr ""
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr ""
@@ -775,6 +809,7 @@ msgid "Minimizing and Maximizing"
 msgstr "A icona/Ingrandisci"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta-configurazione"
 
@@ -1346,23 +1381,28 @@ msgstr ""
 msgid "Window Management"
 msgstr "Modifica propriet� window manager"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 #, fuzzy
 msgid "Action"
 msgstr "Opzioni"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 #, fuzzy
 msgid "Shortcut"
 msgstr "Comandi"
@@ -1391,6 +1431,11 @@ msgstr "Comandi"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr ""
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr ""
@@ -1461,11 +1506,6 @@ msgstr "Suono della tastiera"
 msgid "Repeat Keys"
 msgstr "Ritardo di ripetizione"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Velocit�"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr ""
@@ -1508,56 +1548,56 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Impostazioni della tastiera"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
 "%s"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1691,10 +1731,6 @@ msgstr ""
 msgid "_Threshold:"
 msgstr "Soglia"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Mouse"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1710,42 +1746,75 @@ msgstr "Preferenze del Control Center"
 msgid "Network proxy preferences"
 msgstr "Preferenze del Control Center"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-#, fuzzy
-msgid "Network Preferences"
-msgstr "Preferenze del Control Center"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Preferenze del Control Center"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-#, fuzzy
-msgid "P_ort:"
-msgstr "Punti:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
+msgid "<b>_Manual proxy configuration</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
+msgid "<b>_Use authentication</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr ""
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Comando di configurazione:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-#, fuzzy
-msgid "_Location:"
-msgstr "Accelerazione"
+msgid "HTTP Proxy Details"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Preferenze del Control Center"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "Punti:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+#, fuzzy
+msgid "_Details"
+msgstr "Code"
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+msgid "_FTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+msgid "_HTTP proxy:"
 msgstr ""
 
+#: capplets/network/gnome-network-preferences.glade.h:15
+msgid "_Password:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+msgid "_Secure HTTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Nome:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 #, fuzzy
 msgid "Sound preferences"
@@ -1756,6 +1825,10 @@ msgstr "Preferenze"
 msgid "E_nable sound server startup"
 msgstr "Abilita avvio del server audio"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Impostazioni generali"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1830,33 +1903,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr ""
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr ""
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Sfondo"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-#, fuzzy
-msgid "Theme Preferences"
-msgstr "Preferenze del Control Center"
+msgid "Apply _Font"
+msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
+msgid "Controls"
 msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Preferenze"
+msgid "Icons"
+msgstr "Secondi"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr ""
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+#, fuzzy
+msgid "Theme Preferences"
+msgstr "Preferenze del Control Center"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Preferenze"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 #, fuzzy
 msgid "_Go to theme folder"
 msgstr "Entra in modalit� standby dopo"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr ""
@@ -2027,32 +2115,56 @@ msgstr ""
 msgid "_Save"
 msgstr "Ridimensionata"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+msgid "Control"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
 #, fuzzy
-msgid "Window Preferences"
-msgstr "Preferenze"
+msgid "Hyper"
+msgstr "Tipo MIME"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Velocit�"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
+msgid "To _move windows, click while holding down:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+#, fuzzy
+msgid "Window Preferences"
+msgstr "Preferenze"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
+msgid "_Double-click window titles to:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
+msgid "_Raise selected windows after a short time"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-#, fuzzy
-msgid "Window Manager:"
-msgstr "Modifica propriet� window manager"
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 #, fuzzy
@@ -2196,7 +2308,7 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2278,68 +2390,87 @@ msgstr "Suona"
 msgid "Select sound file"
 msgstr "Seleziona un file..."
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Avvio di %s in corso...\n"
-"(%d secondi prima che l'operazione vada in time out)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Impossibile avviare il gestore di finestre.\n"
-"Un altro gestore di finestre � in esecuzione e non pu� essere terminato.\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "Abilita suono della tastiera"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Impossibile avviare il gestore di finestre.\n"
-"\t'%s' non si � avviato.\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Impostazioni della tastiera"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Il window manager precedente non � stato terminato\n"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "Seleziona un file..."
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Impossibile avviare `%s'.\n"
-"Verr� usato il window manager precedente, `%s'.\n"
+#, fuzzy
+#~ msgid "msecs"
+#~ msgstr "secondi"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Impossibile avviare il window manager: � necessario\n"
-"avviare un window manager manualmente.\n"
-"� possibile effettuare questa operazione selezionando\n"
-"\"Avvia  programma\" nel men� GNOME.\n"
+#, fuzzy
+#~ msgid "Network Preferences"
+#~ msgstr "Preferenze del Control Center"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#, fuzzy
+#~ msgid "_Location:"
+#~ msgstr "Accelerazione"
 
 #, fuzzy
-#~ msgid "Add:"
-#~ msgstr "Aggiungi"
+#~ msgid "Window Manager:"
+#~ msgstr "Modifica propriet� window manager"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Avvio di %s in corso...\n"
+#~ "(%d secondi prima che l'operazione vada in time out)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Impossibile avviare il gestore di finestre.\n"
+#~ "Un altro gestore di finestre � in esecuzione e non pu� essere terminato.\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Impossibile avviare il gestore di finestre.\n"
+#~ "\t'%s' non si � avviato.\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Il window manager precedente non � stato terminato\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Impossibile avviare `%s'.\n"
+#~ "Verr� usato il window manager precedente, `%s'.\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Impossibile avviare il window manager: � necessario\n"
+#~ "avviare un window manager manualmente.\n"
+#~ "� possibile effettuare questa operazione selezionando\n"
+#~ "\"Avvia  programma\" nel men� GNOME.\n"
+
+#~ msgid "OK"
+#~ msgstr "OK"
 
 #, fuzzy
-#~ msgid "_Delete"
-#~ msgstr "Rimuovi"
+#~ msgid "Add:"
+#~ msgstr "Aggiungi"
 
 #, fuzzy
 #~ msgid "_Name"
@@ -2762,9 +2893,6 @@ msgstr "OK"
 #~ msgid "Command:"
 #~ msgstr "Comando:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Comando di configurazione:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Il window manager supporta il controllo di sessione"
 
@@ -3042,9 +3170,6 @@ msgstr "OK"
 #~ msgid "a.a"
 #~ msgstr "a.a"
 
-#~ msgid "Type here to test setting"
-#~ msgstr "Digita qui per provare le impostazioni"
-
 #, fuzzy
 #~ msgid "Mouse Configuration"
 #~ msgstr "Movimento del mouse"
@@ -3143,9 +3268,6 @@ msgstr "OK"
 #~ msgid "Lines"
 #~ msgstr "Linee"
 
-#~ msgid "Tails"
-#~ msgstr "Code"
-
 #~ msgid "Polygons"
 #~ msgstr "Poligoni"
 
@@ -3245,9 +3367,6 @@ msgstr "OK"
 #~ msgid "Use lissajous figures to get points."
 #~ msgstr "Utilizza le figure di lissajous per ottenere i punti."
 
-#~ msgid "Seconds"
-#~ msgstr "Secondi"
-
 #~ msgid "Number"
 #~ msgstr "Numero"
 
@@ -3341,9 +3460,6 @@ msgstr "OK"
 #~ msgid "Number of interpolation steps."
 #~ msgstr "Numero di passi di interpolazione."
 
-#~ msgid "Delay between each step in the maze."
-#~ msgstr "Ritardo tra ciascun passo nel labirinto."
-
 #~ msgid "Less Delay"
 #~ msgstr "Meno ritardo"
 
@@ -3529,9 +3645,6 @@ msgstr "OK"
 #~ msgid "Screensaver Selection"
 #~ msgstr "Selezione salvaschermo"
 
-#~ msgid "Basic"
-#~ msgstr "Base"
-
 #~ msgid "Security"
 #~ msgstr "Sicurezza"
 
diff --git a/po/ja.po b/po/ja.po
index 4a9ecc349..aba18940a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center CVS-20010216\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2001-07-20 13:55+0900\n"
 "Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -16,19 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 #, fuzzy
 msgid "Select CDE AccessX file"
 msgstr "�ե����������..."
@@ -51,154 +50,196 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
 #, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "�����ܡ��ɤΥ���å�����ͭ���ˤ���"
+msgid "Basic"
+msgstr "����"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
+msgid "Beep when _modifier is pressed"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
-msgid "E_nable Toggle Keys"
+msgid "Beep when a _feature is turned on or off"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
-msgid "Enable Bo_unce Keys"
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
-msgid "Enable Slo_w Keys"
+msgid "Beep when key is:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
-msgid "Enable _Mouse Keys"
-msgstr ""
+#, fuzzy
+msgid "Del_ay:"
+msgstr "�Ĥ餹"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
-msgid "Enable _Sticky Keys"
+msgid "Delay between keypress and pointer mo_vement:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-#, fuzzy
-msgid "General"
-msgstr "����"
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+msgid "E_nable Toggle Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
+msgid "Enable Bo_unce Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
-#, fuzzy
-msgid "Keyboard Accessibility Preferences (AccessX)"
-msgstr "�ޥ�����ư��"
+msgid "Enable Slo_w Keys"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
-msgid "Ma_ximum pointer speed:"
+msgid "Enable _Mouse Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
-msgid ""
-"Only accept keys after they have been pressed and held for a user adjustable "
-"amount of time."
+msgid "Enable _Sticky Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
+msgid "Features"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "�����ܡ��ɤ�����"
+msgid "Filters"
+msgstr "������"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
+msgid ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
-msgstr ""
+#, fuzzy
+msgid "Keyboard Accessibility Preferences (AccessX)"
+msgstr "�ޥ�����ư��"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
+msgid "Ma_ximum pointer speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Turn the numeric keypad into a mouse control pad."
-msgstr ""
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "�ޥ���"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr ""
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "�Хå����饦��ɤο�"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-#, fuzzy
-msgid "_Enable keyboard accessibility"
-msgstr "�����ܡ��ɤΥ���å�����ͭ���ˤ���"
+msgid ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "�ե����������..."
+msgid "S_peed:"
+msgstr "®��"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+msgid "Toggle Keys"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+msgid "_Disable if unused for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
-msgstr ""
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
+msgstr "�����ܡ��ɤΥ���å�����ͭ���ˤ���"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+msgid "_Import Feature Settings..."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-#, fuzzy
-msgid "msecs"
-msgstr "��"
+msgid "_Only accept keys held for:"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
-msgstr ""
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "������ԡ��Ȳ��"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#, fuzzy
+msgid "_Type to test settings:"
+msgstr "����Υƥ���"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+msgid "_accepted"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
+msgstr "®��"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
+msgstr "���"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "��"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
+msgstr "��"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "��"
 
@@ -260,7 +301,7 @@ msgstr "������������..."
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr ""
@@ -540,14 +581,6 @@ msgstr ""
 msgid "Please specify a name and a command for this editor."
 msgstr "���˥��ޥ�ɥ饤������Ϥ��Ƥ�������"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr ""
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr ""
@@ -781,6 +814,7 @@ msgid "Minimizing and Maximizing"
 msgstr "���粽/�Ǿ���"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "�᥿"
 
@@ -1356,23 +1390,28 @@ msgstr ""
 msgid "Window Management"
 msgstr "������ɥ��ޥ͡�����Υ��ǥ��å�"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 #, fuzzy
 msgid "Action"
 msgstr "���ץ����"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 #, fuzzy
 msgid "Shortcut"
 msgstr "���硼�ȥ��å�"
@@ -1401,6 +1440,11 @@ msgstr "���硼�ȥ��å�"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr ""
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 #, fuzzy
 msgid "_Accessibility"
@@ -1471,11 +1515,6 @@ msgstr "�����ܡ��ɤΥ���å���"
 msgid "Repeat Keys"
 msgstr "������ԡ��Ȳ��"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "®��"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 #, fuzzy
 msgid "_Accessibility..."
@@ -1519,56 +1558,56 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "�����ܡ��ɤ�����"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
 "%s"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1702,10 +1741,6 @@ msgstr ""
 msgid "_Threshold:"
 msgstr "��������"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "�ޥ���"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1721,43 +1756,75 @@ msgstr "�Хå����饦��ɤο�"
 msgid "Network proxy preferences"
 msgstr "�Хå����饦��ɤο�"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-#, fuzzy
-msgid "Network Preferences"
-msgstr "�Хå����饦��ɤο�"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "�Хå����饦��ɤο�"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-#, fuzzy
-msgid "P_ort:"
-msgstr "��:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-#, fuzzy
-msgid "Pass_word:"
-msgstr "%s �Υѥ����"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
+msgid "<b>_Use authentication</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr ""
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "�ޥ�����ư��"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-#, fuzzy
-msgid "_Location:"
-msgstr "��®"
+msgid "HTTP Proxy Details"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "�Хå����饦��ɤο�"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "��:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+msgid "_FTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+msgid "_HTTP proxy:"
 msgstr ""
 
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "%s �Υѥ����"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+msgid "_Secure HTTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "̾��:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 #, fuzzy
 msgid "Sound preferences"
@@ -1768,6 +1835,11 @@ msgstr "�Хå����饦��ɤο�"
 msgid "E_nable sound server startup"
 msgstr "��ư���˲������С���Ȥ�"
 
+#: capplets/sound/sound-properties.glade.h:2
+#, fuzzy
+msgid "General"
+msgstr "����"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1842,34 +1914,50 @@ msgid "Select themes for various parts of the desktop"
 msgstr ""
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 #, fuzzy
 msgid "Theme"
 msgstr "�ĥ꡼"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
+#, fuzzy
+msgid "Apply _Background"
+msgstr "�Хå����饦���"
+
+#: capplets/theme-switcher/theme-properties.glade.h:2
+msgid "Apply _Font"
+msgstr ""
+
+#: capplets/theme-switcher/theme-properties.glade.h:3
+#, fuzzy
+msgid "Controls"
+msgstr "����"
+
+#: capplets/theme-switcher/theme-properties.glade.h:4
+#, fuzzy
+msgid "Icons"
+msgstr "��������ꥹ��"
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
 msgid "New themes can also be installed by dragging them into the window."
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:7
 #, fuzzy
 msgid "Theme Preferences"
 msgstr "�Хå����饦��ɤο�"
 
-#: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
-
-#: capplets/theme-switcher/theme-properties.glade.h:4
+#: capplets/theme-switcher/theme-properties.glade.h:8
 #, fuzzy
-msgid "Window Border Theme"
+msgid "Window Border"
 msgstr "�Хå����饦��ɤο�"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:9
 #, fuzzy
 msgid "_Go to theme folder"
 msgstr "�����ڥ�ɥ⡼�ɤޤ�"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr ""
@@ -2038,32 +2126,57 @@ msgstr ""
 msgid "_Save"
 msgstr "����"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
 #, fuzzy
-msgid "Window Preferences"
-msgstr "�Хå����饦��ɤο�"
+msgid "Control"
+msgstr "����"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "MIME��"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "®��"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
+msgid "To _move windows, click while holding down:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+#, fuzzy
+msgid "Window Preferences"
+msgstr "�Хå����饦��ɤο�"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
+msgid "_Double-click window titles to:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
+msgid "_Raise selected windows after a short time"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-#, fuzzy
-msgid "Window Manager:"
-msgstr "������ɥ��ޥ͡�����Υ��ǥ��å�"
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 #, fuzzy
@@ -2204,7 +2317,7 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2286,69 +2399,88 @@ msgstr "�Ĥ餹"
 msgid "Select sound file"
 msgstr "�ե����������..."
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"%s ��ư��\n"
-"(̿��Υ����ॢ���ȤޤǤ� %d �ä���ޤ�)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: ������ɥ��ޥ͡�����ν�����˼��Ԥ��ޤ�����\n"
-"\t�̤Υ�����ɥ��ޥ͡����㤬�������äƤ��ơ������ߤ������Ǥ��ޤ���\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "�����ܡ��ɤΥ���å�����ͭ���ˤ���"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: ������ɥ��ޥ͡�����ν�����˼��Ԥ��ޤ�����\n"
-"\t'%s' ��ư���ޤ���\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "�����ܡ��ɤ�����"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "�����Υ�����ɥ��ޥ͡����㤬��ˤޤ���\n"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "�ե����������..."
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"'%s'��ư�Ǥ��ޤ���\n"
-"���Υ�����ɥ��ޥ͡����㡼'%s'���ᤷ�ޤ�\n"
-"\n"
+#, fuzzy
+#~ msgid "msecs"
+#~ msgstr "��"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"���Υ�����ɥ��ޥ͡����㡼�����ޤ���\n"
-"��ǥ�����ɥ��ޥ͡����㡼��ư���Ʋ�������\n"
-"���Υ�˥塼��\"�ץ������¹�\"�������򤷤Ƥ�\n"
-"�¹ԤǤ��ޤ���\n"
+#, fuzzy
+#~ msgid "Network Preferences"
+#~ msgstr "�Хå����饦��ɤο�"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "Ŭ��"
+#, fuzzy
+#~ msgid "_Location:"
+#~ msgstr "��®"
 
 #, fuzzy
-#~ msgid "Add:"
-#~ msgstr "�ɲ�"
+#~ msgid "Window Manager:"
+#~ msgstr "������ɥ��ޥ͡�����Υ��ǥ��å�"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "%s ��ư��\n"
+#~ "(̿��Υ����ॢ���ȤޤǤ� %d �ä���ޤ�)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: ������ɥ��ޥ͡�����ν�����˼��Ԥ��ޤ�����\n"
+#~ "\t�̤Υ�����ɥ��ޥ͡����㤬�������äƤ��ơ������ߤ������Ǥ��ޤ���\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: ������ɥ��ޥ͡�����ν�����˼��Ԥ��ޤ�����\n"
+#~ "\t'%s' ��ư���ޤ���\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "�����Υ�����ɥ��ޥ͡����㤬��ˤޤ���\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "'%s'��ư�Ǥ��ޤ���\n"
+#~ "���Υ�����ɥ��ޥ͡����㡼'%s'���ᤷ�ޤ�\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "���Υ�����ɥ��ޥ͡����㡼�����ޤ���\n"
+#~ "��ǥ�����ɥ��ޥ͡����㡼��ư���Ʋ�������\n"
+#~ "���Υ�˥塼��\"�ץ������¹�\"�������򤷤Ƥ�\n"
+#~ "�¹ԤǤ��ޤ���\n"
+
+#~ msgid "OK"
+#~ msgstr "Ŭ��"
 
 #, fuzzy
-#~ msgid "_Delete"
-#~ msgstr "���"
+#~ msgid "Add:"
+#~ msgstr "�ɲ�"
 
 #, fuzzy
 #~ msgid "_Name"
@@ -3161,14 +3293,6 @@ msgstr "Ŭ��"
 #~ msgstr "�⡼������®��"
 
 #, fuzzy
-#~ msgid "Braid"
-#~ msgstr "����"
-
-#, fuzzy
-#~ msgid "Coral"
-#~ msgstr "����"
-
-#, fuzzy
 #~ msgid "Denser"
 #~ msgstr "̩��"
 
@@ -3313,10 +3437,6 @@ msgstr "Ŭ��"
 #~ msgstr "®��"
 
 #, fuzzy
-#~ msgid "Sphere"
-#~ msgstr "®��"
-
-#, fuzzy
 #~ msgid "Slim"
 #~ msgstr "����"
 
@@ -3529,9 +3649,6 @@ msgstr "Ŭ��"
 #~ msgid ".a"
 #~ msgstr ".a"
 
-#~ msgid "Type here to test setting"
-#~ msgstr "����Υƥ���"
-
 #~ msgid "a....a"
 #~ msgstr "a....a"
 
@@ -3548,19 +3665,12 @@ msgstr "Ŭ��"
 #~ msgid "Configuration Restoration"
 #~ msgstr "���ꥳ�ޥ��:"
 
-#, fuzzy
-#~ msgid "Restore configuration from"
-#~ msgstr "�ޥ�����ư��"
-
 #~ msgid "Enable"
 #~ msgstr "ͭ��"
 
 #~ msgid "HTML"
 #~ msgstr "HTML"
 
-#~ msgid "Icon List"
-#~ msgstr "��������ꥹ��"
-
 #~ msgid "window2"
 #~ msgstr "window2"
 
diff --git a/po/ko.po b/po/ko.po
index 93d1ea343..bd8593ba4 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 1.99.10\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-07-15 18:57+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -12,19 +12,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "키보드 애플릿을 시작하는 데 오류가 발생했습니다: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "AccessX 설정사항을 '%s' 파일에서 가져 올 수 없습니다"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "CDE AccessX 파일 선택"
 
@@ -45,71 +44,117 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "LED가 켜질 때 삑 소리를 내고, LED가 꺼질 때 삑 소리 두번."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "키보드 접근성 기능을 사용/해제할 때 삑소리 내기(_B)"
+msgid "Basic"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "키가 거부되었을 때 삑소리(_J)"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "삑소리 내기:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "변경 키를 눌렀을 때 삑 소리 내기(_E)"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "LED가 켜질 때 삑 소리를 내고, LED가 꺼질 때 삑 소리 두번."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "키가 거부되었을 때 삑소리(_J)"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "지연 시간(_D) (초):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Toggle 키 사용(_T)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Bounce 키 사용(_B)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Slow 키 사용(_W)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Mouse 키 사용(_M)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Sticky 키 사용(_M)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "일반"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "파일(_F)"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "다음 시간 내에 키 누름 무시(_I) :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
 msgstr "지정한 시간 내에 같은 키가 연속해서 눌릴 경우 무시합니다."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "키보드 접근성 기능 설정 (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "최대 포인터 속도(_X):"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "마우스"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "마우스 기본 설정"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -117,92 +162,90 @@ msgstr ""
 "키를 누른 후에 사용자가 설정한 만큼의 시간동안 누르고 있어야 그 키를 받아들입"
 "니다."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
 msgstr "변경 키를 눌러서 차례대로 누른 키가 동시에 눌려진 것처럼 처리합니다."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "반복 키 기본 설정"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "키를 누름 뒤에 이 만큼 지나면 움직이기 시작(_V):"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "테스트 영역"
+msgid "S_peed:"
+msgstr "속도"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "최대 속도로 가속할 시간(_A) :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "토글 및 반복 키"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Toggle 키 사용(_T)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "숫자 키 패드를 마우스 컨트롤 패드로 만듭니다."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "변경 키를 눌렀을 때 삑 소리 내기(_E)"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "이 만큼의 시간동안 사용되지 않으면 끄기(_D): "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
 #, fuzzy
-msgid "_Enable keyboard accessibility"
+msgid "_Enable keyboard accessibility features"
 msgstr "키보드 접근성 기능 기본 설정을 설정합니다"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "CDE AccessX 파일 가져 오기(_I)"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "이 만큼 지난 뒤에 키 누름 받아들이기(_O) :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "반복 정도"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"두 키를 동시에 눌렀을 때\n"
-"StickyKeys 끄기(_T)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "키를 받아들일 때(_A)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "키가 눌러졌을 때(_P)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "키가 거부되었을 때(_R)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "천분의일초"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "초"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "픽셀/초"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "초"
 
@@ -257,7 +300,7 @@ msgstr "그림 선택(_P):"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "물려받은 설정을 되찾아서 저장합니다"
@@ -540,14 +583,6 @@ msgstr "기본 프로그램을 선택하십시오"
 msgid "Please specify a name and a command for this editor."
 msgstr "이 편집기의 이름과 명령을 지정하십시오."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "URL 허용(_P)"
@@ -755,6 +790,7 @@ msgid "Minimizing and Maximizing"
 msgstr "최소화 및 최대화"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "메타"
 
@@ -1305,22 +1341,27 @@ msgstr "바탕 화면"
 msgid "Window Management"
 msgstr "창 관리자"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "설정 데이터 베이스에서 새로운 단축글쇠 설정 오류: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr "키보드 테마를 찾을 수 없습니다.  GTK+ 설치가 불완전하기 때문입니다."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "동작"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "바로 가기"
 
@@ -1345,6 +1386,11 @@ msgstr "텍스트 편집 단축키(_T):"
 msgid "Assign shortcut keys to commands"
 msgstr "명령어에 단축 키를 지정합니다"
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "키보드 애플릿을 시작하는 데 오류가 발생했습니다: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "접근성 기능(_A)"
@@ -1412,11 +1458,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "반복 정도"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "속도"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "접근성 기능(_A)..."
@@ -1457,7 +1498,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "키보드 등록 정보를 설정합니다"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1466,7 +1507,7 @@ msgstr ""
 "<b>알 수 없는 커서</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1474,7 +1515,7 @@ msgstr ""
 "<b>기본 커서 - 현재</b>\n"
 "X에 포함되어 있는 기본 커서"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1482,7 +1523,7 @@ msgstr ""
 "<b>기본 커서</b>\n"
 "X에 포함되어 있는 기본 커서"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1490,7 +1531,7 @@ msgstr ""
 "<b>흰 색 커서 - 현재</b>\n"
 "기본 커서의 반전"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1498,7 +1539,7 @@ msgstr ""
 "<b>흰 색 커서</b>\n"
 "기본 커서의 반전"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1506,7 +1547,7 @@ msgstr ""
 "<b>큰 커서 - 현재</b>\n"
 "기본 커서의 큰 버전"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1514,7 +1555,7 @@ msgstr ""
 "<b>큰 커서</b>\n"
 "기본 커서의 큰 버전"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1522,7 +1563,7 @@ msgstr ""
 "<b>큰 흰 색 커서 - 현재</b>\n"
 "흰 색 커서의 큰 버전"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1653,10 +1694,6 @@ msgstr "컨트롤 키를 눌렀을 때 커서의 위치 표시(_S)"
 msgid "_Threshold:"
 msgstr "임계값(_T):"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "마우스"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "마우스 기본 설정을 설정합니다"
@@ -1671,38 +1708,77 @@ msgstr "네트워크 프록시"
 msgid "Network proxy preferences"
 msgstr "네트워크 프록시 기본 설정"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "네트워크 기본 설정"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "네트워크 프록시 기본 설정"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "포트(_O):"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "비밀번호(_W):"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "프록시에 사용자 이름과 비밀번호 필요(_X)"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "사용자 이름(_N):"
+msgid "Autoconfiguration _URL:"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "위치(_L):"
+msgid "HTTP Proxy Details"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "네트워크 프록시 기본 설정"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "포트(_O):"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
 msgstr "HTTP 프록시 사용(_U)"
 
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "HTTP 프록시 사용(_U)"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "비밀번호(_W):"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "HTTP 프록시 사용(_U)"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "사용자 이름(_N):"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "사운드 기본 설정"
@@ -1711,6 +1787,10 @@ msgstr "사운드 기본 설정"
 msgid "E_nable sound server startup"
 msgstr "사운드 서버 시작하기(_N)"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "일반"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1782,31 +1862,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr "바탕 화면의 여러 곳에 쓰일 테마를 선택합니다"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "테마"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "테마를 창에 끌어오는 방법으로도 새 테마를 설치할 수 있습니다."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "배경"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-msgid "Theme Preferences"
-msgstr "테마 기본 설정"
+#, fuzzy
+msgid "Apply _Font"
+msgstr "지금 적용"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "UI 컨트롤"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "창 가장자리 모양"
+msgid "Icons"
+msgstr "아이콘만"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "테마를 창에 끌어오는 방법으로도 새 테마를 설치할 수 있습니다."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+msgid "Theme Preferences"
+msgstr "테마 기본 설정"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "창 가장자리 모양"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "테마 폴더로 이동(_G)..."
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "새 테마 설치(_I)..."
 
@@ -1963,30 +2060,57 @@ msgstr ""
 msgid "_Save"
 msgstr "크기 조정(_S)"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "창 기본 설정"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "UI 컨트롤"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "형식"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "속도"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "지금 적용"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "i마우스가 창위로 움직이면 창 선택"
+msgid "Window Preferences"
+msgstr "창 기본 설정"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "제목 막대 글꼴"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "창 가장자리 모양"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "창 관리자:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "i마우스가 창위로 움직이면 창 선택"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2135,7 +2259,7 @@ msgstr "이 메세지를 다시 표시하지 않기(_D)"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "사운드 파일 %s을(를) 샘플 %s(으)로 읽어들일 수 없습니다"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "GConf 키 %s이(가) %s 타입으로 지정되었지만 예상되는 타입은 %s입니다\n"
@@ -2214,60 +2338,108 @@ msgstr "재생(_P)"
 msgid "Select sound file"
 msgstr "소리 파일 선택"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"%s 시작중\n"
-"(작업 시간이 초과될 때까지 %d초 남았습니다)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: 창 관리자를 초기화할 수 없습니다\n"
-"\t다른 창 관리자가 이미 실행중이고 강제로 종료할 수 없습니다\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "키보드 접근성 기능을 사용/해제할 때 삑소리 내기(_B)"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: 창 관리자를 초기화할 수 없습니다.\n"
-"\t'%s'이(가) 시작하지 않습니다\n"
+#~ msgid "Beep when:"
+#~ msgstr "삑소리 내기:"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "이전의 창 관리자가 끝나지 않았습니다\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "반복 키 기본 설정"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"'%s'을(를) 시작할 없습니다.\n"
-"이전의 창 관리자인 '%s'(으)로 돌아갑니다\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "키를 누름 뒤에 이 만큼 지나면 움직이기 시작(_V):"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"대체 창 관리자를 시작할 수 없습니다.\n"
-"수동으로 창 관리자를 시작하십시오.  발바닥\n"
-"메뉴에서 \"프로그램 실행\"을 선택하시면\n"
-"실행할 수 있습니다\n"
-
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "확인"
+#~ msgid "Testing Area"
+#~ msgstr "테스트 영역"
+
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "토글 및 반복 키"
+
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "CDE AccessX 파일 가져 오기(_I)"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "두 키를 동시에 눌렀을 때\n"
+#~ "StickyKeys 끄기(_T)"
+
+#~ msgid "msecs"
+#~ msgstr "천분의일초"
+
+#~ msgid "Network Preferences"
+#~ msgstr "네트워크 기본 설정"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "프록시에 사용자 이름과 비밀번호 필요(_X)"
+
+#~ msgid "_Location:"
+#~ msgstr "위치(_L):"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "제목 막대 글꼴"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "창 가장자리 모양"
+
+#~ msgid "Window Manager:"
+#~ msgstr "창 관리자:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "%s 시작중\n"
+#~ "(작업 시간이 초과될 때까지 %d초 남았습니다)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: 창 관리자를 초기화할 수 없습니다\n"
+#~ "\t다른 창 관리자가 이미 실행중이고 강제로 종료할 수 없습니다\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: 창 관리자를 초기화할 수 없습니다.\n"
+#~ "\t'%s'이(가) 시작하지 않습니다\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "이전의 창 관리자가 끝나지 않았습니다\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "'%s'을(를) 시작할 없습니다.\n"
+#~ "이전의 창 관리자인 '%s'(으)로 돌아갑니다\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "대체 창 관리자를 시작할 수 없습니다.\n"
+#~ "수동으로 창 관리자를 시작하십시오.  발바닥\n"
+#~ "메뉴에서 \"프로그램 실행\"을 선택하시면\n"
+#~ "실행할 수 있습니다\n"
+
+#~ msgid "OK"
+#~ msgstr "확인"
 
 #~ msgid "_Category"
 #~ msgstr "범주(_C)"
diff --git a/po/lt.po b/po/lt.po
index dbb58c978..be3f8a941 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 1.99.10\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-06-04 23:25+0200\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konf.lt>\n"
@@ -13,19 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, fuzzy, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "�vyko klaida bandant parodyti �inyn�: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Nepavyko importuoti AccessX nuostat� i� bylos '%s'"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Pasirink CDE AccessX byl�"
 
@@ -47,151 +46,194 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
+msgid "Beep when _modifier is pressed"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
-msgid "E_nable Toggle Keys"
+msgid "Beep when a _feature is turned on or off"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
-msgid "Enable Bo_unce Keys"
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
-msgid "Enable Slo_w Keys"
+msgid "Beep when key is:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
-msgid "Enable _Mouse Keys"
-msgstr ""
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Delsa (sek.):"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
-msgid "Enable _Sticky Keys"
+msgid "Delay between keypress and pointer mo_vement:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-#, fuzzy
-msgid "General"
-msgstr "_Bendra"
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+msgid "E_nable Toggle Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
+msgid "Enable Bo_unce Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
-#, fuzzy
-msgid "Keyboard Accessibility Preferences (AccessX)"
-msgstr "Klaviat�ros savyb�s"
+msgid "Enable Slo_w Keys"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
-msgid "Ma_ximum pointer speed:"
+msgid "Enable _Mouse Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
-msgid ""
-"Only accept keys after they have been pressed and held for a user adjustable "
-"amount of time."
+msgid "Enable _Sticky Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
+msgid "Features"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Klaviat�ros parinktys"
+msgid "Filters"
+msgstr "_Byla"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
+msgid ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
-msgstr ""
+#, fuzzy
+msgid "Keyboard Accessibility Preferences (AccessX)"
+msgstr "Klaviat�ros savyb�s"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
+msgid "Ma_ximum pointer speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Turn the numeric keypad into a mouse control pad."
-msgstr ""
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Pel�"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr ""
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Pel�s parinktys"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+msgid ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "Pasirink CDE AccessX byl�"
+msgid "S_peed:"
+msgstr "Greitis"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+msgid "Toggle Keys"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+msgid "_Disable if unused for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
-msgstr ""
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
+msgstr "Klaviat�ros savyb�s"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+msgid "_Import Feature Settings..."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
+msgid "_Only accept keys held for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
-msgstr ""
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Kartojimo sparta"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+msgid "_accepted"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
+msgstr "Greitis"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
+msgstr "I�trinti"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "sekund�i�"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
+msgstr "sekund�i�"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 #, fuzzy
 msgid "seconds"
 msgstr "sekund�i�"
@@ -253,7 +295,7 @@ msgstr "_Pasirink redaktori�:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Gauti ir �ra�yti pasenusias nuostatas"
@@ -533,14 +575,6 @@ msgstr "Nustatyti programose naudojam� �rift�"
 msgid "Please specify a name and a command for this editor."
 msgstr "Pra�om nurodyti �io redaktoriaus pavadinim� ir komand�."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Priima _URL"
@@ -747,6 +781,7 @@ msgid "Minimizing and Maximizing"
 msgstr "I�didinimas ir suma�inimas"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1304,22 +1339,27 @@ msgstr "Darbalaukis"
 msgid "Window Management"
 msgstr "Lang� tvarkymas"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Veiksmas"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Susiejimas"
 
@@ -1344,6 +1384,11 @@ msgstr ""
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, fuzzy, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "�vyko klaida bandant parodyti �inyn�: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr ""
@@ -1411,11 +1456,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Kartojimo sparta"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Greitis"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr ""
@@ -1457,7 +1497,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Klaviat�ros parinktys"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1466,7 +1506,7 @@ msgstr ""
 "<b>Ne�inomas �ymeklis</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1474,7 +1514,7 @@ msgstr ""
 "<b>�prastas �ymeklis - Esamas</b>\n"
 "�prastas �ymeklis, ateinantis su X'ais"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1482,7 +1522,7 @@ msgstr ""
 "<b>�prastas �ymeklis</b>\n"
 "�prastas �ymeklis, ateinantis su X'ais"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1490,7 +1530,7 @@ msgstr ""
 "<b>Baltas �ymeklis - Esamas</b>\n"
 "Invertuotas �prastas �ymeklis"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1498,7 +1538,7 @@ msgstr ""
 "<b>Baltas �ymeklis</b>\n"
 "Invertuotas �prastas �ymeklis"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1506,7 +1546,7 @@ msgstr ""
 "<b>Didelis �ymeklis - Esamas</b>\n"
 "�prasto �ymeklio didel� versija"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1514,7 +1554,7 @@ msgstr ""
 "<b>Didelis �ymeklis</b>\n"
 "�prasto �ymeklio didel� versija"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1522,7 +1562,7 @@ msgstr ""
 "<b>Didelis baltas �ymeklis - Esamas</b>\n"
 "Balto �ymeklio didel� versija"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1655,10 +1695,6 @@ msgstr "_Parodyti �ymeklio viet�, kai paspaud�iamas Control klavi�as"
 msgid "_Threshold:"
 msgstr "_Slenkstis:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Pel�"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1674,40 +1710,78 @@ msgstr "Tinklas"
 msgid "Network proxy preferences"
 msgstr "Tinklo parinktys"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Tinklo parinktys"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Tinklo parinktys"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_rievadas:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "_Slapta�odis:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-#, fuzzy
-msgid "Pro_xy requires username and password"
-msgstr "Ta_rpinei sto�iai reikia vartotojo vardo ir slapta�od�io"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "Vartotojo _vardas:"
+msgid "Autoconfiguration _URL:"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Vieta:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "HTTP tarpin�s stoties nuostatos"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Tinklo parinktys"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_rievadas:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "_Naudoti HTTP tarpin� stot�"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Naudoti HTTP tarpin� stot�"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "_Slapta�odis:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "_Naudoti HTTP tarpin� stot�"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Vartotojo _vardas:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Garso parinktys"
@@ -1716,6 +1790,11 @@ msgstr "Garso parinktys"
 msgid "E_nable sound server startup"
 msgstr "_Prad�ioje paleisti gars� server�"
 
+#: capplets/sound/sound-properties.glade.h:2
+#, fuzzy
+msgid "General"
+msgstr "_Bendra"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1790,32 +1869,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Nustatyti darbalaukio ikon� �rift�"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Tema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Naujos temos gali b�ti �diegtos atitempus jas ant lango."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Fonas"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
 #, fuzzy
-msgid "Theme Preferences"
-msgstr "Gtk+ temos parinktys"
+msgid "Apply _Font"
+msgstr "Pritaikyti dabar"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Kontaktai"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Lang� r�meli� i�vaizda"
+msgid "Icons"
+msgstr "Tik ikonos"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Naujos temos gali b�ti �diegtos atitempus jas ant lango."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+#, fuzzy
+msgid "Theme Preferences"
+msgstr "Gtk+ temos parinktys"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Lang� r�meli� i�vaizda"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Eiti � tem� aplank�"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "�_diegti nauj� tem�..."
@@ -1973,30 +2069,56 @@ msgstr ""
 msgid "_Save"
 msgstr "_Padidintas"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Lang� parinktys"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+msgid "Control"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Tipas"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Greitis"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Pritaikyti dabar"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Pasirinkti langus pelei praeinant vir� j�"
+msgid "Window Preferences"
+msgstr "Lang� parinktys"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Pavadinimo juostos �riftas"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Lang� r�meli� i�vaizda"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Lang� tvarkykl�:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Pasirinkti langus pelei praeinant vir� j�"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2134,7 +2256,7 @@ msgstr "_Daugiau nerodyti �io prane�imo"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2211,64 +2333,69 @@ msgstr "_Groti"
 msgid "Select sound file"
 msgstr "Pasirink garso byl�"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Paleid�iu %s\n"
-"(Liko %d sekund�s, kol pasibaigs laiko riba)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Klaviat�ros parinktys"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "Pasirink CDE AccessX byl�"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Tinklo parinktys"
 
-#: libwindow-settings/gnome-wm-manager.c:378
 #, fuzzy
-msgid "Previous window manager did not die\n"
-msgstr "Leisti lang� tvarkykl�s garsus"
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Ta_rpinei sto�iai reikia vartotojo vardo ir slapta�od�io"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Nepavyko paleisti �%s�\n"
-"Gr��tu prie ankstesn�s lang� tvarkykl�s �%s�\n"
+#~ msgid "_Location:"
+#~ msgstr "_Vieta:"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Negaliu paleisti ankstesn�s lang� tvarkykl�s.\n"
-"Pra�au, paleisk lang� tvarkykl� rankomis. Tai\n"
-"gali padaryti pasirink�s �Paleisti program�\n"
-"pagrindiniame meniu\n"
+#~ msgid "Titlebar Font"
+#~ msgstr "Pavadinimo juostos �riftas"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr ""
+#~ msgid "Window Border Appearance"
+#~ msgstr "Lang� r�meli� i�vaizda"
 
-#~ msgid "_Category"
-#~ msgstr "_Kategorija"
+#~ msgid "Window Manager:"
+#~ msgstr "Lang� tvarkykl�:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Paleid�iu %s\n"
+#~ "(Liko %d sekund�s, kol pasibaigs laiko riba)"
 
 #, fuzzy
-#~ msgid "_Delete"
-#~ msgstr "I�trinti"
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Leisti lang� tvarkykl�s garsus"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Nepavyko paleisti �%s�\n"
+#~ "Gr��tu prie ankstesn�s lang� tvarkykl�s �%s�\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Negaliu paleisti ankstesn�s lang� tvarkykl�s.\n"
+#~ "Pra�au, paleisk lang� tvarkykl� rankomis. Tai\n"
+#~ "gali padaryti pasirink�s �Paleisti program�\n"
+#~ "pagrindiniame meniu\n"
+
+#~ msgid "_Category"
+#~ msgstr "_Kategorija"
 
 #~ msgid "_Name"
 #~ msgstr "_Pavadinimas"
@@ -2351,9 +2478,6 @@ msgstr ""
 #~ msgid "Calendar"
 #~ msgstr "Kalendorius"
 
-#~ msgid "Contacts"
-#~ msgstr "Kontaktai"
-
 #~ msgid "Packages"
 #~ msgstr "Paketai"
 
@@ -2459,9 +2583,6 @@ msgstr ""
 #~ msgid "Mouse Properties"
 #~ msgstr "Pel�s savyb�s"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "HTTP tarpin�s stoties nuostatos"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Nustatyti, kaip GNOME naudoja gars�"
 
diff --git a/po/lv.po b/po/lv.po
index f0aee5900..d45a33bd4 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2001-11-01 17:40+0200\n"
 "Last-Translator: Artis Trops <hornet@navigators.lv>\n"
 "Language-Team: Latvian <hornet@navigators.lv>\n"
@@ -13,19 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 #, fuzzy
 msgid "Select CDE AccessX file"
 msgstr "Izv�lies failu..."
@@ -49,153 +48,198 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
 #, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "Aktiviz�t Tastat�ras Klik��i"
+msgid "Basic"
+msgstr "Pamata"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
+msgid "Beep when _modifier is pressed"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
-msgid "E_nable Toggle Keys"
+msgid "Beep when a _feature is turned on or off"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
-msgid "Enable Bo_unce Keys"
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
-msgid "Enable Slo_w Keys"
+msgid "Beep when key is:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
-msgid "Enable _Mouse Keys"
-msgstr ""
+#, fuzzy
+msgid "Del_ay:"
+msgstr "Atska�ot"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
-msgid "Enable _Sticky Keys"
-msgstr ""
+#, fuzzy
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr "Aizture starp katru soli labirint�."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Visp�r�gi"
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+msgid "E_nable Toggle Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
+msgid "Enable Bo_unce Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
-#, fuzzy
-msgid "Keyboard Accessibility Preferences (AccessX)"
-msgstr "Galvenie Rekviz�ti"
+msgid "Enable Slo_w Keys"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
-msgid "Ma_ximum pointer speed:"
+msgid "Enable _Mouse Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
-msgid ""
-"Only accept keys after they have been pressed and held for a user adjustable "
-"amount of time."
+msgid "Enable _Sticky Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
+msgid "Features"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Galvenie Rekviz�ti"
+msgid "Filters"
+msgstr "Fails"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
+msgid ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
-msgstr ""
+#, fuzzy
+msgid "Keyboard Accessibility Preferences (AccessX)"
+msgstr "Galvenie Rekviz�ti"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
+msgid "Ma_ximum pointer speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Turn the numeric keypad into a mouse control pad."
-msgstr ""
+#: capplets/mouse/mouse.desktop.in.h:1
+#, fuzzy
+msgid "Mouse"
+msgstr "Moe"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr ""
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Papla�in�t�s Opcijas"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-#, fuzzy
-msgid "_Enable keyboard accessibility"
-msgstr "Aktiviz�t Tastat�ras Klik��i"
+msgid ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "Izv�lies failu..."
+msgid "S_peed:"
+msgstr "�trums"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+msgid "Toggle Keys"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+msgid "_Disable if unused for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
-msgstr ""
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
+msgstr "Aktiviz�t Tastat�ras Klik��i"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+msgid "_Import Feature Settings..."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-#, fuzzy
-msgid "msecs"
-msgstr "sekundes"
+msgid "_Only accept keys held for:"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
-msgstr ""
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Tausti�u Atk�rto�n�s Temps"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#, fuzzy
+msgid "_Type to test settings:"
+msgstr "Raksti �eit, lai p�rbaud�tu uzst�d�jumus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+msgid "_accepted"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
+msgstr "�trums"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
+msgstr "Dz�st"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "sekundes"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
+msgstr "sekundes"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "sekundes"
 
@@ -258,7 +302,7 @@ msgstr "Izv�lies Ikonu..."
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr ""
@@ -541,14 +585,6 @@ msgstr ""
 msgid "Please specify a name and a command for this editor."
 msgstr "L�dzu zem�k ievadi komandrindu"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr ""
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr ""
@@ -783,6 +819,7 @@ msgid "Minimizing and Maximizing"
 msgstr ""
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr ""
 
@@ -1358,23 +1395,28 @@ msgstr ""
 msgid "Window Management"
 msgstr "Pievienot Jaunu Logu P�rvaldnieku"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 #, fuzzy
 msgid "Action"
 msgstr "Opcijas"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 #, fuzzy
 msgid "Shortcut"
 msgstr "�ss"
@@ -1403,6 +1445,11 @@ msgstr "�ss"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr ""
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 #, fuzzy
 msgid "_Accessibility"
@@ -1473,11 +1520,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Tausti�u Atk�rto�n�s Temps"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "�trums"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 #, fuzzy
 msgid "_Accessibility..."
@@ -1521,56 +1563,56 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Galvenie Rekviz�ti"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
 "%s"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1704,11 +1746,6 @@ msgstr ""
 msgid "_Threshold:"
 msgstr "Solis"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-#, fuzzy
-msgid "Mouse"
-msgstr "Moe"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1724,43 +1761,76 @@ msgstr "Papla�in�t�s Opcijas"
 msgid "Network proxy preferences"
 msgstr "Papla�in�t�s Opcijas"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-#, fuzzy
-msgid "Network Preferences"
-msgstr "Papla�in�t�s Opcijas"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:4
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:5
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:6
+msgid "<b>_Use authentication</b>"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:7
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Konfigur�cijas Komanda:"
+
+#: capplets/network/gnome-network-preferences.glade.h:8
+msgid "HTTP Proxy Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:9
 #, fuzzy
-msgid "Network Proxy Preferences"
+msgid "Network Proxy Configuration"
 msgstr "Papla�in�t�s Opcijas"
 
-#: capplets/network/gnome-network-preferences.glade.h:4
+#: capplets/network/gnome-network-preferences.glade.h:10
 #, fuzzy
-msgid "P_ort:"
+msgid "Port:"
 msgstr "Punkti:"
 
-#: capplets/network/gnome-network-preferences.glade.h:5
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
 #, fuzzy
-msgid "Pass_word:"
-msgstr "Parole priek� %s"
+msgid "_Details"
+msgstr "Astes"
 
-#: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
+#: capplets/network/gnome-network-preferences.glade.h:13
+msgid "_FTP proxy:"
 msgstr ""
 
-#: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
+#: capplets/network/gnome-network-preferences.glade.h:14
+msgid "_HTTP proxy:"
 msgstr ""
 
-#: capplets/network/gnome-network-preferences.glade.h:8
+#: capplets/network/gnome-network-preferences.glade.h:15
 #, fuzzy
-msgid "_Location:"
-msgstr "Pa�trin�jums"
+msgid "_Password:"
+msgstr "Parole priek� %s"
 
-#: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#: capplets/network/gnome-network-preferences.glade.h:16
+msgid "_Secure HTTP proxy:"
 msgstr ""
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Nosaukums:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 #, fuzzy
 msgid "Sound preferences"
@@ -1771,6 +1841,10 @@ msgstr "Papla�in�t�s Opcijas"
 msgid "E_nable sound server startup"
 msgstr "Aktiviz�t ska�as servera s�kn��anos"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Visp�r�gi"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1845,34 +1919,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr ""
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 #, fuzzy
 msgid "Theme"
 msgstr "Koks"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
+msgid "Apply _Background"
 msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-#, fuzzy
-msgid "Theme Preferences"
-msgstr "Papla�in�t�s Opcijas"
+msgid "Apply _Font"
+msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Norm�ls"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Papla�in�t�s Opcijas"
+msgid "Icons"
+msgstr "Ikonu Saraksts"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr ""
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+#, fuzzy
+msgid "Theme Preferences"
+msgstr "Papla�in�t�s Opcijas"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Papla�in�t�s Opcijas"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 #, fuzzy
 msgid "_Go to theme folder"
 msgstr "Ieiet �slaic�g� izsl�g�anas re��m� p�c"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr ""
@@ -2040,33 +2129,58 @@ msgstr ""
 msgid "_Save"
 msgstr "St�voklis"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
 #, fuzzy
-msgid "Window Preferences"
-msgstr "Papla�in�t�s Opcijas"
+msgid "Control"
+msgstr "Norm�ls"
+
+#: capplets/windows/gnome-window-properties.c:580
+#, fuzzy
+msgid "Alt"
+msgstr "Jebkur�"
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Mime Tips"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "�trums"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
+msgid "To _move windows, click while holding down:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+#, fuzzy
+msgid "Window Preferences"
+msgstr "Papla�in�t�s Opcijas"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-#, fuzzy
-msgid "Titlebar Font"
-msgstr "Str�vas Vad�ba"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
+msgid "_Raise selected windows after a short time"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-#, fuzzy
-msgid "Window Manager:"
-msgstr "Pievienot Jaunu Logu P�rvaldnieku"
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 #, fuzzy
@@ -2208,7 +2322,7 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2290,68 +2404,91 @@ msgstr "Atska�ot"
 msgid "Select sound file"
 msgstr "Izv�lies failu..."
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Start�ju %s\n"
-"(atliku�as %d sekundes pirms oper�cijas laika iztec��anas)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Nevar�ju inicializ�t logu p�rvaldnieku.\n"
-"\tJau darbojas cits logu p�rvalnieks un nevar tikt nokauts\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "Aktiviz�t Tastat�ras Klik��i"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Nevar�ju inicializ�t logu p�rvaldnieku.\n"
-"\tnepalaidu '%s'\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Galvenie Rekviz�ti"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Iepriek��jais Logu P�rvaldnieks nav miris\n"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "Izv�lies failu..."
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Nevar�ju palaist '%s'.\n"
-"Atgrie�amies atpaka� pie pa�reiz�j� logu p�rvaldnieka '%s'\n"
+#, fuzzy
+#~ msgid "msecs"
+#~ msgstr "sekundes"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Nevar�ju palaist atk�p�an�s logu p�rvaldnieku.\n"
-"L�dzu palaid logu p�rvaldnieku pa�roc�gi. Tu to\n"
-"vari izdar�t, izv�loties \"Palaist...\" no\n"
-"p�das izv�lnes\n"
+#, fuzzy
+#~ msgid "Network Preferences"
+#~ msgstr "Papla�in�t�s Opcijas"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#, fuzzy
+#~ msgid "_Location:"
+#~ msgstr "Pa�trin�jums"
 
 #, fuzzy
-#~ msgid "Add:"
-#~ msgstr "Pievienot"
+#~ msgid "Titlebar Font"
+#~ msgstr "Str�vas Vad�ba"
 
 #, fuzzy
-#~ msgid "_Delete"
-#~ msgstr "Dz�st"
+#~ msgid "Window Manager:"
+#~ msgstr "Pievienot Jaunu Logu P�rvaldnieku"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Start�ju %s\n"
+#~ "(atliku�as %d sekundes pirms oper�cijas laika iztec��anas)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Nevar�ju inicializ�t logu p�rvaldnieku.\n"
+#~ "\tJau darbojas cits logu p�rvalnieks un nevar tikt nokauts\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Nevar�ju inicializ�t logu p�rvaldnieku.\n"
+#~ "\tnepalaidu '%s'\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Iepriek��jais Logu P�rvaldnieks nav miris\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Nevar�ju palaist '%s'.\n"
+#~ "Atgrie�amies atpaka� pie pa�reiz�j� logu p�rvaldnieka '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Nevar�ju palaist atk�p�an�s logu p�rvaldnieku.\n"
+#~ "L�dzu palaid logu p�rvaldnieku pa�roc�gi. Tu to\n"
+#~ "vari izdar�t, izv�loties \"Palaist...\" no\n"
+#~ "p�das izv�lnes\n"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#, fuzzy
+#~ msgid "Add:"
+#~ msgstr "Pievienot"
 
 #, fuzzy
 #~ msgid "_Name"
@@ -2755,9 +2892,6 @@ msgstr "OK"
 #~ msgid "Command:"
 #~ msgstr "Komanda:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Konfigur�cijas Komanda:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Logu p�rvaldnieks ir sesijas p�rvald�ts"
 
@@ -3101,10 +3235,6 @@ msgstr "OK"
 #~ msgid "Wobble:"
 #~ msgstr "Gr��o�an�s:"
 
-#, fuzzy
-#~ msgid "Ant"
-#~ msgstr "Jebkur�"
-
 #~ msgid "Four Sided cells"
 #~ msgstr "�etrst�rainas ��nas"
 
@@ -3178,9 +3308,6 @@ msgstr "OK"
 #~ msgid "Splines"
 #~ msgstr "Spl�nes"
 
-#~ msgid "Tails"
-#~ msgstr "Astes"
-
 #~ msgid "Threshold of repulsion"
 #~ msgstr "Atsi�an�s robe�a"
 
@@ -3212,10 +3339,6 @@ msgstr "OK"
 #~ msgid "Use red/blue 3d seperation."
 #~ msgstr "Lietot sarkano/zilo 3d atdal��anu."
 
-#, fuzzy
-#~ msgid "Braid"
-#~ msgstr "Pamata"
-
 #~ msgid "Bubbles exist in three dimensions."
 #~ msgstr "Burbu�iem ir tr�s dimensijas."
 
@@ -3231,10 +3354,6 @@ msgstr "OK"
 #~ msgid "Use double buffering"
 #~ msgstr "Lietot dubultbuferi"
 
-#, fuzzy
-#~ msgid "Coral"
-#~ msgstr "Norm�ls"
-
 #~ msgid "Denser"
 #~ msgstr "Bl�v�k"
 
@@ -3462,9 +3581,6 @@ msgstr "OK"
 #~ msgid "Delay between drawing the maze and starting the solution."
 #~ msgstr "Aizture pirms labirinta z�m��anas un atrisin�juma s�k�anas."
 
-#~ msgid "Delay between each step in the maze."
-#~ msgstr "Aizture starp katru soli labirint�."
-
 #~ msgid "Delay between finishing the maze and starting a new one."
 #~ msgstr "Aizture starp labirinta pabeig�anu un jauna s�k�anu."
 
@@ -3582,10 +3698,6 @@ msgstr "OK"
 #~ msgid "SpeedMine"
 #~ msgstr "�trums"
 
-#, fuzzy
-#~ msgid "Sphere"
-#~ msgstr "�trums"
-
 #~ msgid "Change to display in monochrome."
 #~ msgstr "P�riet uz melnbalto ekr�nu."
 
@@ -3869,9 +3981,6 @@ msgstr "OK"
 #~ msgid "a.a"
 #~ msgstr "a.a"
 
-#~ msgid "Type here to test setting"
-#~ msgstr "Raksti �eit, lai p�rbaud�tu uzst�d�jumus"
-
 #~ msgid "Right handed"
 #~ msgstr "Labietis"
 
@@ -4145,6 +4254,3 @@ msgstr "OK"
 
 #~ msgid "HTML"
 #~ msgstr "HTML"
-
-#~ msgid "Icon List"
-#~ msgstr "Ikonu Saraksts"
diff --git a/po/ms.po b/po/ms.po
index e1e2a5bc7..0ee897aec 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center HEAD\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-10-14 16:13+0800\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@lists.sourceforge.org>\n"
@@ -12,19 +12,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Terdapat ralat melancarkan caplet papan kekunci: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Tak dapat mengimport tetapan AccessX dari fail '%s'"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Pilih fail AccessX CDE"
 
@@ -47,51 +46,89 @@ msgstr ""
 "kekunci tidak akan beroperasi dengannya"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Beep bila LED dinyalana dan 2 beep bila salah satu dipadam."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Beep bila kekunci di_lepas"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Beep bila:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "_Beep bila modifier ditekan"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "Beep bila LED dinyalana dan 2 beep bila salah satu dipadam."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Beep bila kekunci di_lepas"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Sela:"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 msgid "E_nable Toggle Keys"
 msgstr "Hidupkan Kekunci _Togol"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 msgid "Enable Bo_unce Keys"
 msgstr "Hidupkan Kekunci _Bounce"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Hidupkan Kekunci _Perlahan"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Hidupkan Kekunci _Tetikus"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Hidupkan Kekunci _Melekat"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Am"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "_Fail"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#, fuzzy
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Abaikan tekanan kekunci dalam tempoh:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -99,99 +136,113 @@ msgstr ""
 "Abaikan semua turutan tekan bagi kekunci SAMA jika ianya berlaku dalam "
 "tempoh yang boleh dipilih pengguna."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Keutamaan Kebolehcapaian Papan Kekunci (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 msgid "Ma_ximum pointer speed:"
 msgstr "Kelajuan ma_ksima penuding:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Tetikus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Keutamaan Tetikus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-msgid "Repeat Key Pre_ferences..."
-msgstr "Ke_utamaan Papan Kekunci Ulangan..."
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
-msgstr "Mula ge_rak selama ini selepas tekanan kekunci:"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Kawasan Ujian"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr "Ke_lajuan:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#, fuzzy
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Masa untuk meme_cut ke kelajuan maksima :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Kekunci Togol dan Ulangan"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Hidupkan Kekunci _Togol"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Hidupkan pad kekunci numerik pada pad kawalan tetikus."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr "_Beep bila modifier ditekan"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
+#, fuzzy
+msgid "_Disable if unused for:"
 msgstr "_Dimatikan jika tidak digunakan selama"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Hidupkan kebolehcapaian Papan Kekunci"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-msgid "_Import CDE AccessX file..."
-msgstr "_Import fail AccessX CDE..."
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
+#, fuzzy
+msgid "_Only accept keys held for:"
 msgstr "_Hanya terima tekanan kekunci selepas:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Kekunci Ulangan"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"Ma_tikan Kekunci Lekat bila \n"
-"dua kekunci ditekan serentak"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "Kekunci dite_rima"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "kekunci dite_kan"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "kekunci di_lepaskan"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "msaat"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "saat"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "piksel/saat"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "saat"
 
@@ -246,7 +297,7 @@ msgstr "_Pilih gambar:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Terima dan simpan tetapan warisan"
@@ -540,14 +591,6 @@ msgstr "Pilih aplikasi default anda"
 msgid "Please specify a name and a command for this editor."
 msgstr "Sila nyatakan nama dan arahan bagi editor ini."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "_Terima URL"
@@ -755,6 +798,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Miniatur dan Pemaksimaan"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1281,12 +1325,17 @@ msgstr "Desktop"
 msgid "Window Management"
 msgstr "Pengurusan Tetingkap"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Ralat menetapkan pemecut baru pada pangkalandata konfigurasi: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1294,11 +1343,11 @@ msgstr ""
 "Tak dapat menjumpai tema papankekunci. Ini bermaksud pemasangan GTK+ tidak "
 "dipasang dengan sempurna."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Aksi"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Pintasan"
 
@@ -1323,6 +1372,11 @@ msgstr "_Teks mengedit pintasan:"
 msgid "Assign shortcut keys to commands"
 msgstr "Umpuk kekunci pintasan pada arahan"
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Terdapat ralat melancarkan caplet papan kekunci: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "Keboleh_capaikan"
@@ -1389,10 +1443,6 @@ msgstr "Klik Tekanankekunci"
 msgid "Repeat Keys"
 msgstr "Kekunci Ulangan"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr "Ke_lajuan:"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "Keboleh_capaian..."
@@ -1429,7 +1479,7 @@ msgstr "senyap"
 msgid "Set your keyboard preferences"
 msgstr "Tetapkan keutamaan papan kekunci"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1438,7 +1488,7 @@ msgstr ""
 "<b>Kursor tidak diketahui</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1446,7 +1496,7 @@ msgstr ""
 "<b>Kursor Default  - Semasa</b>\n"
 "Kursor default yang datang dengan X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1454,7 +1504,7 @@ msgstr ""
 "<b>Kursor Default </b>\n"
 "Kursor default yang datang dengan X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1462,7 +1512,7 @@ msgstr ""
 "<b>Kursor Putih - Semasa</b>\n"
 "Kursor default disongsangkan"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1470,7 +1520,7 @@ msgstr ""
 "<b>Kursor Putih</b>\n"
 "Kursor default disongsangkan"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1478,7 +1528,7 @@ msgstr ""
 "<b>Kursor Besar - Semasa</b>\n"
 "Versi besar bagi kursor normal"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1486,7 +1536,7 @@ msgstr ""
 "<b>Kursor Besar </b>\n"
 "Versi besar bagi kursor normal"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1494,7 +1544,7 @@ msgstr ""
 "<b>Kursor Putih Besar - Semasa</b>\n"
 "Versi besar bagi kursor putih"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1629,10 +1679,6 @@ msgstr "_Paparkan kedudukan kursor apabila kekunci Control ditekan"
 msgid "_Threshold:"
 msgstr "_Treshold:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Tetikus"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Tetapkan keutamaan tetikus"
@@ -1645,38 +1691,78 @@ msgstr "Proksi rangkaian"
 msgid "Network proxy preferences"
 msgstr "Keutamaan proksi rangkaian"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Keutamaan Rangkaian"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Keutamaan Proksi Rangkaian"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "_Liang:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "Katalaluan:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "Pro_ksi memerlukan namapengguna dan katalaluan"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "_Namapengguna:"
+msgid "Autoconfiguration _URL:"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Lokasi:"
+msgid "HTTP Proxy Details"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Keutamaan Proksi Rangkaian"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "_Liang:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+#, fuzzy
+msgid "_Details"
+msgstr "P_erincian..."
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "_Guna Proksi HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
 msgstr "_Guna Proksi HTTP"
 
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "Katalaluan:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "_Guna Proksi HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "_Namapengguna:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Keutamaan Bunyi"
@@ -1685,6 +1771,10 @@ msgstr "Keutamaan Bunyi"
 msgid "E_nable sound server startup"
 msgstr "_Hidupkan pelayan bunyi permulaan"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Am"
+
 #: capplets/sound/sound-properties.glade.h:3
 msgid "Sound Events"
 msgstr "Acara Bunyi"
@@ -1755,30 +1845,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr "PIlih tema bagi pelbagai bahagian pada dekstop"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Tema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Tema baru boleh juga dipasang dengan mengheret tema ke tetingkap."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Latar Belakang"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-msgid "Theme Preferences"
-msgstr "Keutamaan Tema"
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Terapkan Sekarang"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr "Tema Wiget"
+#, fuzzy
+msgid "Controls"
+msgstr "Kawalan UI"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
-msgid "Window Border Theme"
-msgstr "Tema Sempadan Tetingkap"
+#, fuzzy
+msgid "Icons"
+msgstr "Ikon Sahaja"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Tema baru boleh juga dipasang dengan mengheret tema ke tetingkap."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+msgid "Theme Preferences"
+msgstr "Keutamaan Tema"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Tema Sempadan Tetingkap"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Pergi ke folder tema"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "_Pasang Tema Baru..."
 
@@ -1923,30 +2031,58 @@ msgstr "_Keluar"
 msgid "_Save"
 msgstr "_Simpan"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Keutamaan Tetingkap"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Kawalan UI"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Jenis"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Kelajuan"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Terapkan Sekarang"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Pilih tetingkap bila mouse di atasnya"
+msgid "Window Preferences"
+msgstr "Keutamaan Tetingkap"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Font Bar Tajuk"
+#, fuzzy
+msgid "_Double-click window titles to:"
+msgstr "Font tajuk _tetingkap:"
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Penampilan Sempadan Tetingkap"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Pengurus Tetingkap:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Pilih tetingkap bila mouse di atasnya"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2093,7 +2229,7 @@ msgstr "_Jangan papar mesej ini lagi"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Tak dapat memuatkan fail bunyi %s sebagai contoh %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2173,53 +2309,90 @@ msgstr "_Main"
 msgid "Select sound file"
 msgstr "Pilih fail bunyi"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Memulakan %s\n"
-"(%d saat tinggal sebelum operasi melebihi had masa)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-caplet: Tak dapat menginitialisasi pengurus tetingkap.\n"
-"\tPengurus tetingkap lain sudah dilaksana dan tak dpaat dibunuh.\n"
+#~ msgid "Beep when:"
+#~ msgstr "Beep bila:"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Tak dapat menginitialisasi pengurus tetingkap.\n"
-"\t'%s' tidak bermula\n"
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Ke_utamaan Papan Kekunci Ulangan..."
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Pengurus tetingkap terdahulu belum mati\n"
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Mula ge_rak selama ini selepas tekanan kekunci:"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Tak dapat memulakan '%s'.\n"
-"Kembali menggunakan pengurus tetingkap terdahulu '%s'\n"
+#~ msgid "Testing Area"
+#~ msgstr "Kawasan Ujian"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Kekunci Togol dan Ulangan"
+
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Import fail AccessX CDE..."
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "Ma_tikan Kekunci Lekat bila \n"
+#~ "dua kekunci ditekan serentak"
+
+#~ msgid "msecs"
+#~ msgstr "msaat"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Keutamaan Rangkaian"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Pro_ksi memerlukan namapengguna dan katalaluan"
+
+#~ msgid "_Location:"
+#~ msgstr "_Lokasi:"
+
+#~ msgid "Widget Theme"
+#~ msgstr "Tema Wiget"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Font Bar Tajuk"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Penampilan Sempadan Tetingkap"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Pengurus Tetingkap:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Memulakan %s\n"
+#~ "(%d saat tinggal sebelum operasi melebihi had masa)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-caplet: Tak dapat menginitialisasi pengurus tetingkap.\n"
+#~ "\tPengurus tetingkap lain sudah dilaksana dan tak dpaat dibunuh.\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Tak dapat menginitialisasi pengurus tetingkap.\n"
+#~ "\t'%s' tidak bermula\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Pengurus tetingkap terdahulu belum mati\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Tak dapat memulakan '%s'.\n"
+#~ "Kembali menggunakan pengurus tetingkap terdahulu '%s'\n"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid "OK"
+#~ msgstr "OK"
diff --git a/po/nl.po b/po/nl.po
index a38577d75..880aedf1f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center CVS\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-06-12 00:14+0200\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -20,19 +20,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, fuzzy, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Er is een fout opgetreden bij de hulpweergave: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "AccessX-instellingen vanuit bestand '%s' importeren is mislukt"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "CDE AccessX-bestand selecteren"
 
@@ -54,60 +53,92 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
-"Piepen als een LED aangezet wordt en piep twee keer als er één afgezet wordt."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
-"_Piep als toetsenbord-toegangelijkheid-eigenschappen in- of uitgeschakeld "
-"worden"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
 #, fuzzy
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr "toets is ge_weigerd"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Piepen wanneer:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "_Piepen wanneer optietoets wordt ingedrukt"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr ""
+"Piepen als een LED aangezet wordt en piep twee keer als er één afgezet wordt."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "toets is ge_weigerd"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "Ver_traging (sec):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "_SchakelToetsen inschakelen"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "_KaatsToetsen inschakelen"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "_TrageToetsen inschakelen"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "_MuisToetsen inschakelen"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "_PlakToetsen inschakelen"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "General"
-msgstr "_Algemeen"
+msgid "Filters"
+msgstr "_Bestand"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Negeer toetsaanslagen binnen :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -115,17 +146,27 @@ msgstr ""
 "Alle opeenvolgende aanslagen van DEZELFDE toets negeren indien dit binnen "
 "een door de gebruiker in te stellen tijdsinterval gebeurt."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Configuratie Toetsenbord-toegankelijkheid (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Ma_ximum aanwijzersnelheid:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Muis"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Muisvoorkeuren"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -133,7 +174,7 @@ msgstr ""
 "Toetsen slechts accepteren nadat zij ingedrukt zijn en gehouden gedurende "
 "een door de gebruiker in te stellen tijdsduur."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -141,85 +182,84 @@ msgstr ""
 "Voer meerdere gelijktijdige toetsaanslag-operaties uit wanneer plaktoetsen "
 "in volgorde aangeslagen worden."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Toetsenbordeigenschappen"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "Beginnen met _bewegen deze tijdsduur na toetsaanslag:"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr ""
+msgid "S_peed:"
+msgstr "Snelheid"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Tijd om te _versnellen naar maximumsnelheid:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr ""
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "_SchakelToetsen inschakelen"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Maak een muis-pad van het numerieke toetsenbord"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "_Piepen wanneer optietoets wordt ingedrukt"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Uitschakelen indien ongebruikt voor "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Toetsenbord-toegankelijkheid inschakelen"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "CDE AccessX-bestand _importeren"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "Toetsaanslag _slechts accepteren na:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Herhaalsnelheid"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"PlakToetsen _uitschakelen indien\n"
-"twee toetsen gelijktijdig ingedrukt worden"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "toets is gea_ccepteerd"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "toets is _ingedrukt"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "toets is ge_weigerd"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "msec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "seconden"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "pixels/sec"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "seconden"
 
@@ -280,7 +320,7 @@ msgstr "_Kies een editor..."
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Ga terug naar de standaard instellingen"
@@ -581,14 +621,6 @@ msgstr "Het lettertype instellen voor toepassingen"
 msgid "Please specify a name and a command for this editor."
 msgstr "Geef een naam en een opdracht voor deze editor."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Acce_pteer URL's"
@@ -799,6 +831,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Minimalisatie en maximalisatie"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1362,13 +1395,18 @@ msgstr "Bureaublad"
 msgid "Window Management"
 msgstr "Vensterbeheer"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Fout bij het instellen van nieuwe sneltoets in configuratiedatabase: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1376,11 +1414,11 @@ msgstr ""
 "Kon geen enkel toetsenbord-thema vinden. Dit betekent dat uw GTK+-"
 "installatie incompleet is."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Actie"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Sneltoets"
 
@@ -1406,6 +1444,11 @@ msgstr "_Bureaublad-sneltoetsen:"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, fuzzy, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Er is een fout opgetreden bij de hulpweergave: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Toegankelijkheid"
@@ -1475,11 +1518,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Herhaalsnelheid"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Snelheid"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Toegankelijkheid..."
@@ -1521,7 +1559,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Toetsenbordeigenschappen"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1530,7 +1568,7 @@ msgstr ""
 "<b>Onbekende Cursor</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1538,7 +1576,7 @@ msgstr ""
 "<b>Standaard cursor - Huidig</b>\n"
 "De standaard cursor die meegeleverd wordt met X "
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1546,7 +1584,7 @@ msgstr ""
 "<b>Standaard cursor</b>\n"
 "De standaard cursor die meegeleverd wordt met X "
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1554,7 +1592,7 @@ msgstr ""
 "<b>Witte Cursor - Huidig</b>\n"
 "De standaard cursor geïnverteerd"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1562,7 +1600,7 @@ msgstr ""
 "<b>Witte Cursor</b>\n"
 "De standaard cursor geïnverteerd"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1570,7 +1608,7 @@ msgstr ""
 "<b>Grote Cursor - Huidig</b>\n"
 "Grote versie van de standaard cursor"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1578,7 +1616,7 @@ msgstr ""
 "<b>Grote Cursor</b>\n"
 "Grote versie van de standaard cursor"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1586,7 +1624,7 @@ msgstr ""
 "<b>Grote Witte Cursor - Huidig</b>\n"
 "Grote versie van de witte cursor"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1723,10 +1761,6 @@ msgstr "_Toon positie van cursor wanneer de Control toets is ingedrukt."
 msgid "_Threshold:"
 msgstr "_Drempelwaarde:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Muis"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1742,40 +1776,79 @@ msgstr "Netwerk"
 msgid "Network proxy preferences"
 msgstr "Netwerk-voorkeuren"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Netwerk-voorkeuren"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Netwerk-voorkeuren"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_oort:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "Wacht_woord:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-#, fuzzy
-msgid "Pro_xy requires username and password"
-msgstr "Pro_xy vereist een gebruikersnaam en wachtwoord."
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "Gebruikers_naam:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Configuratie-opdracht:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Locatie"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "HTTP Proxy instellingen"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Netwerk-voorkeuren"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_oort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "H_TTP proxy gebruiken"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "H_TTP proxy gebruiken"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "Wacht_woord:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "H_TTP proxy gebruiken"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Gebruikers_naam:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Geluidsvoorkeuren"
@@ -1784,6 +1857,11 @@ msgstr "Geluidsvoorkeuren"
 msgid "E_nable sound server startup"
 msgstr "S_tarten van geluidsserver inschakelen"
 
+#: capplets/sound/sound-properties.glade.h:2
+#, fuzzy
+msgid "General"
+msgstr "_Algemeen"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1858,34 +1936,51 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Het lettertype intstellen voor de pictogrammen op het bureaublad"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Thema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Achtergrond"
+
+#: capplets/theme-switcher/theme-properties.glade.h:2
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Nu toepassen"
+
+#: capplets/theme-switcher/theme-properties.glade.h:3
+#, fuzzy
+msgid "Controls"
+msgstr "UI Regelaar"
+
+#: capplets/theme-switcher/theme-properties.glade.h:4
+#, fuzzy
+msgid "Icons"
+msgstr "Alleen pictogrammen"
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
 msgid "New themes can also be installed by dragging them into the window."
 msgstr ""
 "Nieuwe thema's kunnen ook geïnstalleerd worden door ze naar het venster te "
 "slepen."
 
-#: capplets/theme-switcher/theme-properties.glade.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:7
 #, fuzzy
 msgid "Theme Preferences"
 msgstr "Gtk+ thema-vookeuren"
 
-#: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
-
-#: capplets/theme-switcher/theme-properties.glade.h:4
+#: capplets/theme-switcher/theme-properties.glade.h:8
 #, fuzzy
-msgid "Window Border Theme"
+msgid "Window Border"
 msgstr "Uiterlijk vensterkader"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Ga naar thema-map"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "Nieuw thema _installeren..."
@@ -2043,30 +2138,57 @@ msgstr ""
 msgid "_Save"
 msgstr "Ge_schaald"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Venstervoorkeuren"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "UI Regelaar"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Type"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Snelheid"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Nu toepassen"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Vensters selecteren wanneer muis eroverheen beweegt"
+msgid "Window Preferences"
+msgstr "Venstervoorkeuren"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Titelbalk-lettertype"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Uiterlijk vensterkader"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Window manager:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Vensters selecteren wanneer muis eroverheen beweegt"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2217,7 +2339,7 @@ msgstr "_Dit bericht niet nogmaals weergeven"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Kon geluidsbestand %s niet laden als sample %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "GConf-sleutel %s ingesteld op type %s maar het verwachte type was %s\n"
@@ -2296,60 +2418,105 @@ msgstr "_Afspelen"
 msgid "Select sound file"
 msgstr "Geluidsbestand selecteren"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Bezig met starten %s\n"
-"(%d seconden over totdat tijdsduur voor deze operatie verstrijkt)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Niet mogelijk de window manager te initialiseren.\n"
-"\tEen andere window manager draait al en kon niet afgesloten worden.\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr ""
+#~ "_Piep als toetsenbord-toegangelijkheid-eigenschappen in- of uitgeschakeld "
+#~ "worden"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Niet mogelijk de window manager te initialiseren.\n"
-"\t'%s' startte niet.\n"
+#~ msgid "Beep when:"
+#~ msgstr "Piepen wanneer:"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Vorige window manager werd niet beëndigd.\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Toetsenbordeigenschappen"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Kon '%s' niet starten.\n"
-"Er wordt teruggevallen op de vorige window manager '%s'\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Beginnen met _bewegen deze tijdsduur na toetsaanslag:"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"De terugval-window manager kon niet gestart worden.\n"
-"Start alstublieft een window manager met de hand.\n"
-"Dit kunt u doen door \"Programma uitvoeren\" te selecteren in\n"
-"het Acties-menu.\n"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "CDE AccessX-bestand _importeren"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "PlakToetsen _uitschakelen indien\n"
+#~ "twee toetsen gelijktijdig ingedrukt worden"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid "msecs"
+#~ msgstr "msec"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Netwerk-voorkeuren"
+
+#, fuzzy
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Pro_xy vereist een gebruikersnaam en wachtwoord."
+
+#~ msgid "_Location:"
+#~ msgstr "_Locatie"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Titelbalk-lettertype"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Uiterlijk vensterkader"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Window manager:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Bezig met starten %s\n"
+#~ "(%d seconden over totdat tijdsduur voor deze operatie verstrijkt)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Niet mogelijk de window manager te initialiseren.\n"
+#~ "\tEen andere window manager draait al en kon niet afgesloten worden.\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Niet mogelijk de window manager te initialiseren.\n"
+#~ "\t'%s' startte niet.\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Vorige window manager werd niet beëndigd.\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Kon '%s' niet starten.\n"
+#~ "Er wordt teruggevallen op de vorige window manager '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "De terugval-window manager kon niet gestart worden.\n"
+#~ "Start alstublieft een window manager met de hand.\n"
+#~ "Dit kunt u doen door \"Programma uitvoeren\" te selecteren in\n"
+#~ "het Acties-menu.\n"
+
+#~ msgid "OK"
+#~ msgstr "OK"
 
 #, fuzzy
 #~ msgid "Add:"
@@ -2588,9 +2755,6 @@ msgstr "OK"
 #~ msgid "Mouse Properties"
 #~ msgstr "Muis-eigenschappen"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "HTTP Proxy instellingen"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Het gebruik van geluid in GNOME configureren"
 
@@ -2907,9 +3071,6 @@ msgstr "OK"
 #~ msgid "Command:"
 #~ msgstr "Opdracht:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Configuratie-opdracht:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Window manager is sessiebeheerd."
 
@@ -2982,9 +3143,6 @@ msgstr "OK"
 #~ msgid "Icons and Text"
 #~ msgstr "Pictogrammen en Tekst"
 
-#~ msgid "Only Icons"
-#~ msgstr "Alleen pictogrammen"
-
 #~ msgid "Only Text"
 #~ msgstr "Alleen Tekst"
 
diff --git a/po/nn.po b/po/nn.po
index 9269dfc69..024d36778 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 1.4.0.1\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-01-27 02:35+0100\n"
 "Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
 "Language-Team: Norwegian/Nynorsk <no@li.org>\n"
@@ -13,19 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 #, fuzzy
 msgid "Select CDE AccessX file"
 msgstr "Vel lydfil"
@@ -48,153 +47,197 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
 #, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "Tasteklikk"
+msgid "Basic"
+msgstr "Flette"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
+msgid "Beep when _modifier is pressed"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
-msgid "E_nable Toggle Keys"
+msgid "Beep when a _feature is turned on or off"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
-msgid "Enable Bo_unce Keys"
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
-msgid "Enable Slo_w Keys"
+msgid "Beep when key is:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
-msgid "Enable _Mouse Keys"
-msgstr ""
+#, fuzzy
+msgid "Del_ay:"
+msgstr "Spel"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
-msgid "Enable _Sticky Keys"
-msgstr ""
+#, fuzzy
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr "Ventetid mellom kvart steg i labyrinten."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Allment"
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+msgid "E_nable Toggle Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
+msgid "Enable Bo_unce Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
-#, fuzzy
-msgid "Keyboard Accessibility Preferences (AccessX)"
-msgstr "Eigenskapar tastatur"
+msgid "Enable Slo_w Keys"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
-msgid "Ma_ximum pointer speed:"
+msgid "Enable _Mouse Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
-msgid ""
-"Only accept keys after they have been pressed and held for a user adjustable "
-"amount of time."
+msgid "Enable _Sticky Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
-msgstr ""
+#, fuzzy
+msgid "Features"
+msgstr "Girhjul"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Eigenskapar tastatur"
+msgid "Filters"
+msgstr "Flamme"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
+msgid ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
-msgstr ""
+#, fuzzy
+msgid "Keyboard Accessibility Preferences (AccessX)"
+msgstr "Eigenskapar tastatur"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
+msgid "Ma_ximum pointer speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Turn the numeric keypad into a mouse control pad."
-msgstr ""
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Mus"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr ""
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Eigenskapar for lyd"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-#, fuzzy
-msgid "_Enable keyboard accessibility"
-msgstr "Tasteklikk"
+msgid ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "Vel lydfil"
+msgid "S_peed:"
+msgstr "Fart"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+msgid "Toggle Keys"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+msgid "_Disable if unused for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
-msgstr ""
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
+msgstr "Tasteklikk"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+msgid "_Import Feature Settings..."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-#, fuzzy
-msgid "msecs"
-msgstr "sekund"
+msgid "_Only accept keys held for:"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
-msgstr ""
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Tastaturrepetisjon"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+msgid "_accepted"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
+msgstr "Fart"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
+msgstr "Deluxe"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "sekund"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
+msgstr "sekund"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "sekund"
 
@@ -257,7 +300,7 @@ msgstr "Vel ikon"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr ""
@@ -541,14 +584,6 @@ msgstr "Forvalde program"
 msgid "Please specify a name and a command for this editor."
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr ""
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr ""
@@ -781,6 +816,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Minimering og maksimering"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1348,23 +1384,28 @@ msgstr ""
 msgid "Window Management"
 msgstr "Sawfish vindaugshandsamar"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 #, fuzzy
 msgid "Action"
 msgstr "Fjell"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 #, fuzzy
 msgid "Shortcut"
 msgstr "Snarveg"
@@ -1393,6 +1434,11 @@ msgstr "Snarveg"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr ""
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 #, fuzzy
 msgid "_Accessibility"
@@ -1465,11 +1511,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Tastaturrepetisjon"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Fart"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 #, fuzzy
 msgid "_Accessibility..."
@@ -1513,56 +1554,56 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Eigenskapar tastatur"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
 "%s"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1693,10 +1734,6 @@ msgstr ""
 msgid "_Threshold:"
 msgstr ""
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Mus"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1712,42 +1749,75 @@ msgstr "Eigenskapar for lyd"
 msgid "Network proxy preferences"
 msgstr "Eigenskapar for lyd"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-#, fuzzy
-msgid "Network Preferences"
-msgstr "Eigenskapar for lyd"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Eigenskapar for lyd"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-#, fuzzy
-msgid "P_ort:"
-msgstr "Punkt:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
+msgid "<b>_Manual proxy configuration</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
+msgid "<b>_Use authentication</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr ""
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Oppsett"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-#, fuzzy
-msgid "_Location:"
-msgstr "Fjell"
+msgid "HTTP Proxy Details"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Eigenskapar for lyd"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "Punkt:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
 msgstr ""
 
+#: capplets/network/gnome-network-preferences.glade.h:12
+#, fuzzy
+msgid "_Details"
+msgstr "Spor"
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+msgid "_FTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+msgid "_HTTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+msgid "_Password:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+msgid "_Secure HTTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Namn:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 #, fuzzy
 msgid "Sound preferences"
@@ -1758,6 +1828,10 @@ msgstr "Eigenskapar for lyd"
 msgid "E_nable sound server startup"
 msgstr "Tillat oppstart av lydtenar"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Allment"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1832,33 +1906,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr ""
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 #, fuzzy
 msgid "Theme"
 msgstr "Gtk+ temaveljar"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Bakgrunn"
+
+#: capplets/theme-switcher/theme-properties.glade.h:2
+msgid "Apply _Font"
+msgstr ""
+
+#: capplets/theme-switcher/theme-properties.glade.h:3
+#, fuzzy
+msgid "Controls"
+msgstr "Korall"
+
+#: capplets/theme-switcher/theme-properties.glade.h:4
+#, fuzzy
+msgid "Icons"
+msgstr "Sekund"
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
 msgid "New themes can also be installed by dragging them into the window."
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:7
 #, fuzzy
 msgid "Theme Preferences"
 msgstr "Eigenskapar for lyd"
 
-#: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
-
-#: capplets/theme-switcher/theme-properties.glade.h:4
+#: capplets/theme-switcher/theme-properties.glade.h:8
 #, fuzzy
-msgid "Window Border Theme"
+msgid "Window Border"
 msgstr "Eigenskapar for lyd"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr ""
 
@@ -2014,33 +2104,58 @@ msgstr ""
 msgid "_Save"
 msgstr "Namn:"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
 #, fuzzy
-msgid "Window Preferences"
-msgstr "Eigenskapar for lyd"
+msgid "Control"
+msgstr "Korall"
+
+#: capplets/windows/gnome-window-properties.c:580
+#, fuzzy
+msgid "Alt"
+msgstr "Maur"
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Hyperkube"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Kule"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
+msgid "To _move windows, click while holding down:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+#, fuzzy
+msgid "Window Preferences"
+msgstr "Eigenskapar for lyd"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-#, fuzzy
-msgid "Titlebar Font"
-msgstr "Filoverføringsprotokoll"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
+msgid "_Raise selected windows after a short time"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-#, fuzzy
-msgid "Window Manager:"
-msgstr "Sawfish vindaugshandsamar"
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 #, fuzzy
@@ -2184,7 +2299,7 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2267,49 +2382,46 @@ msgstr "Spel"
 msgid "Select sound file"
 msgstr "Vel lydfil"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "Tasteklikk"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Eigenskapar tastatur"
 
-#: libwindow-settings/gnome-wm-manager.c:378
 #, fuzzy
-msgid "Previous window manager did not die\n"
-msgstr "Tillat vindaugshandsamar lydhendingar"
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "Vel lydfil"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
+#, fuzzy
+#~ msgid "msecs"
+#~ msgstr "sekund"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Network Preferences"
+#~ msgstr "Eigenskapar for lyd"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr ""
+#, fuzzy
+#~ msgid "_Location:"
+#~ msgstr "Fjell"
+
+#, fuzzy
+#~ msgid "Titlebar Font"
+#~ msgstr "Filoverføringsprotokoll"
+
+#, fuzzy
+#~ msgid "Window Manager:"
+#~ msgstr "Sawfish vindaugshandsamar"
+
+#, fuzzy
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Tillat vindaugshandsamar lydhendingar"
 
 #, fuzzy
 #~ msgid "Add:"
@@ -2320,10 +2432,6 @@ msgstr ""
 #~ msgstr "Kategori"
 
 #, fuzzy
-#~ msgid "_Delete"
-#~ msgstr "Deluxe"
-
-#, fuzzy
 #~ msgid "_Name"
 #~ msgstr "Namn:"
 
@@ -2550,10 +2658,6 @@ msgstr ""
 #~ msgstr "Kommando:"
 
 #, fuzzy
-#~ msgid "Configuration Command:"
-#~ msgstr "Oppsett"
-
-#, fuzzy
 #~ msgid "Edit Window Manager"
 #~ msgstr "Sawfish vindaugshandsamar"
 
@@ -2852,9 +2956,6 @@ msgstr ""
 #~ "pikslane i deirabane. Etterpå, etterkvart som dei passerar over dei endra "
 #~ "pikslane, vert måten dei oppfører seg på endra."
 
-#~ msgid "Ant"
-#~ msgstr "Maur"
-
 #~ msgid "Number of colours"
 #~ msgstr "Tal på fargar"
 
@@ -2900,10 +3001,6 @@ msgstr ""
 #~ msgstr "Sproing (GL)"
 
 #, fuzzy
-#~ msgid "Tails"
-#~ msgstr "Spor"
-
-#, fuzzy
 #~ msgid "Blaster"
 #~ msgstr "Raskare"
 
@@ -2934,9 +3031,6 @@ msgstr ""
 #~ msgid "Use red/blue 3d seperation."
 #~ msgstr "Bruk raud/blå 3d-separasjon."
 
-#~ msgid "Braid"
-#~ msgstr "Flette"
-
 #~ msgid "BSOD"
 #~ msgstr "BSOD"
 
@@ -2964,9 +3058,6 @@ msgstr ""
 #~ msgid "Compass"
 #~ msgstr "Kompass"
 
-#~ msgid "Coral"
-#~ msgstr "Korall"
-
 #~ msgid "Denser"
 #~ msgstr "Tettare"
 
@@ -3060,9 +3151,6 @@ msgstr ""
 #~ msgid "Epicycle"
 #~ msgstr "Episyklus"
 
-#~ msgid "Seconds"
-#~ msgstr "Sekund"
-
 #, fuzzy
 #~ msgid ""
 #~ "This program draws the path traced out by a point on the edge of a "
@@ -3115,9 +3203,6 @@ msgstr ""
 #~ msgid "Galaxy"
 #~ msgstr "Galakse"
 
-#~ msgid "Gears"
-#~ msgstr "Girhjul"
-
 #, fuzzy
 #~ msgid "GLText"
 #~ msgstr "Venstre"
@@ -3170,10 +3255,6 @@ msgstr ""
 #~ msgid "Number of pixels before a color change."
 #~ msgstr "Tal på pikslar før fargeendring."
 
-#, fuzzy
-#~ msgid "Hyperball"
-#~ msgstr "Hyperkube"
-
 #~ msgid "Closer"
 #~ msgstr "Nærmare"
 
@@ -3274,9 +3355,6 @@ msgstr ""
 #~ msgid "Delay between drawing the maze and starting the solution."
 #~ msgstr "Ventetid mellom oppteikning av labyrinten og oppstart av løysing."
 
-#~ msgid "Delay between each step in the maze."
-#~ msgstr "Ventetid mellom kvart steg i labyrinten."
-
 #~ msgid "Delay between finishing the maze and starting a new one."
 #~ msgstr "Ventetid mellom labyrinten er ferdig og oppstart for ny."
 
@@ -3458,9 +3536,6 @@ msgstr ""
 #~ msgid "SpeedMine"
 #~ msgstr "Fart"
 
-#~ msgid "Sphere"
-#~ msgstr "Kule"
-
 #~ msgid "Spiral"
 #~ msgstr "Spiral"
 
diff --git a/po/no.po b/po/no.po
index eb1a21277..7a4f55a18 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 1.5.8\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-10-21 12:18+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -13,19 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Det oppsto en feil under oppstart av tastaturdialogen : %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Kan ikke importere innstillinger for AccessX fra fil «%s»"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Velg AccessX-fil for CDE"
 
@@ -48,51 +47,89 @@ msgstr ""
 "tastaturtilgjengelighet vil ikke virke."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Pip en gang når en LED slås på og to ganger når en slås av."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "_Pip ved aktivering/deaktivering av tilgjengelighet for tastatur"
+msgid "Basic"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Pip når tast er a_vvist"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Pip når:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "_Pip når endringstast trykkes ned"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "Pip en gang når en LED slås på og to ganger når en slås av."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Pip når tast er a_vvist"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Pause:"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 msgid "E_nable Toggle Keys"
 msgstr "Aktiver _BryterTaster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 msgid "Enable Bo_unce Keys"
 msgstr "Aktiver B_ounce Keys"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Aktiver tre_ge taster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Aktiver _mustaster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Aktiver _klebrige taster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Generelt"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "_Fil"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#, fuzzy
+msgid "I_gnore duplicate keypresses within:"
 msgstr "I_gnorer tastaturtrykk innen:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -100,15 +137,25 @@ msgstr ""
 "Ignorer alle etterfølgende trykk på SAMME tast hvis de skjer innenfor en "
 "tidsramme som kan bestemmes av brukeren."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Brukervalg for tastaturtilgjengelighet (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 msgid "Ma_ximum pointer speed:"
 msgstr "Ma_ksimal pekerhastighet:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Mus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Brukervalg for mus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -116,86 +163,90 @@ msgstr ""
 "Aksepterer bare taster etter at de trykkes og holdes nede i et "
 "brukerjusterbart intervall."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
 msgstr ""
 "Utfør flere samtidige tastetrykk ved å holde nede endringstaster i sekvens."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-msgid "Repeat Key Pre_ferences..."
-msgstr "Bruker_valg for tasterepetering..."
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
-msgstr "Tid før be_vegelse starter etter tastetrykk:"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Testområde"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr "_Hastighet:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#, fuzzy
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Tid før akse_llerasjon til maks hastighet:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Slå av/på repetering av tastetrykk"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Aktiver _BryterTaster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Endre det numeriske tastaturet til å kontrollere musen."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr "_Pip når endringstast trykkes ned"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
+#, fuzzy
+msgid "_Disable if unused for:"
 msgstr "_Deaktiver hvis ubrukt i "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "Aktiv_er tilgjengelighet for tastatur"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-msgid "_Import CDE AccessX file..."
-msgstr "_Importer AccessX-fil fra CDE..."
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
+#, fuzzy
+msgid "_Only accept keys held for:"
 msgstr "_Kun aksepter tastetrykk etter:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Repeteringstaster"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"Slå av klebrige taster når\n"
-"to taster trykkes samtidig"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "tast er _akseptert"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "tast er _nedtrykt"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "tast er _avvist"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "millisekunder"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "sekunder"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "piksler/sek"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "sekunder"
 
@@ -250,7 +301,7 @@ msgstr "Velg _bilde:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Hent og lagre gamle innstillinger"
@@ -546,14 +597,6 @@ msgid "Please specify a name and a command for this editor."
 msgstr ""
 "Vennligst spesifiser et navn og en kommando for dette redigeringsprogrammet."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Go_dtar URLer"
@@ -761,6 +804,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Minimering og maksimering"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1291,12 +1335,17 @@ msgstr "Skrivebord"
 msgid "Window Management"
 msgstr "Vindushåndtering"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Feil under setting av ny snarvei i konfigurasjonsdatabasen: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1304,11 +1353,11 @@ msgstr ""
 "Kan ikke finne tastaturtema. Dette betyr at din GTK+-installasjon ikke er "
 "komplett."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Handling"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Snarvei"
 
@@ -1333,6 +1382,11 @@ msgstr "_Snarveier for redigering av tekst:"
 msgid "Assign shortcut keys to commands"
 msgstr "Tilegn snarveitaster til kommandoer"
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Det oppsto en feil under oppstart av tastaturdialogen : %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Tilgjengelighet"
@@ -1399,10 +1453,6 @@ msgstr "Klikk ved tastetrykk"
 msgid "Repeat Keys"
 msgstr "Repeteringstaster"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr "_Hastighet:"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Tilgjengelighet..."
@@ -1439,7 +1489,7 @@ msgstr "stille"
 msgid "Set your keyboard preferences"
 msgstr "Sett dine brukervalg for tastatur"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1448,7 +1498,7 @@ msgstr ""
 "<b>Ukjent markør</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1456,7 +1506,7 @@ msgstr ""
 "<b>Forvalgt markør - Aktiv</b>\n"
 "Standardmarkør som følger med X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1464,7 +1514,7 @@ msgstr ""
 "<b>Forvalgt markør</b>\n"
 "Standardmarkør som følger med X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1472,7 +1522,7 @@ msgstr ""
 "<b>Hvit markør - Aktiv</b>\n"
 "Omvendt versjon av standardmarkør"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1480,7 +1530,7 @@ msgstr ""
 "<b>Hvit markør</b>\n"
 "Omvendt standardmarkør"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1488,7 +1538,7 @@ msgstr ""
 "<b>Stor markør - Aktiv</b>\n"
 "Stor versjon av standardmarkør"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1496,7 +1546,7 @@ msgstr ""
 "<b>Stor markør</b>\n"
 "Stor versjon av standardmarkør"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1504,7 +1554,7 @@ msgstr ""
 "<b>Stor hvit markør - Aktiv</b>\n"
 "Stor versjon av hvit markør"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1637,10 +1687,6 @@ msgstr "Vi_s markørposisjonen når Ctrl-tasten trykkes ned"
 msgid "_Threshold:"
 msgstr "_Terskel:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Mus"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Sett dine brukervalg for mus"
@@ -1653,38 +1699,80 @@ msgstr "Nettverksproxy"
 msgid "Network proxy preferences"
 msgstr "Brukervalg for nettverksproxy"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Brukervalg for nettverk"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Brukervalg for nettverksproxy"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "Pass_ord:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "Pro_xy krever brukernavn og passord"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "Bruker_navn:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Konfigurasjonskommando:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "P_lassering"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Innstillinger for HTTP-proxy"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Brukervalg for nettverksproxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+#, fuzzy
+msgid "_Details"
+msgstr "De_taljer..."
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "Br_uk HTTP-proxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "Br_uk HTTP-proxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "Pass_ord:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "Br_uk HTTP-proxy"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Bruker_navn:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Brukervalg for lyd"
@@ -1693,6 +1781,10 @@ msgstr "Brukervalg for lyd"
 msgid "E_nable sound server startup"
 msgstr "Slå på oppstart av lydtje_ner"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Generelt"
+
 #: capplets/sound/sound-properties.glade.h:3
 msgid "Sound Events"
 msgstr "Lydhendelser"
@@ -1763,30 +1855,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Velg tema for forskjellige deler av skrivebordet"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Tema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Nye tema kan også installeres ved å dra dem inn i vinduet."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Bakgrunn"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-msgid "Theme Preferences"
-msgstr "Brukervalg for tema"
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Aktiver nå"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr "Tema for widget"
+#, fuzzy
+msgid "Controls"
+msgstr "UI-kontroll"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
-msgid "Window Border Theme"
-msgstr "Tema for vinduskant"
+#, fuzzy
+msgid "Icons"
+msgstr "Kun ikoner"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Nye tema kan også installeres ved å dra dem inn i vinduet."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+msgid "Theme Preferences"
+msgstr "Brukervalg for tema"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Tema for vinduskant"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Gå til temamappen"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "_Installer nytt tema..."
 
@@ -1932,30 +2042,58 @@ msgstr "A_vslutt"
 msgid "_Save"
 msgstr "_Lagre"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Brukervalg for vinduer"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "UI-kontroll"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Type"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Hastighet"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Aktiver nå"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Velg vinduer når musen beveger seg over dem"
+msgid "Window Preferences"
+msgstr "Brukervalg for vinduer"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Skrift for tittellinjen"
+#, fuzzy
+msgid "_Double-click window titles to:"
+msgstr "Skrift for _vindutittel:"
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Utseende for vinduskant"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Vindushåndterer:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Velg vinduer når musen beveger seg over dem"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2102,7 +2240,7 @@ msgstr "_Ikke vis denne meldingen igjen"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Kunne ikke laste lydfil %s som sample %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "GConf-nøkkel %s satt til type %s men forventet type var %s\n"
@@ -2181,60 +2319,107 @@ msgstr "S_pill"
 msgid "Select sound file"
 msgstr "Velg lydfil"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Starter %s\n"
-"(%d sekunder gjenstår før tidsavbrudd for operasjonen)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Kan ikke initiere vindushåndterer.\n"
-"\tEn annen vindushåndterer kjørere allerede og kunne ikke termineres\n"
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "_Pip ved aktivering/deaktivering av tilgjengelighet for tastatur"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Kan ikke initiere vindushåndterer.\n"
-"\t«%s» startet ikke\n"
+#~ msgid "Beep when:"
+#~ msgstr "Pip når:"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Tidligere vindushåndterer terminerte ikke\n"
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Bruker_valg for tasterepetering..."
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Kunne ikke starte «%s».\n"
-"Faller tilbake til tidligere vindushåndterer «%s»\n"
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Tid før be_vegelse starter etter tastetrykk:"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Kunne ikke starte gammel vindushåndterer.\n"
-"Vennligst start en vindushåndterer manuelt. Du kan\n"
-"gjøre dette ved å velge «Kjør program» fra menyen\n"
-"«Handlinger»\n"
+#~ msgid "Testing Area"
+#~ msgstr "Testområde"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Slå av/på repetering av tastetrykk"
+
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Importer AccessX-fil fra CDE..."
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "Slå av klebrige taster når\n"
+#~ "to taster trykkes samtidig"
+
+#~ msgid "msecs"
+#~ msgstr "millisekunder"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Brukervalg for nettverk"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Pro_xy krever brukernavn og passord"
+
+#~ msgid "_Location:"
+#~ msgstr "P_lassering"
+
+#~ msgid "Widget Theme"
+#~ msgstr "Tema for widget"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Skrift for tittellinjen"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Utseende for vinduskant"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Vindushåndterer:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Starter %s\n"
+#~ "(%d sekunder gjenstår før tidsavbrudd for operasjonen)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Kan ikke initiere vindushåndterer.\n"
+#~ "\tEn annen vindushåndterer kjørere allerede og kunne ikke termineres\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Kan ikke initiere vindushåndterer.\n"
+#~ "\t«%s» startet ikke\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Tidligere vindushåndterer terminerte ikke\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Kunne ikke starte «%s».\n"
+#~ "Faller tilbake til tidligere vindushåndterer «%s»\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Kunne ikke starte gammel vindushåndterer.\n"
+#~ "Vennligst start en vindushåndterer manuelt. Du kan\n"
+#~ "gjøre dette ved å velge «Kjør program» fra menyen\n"
+#~ "«Handlinger»\n"
+
+#~ msgid "OK"
+#~ msgstr "OK"
 
 #~ msgid "_General"
 #~ msgstr "_Generelt"
@@ -2515,9 +2700,6 @@ msgstr "OK"
 #~ msgid "Mouse Properties"
 #~ msgstr "Egenskaper for mus"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Innstillinger for HTTP-proxy"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Konfigurér bruk av lyd i GNOME."
 
@@ -2805,9 +2987,6 @@ msgstr "OK"
 #~ msgid "Command:"
 #~ msgstr "Kommando:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Konfigurasjonskommando:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Vindushåndtereren er sesjonshåndtert"
 
@@ -2847,9 +3026,6 @@ msgstr "OK"
 #~ msgid "Icons and Text"
 #~ msgstr "Ikoner og tekst"
 
-#~ msgid "Only Icons"
-#~ msgstr "Kun ikoner"
-
 #~ msgid "Only Text"
 #~ msgstr "Kun tekst"
 
diff --git a/po/pl.po b/po/pl.po
index 44ca10dee..6d4c40e7e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-07-15 13:11+0200\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -17,19 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Przy uruchamianiu apletu klawiatury wystąpił błąd: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Nie można zaimportować ustawień AccessX z pliku \"%s\""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Wybór pliku CDE AccessX"
 
@@ -50,57 +49,93 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
-"Powoduje użycie sygnału dźwiękowego przy zapalaniu diody i dwóch sygnałów "
-"przy gaśnięciu."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "_Sygnał dźwiękowy przy przełączaniu _dostępności klawiatury"
+msgid "Basic"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Sygnał dźwiękowy przy o_drzuceniu klawisza"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Sygnał dźwiękowy przy:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "Sygnał dźwiękowy przy przyciśnięciu _modyfikatora"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr ""
+"Powoduje użycie sygnału dźwiękowego przy zapalaniu diody i dwóch sygnałów "
+"przy gaśnięciu."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Sygnał dźwiękowy przy o_drzuceniu klawisza"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Opóźnienie (sek):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Klawisze prz_ełączające"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Od_skakujące klawisze"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Po_wolne klawisze"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "_Emulacja myszy"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Klawisze _trwałe"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Ogólne"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "_Plik"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Ignorowanie przyciśnięć klawiszy przez :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -108,17 +143,27 @@ msgstr ""
 "Ignoruje kolejne przyciśnięcia tego samego klawisza, jeśli będą one miały "
 "miejsce w podanym okresie czasu."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Konfiguracja dostępności klawiatury (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Ma_ksymalna szybkość wskaźnika :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Mysz"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Preferencje myszy"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -126,7 +171,7 @@ msgstr ""
 "Akceptuje przyciśnięcia klawiszy, tylko, jeśli są przyciśnięte co najmniej "
 "przez podany okres czasu."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -134,88 +179,86 @@ msgstr ""
 "Umożliwia wiele jednoczesnych przyciśnięć klawiszy poprzez sekwencyjne "
 "przyciśnięcie klawiszy modyfikatorów."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Ustawienia powtarzanych klawiszy"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "Rozpoczęcie przemieszczania po odczekaniu po przyciśnięciu klawisza :"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Obszar testów"
+msgid "S_peed:"
+msgstr "Szybkość"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "_Czas przyspieszania do maksymalnej prędkości :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Przełączanie i powtarzanie klawiszy"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Klawisze prz_ełączające"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 "Powoduje przekształcenie bloku klawiszy numerycznych w blok sterowania "
 "wskaźnikiem myszy."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "Sygnał dźwiękowy przy przyciśnięciu _modyfikatora"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "U_nieaktywnienie jeśli nie używane przez "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
 #, fuzzy
-msgid "_Enable keyboard accessibility"
+msgid "_Enable keyboard accessibility features"
 msgstr "Ustawienia dostępności klawiatury"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "Za_importuj plik CDE AccessX"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "Akc_eptowanie przyciśnięć klawiszy dopiero po :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Częstotliwość powtarzania"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"Unieaktywnienie klawiszy trwałych\n"
-"po jednoczesnym przyciśnięciu dwóch klawiszy"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "_akceptacji klawisza"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "p_rzyciśnięciu klawisza"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "_odrzuceniu klawisza"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "ms"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "sekund"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "pikseli/s"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "sekund"
 
@@ -270,7 +313,7 @@ msgstr "Wybierz _obraz:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Pobiera i zapisuje tradycyjne ustawienia"
@@ -554,14 +597,6 @@ msgstr "Wybór domyślnych aplikacji"
 msgid "Please specify a name and a command for this editor."
 msgstr "Wprowadź nazwę edytora i uruchamiające go polecenie."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Obsługuje _URL-e"
@@ -771,6 +806,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Minimalizacja i maksymalizacja"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1326,14 +1362,19 @@ msgstr "Biurko"
 msgid "Window Management"
 msgstr "Zarządzanie oknami"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Przy ustawianiu nowego akceleratora w bazie danych konfiguracji wystąpił "
 "błąd: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1341,11 +1382,11 @@ msgstr ""
 "Nie można odnaleźć żadnych motywów klawiszowych. Oznacza to, że instalacja "
 "GTK+ jest niekompletna."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Czynność"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Skrót"
 
@@ -1370,6 +1411,11 @@ msgstr "Skróty klawiszowe _redagowania tekstu:"
 msgid "Assign shortcut keys to commands"
 msgstr "Powiązania skrótów klawiszowych z poleceniami"
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Przy uruchamianiu apletu klawiatury wystąpił błąd: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Dostępność"
@@ -1438,11 +1484,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Częstotliwość powtarzania"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Szybkość"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Dostępność..."
@@ -1483,7 +1524,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Ustawienia klawiatury"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1492,7 +1533,7 @@ msgstr ""
 "<b>Nieznany wskaźnik</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1500,7 +1541,7 @@ msgstr ""
 "<b>Domyślny wskaźnik - bieżący</b>\n"
 "Domyślny wskaźnik dostarczany z X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1508,7 +1549,7 @@ msgstr ""
 "<b>Domyślny wskaźnik</b>\n"
 "Domyślny wskaźnik dostarczany z X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1516,7 +1557,7 @@ msgstr ""
 "<b>Biały wskaźnik - bieżący</b>\n"
 "Domyślny wskaźnik poddany inwersji"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1524,7 +1565,7 @@ msgstr ""
 "<b>Biały wskaźnik</b>\n"
 "Domyślny wskaźnik poddany inwersji"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1532,7 +1573,7 @@ msgstr ""
 "<b>Duży wskaźnik - bieżący</b>\n"
 "Duża odmiana zwykłego wskaźnika"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1540,7 +1581,7 @@ msgstr ""
 "<b>Duży wskaźnik</b>\n"
 "Duża odmiana zwykłego wskaźnika"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1548,7 +1589,7 @@ msgstr ""
 "<b>Duży biały wskaźnik - bieżący</b>\n"
 "Duża odmiana białego wskaźnika"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1685,10 +1726,6 @@ msgstr "_Wyświetlanie pozycji wskaźnika po przyciśnięciu klawisza Control"
 msgid "_Threshold:"
 msgstr "Prz_esunięcie progowe:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Mysz"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Ustawienia myszy"
@@ -1703,38 +1740,77 @@ msgstr "Pośrednik sieciowy"
 msgid "Network proxy preferences"
 msgstr "Ustawienia pośrednika sieciowego"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Ustawienia sieci"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Ustawienia pośrednika sieciowego"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "Ha_sło:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "Pośrednik _wymaga nazwy użytkownika i hasła"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "_Nazwa użytkownika:"
+msgid "Autoconfiguration _URL:"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Położenie:"
+msgid "HTTP Proxy Details"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Ustawienia pośrednika sieciowego"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "_Użycie pośrednika HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Użycie pośrednika HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "Ha_sło:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "_Użycie pośrednika HTTP"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "_Nazwa użytkownika:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Ustawienia dźwięku"
@@ -1743,6 +1819,10 @@ msgstr "Ustawienia dźwięku"
 msgid "E_nable sound server startup"
 msgstr "_Uruchamianie serwera dźwięku"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Ogólne"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1814,31 +1894,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Wybór motywów różnych części środowiska"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Motyw"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Nowe motywy można również instalować przeciągając je do tego okna."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Tło"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-msgid "Theme Preferences"
-msgstr "Ustawienia motywu"
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Zastosuj teraz"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Kontrolujący obiekt"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Wygląd krawędzi okna"
+msgid "Icons"
+msgstr "Tylko ikony"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Nowe motywy można również instalować przeciągając je do tego okna."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+msgid "Theme Preferences"
+msgstr "Ustawienia motywu"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Wygląd krawędzi okna"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Przejdź do folderu z motywem"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "Za_instaluj nowy motyw..."
 
@@ -1995,30 +2092,57 @@ msgstr ""
 msgid "_Save"
 msgstr "Prze_skalowany"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Preferencje okna"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Kontrolujący obiekt"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Typ"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Szybkość"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Zastosuj teraz"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Zaznaczanie okna po umieszczeniu wskaźnika nad jego obszarem"
+msgid "Window Preferences"
+msgstr "Preferencje okna"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Czcionka paska tytułowego"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Wygląd krawędzi okna"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Menedżer okien:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Zaznaczanie okna po umieszczeniu wskaźnika nad jego obszarem"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2167,7 +2291,7 @@ msgstr "_Nie wyświetlaj więcej tego komunikatu"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Nie można wczytać pliku dźwiękowego %s jako próbki %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2250,60 +2374,109 @@ msgstr "_Odtwórz"
 msgid "Select sound file"
 msgstr "Wybór pliku dźwiękowego"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Uruchamianie %s\n"
-"(pozostało %d sekund do upłynięcia czasu przeznaczonego na wykonanie "
-"operacji)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Nie można zainicjować menedżera okien.\n"
-"\tMenedżer okien jest już uruchomiony i nie może zostać zamknięty\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "_Sygnał dźwiękowy przy przełączaniu _dostępności klawiatury"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Nie można zainicjować menedżera okien.\n"
-"\t'%s' nie został uruchomiony\n"
+#~ msgid "Beep when:"
+#~ msgstr "Sygnał dźwiękowy przy:"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Poprzedni menedżer okien nie został zakończony\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Ustawienia powtarzanych klawiszy"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Nie można uruchomić '%s'.\n"
-"Powrót do poprzedniego menedżera okien '%s'.\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr ""
+#~ "Rozpoczęcie przemieszczania po odczekaniu po przyciśnięciu klawisza :"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Nie można uruchomić poprzedniego menedżera okien.\n"
-"Należy samodzielnie uruchomić menedżera okien\n"
-"(na przykład wybierając \"Wykonaj polecenie\" z menu głównego).\n"
-
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid "Testing Area"
+#~ msgstr "Obszar testów"
+
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Przełączanie i powtarzanie klawiszy"
+
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "Za_importuj plik CDE AccessX"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "Unieaktywnienie klawiszy trwałych\n"
+#~ "po jednoczesnym przyciśnięciu dwóch klawiszy"
+
+#~ msgid "msecs"
+#~ msgstr "ms"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Ustawienia sieci"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Pośrednik _wymaga nazwy użytkownika i hasła"
+
+#~ msgid "_Location:"
+#~ msgstr "_Położenie:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Czcionka paska tytułowego"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Wygląd krawędzi okna"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Menedżer okien:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Uruchamianie %s\n"
+#~ "(pozostało %d sekund do upłynięcia czasu przeznaczonego na wykonanie "
+#~ "operacji)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Nie można zainicjować menedżera okien.\n"
+#~ "\tMenedżer okien jest już uruchomiony i nie może zostać zamknięty\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Nie można zainicjować menedżera okien.\n"
+#~ "\t'%s' nie został uruchomiony\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Poprzedni menedżer okien nie został zakończony\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Nie można uruchomić '%s'.\n"
+#~ "Powrót do poprzedniego menedżera okien '%s'.\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Nie można uruchomić poprzedniego menedżera okien.\n"
+#~ "Należy samodzielnie uruchomić menedżera okien\n"
+#~ "(na przykład wybierając \"Wykonaj polecenie\" z menu głównego).\n"
+
+#~ msgid "OK"
+#~ msgstr "OK"
 
 #~ msgid "_Category"
 #~ msgstr "_Kategoria"
diff --git a/po/pt.po b/po/pt.po
index 714e6c189..3dce9c5e0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-06-15 21:20+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -14,19 +14,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, fuzzy, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Ocorreu um erro ao mostrar a ajuda: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Incapaz de importar definições AccessX do ficheiro '%s'"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Seleccione ficheiro AccessX CDE"
 
@@ -48,56 +47,91 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Beep quando um LED é ligado e dois beeps quando é desligado."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "Emitir beep ao activar/desactivar acessibilidade de teclado"
+msgid "Basic"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
 #, fuzzy
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr "tecla é re_jeitada"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Bipar quando:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "B_ipar quando o modificar for primido"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "Beep quando um LED é ligado e dois beeps quando é desligado."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "tecla é re_jeitada"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Atraso (seg):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Activar _Alternar Teclas"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Activar Teclas_Saltantes"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Activar Teclas Le_ntas"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Activar Teclas _Rato"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Activar Teclas _Coladas"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Geral"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "Filters"
+msgstr "_Ficheiro"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#, fuzzy
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Ignorar pressões de tecla em :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -105,17 +139,27 @@ msgstr ""
 "Ignorar pressões subsequentes da MESMA tecla caso ocorram dentro de um "
 "período de tempo definido pelo utilizador."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Configuração de Acessibilidade de Teclado (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Velocidade má_xima cursor :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Rato"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Preferências Rato"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -123,7 +167,7 @@ msgstr ""
 "Apenas aceitar teclas após serem mantidas primidas por uma quantidade de "
 "tempo ajustável."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -131,85 +175,84 @@ msgstr ""
 "Executar múltiplas operações de pressão de teclas primindo teclas "
 "modificadoras em sequência."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Preferências do Teclado"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "Começar a mover esta distância após pressão da tecla :"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr ""
+msgid "S_peed:"
+msgstr "Velocidade"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Tempo para _acelarar para a velocidade máxima :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr ""
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Activar _Alternar Teclas"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Transformar o teclado numérico num controlo de rato."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "B_ipar quando o modificar for primido"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Desactivar se inutilizado por "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Activar acessibilidade de teclado"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "_Importar ficheiro CDE AccessX"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "Apenas aceitar pressões de teclad_o após :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Rácio Repetição"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"Desligar TeclasColadas quando\n"
-"duas teclas são primidas simultaneamente"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "tecla é _aceite"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "tecla é _primida"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "tecla é _rejeitada"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "mseg"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "segundos"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "pixels/seg"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "segundos"
 
@@ -270,7 +313,7 @@ msgstr "_Seleccione um Editor:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Recuperar e armazenar configurações obsoletas"
@@ -568,14 +611,6 @@ msgstr "Aplicações Defeito"
 msgid "Please specify a name and a command for this editor."
 msgstr "Especifique um nome e um comando para este editor."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Ac_eita URLs"
@@ -785,6 +820,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Minimizar e Maximizar"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1349,12 +1385,17 @@ msgstr "Ambiente Trabalho"
 msgid "Window Management"
 msgstr "Gestão de Janelas"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Erro ao definir novo atalho na base de dados de configuração: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1362,11 +1403,11 @@ msgstr ""
 "Incapaz de encontrar temas de teclado. Isto significa que a sua instalação "
 "do GTK+ foi incompleta."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Acção"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Atalho"
 
@@ -1392,6 +1433,11 @@ msgstr "_Atalhos ambiente trabalho:"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, fuzzy, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Ocorreu um erro ao mostrar a ajuda: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Acessibilidade"
@@ -1461,11 +1507,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Rácio Repetição"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Velocidade"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Acessibilidade..."
@@ -1507,7 +1548,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Preferências do Teclado"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1516,7 +1557,7 @@ msgstr ""
 "<b>Cursor Desconhecido</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1524,7 +1565,7 @@ msgstr ""
 "<b>Cursor Defeito - Actual</b>\n"
 "O cursor de defeito que vem com o X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1532,7 +1573,7 @@ msgstr ""
 "<b>Cursor Defeito</b>\n"
 "O cursor de defeito que vem com o X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1540,7 +1581,7 @@ msgstr ""
 "<b>Cursor Branco - Actual</b>\n"
 "O cursor de defeito invertido"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1548,7 +1589,7 @@ msgstr ""
 "<b>Cursor Branco</b>\n"
 "O cursor de defeito invertido"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1556,7 +1597,7 @@ msgstr ""
 "<b>Cursor Grande - Actual</b>\n"
 "Versão grande do cursor normal"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1564,7 +1605,7 @@ msgstr ""
 "<b>Cursor Grande</b>\n"
 "Versão grande do cursor normal"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1572,7 +1613,7 @@ msgstr ""
 "<b>Cursor Branco Grande - Actual</b>\n"
 "Versão grande do cursor branco"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1707,10 +1748,6 @@ msgstr "Mo_strar posição do cursor quando a tecla de Control estiver primida"
 msgid "_Threshold:"
 msgstr "_Espera:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Rato"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1726,40 +1763,79 @@ msgstr "Rede"
 msgid "Network proxy preferences"
 msgstr "Preferências de Rede"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Preferências de Rede"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Preferências de Rede"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_orto:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "Sen_ha:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-#, fuzzy
-msgid "Pro_xy requires username and password"
-msgstr "Pro_xy requer um utilizador e senha"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "Utili_zador:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Comando de Configuração:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Localização:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Definições Proxy HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Preferências de Rede"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_orto:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
 msgstr "_Utilizar proxy HTTP"
 
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Utilizar proxy HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "Sen_ha:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "_Utilizar proxy HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Utili_zador:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Preferências de som"
@@ -1768,6 +1844,10 @@ msgstr "Preferências de som"
 msgid "E_nable sound server startup"
 msgstr "Activar arra_nque do servidor de som"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Geral"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1842,32 +1922,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Define a fonte dos ícones no ambiente de trabalho"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Tema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Novos temas também podem ser instalados arrastando-os para a janela."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Fundo"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
 #, fuzzy
-msgid "Theme Preferences"
-msgstr "Preferências Tema Gtk+"
+msgid "Apply _Font"
+msgstr "Aplicar Agora"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Controlo IU"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Aparência da Margem Janela"
+msgid "Icons"
+msgstr "Apenas Ícones"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Novos temas também podem ser instalados arrastando-os para a janela."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+#, fuzzy
+msgid "Theme Preferences"
+msgstr "Preferências Tema Gtk+"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Aparência da Margem Janela"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "Ir _para a pasta dos temas..."
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "_Instalar novo tema..."
@@ -2025,30 +2122,57 @@ msgstr ""
 msgid "_Save"
 msgstr "E_scalada"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Preferências Janela"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Controlo IU"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Tipo"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Velocidade"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Aplicar Agora"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Seleccionar as janelas quando o rato se move sobre elas"
+msgid "Window Preferences"
+msgstr "Preferências Janela"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Fonte de Barra Título"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Aparência da Margem Janela"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Gestor de Janelas:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Seleccionar as janelas quando o rato se move sobre elas"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2195,7 +2319,7 @@ msgstr "_Não mostrar esta mensagem novamente"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Incapaz de ler ficheiro de som %s como amostra %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "have GConf %s definida como tipo %s mas o tipo esperado era %s\n"
@@ -2275,60 +2399,103 @@ msgstr "_Tocar"
 msgid "Select sound file"
 msgstr "Seleccione ficheiro de som"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"A iniciar %s\n"
-"(restam %d segundos antes da operação expirar)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Incapaz de inicializar gestor de janelas.\n"
-"\tOutro gestor de janelas está a correr e não pode ser morto\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "Emitir beep ao activar/desactivar acessibilidade de teclado"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Incapaz de inicializar gestor de janelas.\n"
-"\t'%s' não arrancou\n"
+#~ msgid "Beep when:"
+#~ msgstr "Bipar quando:"
+
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Preferências do Teclado"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Gestor de janelas anterior não morreu\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Começar a mover esta distância após pressão da tecla :"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Incapaz de iniciar '%s'.\n"
-"A regressar ao gestor de janelas anterior '%s'\n"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Importar ficheiro CDE AccessX"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Incapaz de iniciar gestor de janelas de recurso.\n"
-"Execute um gestor de janelas manualmente. Pode\n"
-"faze-lo seleccionando \"Executar Aplicação\" no\n"
-"menu do pé\n"
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "Desligar TeclasColadas quando\n"
+#~ "duas teclas são primidas simultaneamente"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid "msecs"
+#~ msgstr "mseg"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Preferências de Rede"
+
+#, fuzzy
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Pro_xy requer um utilizador e senha"
+
+#~ msgid "_Location:"
+#~ msgstr "_Localização:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Fonte de Barra Título"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Aparência da Margem Janela"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Gestor de Janelas:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "A iniciar %s\n"
+#~ "(restam %d segundos antes da operação expirar)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Incapaz de inicializar gestor de janelas.\n"
+#~ "\tOutro gestor de janelas está a correr e não pode ser morto\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Incapaz de inicializar gestor de janelas.\n"
+#~ "\t'%s' não arrancou\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Gestor de janelas anterior não morreu\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Incapaz de iniciar '%s'.\n"
+#~ "A regressar ao gestor de janelas anterior '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Incapaz de iniciar gestor de janelas de recurso.\n"
+#~ "Execute um gestor de janelas manualmente. Pode\n"
+#~ "faze-lo seleccionando \"Executar Aplicação\" no\n"
+#~ "menu do pé\n"
+
+#~ msgid "OK"
+#~ msgstr "OK"
 
 #, fuzzy
 #~ msgid "Add:"
@@ -2563,9 +2730,6 @@ msgstr "OK"
 #~ msgid "Mouse Properties"
 #~ msgstr "Propriedades do Rato"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Definições Proxy HTTP"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Configurar a utilização de som pelo GNOME"
 
@@ -2882,9 +3046,6 @@ msgstr "OK"
 #~ msgid "Command:"
 #~ msgstr "Comando:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Comando de Configuração:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Gestor de janelas é gerido pela sessão"
 
@@ -2957,9 +3118,6 @@ msgstr "OK"
 #~ msgid "Icons and Text"
 #~ msgstr "Ícones e Texto"
 
-#~ msgid "Only Icons"
-#~ msgstr "Apenas Ícones"
-
 #~ msgid "Only Text"
 #~ msgstr "Apenas Texto"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6ecfeb690..aa5a1b62a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 1.5.6\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-09-04 19:06-0300\n"
 "Last-Translator: Gustavo Noronha Silva <kov@debian.org>\n"
 "Language-Team: Debian-BR <debian-l10n-portuguese@lists.debian.org>, "
@@ -17,20 +17,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Houve um erro ao lançar o capplet de teclado: %s"
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Não é possível importar as configurações do AccessX do arquivo '%s'"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Selecione o arquivo CDE AccessX"
 
@@ -52,69 +51,107 @@ msgstr ""
 
 # SUN NEW TRANSLATION
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
-"Emitir um aviso sonoro quando um LED está ligado e dois quando está "
-"desligado."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
-# SUN NEW TRANSLATION
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
 #, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr ""
-"_Emitir aviso sonoro ao habilitar/desabilitar os recursos de acessibilidade "
-"do teclado"
+msgid "Basic"
+msgstr "Bolas"
 
 # MODIFIED SUN TRANSLATION
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Bipar quando a tecla for re_jeitada"
 
 # SUN NEW TRANSLATION
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Emitir aviso sonoro quando:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "_Emitir aviso sonoro quando o modificador for pressionado"
 
-# SUN NEW TRANSLATION
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+# SUN NEW TRANSLATION
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr ""
+"Emitir um aviso sonoro quando um LED está ligado e dois quando está "
+"desligado."
+
+# MODIFIED SUN TRANSLATION
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Bipar quando a tecla for re_jeitada"
+
+# MODIFIED SUN NEW TRANSLATION
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Atraso:"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#, fuzzy
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr "Espera entre cada passo no labirinto."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+# SUN NEW TRANSLATION
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Habilitar Teclas de Al_ternância"
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Habilitar Teclas de _Repercussão"
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Habilitar Teclas Len_tas"
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Habilitar Teclas do _Mouse"
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Habilitar Teclas de _Aderência"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Geral"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "_Arquivo"
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Ignorar pressionamentos de teclas em :"
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -122,19 +159,29 @@ msgstr ""
 "Ignora todos os pressionamentos subseqüentes da MESMA tecla se eles "
 "ocorrerem em um período de tempo selecionável pelo usuário."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Configuração de Acessibilidade do Teclado (AccessX)"
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Velocidade má_xima do ponteiro :"
 
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Mouse"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Preferências do Mouse"
+
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -143,7 +190,7 @@ msgstr ""
 "pressionadas por um período de tempo ajustável pelo usuário."
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -151,99 +198,94 @@ msgstr ""
 "Executar várias operações simultâneas de pressionamento de teclas, "
 "pressionando as teclas modificadoras em seqüência."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Preferências de Repetição da Tecla"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr "_Velocidade:"
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "Começar a mo_ver muito tempo depois do pressionamento da tecla :"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Área de Testes"
+msgid "Time to acce_lerate to maximum speed:"
+msgstr "Tempo para _acelerar até a velocidade máxima :"
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
-msgstr "Tempo para _acelerar até a velocidade máxima :"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Teclas de Alternância e Repetição"
+msgid "Toggle Keys"
+msgstr "Habilitar Teclas de Al_ternância"
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Transformar o teclado numérico em um teclado de controle do mouse."
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "_Emitir aviso sonoro quando o modificador for pressionado"
-
-# SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Desabilitar se não for usado por "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Habilitar acessibilidade do teclado"
 
-# SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "_Importar arquivo CDE do AccessX"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "_Aceitar o pressionamento de tecla somente após :"
 
-# SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Repetição de Teclas"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"_Desativar as teclas de aderência quando\n"
-"duas teclas são pressionadas simultaneamente"
 
 # MODIFIED SUN TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "a tecla for _aceita"
 
 # MODIFIED SUN TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "a tecla for _pressionada"
 
 # MODIFIED SUN TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "a tecla for _rejeitada"
 
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
+
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "ms"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "segundos"
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "pixels/s"
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "segundos"
 
@@ -305,7 +347,7 @@ msgstr "Selecione _foto:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Recuperar e armazenar as configurações legadas"
@@ -634,15 +676,6 @@ msgid "Please specify a name and a command for this editor."
 msgstr "Por favor entre um nome e um comando para esse editor."
 
 # SUN NEW TRANSLATION
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
-# SUN NEW TRANSLATION
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Ace_ita URLs"
@@ -870,6 +903,7 @@ msgstr "Minimizando e Maximizando"
 
 # SUN NEW TRANSLATION
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1473,13 +1507,18 @@ msgstr "Desktop"
 msgid "Window Management"
 msgstr "Gerenciamento de Janelas"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Erro definindo novo atalho na base de dados de configuração: %s\n"
 
 # SUN NEW TRANSLATION
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1488,11 +1527,11 @@ msgstr ""
 "instalação do GTK+ está incompleta."
 
 # SUN NEW TRANSLATION
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Ação"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Atalho"
 
@@ -1517,6 +1556,11 @@ msgstr "Atalhos de edição de _texto:"
 msgid "Assign shortcut keys to commands"
 msgstr "Designar teclas de atalhos a comandos"
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Houve um erro ao lançar o capplet de teclado: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Acessibilidade"
@@ -1586,10 +1630,6 @@ msgstr "Clique no Pressionamento de Teclas"
 msgid "Repeat Keys"
 msgstr "Repetição de Teclas"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr "_Velocidade:"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Acessibilidade..."
@@ -1630,7 +1670,7 @@ msgid "Set your keyboard preferences"
 msgstr "Definir suas preferências de teclado"
 
 # SUN NEW TRANSLATION
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1640,7 +1680,7 @@ msgstr ""
 "%s"
 
 # SUN NEW TRANSLATION
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1649,7 +1689,7 @@ msgstr ""
 "O cursor padrão fornecido com X"
 
 # SUN NEW TRANSLATION
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1658,7 +1698,7 @@ msgstr ""
 "O cursor padrão fornecido com X"
 
 # SUN NEW TRANSLATION
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1667,7 +1707,7 @@ msgstr ""
 "O cursor padrão invertido"
 
 # SUN NEW TRANSLATION
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1676,7 +1716,7 @@ msgstr ""
 "O cursor padrão invertido"
 
 # SUN NEW TRANSLATION
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1685,7 +1725,7 @@ msgstr ""
 "Versão grande do cursor normal"
 
 # SUN NEW TRANSLATION
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1694,7 +1734,7 @@ msgstr ""
 "Versão grande do cursor normal"
 
 # SUN NEW TRANSLATION
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1703,7 +1743,7 @@ msgstr ""
 "Versão grande do cursor branco"
 
 # SUN NEW TRANSLATION
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1857,10 +1897,6 @@ msgstr "_Mostrar a posição do cursor quando a tecla Control é pressionada"
 msgid "_Threshold:"
 msgstr "_Limiar:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Mouse"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Definir suas preferências de mouse"
@@ -1875,38 +1911,81 @@ msgstr "Proxy da Rede"
 msgid "Network proxy preferences"
 msgstr "Preferências do Proxy da Rede"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Preferências de Rede"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Preferências do Proxy da Rede"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_orta:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "_Senha:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "O Pro_xy precisa de usuário e senha"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
+# MODIFIED SUN TRANSLATION
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "_Nome de Usuário:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Comando de Configuração:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Localização:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Configurações do Proxy HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Preferências do Proxy da Rede"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_orta:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+#, fuzzy
+msgid "_Details"
+msgstr "De_talhes..."
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "_Usar proxy HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Usar proxy HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "_Senha:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "_Usar proxy HTTP"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "_Nome de Usuário:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Preferências de Som"
@@ -1916,6 +1995,10 @@ msgstr "Preferências de Som"
 msgid "E_nable sound server startup"
 msgstr "_Habilitar a inicialização do servidor de som"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Geral"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -2001,31 +2084,52 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Selecionar temas para várias partes do desktop"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Tema"
 
+# SUN NEW TRANSLATION
 #: capplets/theme-switcher/theme-properties.glade.h:1
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Plano de Fundo"
+
+#: capplets/theme-switcher/theme-properties.glade.h:2
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Aplicar Agora"
+
+# SUN NEW TRANSLATION
+#: capplets/theme-switcher/theme-properties.glade.h:3
+#, fuzzy
+msgid "Controls"
+msgstr "Controle da Interface de Usuário"
+
+# SUN NEW TRANSLATION
+#: capplets/theme-switcher/theme-properties.glade.h:4
+#, fuzzy
+msgid "Icons"
+msgstr "Somente Ícones"
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
 msgid "New themes can also be installed by dragging them into the window."
 msgstr ""
 "Novos temas podem também ser instalados arrastando-os para esta janela."
 
-#: capplets/theme-switcher/theme-properties.glade.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:7
 msgid "Theme Preferences"
 msgstr "Preferências do Tema"
 
-#: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr "Tema dos Widgets"
-
-#: capplets/theme-switcher/theme-properties.glade.h:4
-msgid "Window Border Theme"
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
 msgstr "Tema da Borda da Janela"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Ir para a pasta de temas"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "_Instalar Novo Tema..."
 
@@ -2190,31 +2294,61 @@ msgstr "_Sair"
 msgid "_Save"
 msgstr "_Salvar"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Preferências de Janelas"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+# SUN NEW TRANSLATION
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Controle da Interface de Usuário"
+
+#: capplets/windows/gnome-window-properties.c:580
+#, fuzzy
+msgid "Alt"
+msgstr "Qualquer"
+
+# SUN NEW TRANSLATION
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Tipo"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Velocidade"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Aplicar Agora"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Selecionar janela quando o mouse passa para cima dela"
+msgid "Window Preferences"
+msgstr "Preferências de Janelas"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Fonte do Título"
+#, fuzzy
+msgid "_Double-click window titles to:"
+msgstr "Fonte do Título da _Janela:"
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Aparência da Borda da Janela"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
-# SUN NEW TRANSLATION
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Gerenciador de Janelas:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Selecionar janela quando o mouse passa para cima dela"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2377,7 +2511,7 @@ msgstr "_Não mostrar esta mensagem novamente"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Não foi possível carregar o arquivo de som %s como exemplo %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "Chave GConf %s definida para o tipo %s mas o tipo esperado era %s\n"
@@ -2464,67 +2598,129 @@ msgstr "_Tocar"
 msgid "Select sound file"
 msgstr "Selecionar arquivo de som"
 
-# SUN NEW TRANSLATION
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Iniciando %s\n"
-"(restam %d segundos para o tempo limite da operação)"
 
 # SUN NEW TRANSLATION
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Não é possível inicializar o gerenciador de janelas.\n"
-"\tOutro gerenciador de janelas já está em execução e não pode ser morto\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr ""
+#~ "_Emitir aviso sonoro ao habilitar/desabilitar os recursos de "
+#~ "acessibilidade do teclado"
 
 # SUN NEW TRANSLATION
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Não é possível inicializar o gerenciador de janelas.\n"
-"\t'%s' não foi iniciado\n"
+#~ msgid "Beep when:"
+#~ msgstr "Emitir aviso sonoro quando:"
+
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Preferências de Repetição da Tecla"
 
 # SUN NEW TRANSLATION
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "O gerenciador de janelas anterior não morreu\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Começar a mo_ver muito tempo depois do pressionamento da tecla :"
+
+#~ msgid "Testing Area"
+#~ msgstr "Área de Testes"
+
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Teclas de Alternância e Repetição"
 
 # SUN NEW TRANSLATION
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Não foi possível iniciar '%s'.\n"
-"Retornando ao gerenciador de janelas anterior '%s'\n"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Importar arquivo CDE do AccessX"
 
 # SUN NEW TRANSLATION
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Não foi possível iniciar o último gerenciador de janelas usado.\n"
-"Execute um gerenciador de janelas manualmente. Para fazer isso,\n"
-"selecione \"Executar Programa\" no\n"
-"menu do rodapé\n"
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "_Desativar as teclas de aderência quando\n"
+#~ "duas teclas são pressionadas simultaneamente"
+
+# SUN NEW TRANSLATION
+#~ msgid "msecs"
+#~ msgstr "ms"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Preferências de Rede"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "O Pro_xy precisa de usuário e senha"
+
+#~ msgid "_Location:"
+#~ msgstr "_Localização:"
+
+#~ msgid "Widget Theme"
+#~ msgstr "Tema dos Widgets"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Fonte do Título"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Aparência da Borda da Janela"
+
+# SUN NEW TRANSLATION
+#~ msgid "Window Manager:"
+#~ msgstr "Gerenciador de Janelas:"
+
+# SUN NEW TRANSLATION
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Iniciando %s\n"
+#~ "(restam %d segundos para o tempo limite da operação)"
+
+# SUN NEW TRANSLATION
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Não é possível inicializar o gerenciador de "
+#~ "janelas.\n"
+#~ "\tOutro gerenciador de janelas já está em execução e não pode ser morto\n"
+
+# SUN NEW TRANSLATION
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Não é possível inicializar o gerenciador de "
+#~ "janelas.\n"
+#~ "\t'%s' não foi iniciado\n"
+
+# SUN NEW TRANSLATION
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "O gerenciador de janelas anterior não morreu\n"
+
+# SUN NEW TRANSLATION
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Não foi possível iniciar '%s'.\n"
+#~ "Retornando ao gerenciador de janelas anterior '%s'\n"
 
 # SUN NEW TRANSLATION
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Não foi possível iniciar o último gerenciador de janelas usado.\n"
+#~ "Execute um gerenciador de janelas manualmente. Para fazer isso,\n"
+#~ "selecione \"Executar Programa\" no\n"
+#~ "menu do rodapé\n"
+
+# SUN NEW TRANSLATION
+#~ msgid "OK"
+#~ msgstr "OK"
 
 # SUN NEW TRANSLATION
 #~ msgid "Add:"
@@ -2817,9 +3013,6 @@ msgstr "OK"
 #~ msgid "Mouse Properties"
 #~ msgstr "Propriedades do Mouse"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Configurações do Proxy HTTP"
-
 # SUN NEW TRANSLATION
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Configurar o uso de som pelo GNOME"
@@ -3190,10 +3383,6 @@ msgstr "OK"
 #~ msgid "Command:"
 #~ msgstr "Comando:"
 
-# MODIFIED SUN TRANSLATION
-#~ msgid "Configuration Command:"
-#~ msgstr "Comando de Configuração:"
-
 # SUN NEW TRANSLATION
 #~ msgid "Window manager is session managed"
 #~ msgstr "O gerenciador de janelas é gerenciado pela sessão"
@@ -3291,10 +3480,6 @@ msgstr "OK"
 #~ msgstr "Ícones e Texto"
 
 # SUN NEW TRANSLATION
-#~ msgid "Only Icons"
-#~ msgstr "Somente Ícones"
-
-# SUN NEW TRANSLATION
 #~ msgid "Only Text"
 #~ msgstr "Somente Texto"
 
@@ -3572,10 +3757,6 @@ msgstr "OK"
 #~ msgid "Wobble:"
 #~ msgstr "Pulsação"
 
-#, fuzzy
-#~ msgid "Ant"
-#~ msgstr "Qualquer"
-
 #~ msgid "Four Sided cells"
 #~ msgstr "Células com quatro lados"
 
@@ -3626,9 +3807,6 @@ msgstr "OK"
 #~ msgid "Attraction (balls)"
 #~ msgstr "Duração (ms)"
 
-#~ msgid "Balls"
-#~ msgstr "Bolas"
-
 #~ msgid "Color Contrast"
 #~ msgstr "Contraste das cores"
 
@@ -3904,9 +4082,6 @@ msgstr "OK"
 #~ msgid "Delay between drawing the maze and starting the solution."
 #~ msgstr "Espera entre o desenho do labirinto e o começo da solução."
 
-#~ msgid "Delay between each step in the maze."
-#~ msgstr "Espera entre cada passo no labirinto."
-
 #~ msgid "Delay between finishing the maze and starting a new one."
 #~ msgstr "Espera entre o término e o começo de um novo labirinto."
 
@@ -4001,10 +4176,6 @@ msgstr "OK"
 #~ msgid "SpeedMine"
 #~ msgstr "Velocidade"
 
-#, fuzzy
-#~ msgid "Sphere"
-#~ msgstr "Velocidade"
-
 #~ msgid "Change to display in monochrome."
 #~ msgstr "Alterar a exibição para monocromático."
 
diff --git a/po/ro.po b/po/ro.po
index 7be97b2da..8b6929613 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.1-1\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-09-05 16:53+0300\n"
 "Last-Translator: Mugurel Tudor <mugurelu@go.ro>\n"
 "Language-Team: română <ro@li.org>\n"
@@ -15,19 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "A intervenit o eroare la lansarea capplet tastatură: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Nu am putut importa setările AccessX din fişierul '%s'"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Selectează fişierul AccessX CDE"
 
@@ -48,56 +47,91 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Un bip când un LED este aprins şi două bipuri când este stins."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
-"_Bip la activarea/dezactivarea facilităţilor de accesibilitate a tastaturii"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Bip când tasta este _refuzată"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Bip când:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "B_ip când modificatorul este apăsat"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "Un bip când un LED este aprins şi două bipuri când este stins."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Bip când tasta este _refuzată"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Întârziere:"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Pemite taste de _comutare"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Refuză tastarea _repetitivă"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Permite tastare _lentă"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Permite _controlul mausului"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Permite taste _persistente"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "General"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "_Fişier"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Ignoră apăsările de taste după :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -105,17 +139,27 @@ msgstr ""
 "Ignoră toate apăsările ACELEAŞI taste dacă se întâmplă într-o anumită "
 "perioadă de timp ce poate fi setată"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Configurare accesibilitate tastatură (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Viteza ma_ximă a cursorului:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Maus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Preferinţe maus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -123,92 +167,90 @@ msgstr ""
 "Acceptă tasta doar după ce a fost ţinută apasată o anumită perioadă de timp, "
 "ce poate fi setată"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
 msgstr ""
 "Permite apăsări simultane de taste prin apăsarea modificatorilor în secvenţă."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Preferinţe repetare taste"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-#, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "Începe mişcarea la acest interval după apăsare :"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Zonă de testare"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr "V_iteză:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Timpul _accelerării la viteză maximă :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Taste de comutare şi repetare"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Pemite taste de _comutare"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Controlează mişcarea mausului cu ajutorul zonei numerice a tastaturii."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "B_ip când modificatorul este apăsat"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Dezactivează dacă nu este folosită pentru "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Activează accesibilitatea tastaturii"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "_Importă fişier AccessX CDE"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "_Acceptă apăsări de taste doar după :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Repetarea tastelor"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"_Anulează tastarea persistentă când\n"
-"două taste sunt apăsate simultan"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "tasta este _acceptată"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "tasta este a_păsată"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "tasta este _ignorată"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "msec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "secunde"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "pixeli/sec"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "secunde"
 
@@ -263,7 +305,7 @@ msgstr "Selectaţi _imaginea:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Recuperează şi memorează setările anterioare"
@@ -551,14 +593,6 @@ msgstr "Selectează aplicaţiile implicite"
 msgid "Please specify a name and a command for this editor."
 msgstr "Vă rugăm specificaţi un nume şi o comandă pentru acest editor."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Acceptă URL-uri"
@@ -767,6 +801,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Minimizare şi maximizare"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1319,13 +1354,18 @@ msgstr "Desktop"
 msgid "Window Management"
 msgstr "Management ferestre"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Eroare la setarea noului accelerator în baza de date a configuraţiei: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1333,11 +1373,11 @@ msgstr ""
 "Nu am putut găsi nici o temă pentru tastatură. Acest lucru înseamnă că "
 "instalarea dumneavoastră GTK+ a fost incompletă."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Acţiune"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Combinaţie taste"
 
@@ -1362,6 +1402,11 @@ msgstr "_Scurtături editare text:"
 msgid "Assign shortcut keys to commands"
 msgstr "Setează scurtăturile pentru comenzi"
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "A intervenit o eroare la lansarea capplet tastatură: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Accesibilitate"
@@ -1428,10 +1473,6 @@ msgstr "Click la apăsarea tastei"
 msgid "Repeat Keys"
 msgstr "Repetarea tastelor"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr "V_iteză:"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Accesibilitate..."
@@ -1468,7 +1509,7 @@ msgstr "încet"
 msgid "Set your keyboard preferences"
 msgstr "Setează preferinţele tastaturii"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1477,7 +1518,7 @@ msgstr ""
 "<b>Cursor necunoscut</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1485,7 +1526,7 @@ msgstr ""
 "<b>Cursor implicit - Curent</b>\n"
 "Cursorul implicit folosit de X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1493,7 +1534,7 @@ msgstr ""
 "<b>Cursorul implicit</b>\n"
 "Cursorul implicit folost de X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1501,7 +1542,7 @@ msgstr ""
 "<b>Cursor alb - Curent</b>\n"
 "Cursorul implicit inversat"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1509,7 +1550,7 @@ msgstr ""
 "<b>Cursor alb</b>\n"
 "Cursorul implicit inversat"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1517,7 +1558,7 @@ msgstr ""
 "<b>Cursor mare - Curent</b>\n"
 "Versiunea mărită a cursorului normal"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1525,7 +1566,7 @@ msgstr ""
 "<b>Cursor mare</b>\n"
 "Versiunea mărită a cursorului normal"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1533,7 +1574,7 @@ msgstr ""
 "<b>Cursor mare alb - Curent</b>\n"
 "Versiunea mărită a cursorului alb"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1668,10 +1709,6 @@ msgstr "_Arată poziţia cursorului la apăsarea tastei Control"
 msgid "_Threshold:"
 msgstr "_Reactivitate:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Maus"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Setează preferinţele mausului"
@@ -1686,38 +1723,77 @@ msgstr "Proxy reţea"
 msgid "Network proxy preferences"
 msgstr "Preferinţe proxy reţea"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Preferinţele reţelei"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Preferinţe proxy reţea"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "Paro_lă:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "Pro_xy necesită nume utilizator şi parolă"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "Nume _utilizator:"
+msgid "Autoconfiguration _URL:"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Locaţie:"
+msgid "HTTP Proxy Details"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Preferinţe proxy reţea"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "_Foloseşte proxy HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
 msgstr "_Foloseşte proxy HTTP"
 
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "Paro_lă:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "_Foloseşte proxy HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Nume _utilizator:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Preferinţe sunet"
@@ -1726,6 +1802,10 @@ msgstr "Preferinţe sunet"
 msgid "E_nable sound server startup"
 msgstr "_Activează serverul de sunet la pornire"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "General"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1797,32 +1877,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Selectează teme pentru diferite porţiuni ale desktop-ului"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Temă"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Fundal"
+
+#: capplets/theme-switcher/theme-properties.glade.h:2
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Aplică acum"
+
+#: capplets/theme-switcher/theme-properties.glade.h:3
+#, fuzzy
+msgid "Controls"
+msgstr "Control UI"
+
+#: capplets/theme-switcher/theme-properties.glade.h:4
+#, fuzzy
+msgid "Icons"
+msgstr "Doar iconiţe"
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
 msgid "New themes can also be installed by dragging them into the window."
 msgstr ""
 "Temele noi pot fi instalate şi prin tragerea lor deasupra acestei ferestre."
 
-#: capplets/theme-switcher/theme-properties.glade.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:7
 msgid "Theme Preferences"
 msgstr "Preferinţe temă"
 
-#: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
-
-#: capplets/theme-switcher/theme-properties.glade.h:4
+#: capplets/theme-switcher/theme-properties.glade.h:8
 #, fuzzy
-msgid "Window Border Theme"
+msgid "Window Border"
 msgstr "Aspect margine fereastră"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Du-te în directorul cu teme"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "_Instalează o nouă temă..."
 
@@ -1973,30 +2070,57 @@ msgstr "_Ieşi"
 msgid "_Save"
 msgstr "_Salvează"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Preferinţe ferestre"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Control UI"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Tip"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Viteză"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Aplică acum"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Selectează ferestrele când mausul se mişcă deasupra lor"
+msgid "Window Preferences"
+msgstr "Preferinţe ferestre"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Font pentru bara de titlu"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Aspect margine fereastră"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Manager de ferestre:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Selectează ferestrele când mausul se mişcă deasupra lor"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2143,7 +2267,7 @@ msgstr "_Nu mai arăta acest mesaj pe viitor"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Nu am putut încărca fişierul de sunet %s ca eşantion %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "Cheia GConf %s este setată la tipul %s dar tipul aşteptat era %s\n"
@@ -2222,60 +2346,110 @@ msgstr "_Redă"
 msgid "Select sound file"
 msgstr "Selectează fişierul de sunet"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Pornesc %s\n"
-"(%d secunde rămase până la expirarea timpului)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Nu am putut iniţializa managerul de ferestre.\n"
-"\tUn alt manager de ferestre rulează deja şi nu a putut fi omorât\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr ""
+#~ "_Bip la activarea/dezactivarea facilităţilor de accesibilitate a "
+#~ "tastaturii"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Nu am putut iniţializa managerul de ferestre.\n"
-"\t'%s' nu a pornit\n"
+#~ msgid "Beep when:"
+#~ msgstr "Bip când:"
+
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Preferinţe repetare taste"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Precedentul manager de ferestre nu a murit\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Începe mişcarea la acest interval după apăsare :"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Nu am putut porni '%s'.\n"
-"Mă întorc la managerul de ferestre precedent '%s'\n"
+#~ msgid "Testing Area"
+#~ msgstr "Zonă de testare"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Nu am putut reveni la managerul de ferestre.\n"
-"Vă rugăm rulaţi manual un manager de ferestre.\n"
-"Puteţi face asta selectând \"Rulează program\" din\n"
-"meniul principal.\n"
-
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Taste de comutare şi repetare"
+
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Importă fişier AccessX CDE"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "_Anulează tastarea persistentă când\n"
+#~ "două taste sunt apăsate simultan"
+
+#~ msgid "msecs"
+#~ msgstr "msec"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Preferinţele reţelei"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Pro_xy necesită nume utilizator şi parolă"
+
+#~ msgid "_Location:"
+#~ msgstr "_Locaţie:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Font pentru bara de titlu"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Aspect margine fereastră"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Manager de ferestre:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Pornesc %s\n"
+#~ "(%d secunde rămase până la expirarea timpului)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Nu am putut iniţializa managerul de ferestre.\n"
+#~ "\tUn alt manager de ferestre rulează deja şi nu a putut fi omorât\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Nu am putut iniţializa managerul de ferestre.\n"
+#~ "\t'%s' nu a pornit\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Precedentul manager de ferestre nu a murit\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Nu am putut porni '%s'.\n"
+#~ "Mă întorc la managerul de ferestre precedent '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Nu am putut reveni la managerul de ferestre.\n"
+#~ "Vă rugăm rulaţi manual un manager de ferestre.\n"
+#~ "Puteţi face asta selectând \"Rulează program\" din\n"
+#~ "meniul principal.\n"
+
+#~ msgid "OK"
+#~ msgstr "OK"
 
 #~ msgid "_Category"
 #~ msgstr "_Categorie"
diff --git a/po/ru.po b/po/ru.po
index 6f57e7b0e..947b24c3e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-07-18 14:47+04:00\n"
 "Last-Translator: Dmitry G. Mastrukov <dmitry@taurussoft.org>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
@@ -13,19 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Возникла ошибка при запуске капплета клавиатуры: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Невозможно импортировать установки AccessX из файла \"%s\""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Выбрать AccessX файл CDE"
 
@@ -46,58 +45,93 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
-"Подавать один сигнал, когда LED-индикатор загорается и два сигнала, когда "
-"гаснет"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
-"По_давать сигнал при включении/выключении специальных возможностей клавиатуры"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Подавать сигнал, когда клавиша н_е принята"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Подавать сигнал, когда "
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "Пода_вать сигнал, когда модификатор нажат"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr ""
+"Подавать один сигнал, когда LED-индикатор загорается и два сигнала, когда "
+"гаснет"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Подавать сигнал, когда клавиша н_е принята"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "Зад_ержка:"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Включить \"перекл_ючающие\" клавиши"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Включить \"ска_чущие\" клавиши"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Включить \"_медленные\" клавиши"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Включить \"пози_ционирующие\" клавиши"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Включить \"за_липающие\" клавиши"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Общие"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "Filters"
+msgstr "_Файл"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#, fuzzy
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Игнорировать нажатия в период :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -105,17 +139,27 @@ msgstr ""
 "Игнорировать все последовательные нажатия ОДНОЙ клавиши, если они происходят "
 "в указанный пользователем промежуток времени."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Настроить Специальные возможности клавиатуры (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Максимальная скорость _указателя :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Мышь"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Настроить использование мыши"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -123,7 +167,7 @@ msgstr ""
 "Принимать только те клавиши, которые были нажаты и задержаны на определённый "
 "пользователем период времени."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -131,85 +175,83 @@ msgstr ""
 "Генерировать несколько нажатий клавиш одновременно по последовательному "
 "нажатию клавиш-модификаторов"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Настроить повтор клавишей"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-#, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "Начинать переме_щать после долгого нажатия :"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Область тестирования"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr "Ск_орость:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Время ускорения до м_аксимальной скорости :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Переключающие и повторяющие клавиши"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Включить \"перекл_ючающие\" клавиши"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Сделать цифровую клавиатуру панелью управления мыши."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "Пода_вать сигнал, когда модификатор нажат"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Отключать при неиспользовании в течении "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Включить специальные возможности клавиатуры"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "Им_портировать файл AccessX из CDE"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "Принимать нажатия тол_ько после :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Повтор клавиш"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"О_тключать \"залипающие\" клавиши,\n"
-"когда две клавиши нажаты одновременно"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "клавиша прин_ята"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "клавиша на_жата"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "клавиша _не принята"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "мсек"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "секунд"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "пикселей/сек"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "секунд"
 
@@ -264,7 +306,7 @@ msgstr "Выбрать ка_ртинку:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Запрос и сохранение старых настроек"
@@ -560,14 +602,6 @@ msgstr "Выбрать исходные приложения-обработчи�
 msgid "Please specify a name and a command for this editor."
 msgstr "Укажите имя и команду для этого редактора"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "При_нимает URL"
@@ -776,6 +810,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Минимизация и максимизация"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Мета"
 
@@ -1334,12 +1369,17 @@ msgstr "Рабочий стол"
 msgid "Window Management"
 msgstr "Управление окнами"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Ошибка установки нового ускорителя в базе данных конфигурации: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1347,11 +1387,11 @@ msgstr ""
 "Невозможно найти клавиатурные темы. Это значит, что установка GTK+ является "
 "неполной."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Действие"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Комбинация клавиш"
 
@@ -1376,6 +1416,11 @@ msgstr "Комбинации клавиш редактирования _текс
 msgid "Assign shortcut keys to commands"
 msgstr "Назначить комбинации клавиш командам"
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Возникла ошибка при запуске капплета клавиатуры: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Специальные возможности"
@@ -1442,10 +1487,6 @@ msgstr "Щелчок при нажатии"
 msgid "Repeat Keys"
 msgstr "Повтор клавиш"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr "Ск_орость:"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "Спе_циальные возможности..."
@@ -1482,7 +1523,7 @@ msgstr "тише"
 msgid "Set your keyboard preferences"
 msgstr "Настроить использование клавиатуры"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1491,7 +1532,7 @@ msgstr ""
 "<b>Неизвестный курсор</>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1499,7 +1540,7 @@ msgstr ""
 "<b>Курсор по умолчанию - текущий</b>\n"
 "Курсор по умолчанию поставляемый с X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1507,7 +1548,7 @@ msgstr ""
 "<b>Курсор по умолчанию</b>\n"
 "Курсор по умолчанию поставляемый с X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1515,7 +1556,7 @@ msgstr ""
 "<b>Белый курсор - текущий</b>\n"
 "Инвертированный курсор по умолчанию"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1523,7 +1564,7 @@ msgstr ""
 "<b>Белый курсор</b>\n"
 "Инвертированный курсор по умолчанию"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1531,7 +1572,7 @@ msgstr ""
 "<b>Большой курсор - текущий</b>\n"
 "Увеличенная версия обычного курсора"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1539,7 +1580,7 @@ msgstr ""
 "<b>Большой курсор</b>\n"
 "Увеличенная версия обычного курсора"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1547,7 +1588,7 @@ msgstr ""
 "<b>Большой белый курсор - текущий</b>\n"
 "Увеличенная версия белого курсора"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1680,10 +1721,6 @@ msgstr "Пок_азывать положение курсора когда на�
 msgid "_Threshold:"
 msgstr "_Порог:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Мышь"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Настроить мышь"
@@ -1698,38 +1735,79 @@ msgstr "Прокси"
 msgid "Network proxy preferences"
 msgstr "Настроить использование прокси"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Настроить сеть"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Настроить использование прокси"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "По_рт:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "Пар_оль:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "Про_кси требует имя пользователя и пароль"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "И_мя пользователя:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Команда конфигурации:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Местоположение:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Установки прокси типа HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Настроить использование прокси"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "По_рт:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "Использовать _прокси типа HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
 msgstr "Использовать _прокси типа HTTP"
 
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "Пар_оль:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "Использовать _прокси типа HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "И_мя пользователя:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Настроить звук"
@@ -1738,6 +1816,10 @@ msgstr "Настроить звук"
 msgid "E_nable sound server startup"
 msgstr "_Включать сервер звука при запуске"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Общие"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1809,31 +1891,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Выбрать темы для различных частей рабочего стола"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Тема"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Новые темы могут быть также установленны перетаскиванием их в окно."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Фон"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-msgid "Theme Preferences"
-msgstr "Настроить тему"
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Применить сейчас"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Управление интерфейсом"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Внешний вид рамки окна"
+msgid "Icons"
+msgstr "Только пиктограммы"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Новые темы могут быть также установленны перетаскиванием их в окно."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+msgid "Theme Preferences"
+msgstr "Настроить тему"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Внешний вид рамки окна"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Перейти в каталог тем"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "_Установить новую тему..."
 
@@ -1988,30 +2087,57 @@ msgstr "тише"
 msgid "_Save"
 msgstr "Мас_штабированная"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Настроить окно"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Управление интерфейсом"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Тип"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Скорость"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Применить сейчас"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Выбирать окна, когда указательмыши находится над ним"
+msgid "Window Preferences"
+msgstr "Настроить окно"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Шрифт заголовка"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Внешний вид рамки окна"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Диспетчер окон:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Выбирать окна, когда указательмыши находится над ним"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2162,7 +2288,7 @@ msgstr "_Не показывать это сообщение снова"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Не удалось загрузить звуковой файл %s в качестве сэмпла %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "Ключ GConf %s установлен в тип %s, а ожидаемый тип был %s\n"
@@ -2241,60 +2367,110 @@ msgstr "_Воспроизвести"
 msgid "Select sound file"
 msgstr "Выбрать звуковой файл"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Запускается %s\n"
-"(%d секунд осталось до истечения времени операции)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Невозможно инициализировать диспетчер окон.\n"
-"\tДругой диспетчер окон уже запущен и не может быть завершён\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr ""
+#~ "По_давать сигнал при включении/выключении специальных возможностей "
+#~ "клавиатуры"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Невозможно инициализировать диспетчер окон.\n"
-"\t\"%s\" не стартовал\n"
+#~ msgid "Beep when:"
+#~ msgstr "Подавать сигнал, когда "
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Предыдущий дистпетчер окон не завершился\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Настроить повтор клавишей"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Не удалось стартовать \"%s\".\n"
-"Откат на предыдущий диспетчер окон \"%s\"\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Начинать переме_щать после долгого нажатия :"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Не удалось стартовать предыдущий диспетчер окон.\n"
-"Запустите диспетчер окон вручную. Это можно сделать\n"
-"путём выбора пунктоа \"Запустить программу\" в\n"
-"главном меню\n"
+#~ msgid "Testing Area"
+#~ msgstr "Область тестирования"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Переключающие и повторяющие клавиши"
+
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "Им_портировать файл AccessX из CDE"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "О_тключать \"залипающие\" клавиши,\n"
+#~ "когда две клавиши нажаты одновременно"
+
+#~ msgid "msecs"
+#~ msgstr "мсек"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Настроить сеть"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Про_кси требует имя пользователя и пароль"
+
+#~ msgid "_Location:"
+#~ msgstr "_Местоположение:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Шрифт заголовка"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Внешний вид рамки окна"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Диспетчер окон:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Запускается %s\n"
+#~ "(%d секунд осталось до истечения времени операции)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Невозможно инициализировать диспетчер окон.\n"
+#~ "\tДругой диспетчер окон уже запущен и не может быть завершён\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Невозможно инициализировать диспетчер окон.\n"
+#~ "\t\"%s\" не стартовал\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Предыдущий дистпетчер окон не завершился\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Не удалось стартовать \"%s\".\n"
+#~ "Откат на предыдущий диспетчер окон \"%s\"\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Не удалось стартовать предыдущий диспетчер окон.\n"
+#~ "Запустите диспетчер окон вручную. Это можно сделать\n"
+#~ "путём выбора пунктоа \"Запустить программу\" в\n"
+#~ "главном меню\n"
+
+#~ msgid "OK"
+#~ msgstr "OK"
 
 #~ msgid "Add:"
 #~ msgstr "Добавить:"
@@ -2549,9 +2725,6 @@ msgstr "OK"
 #~ msgid "Mouse Properties"
 #~ msgstr "Настроить мышь"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Установки прокси типа HTTP"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Настроить использование звука в среде GNOME"
 
@@ -2859,9 +3032,6 @@ msgstr "OK"
 #~ msgid "Command:"
 #~ msgstr "Команда:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Команда конфигурации:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Диспетчер окон управляется сессией"
 
@@ -2937,9 +3107,6 @@ msgstr "OK"
 #~ msgid "Icons and Text"
 #~ msgstr "Пиктограммы и текст"
 
-#~ msgid "Only Icons"
-#~ msgstr "Только пиктограммы"
-
 #~ msgid "Only Text"
 #~ msgstr "Только текст"
 
diff --git a/po/sk.po b/po/sk.po
index 024280a97..433fea5c7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sk\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-06-10 13:59+0200\n"
 "Last-Translator: Stanislav Višňovský <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -17,19 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta2\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, fuzzy, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Pri pokuse o zobrazenie Pomocníka nastala chyba: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Nepodarilo sa importovať nastavenie AccessX zo súboru '%s'"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Vyberte súbor CDE AccessX"
 
@@ -51,57 +50,91 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Pípne pri zapnutí indikátoru LED a pípne dvakrát pri jeho vypnutí."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "_Pípnuť pri povolení/zakázaní funkcií pre sprístupnenie klávesnice"
+msgid "Basic"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
 #, fuzzy
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr "kláves je _odmietnutý"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Pípnuť pri:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "_Pípnuť pri stlačení modifikátora"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "Pípne pri zapnutí indikátoru LED a pípne dvakrát pri jeho vypnutí."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "kláves je _odmietnutý"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Pauza (sek):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Povoliť _prepínacie klávesy"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Povoliť _odrazové klávesy"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Povoliť _pomalé klávesy"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Povoliť klávesy _myši"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Povoliť _lepkavé klávesy"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "General"
-msgstr "_Všeobecné"
+msgid "Filters"
+msgstr "_Súbor"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Ignorovať stlačenie kláves po dobu:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -109,23 +142,33 @@ msgstr ""
 "Ignoruje všetky následné stlačenia ROVNAKÉHO klávesu ak sa opakuje v "
 "nastavenej dobe."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Nastavenie sprístupnenia klávesnice (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Ma_ximálna rýchlosť kurzoru:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Myš"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Nastavenie myši"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
 msgstr "Akceptovať klávesy iba po stlačení a držaní danú dobu."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -133,85 +176,84 @@ msgstr ""
 "Vykonať operácie používajúce viac naraz stlačených kláves pri postupnom "
 "stlačení modifikátorov."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Nastavenie klávesnice"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "Začať _presun po takto dlhom držaní:"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr ""
+msgid "S_peed:"
+msgstr "Rýchlosť"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Čas pre _zrýchlenie na maximum:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr ""
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Povoliť _prepínacie klávesy"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Simulovať myš pomocou číselnej časti klávesnice."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "_Pípnuť pri stlačení modifikátora"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Zakázať ak nepoužívané po:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Povoliť sprístupnenie klávesnice"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "_Importovať súbor CDE AccessX"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "_Akceptovať stlačenie klávesu po:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Rýchlosť opakovania kláves"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"_Vypnúť lepivé klávesy ak sú\n"
-"naraz stlačené dva klávesy."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "kláves je _akceptovaný"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "kláves je _stlačený"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "kláves je _odmietnutý"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "msek"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "sekúnd"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "bodov/sek"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "sekúnd"
 
@@ -272,7 +314,7 @@ msgstr "_Vybrať editor:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Získať a uložiť predchádzajúce nastavenie"
@@ -559,14 +601,6 @@ msgstr "Nastavuje štandardné písmo pre aplikácie"
 msgid "Please specify a name and a command for this editor."
 msgstr "Prosím, zadajte meno a príkaz pre tento editor."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "_Akceptuje URL"
@@ -776,6 +810,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Minimalizácia a maximalizácia"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1338,13 +1373,18 @@ msgstr "Prostredie"
 msgid "Window Management"
 msgstr "Správa okien"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Chyba pri nastavovaní nového akcelerátoru v konfiguračnej databázi: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1352,11 +1392,11 @@ msgstr ""
 "Nepodarilo sa nájsť žiadne klávesové témy. To znamená, že nemáte úplne "
 "nainštalované GTK+."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Akcie"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Klávesová skratka"
 
@@ -1382,6 +1422,11 @@ msgstr "Klávesové skratky _prostredia:"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, fuzzy, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Pri pokuse o zobrazenie Pomocníka nastala chyba: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Prístupnosť"
@@ -1450,11 +1495,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Rýchlosť opakovania kláves"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Rýchlosť"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Prístupnosť..."
@@ -1496,7 +1536,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Nastavenie klávesnice"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1505,7 +1545,7 @@ msgstr ""
 "<b>Neznámy kurzor</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1513,7 +1553,7 @@ msgstr ""
 "<b>Štandardný kurzor - aktuálny</b>\n"
 "Štandardný kurzor dodávaný s X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1521,7 +1561,7 @@ msgstr ""
 "<b>Štandardný kurzor</b>\n"
 "Štandardný kurzor dodávaný s X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1529,7 +1569,7 @@ msgstr ""
 "<b>Biely kurzor - aktuálny</b>\n"
 "Invertovaný štandardný kurzor"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1537,7 +1577,7 @@ msgstr ""
 "<b>Biely kurzor</b>\n"
 "Invertovaný štandardný kurzor"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1545,7 +1585,7 @@ msgstr ""
 "<b>Veľký kurzor - aktuálny</b>\n"
 "Veľká verzia normálneho kurzoru"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1553,7 +1593,7 @@ msgstr ""
 "<b>Veľký kurzor</b>\n"
 "Veľká verzia normálneho kurzoru"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1561,7 +1601,7 @@ msgstr ""
 "<b>Veľký biely kurzor - aktuálny</b>\n"
 "Veľká verzia bieleho kurzoru"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1692,10 +1732,6 @@ msgstr "_Zobraziť pozíciu kurzoru pri stlačení klávesu Control"
 msgid "_Threshold:"
 msgstr "_Hranica:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Myš"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1711,40 +1747,78 @@ msgstr "Sieť"
 msgid "Network proxy preferences"
 msgstr "Sieťové nastavenie"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Sieťové nastavenie"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Sieťové nastavenie"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "_Heslo:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-#, fuzzy
-msgid "Pro_xy requires username and password"
-msgstr "Pro_xy vyžaduje zadať používateľa a heslo"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "_Používateľ:"
+msgid "Autoconfiguration _URL:"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "U_miestnenie:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Nastavenie proxy HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Sieťové nastavenie"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "_Použiť HTTP proxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Použiť HTTP proxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "_Heslo:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "_Použiť HTTP proxy"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "_Používateľ:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Nastavenie zvuku"
@@ -1753,6 +1827,11 @@ msgstr "Nastavenie zvuku"
 msgid "E_nable sound server startup"
 msgstr "_Povoliť spustenie zvukového serveru"
 
+#: capplets/sound/sound-properties.glade.h:2
+#, fuzzy
+msgid "General"
+msgstr "_Všeobecné"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1827,32 +1906,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Nastavuje písmo pre ikony na ploche"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Téma"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Nové témy je možné nainštalovať aj ťahaním myšou do tohto okna."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Pozadie"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
 #, fuzzy
-msgid "Theme Preferences"
-msgstr "Nastavenie témy Gtk+"
+msgid "Apply _Font"
+msgstr "Použiť"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Ovládanie rozhrania"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Vzhľad okraja okien"
+msgid "Icons"
+msgstr "Iba ikony"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Nové témy je možné nainštalovať aj ťahaním myšou do tohto okna."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+#, fuzzy
+msgid "Theme Preferences"
+msgstr "Nastavenie témy Gtk+"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Vzhľad okraja okien"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Prejsť do priečinku témy"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "_Inštalovať novú tému..."
@@ -2010,30 +2106,57 @@ msgstr ""
 msgid "_Save"
 msgstr "Š_kálované"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Nastavenie okien"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Ovládanie rozhrania"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Typ"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Rýchlosť"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Použiť"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Vybrať okno pod kurzorom myši"
+msgid "Window Preferences"
+msgstr "Nastavenie okien"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Písmo titulku"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Vzhľad okraja okien"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Správca okien:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Vybrať okno pod kurzorom myši"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2180,7 +2303,7 @@ msgstr "_Túto správu už nezobrazovať"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Nepodarilo sa načítať zvukový súbor %s ako zvuk %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "Kľúč GConf %s nastavený na typ %s, ale očakáva sa typ %s\n"
@@ -2259,59 +2382,102 @@ msgstr "_Zahrať"
 msgid "Select sound file"
 msgstr "Vyberte zvukový súbor"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Spúšťam %s\n"
-"(%d sekúnd čakania)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Nepodarilo sa inicializovať správcu okien.\n"
-"\tUž beží iný správca a nie je možné ho ukončiť.\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "_Pípnuť pri povolení/zakázaní funkcií pre sprístupnenie klávesnice"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Nepodarilo sa inicializovať správcu okien.\n"
-"\t'%s' sa nespustil.\n"
+#~ msgid "Beep when:"
+#~ msgstr "Pípnuť pri:"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Predchádzajúci správca okien neskončil\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Nastavenie klávesnice"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Nepodarilo sa spustiť '%s'.\n"
-"Vraciam sa k predchádzajúcemu správcovi okien '%s'\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Začať _presun po takto dlhom držaní:"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Nepodarilo sa spustiť náhradného správcu okien.\n"
-"Prosím, spustite správcu okien ručne. Môžete to urobiť\n"
-"pomocou príkazu \"Spustiť program\" z hlavného menu.\n"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Importovať súbor CDE AccessX"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "_Vypnúť lepivé klávesy ak sú\n"
+#~ "naraz stlačené dva klávesy."
+
+#~ msgid "msecs"
+#~ msgstr "msek"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Sieťové nastavenie"
+
+#, fuzzy
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Pro_xy vyžaduje zadať používateľa a heslo"
+
+#~ msgid "_Location:"
+#~ msgstr "U_miestnenie:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Písmo titulku"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Vzhľad okraja okien"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid "Window Manager:"
+#~ msgstr "Správca okien:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Spúšťam %s\n"
+#~ "(%d sekúnd čakania)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Nepodarilo sa inicializovať správcu okien.\n"
+#~ "\tUž beží iný správca a nie je možné ho ukončiť.\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Nepodarilo sa inicializovať správcu okien.\n"
+#~ "\t'%s' sa nespustil.\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Predchádzajúci správca okien neskončil\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Nepodarilo sa spustiť '%s'.\n"
+#~ "Vraciam sa k predchádzajúcemu správcovi okien '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Nepodarilo sa spustiť náhradného správcu okien.\n"
+#~ "Prosím, spustite správcu okien ručne. Môžete to urobiť\n"
+#~ "pomocou príkazu \"Spustiť program\" z hlavného menu.\n"
+
+#~ msgid "OK"
+#~ msgstr "OK"
 
 #~ msgid "_Category"
 #~ msgstr "_Kategória"
@@ -2533,9 +2699,6 @@ msgstr "OK"
 #~ msgid "Mouse Properties"
 #~ msgstr "Vlastnosti myši"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Nastavenie proxy HTTP"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Nastavenie zvuku v GNOME"
 
diff --git a/po/sl.po b/po/sl.po
index 4d41fe670..fd7f9999d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-06-09 20:17+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -12,20 +12,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr ""
 "Ob zaganjanju nastavitvenega vstavka tipkovnice se je zgodila napaka : %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Nisem mogel uvoziti nastavitev AccessX iz datoteke '%s'"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Izberi datoteko CDE AccessX"
 
@@ -47,56 +46,92 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
-"Zapiskaj, ko je vklopljena lučka LED in dvakrat zapiskaj, ko je izklopljena."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "_Zapiskaj ob vklopu/izklopu možnosti dostopnosti tipkovnice"
+msgid "Basic"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Zapiskaj, ko je tipka za_vrnjena"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Zapiskaj, ko:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "_Zapiskaj, ko je prisoten spremenilnik"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr ""
+"Zapiskaj, ko je vklopljena lučka LED in dvakrat zapiskaj, ko je izklopljena."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Zapiskaj, ko je tipka za_vrnjena"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Premor (sek):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Vključi _preklopne tipke"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Vključi _odskočne tipke"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Vključi _počasne tipke"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Vključi _miškine tipke"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Vključi _lepljive tipke"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Splošno"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "_Datoteka"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Prezri pritiske tipk znotraj  :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -104,17 +139,27 @@ msgstr ""
 "Prezri vse zaporedne pritiske iste tipke, če se zgodijo znotraj časa, ki "
 "ganavede uporabnik."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Nastavitve dostopnosti tipkovnice (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Na_jvečja hitrost kazalca :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Miška"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Nastavitve miške"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -122,92 +167,91 @@ msgstr ""
 "Sprejmi le tipke, ko so bile pritisnjene in držane toliko časa, kot je "
 "nastavil uporabnik."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
 msgstr ""
 "Izvedi več hkratnih pritiskov tipk s pritiskom spremenilnik tipk v zaporedju."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Nastavitev ponavljanja tipk"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "Začni se _premikati tako dolgo po pritisku tipke :"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Preizkusno območje"
+msgid "S_peed:"
+msgstr "Hitrost"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Čas za _pospešitev na največjo hitrost :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Preklopi in ponavljanje tipk"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Vključi _preklopne tipke"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Spremeni numerično tipkovnico v plošček za nadzor miške."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "_Zapiskaj, ko je prisoten spremenilnik"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Izključi, če ni uporabljeno "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Vključi dostopnost tipkovnice"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "_Uvozi datoteko CDE AccessX"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "_Sprejmi tipke le po :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Hitrost ponavljanja"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"_Izkljči lepljive tipke,\n"
-"ko sta dve tipki pritisnjeni hkrati"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "tipka je _sprejeta"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "tipka je _pritisnjena"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "tipka je _zavrnjena"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "milisekund"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "sekund"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "pikslov/sek"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "sekund"
 
@@ -262,7 +306,7 @@ msgstr "Izberi _sliko:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Prenesi in shrani zapuščene nastavitve"
@@ -554,14 +598,6 @@ msgstr "Privzeti programi"
 msgid "Please specify a name and a command for this editor."
 msgstr "Prosim, navedite ime in ukaz za ta urejevalnik."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Sprejme _URLje"
@@ -773,6 +809,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Razpenjanje in krčenje"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Alt"
 
@@ -1339,14 +1376,19 @@ msgstr "Namizje"
 msgid "Window Management"
 msgstr "Upravljanje oken"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Napaka ob nastavljanju novega pospeševalnika v nastavitveni zbirki podatkov: "
 "%s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1354,11 +1396,11 @@ msgstr ""
 "Nisem našel teme tipkovnice  To pomeni, da je bila vaša namestitev GTK+ "
 "nepopolna."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Dejanje"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Bližnjica"
 
@@ -1384,6 +1426,12 @@ msgstr "Bližnjice _namizja"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr ""
+"Ob zaganjanju nastavitvenega vstavka tipkovnice se je zgodila napaka : %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Dostopnost"
@@ -1453,11 +1501,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Hitrost ponavljanja"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Hitrost"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Dostopnost..."
@@ -1499,7 +1542,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Nastavitv tipkovnice"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1508,7 +1551,7 @@ msgstr ""
 "<b>Neznan kazalec</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1516,7 +1559,7 @@ msgstr ""
 "<b>Privzet kazalec - trenutni</b>\n"
 "Privzet kazalec, ki pride z X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1524,7 +1567,7 @@ msgstr ""
 "<b>Privzet kazalec</b>\n"
 "Privzet kazalec, ki pride z X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1532,7 +1575,7 @@ msgstr ""
 "<b>Bel kazalec - trenutni</b>\n"
 "Invertiran privzet kazalec"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1540,7 +1583,7 @@ msgstr ""
 "<b>Bel kazalec</b>\n"
 "Invertiran privzet kazalec"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1548,7 +1591,7 @@ msgstr ""
 "<b>Velik kazalec - trenutni</b>\n"
 "Velika različica običajnega kazalca"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1556,7 +1599,7 @@ msgstr ""
 "<b>Velik kazalec</b>\n"
 "Velika različica običajnega kazalca"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1564,7 +1607,7 @@ msgstr ""
 "<b>Velik bel kazalec - trenutni</b>\n"
 "Velika različica belega kazalca"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1699,10 +1742,6 @@ msgstr "_Ko je pritisnjena tipka control, kaži položaj kazalca"
 msgid "_Threshold:"
 msgstr "_Prag:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Miška"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1718,40 +1757,79 @@ msgstr "Omrežje"
 msgid "Network proxy preferences"
 msgstr "Nastavitve omrežja"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Nastavitve omrežja"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Nastavitve omrežja"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "_Vrata:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "_Geslo:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-#, fuzzy
-msgid "Pro_xy requires username and password"
-msgstr "Pos_rednik zahteva uporabniško ime in geslo"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "_Uporabniško ime:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Ukaz za nastavitve:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Lokacija"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Nastavitve posrednika HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Nastavitve omrežja"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "_Vrata:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "_Uporabi posrednika HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Uporabi posrednika HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "_Geslo:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "_Uporabi posrednika HTTP"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "_Uporabniško ime:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Nastavitve zvoka"
@@ -1760,6 +1838,10 @@ msgstr "Nastavitve zvoka"
 msgid "E_nable sound server startup"
 msgstr "V_ključi zagon strežnika za zvok"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Splošno"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1834,32 +1916,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr "NAstavi pisavo za ikone na namizju"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Tema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Nove teme se lahko namestijo tudi z spustom v okno."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Ozadje"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
 #, fuzzy
-msgid "Theme Preferences"
-msgstr "Nastavitve teme GTK+"
+msgid "Apply _Font"
+msgstr "Sedaj uveljavi"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Nadzor uporabniškega vmesnika"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Izgled robov oken"
+msgid "Icons"
+msgstr "Le ikone"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Nove teme se lahko namestijo tudi z spustom v okno."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+#, fuzzy
+msgid "Theme Preferences"
+msgstr "Nastavitve teme GTK+"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Izgled robov oken"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Pojdi v mapo tem"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "_Namesti novo temo..."
@@ -2017,30 +2116,57 @@ msgstr ""
 msgid "_Save"
 msgstr "Po_večano"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Nastavitve oken"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Nadzor uporabniškega vmesnika"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Vrsta"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Hitrost"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Sedaj uveljavi"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Izberi okna, ko gre miška nad njimi"
+msgid "Window Preferences"
+msgstr "Nastavitve oken"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Pisava naziva okna"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Izgled robov oken"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Upravljalnik oken:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Izberi okna, ko gre miška nad njimi"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2187,7 +2313,7 @@ msgstr "_Ne kaži več tega sporočila"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Nisem mogel naložiti zvočne datoteke %s kot vzorca %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2268,60 +2394,109 @@ msgstr "_Predvajaj"
 msgid "Select sound file"
 msgstr "Izberi zvočno datoteko"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Zaganjam %s\n"
-"(%d sekund preden potehe hasovna omejitev)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Ne morem inicializirati upravljalnika oken.\n"
-"\tDrug upravljalnik oken že teče in ne more biti ubit\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "_Zapiskaj ob vklopu/izklopu možnosti dostopnosti tipkovnice"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Ne morem inicializirati upravljalnik oken.\n"
-"\t'%s' se ni pognal\n"
+#~ msgid "Beep when:"
+#~ msgstr "Zapiskaj, ko:"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Prejšnji upravljalnik oken ni umru\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Nastavitev ponavljanja tipk"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Nisem mogel pognati '%s'.\n"
-"Poganjam prejšnjega upravljalnika oken '%s'\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Začni se _premikati tako dolgo po pritisku tipke :"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Nisem mogel pognati prejšnjega upravljalnika oken.\n"
-"Prosim poženite upravljalnika oken ročno. To storite\n"
-"tako da izberete \"Poženi\" v \n"
-"nožnem menuju\n"
+#~ msgid "Testing Area"
+#~ msgstr "Preizkusno območje"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "V redu"
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Preklopi in ponavljanje tipk"
+
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Uvozi datoteko CDE AccessX"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "_Izkljči lepljive tipke,\n"
+#~ "ko sta dve tipki pritisnjeni hkrati"
+
+#~ msgid "msecs"
+#~ msgstr "milisekund"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Nastavitve omrežja"
+
+#, fuzzy
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Pos_rednik zahteva uporabniško ime in geslo"
+
+#~ msgid "_Location:"
+#~ msgstr "_Lokacija"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Pisava naziva okna"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Izgled robov oken"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Upravljalnik oken:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Zaganjam %s\n"
+#~ "(%d sekund preden potehe hasovna omejitev)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Ne morem inicializirati upravljalnika oken.\n"
+#~ "\tDrug upravljalnik oken že teče in ne more biti ubit\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Ne morem inicializirati upravljalnik oken.\n"
+#~ "\t'%s' se ni pognal\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Prejšnji upravljalnik oken ni umru\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Nisem mogel pognati '%s'.\n"
+#~ "Poganjam prejšnjega upravljalnika oken '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Nisem mogel pognati prejšnjega upravljalnika oken.\n"
+#~ "Prosim poženite upravljalnika oken ročno. To storite\n"
+#~ "tako da izberete \"Poženi\" v \n"
+#~ "nožnem menuju\n"
+
+#~ msgid "OK"
+#~ msgstr "V redu"
 
 #, fuzzy
 #~ msgid "Add:"
@@ -2533,9 +2708,6 @@ msgstr "V redu"
 #~ msgid "Mouse Properties"
 #~ msgstr "Lastnosti miške"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Nastavitve posrednika HTTP"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Nastavi uporabo zvoka v GNOMEu"
 
@@ -2831,9 +3003,6 @@ msgstr "V redu"
 #~ msgid "Icons and Text"
 #~ msgstr "Ikone in besedilo"
 
-#~ msgid "Only Icons"
-#~ msgstr "Le ikone"
-
 #~ msgid "Only Text"
 #~ msgstr "Le besedilo"
 
@@ -3062,9 +3231,6 @@ msgstr "V redu"
 #~ msgid "Command:"
 #~ msgstr "Ukaz:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Ukaz za nastavitve:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Upravljalnik oken je upravljan s sejo"
 
diff --git a/po/sv.po b/po/sv.po
index 1242a5d03..0a9595432 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-07-17 10:54+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -16,21 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr ""
 "Ett fel inträffade vid visande av kontrollpanelsprogrammet för tangentbord: %"
 "s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Kan inte importera AccessX-inställningar från filen \"%s\""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Välj CDE AccessX-fil"
 
@@ -52,57 +51,97 @@ msgstr ""
 
 # SUN NEW TRANSLATION
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
-"Avge en ljudsignal när en lysdiod sätts på och två ljudsignaler när en "
-"stängs av."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
 #, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "_Pip vid aktivering/inaktivering av tangentbordshjälpmedel"
+msgid "Basic"
+msgstr "Garnering"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Pip när tangenten för_kastas"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Pip då:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "_Pip då modifieraren trycks ned"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+# SUN NEW TRANSLATION
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr ""
+"Avge en ljudsignal när en lysdiod sätts på och två ljudsignaler när en "
+"stängs av."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Pip när tangenten för_kastas"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Fördröjning:"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#, fuzzy
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr "Fördröjning mellan varje steg i labyrinten."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Använd _växlingsknappar"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Använd s_tudsande tangenter"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Använd l_ångsamma tangenter"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Använd _mustangenter"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Använd _klistriga tangenter"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Allmänt"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#, fuzzy
+msgid "Features"
+msgstr "Kugghjul"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "_Arkiv"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Ignorera tangenttryckningar inom:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -110,17 +149,27 @@ msgstr ""
 "Ignorera alla efterföljande nedtryckningar av SAMMA tangent om de sker inom "
 "en användardefinierbar tidsperiod."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Konfiguration av tangentbordshjälpmedel (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Ma_ximal pekarhastighet:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Mus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Musinställningar"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -129,7 +178,7 @@ msgstr ""
 "en användardefinierad tid."
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -137,86 +186,84 @@ msgstr ""
 "Tryck ned flera modifierare i följd i stället för att trycka ned flera "
 "tangenter samtidigt."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Inställningar för tangentbordsupprepning"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-#, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "Börja flytta så här lång tid efter tangentnedtryckning:"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Testområde"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr "Hasti_ghet:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Tid att a_ccelerera till maximal hastighet:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Växlings- och upprepningstangenter"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Använd _växlingsknappar"
 
 # SUN NEW TRANSLATION
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Får det numeriska tangentbordet att fungera som en musstyrningsenhet."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "_Pip då modifieraren trycks ned"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "I_naktivera om oanvänd i "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Använd tangentbordshjälpmedel"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "_Importera CDE AccessX-fil"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "_Godtag endast tangenttryckningar efter:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Repeteringstangenter"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"_Slå av klistriga tangenter då\n"
-"två tangenter trycks ned samtidigt"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "tangenten är _godtagen"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "tangenten är _nedtryckt"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "tangenten är _förkastad"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "millisekunder"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "sekunder"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "bildpunkter/sekund"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "sekunder"
 
@@ -271,7 +318,7 @@ msgstr "Välj _bild:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Hämta och lagra föråldrade inställningar"
@@ -559,15 +606,6 @@ msgstr "Välj dina standardprogram"
 msgid "Please specify a name and a command for this editor."
 msgstr "Ange ett namn och ett kommando för att denna textredigerare."
 
-# SUN NEW TRANSLATION
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Acce_pterar URL:er"
@@ -776,6 +814,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Minimering och maximering"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1337,12 +1376,17 @@ msgstr "Skrivbord"
 msgid "Window Management"
 msgstr "Fönsterhantering"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Fel vid inställning av ny snabbtangent i konfigurationsdatabasen: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1350,11 +1394,11 @@ msgstr ""
 "Kan inte hitta några tangentbordsteman. Detta betyder att din GTK+-"
 "installation inte har installerats korrekt."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Åtgärd"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Genväg"
 
@@ -1379,6 +1423,13 @@ msgstr "_Textredigeringsgenvägar:"
 msgid "Assign shortcut keys to commands"
 msgstr "Associera snabbtangenter med kommandon"
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr ""
+"Ett fel inträffade vid visande av kontrollpanelsprogrammet för tangentbord: %"
+"s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Åtkomlighet"
@@ -1445,10 +1496,6 @@ msgstr "Tangentklick"
 msgid "Repeat Keys"
 msgstr "Repeteringstangenter"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr "Hasti_ghet:"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Åtkomlighet..."
@@ -1485,7 +1532,7 @@ msgstr "tyst"
 msgid "Set your keyboard preferences"
 msgstr "Ställ in dina tangentbordsinställningar"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1494,7 +1541,7 @@ msgstr ""
 "<b>Okänd muspekare</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1502,7 +1549,7 @@ msgstr ""
 "<b>Standardmuspekare - Aktuell</b>\n"
 "Standardmuspekaren som kommer med X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1510,7 +1557,7 @@ msgstr ""
 "<b>Standardmuspekare</b>\n"
 "Standardmuspekaren som kommer med X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1518,7 +1565,7 @@ msgstr ""
 "<b>Vit muspekare - Aktuell</b>\n"
 "Inverterad standardmuspekare"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1526,7 +1573,7 @@ msgstr ""
 "<b>Vit muspekare</b>\n"
 "Inverterad standardmuspekare"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1534,7 +1581,7 @@ msgstr ""
 "<b>Stor muspekare - Aktuell</b>\n"
 "Stor version av den vanliga muspekaren"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1542,7 +1589,7 @@ msgstr ""
 "<b>Stor muspekare</b>\n"
 "Stor version av den vanliga muspekaren"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1550,7 +1597,7 @@ msgstr ""
 "<b>Stor vit muspekare - Aktuell</b>\n"
 "Stor version av den vita muspekaren"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1686,10 +1733,6 @@ msgstr "_Visa muspekarens position då Control-tangenten trycks ned"
 msgid "_Threshold:"
 msgstr "_Tröskel:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Mus"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Ställ in dina musinställningar"
@@ -1704,38 +1747,80 @@ msgstr "Nätverksproxy"
 msgid "Network proxy preferences"
 msgstr "Inställningar för nätverksproxy"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Nätverksinställningar"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Inställningar för nätverksproxy"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "L_ösenord:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "Pro_xyservern kräver användarnamn och lösenord"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "Användar_namn:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Konfigurationskommando:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "_Plats:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "HTTP-proxyinställningar"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Inställningar för nätverksproxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+#, fuzzy
+msgid "_Details"
+msgstr "Svansar"
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "_Använd HTTP-proxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Använd HTTP-proxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "L_ösenord:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "_Använd HTTP-proxy"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Användar_namn:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Ljudegenskaper"
@@ -1744,6 +1829,10 @@ msgstr "Ljudegenskaper"
 msgid "E_nable sound server startup"
 msgstr "A_ktivera uppstart av ljudserver"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Allmänt"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1815,31 +1904,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Välj teman för diverse delar av skrivbordet"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Tema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Nya teman kan också installeras genom att de dras till fönstret."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Bakgrund"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-msgid "Theme Preferences"
-msgstr "Temainställningar"
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Verkställ nu"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Användargränssnittsstyrning"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Fönsterramsutseende"
+msgid "Icons"
+msgstr "Sekunder"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Nya teman kan också installeras genom att de dras till fönstret."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+msgid "Theme Preferences"
+msgstr "Temainställningar"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Fönsterramsutseende"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Gå till temamappen"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "_Installera nytt tema..."
 
@@ -1994,30 +2100,58 @@ msgstr "tyst"
 msgid "_Save"
 msgstr "_Skalad"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Fönsterinställningar"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Användargränssnittsstyrning"
+
+#: capplets/windows/gnome-window-properties.c:580
+#, fuzzy
+msgid "Alt"
+msgstr "Myra"
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Hyperboll"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Sfär"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Verkställ nu"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Markera fönster när muspekaren rör sig över dem"
+msgid "Window Preferences"
+msgstr "Fönsterinställningar"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Titelradstypsnitt"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Fönsterramsutseende"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Fönsterhanterare:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Markera fönster när muspekaren rör sig över dem"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2167,7 +2301,7 @@ msgstr "_Visa inte detta meddelande igen"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Kunde inte läsa in ljudfilen %s som prov %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2248,42 +2382,94 @@ msgstr "_Spela"
 msgid "Select sound file"
 msgstr "Välj en ljudfil"
 
-# SUN NEW TRANSLATION
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Startar %s\n"
-"(%d sekunder kvar innan åtgärden når tidsgränsen)"
+
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "_Pip vid aktivering/inaktivering av tangentbordshjälpmedel"
+
+#~ msgid "Beep when:"
+#~ msgstr "Pip då:"
+
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Inställningar för tangentbordsupprepning"
+
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Börja flytta så här lång tid efter tangentnedtryckning:"
+
+#~ msgid "Testing Area"
+#~ msgstr "Testområde"
+
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Växlings- och upprepningstangenter"
+
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Importera CDE AccessX-fil"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "_Slå av klistriga tangenter då\n"
+#~ "två tangenter trycks ned samtidigt"
+
+#~ msgid "msecs"
+#~ msgstr "millisekunder"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Nätverksinställningar"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Pro_xyservern kräver användarnamn och lösenord"
+
+#~ msgid "_Location:"
+#~ msgstr "_Plats:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Titelradstypsnitt"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Fönsterramsutseende"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Fönsterhanterare:"
 
 # SUN NEW TRANSLATION
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-egenskaper-capplet: Det går inte att initiera fönsterhanteraren.\n"
-"\tEn annan fönsterhanterare körs redan och den kan inte stängas\n"
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Startar %s\n"
+#~ "(%d sekunder kvar innan åtgärden når tidsgränsen)"
+
+# SUN NEW TRANSLATION
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-egenskaper-capplet: Det går inte att initiera fönsterhanteraren.\n"
+#~ "\tEn annan fönsterhanterare körs redan och den kan inte stängas\n"
 
 # SUN NEW TRANSLATION
 #
 # Sun vill använda ''
 # Jag vill använda \"\" som i alla andra GNOME-översättningar
 #
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-egenskaper-capplet: Det går inte att initiera fönsterhanteraren.\n"
-"\t\"%s\" startade inte\n"
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-egenskaper-capplet: Det går inte att initiera fönsterhanteraren.\n"
+#~ "\t\"%s\" startade inte\n"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Föregående fönsterhanterare dog inte\n"
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Föregående fönsterhanterare dog inte\n"
 
 # SUN NEW TRANSLATION
 #
@@ -2293,35 +2479,31 @@ msgstr "Föregående fönsterhanterare dog inte\n"
 # Sun vill ha "fönsterhanterare'%s'\n"
 # Jag vill ha "fönsterhanteraren \"%s\"\n"
 #
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Det gick inte att starta \"%s\".\n"
-"Återgår till tidigare fönsterhanteraren \"%s\"\n"
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Det gick inte att starta \"%s\".\n"
+#~ "Återgår till tidigare fönsterhanteraren \"%s\"\n"
 
 # SUN NEW TRANSLATION
 #
 # Sun vill ha "markera\"Kör…\""
 # Jag vill ha "välja \"Kör\""
 #
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Kunde inte starta den alternativa fönsterhanteraren.\n"
-"Kör en fönsterhanterare manuellt. Det gör du\n"
-"genom att välja \"Kör\" i fotmenyn\n"
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Kunde inte starta den alternativa fönsterhanteraren.\n"
+#~ "Kör en fönsterhanterare manuellt. Det gör du\n"
+#~ "genom att välja \"Kör\" i fotmenyn\n"
 
 # SUN NEW TRANSLATION
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid "OK"
+#~ msgstr "OK"
 
 #~ msgid "Add:"
 #~ msgstr "Lägg till:"
@@ -2605,9 +2787,6 @@ msgstr "OK"
 #~ msgid "Mouse Properties"
 #~ msgstr "Egenskaper för mus"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "HTTP-proxyinställningar"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Konfigurera GNOME:s användning av ljud"
 
@@ -3003,9 +3182,6 @@ msgstr "OK"
 #~ msgid "Command:"
 #~ msgstr "Kommando:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Konfigurationskommando:"
-
 # SUN NEW TRANSLATION
 #
 # Sun vill ha "Fönsterhanterare är sessionshanterade"
@@ -3724,9 +3900,6 @@ msgstr "OK"
 #~ "deras väg. När de sedan passerar ändrade bildpunkter ändras även deras "
 #~ "beteende. Skriven av David Bagley."
 
-#~ msgid "Ant"
-#~ msgstr "Myra"
-
 #~ msgid "Four Sided cells"
 #~ msgstr "Fyrsidiga celler"
 
@@ -3808,9 +3981,6 @@ msgstr "OK"
 #~ msgid "Splines"
 #~ msgstr "Spliner"
 
-#~ msgid "Tails"
-#~ msgstr "Svansar"
-
 #~ msgid "Threshold of repulsion"
 #~ msgstr "Repulsionströskelvärde"
 
@@ -3867,9 +4037,6 @@ msgstr "OK"
 #~ msgid "Use red/blue 3d seperation."
 #~ msgstr "Använd röd/blå 3d-separation."
 
-#~ msgid "Braid"
-#~ msgstr "Garnering"
-
 #~ msgid ""
 #~ "Draws random color-cycling inter-braided concentric circles. Written by "
 #~ "John Neil."
@@ -4181,9 +4348,6 @@ msgstr "OK"
 #~ msgid "Epicycle"
 #~ msgstr "Epicykel"
 
-#~ msgid "Seconds"
-#~ msgstr "Sekunder"
-
 #~ msgid ""
 #~ "This program draws the path traced out by a point on the edge of a "
 #~ "circle. That circle rotates around a point on the rim of another circle, "
@@ -4287,9 +4451,6 @@ msgstr "OK"
 #~ "stjärnor med alla fyra vindar, eller, hmm, något. Ursprungligen ett Amiga-"
 #~ "program av Uli Siegmund."
 
-#~ msgid "Gears"
-#~ msgstr "Kugghjul"
-
 #~ msgid ""
 #~ "This draws sets of turning, interlocking gears, rotating in three "
 #~ "dimensions. Another GL hack, by Danny Sung, Brian Paul, Ed Mackey, and "
@@ -4360,9 +4521,6 @@ msgstr "OK"
 #~ msgid "Number of pixels before a color change."
 #~ msgstr "Antal pixlar innan en färgändring."
 
-#~ msgid "Hyperball"
-#~ msgstr "Hyperboll"
-
 #~ msgid "Closer"
 #~ msgstr "Närmare"
 
@@ -4447,9 +4605,6 @@ msgstr "OK"
 #~ msgid "Delay between drawing the maze and starting the solution."
 #~ msgstr "Fördröjning mellan labyrinten och startandet av lösningen."
 
-#~ msgid "Delay between each step in the maze."
-#~ msgstr "Fördröjning mellan varje steg i labyrinten."
-
 #~ msgid "Delay between finishing the maze and starting a new one."
 #~ msgstr "Fördröjning mellan avslutande av labyrinten och start av en ny."
 
@@ -4611,9 +4766,6 @@ msgstr "OK"
 #~ msgid "SpeedMine"
 #~ msgstr "SpeedMine"
 
-#~ msgid "Sphere"
-#~ msgstr "Sfär"
-
 #~ msgid "Spiral"
 #~ msgstr "Spiral"
 
diff --git a/po/tr.po b/po/tr.po
index 5d2474bd5..e6cf57db0 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 1.5.0\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-06-25 00:23+0300\n"
 "Last-Translator: Görkem Çetin <gorkem@gelecek.com.tr>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -14,19 +14,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, fuzzy, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Yardım dosyasının görüntülenmesinde bir hata oluştu: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "CDE AccessX dosyasını seçin"
 
@@ -48,158 +47,205 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
 #, fuzzy
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr "tuş _kabul edilmediğinde"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Biple:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "tuş _kabul edilmediğinde"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "tuş _kabul edilmediğinde"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Gecikme (sn):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Aç/Kapat Tuşlarını Etkinleştir"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "_Tekrarlayan Tuşları Etkinleştir"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "_Yavaş Tuşları Etkinleştir"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "_Fare Tuşlarını Etkinleştir"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "_Yapışkan Tuşları Etkinleştir"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "General"
-msgstr "_Genel"
+msgid "Filters"
+msgstr "_Dosya"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "Bu aralıktaki tuş basmalarını gözardı et:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Klavye Erişilebilirlik Yapılandırması"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Azami fare hızı:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Fare"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Fare Tercihleri"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Klavye Tercihleri"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
-msgstr ""
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr ""
+msgid "S_peed:"
+msgstr "Hız"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr ""
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Aç/Kapat Tuşlarını Etkinleştir"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "tuş _kabul edilmediğinde"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "Bu süre boyunca kullanılmadığı zaman etkisiz hale getir"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Klavye erişilebilirliğini etkinleştir"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "_CDE AccessX dosyasını aktar"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "Tuş basımını sadece bu süre sonunda kabul et:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Tekrarlama Sıklığı"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "_tuş kabul edildiğinde"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "t_uş basıldığında"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "tuş _kabul edilmediğinde"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "msn"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "saniye"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "piksel/san"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "saniye"
 
@@ -260,7 +306,7 @@ msgstr "_Bir Düzenleyici Seçin:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Eski ayarları al ve sakla"
@@ -531,14 +577,6 @@ msgstr "Öntanımlı Uygulamalar"
 msgid "Please specify a name and a command for this editor."
 msgstr "Lütfen bu düzenleyici için bir isim ve bir komut verin."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "URL'leri Kabul Et"
@@ -745,6 +783,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Alçaltma ve Yükseltme"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1302,22 +1341,27 @@ msgstr ""
 msgid "Window Management"
 msgstr "Pencere Yönetimi"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Eylem"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Kısayol"
 
@@ -1343,6 +1387,11 @@ msgstr "Masaüstü _kısayolları:"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, fuzzy, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Yardım dosyasının görüntülenmesinde bir hata oluştu: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "E_rişilebilirlik"
@@ -1410,11 +1459,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Tekrarlama Sıklığı"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Hız"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Erişilebilirlik..."
@@ -1456,7 +1500,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Klavye Tercihleri"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1465,7 +1509,7 @@ msgstr ""
 "<b>Bilinmeyen İmleç</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1473,7 +1517,7 @@ msgstr ""
 "<b>Öntanımlı İmleç - Güncel</b>\n"
 "X Window ile birlikte gelen imleç"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1481,7 +1525,7 @@ msgstr ""
 "<b>Öntanımlı İmleç</b>\n"
 "X Window ile birlikte gelen imleç"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1489,7 +1533,7 @@ msgstr ""
 "<b>Beyaz İmleç - Güncel</b>\n"
 "Öntanımlı imlecin ters çevrilmiş hali"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1497,7 +1541,7 @@ msgstr ""
 "<b>Beyaz İmleç</b>\n"
 "Öntanımlı imlecin ters çevrilmiş hali"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1505,7 +1549,7 @@ msgstr ""
 "<b>Büyük İmleç - Güncel</b>\n"
 "Normal imlecin büyük hali"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1513,7 +1557,7 @@ msgstr ""
 "<b>Büyük İmleç</b>\n"
 "Normal imlecin büyük hali"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1521,7 +1565,7 @@ msgstr ""
 "<b>Büyük Beyaz İmleç - Güncel</b>\n"
 "Beyaz imlecin büyük hali"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1658,10 +1702,6 @@ msgstr "_Kontrol tuşuna basıldığında farenin konumunu göster"
 msgid "_Threshold:"
 msgstr "_Alınacak yol:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Fare"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1677,40 +1717,78 @@ msgstr "Ağ"
 msgid "Network proxy preferences"
 msgstr "Ağ Tercihleri"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Ağ Tercihleri"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Ağ Tercihleri"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "_Parola:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-#, fuzzy
-msgid "Pro_xy requires username and password"
-msgstr "Bu sunucu bir kullanıcı adı ve parola istiyor"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "_Kullanıcı adı:"
+msgid "Autoconfiguration _URL:"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "K_onum:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "HTTP Vekil Ayarları"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Ağ Tercihleri"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
 msgstr "HTTP vekil sunucu kullan"
 
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "HTTP vekil sunucu kullan"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "_Parola:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
+msgstr "HTTP vekil sunucu kullan"
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "_Kullanıcı adı:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Ses tercihleri"
@@ -1719,6 +1797,11 @@ msgstr "Ses tercihleri"
 msgid "E_nable sound server startup"
 msgstr "_Başlangıçta ses sunucusunu çalıştır"
 
+#: capplets/sound/sound-properties.glade.h:2
+#, fuzzy
+msgid "General"
+msgstr "_Genel"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1793,34 +1876,51 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Masaüstü simgelerinin yazıtipini ayarla"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Tema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Arkaplan"
+
+#: capplets/theme-switcher/theme-properties.glade.h:2
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Şimdi Uygula"
+
+#: capplets/theme-switcher/theme-properties.glade.h:3
+#, fuzzy
+msgid "Controls"
+msgstr "Arayüz Kontrolü"
+
+#: capplets/theme-switcher/theme-properties.glade.h:4
+#, fuzzy
+msgid "Icons"
+msgstr "Sadece Simgeler"
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
 msgid "New themes can also be installed by dragging them into the window."
 msgstr ""
 "Yeni temalar, tema dosyalarını bu pencereye sürüklemek yöntemiyle de "
 "kurulabilir."
 
-#: capplets/theme-switcher/theme-properties.glade.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:7
 #, fuzzy
 msgid "Theme Preferences"
 msgstr "GTK+ Tema Tercihleri"
 
-#: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
-
-#: capplets/theme-switcher/theme-properties.glade.h:4
+#: capplets/theme-switcher/theme-properties.glade.h:8
 #, fuzzy
-msgid "Window Border Theme"
+msgid "Window Border"
 msgstr "Pencere Kenarı Görünümü"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Tema dizinine git"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "_Yeni tema kur..."
@@ -1978,30 +2078,57 @@ msgstr ""
 msgid "_Save"
 msgstr "_Odaklanmış"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Pencere Tercihleri"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Arayüz Kontrolü"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Tür"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Hız"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Şimdi Uygula"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Fare bir pencerenin üzerine geldiğinde onu seç"
+msgid "Window Preferences"
+msgstr "Pencere Tercihleri"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Başlık Çubuğu Yazıtipi"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Pencere Kenarı Görünümü"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Pencere Yöneticisi:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Fare bir pencerenin üzerine geldiğinde onu seç"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2139,7 +2266,7 @@ msgstr "_Bu mesajı yeniden gösterme"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2217,49 +2344,50 @@ msgstr "Ç_al"
 msgid "Select sound file"
 msgstr "Ses dosyasını seçin"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
+#~ msgid "Beep when:"
+#~ msgstr "Biple:"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Klavye Tercihleri"
 
-#: libwindow-settings/gnome-wm-manager.c:378
 #, fuzzy
-msgid "Previous window manager did not die\n"
-msgstr "Pencere yöneticisi ses olaylarını etkinleştir"
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_CDE AccessX dosyasını aktar"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
+#~ msgid "msecs"
+#~ msgstr "msn"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
+#~ msgid "Network Preferences"
+#~ msgstr "Ağ Tercihleri"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "Tamam"
+#, fuzzy
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Bu sunucu bir kullanıcı adı ve parola istiyor"
+
+#~ msgid "_Location:"
+#~ msgstr "K_onum:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Başlık Çubuğu Yazıtipi"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Pencere Kenarı Görünümü"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Pencere Yöneticisi:"
+
+#, fuzzy
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Pencere yöneticisi ses olaylarını etkinleştir"
+
+#~ msgid "OK"
+#~ msgstr "Tamam"
 
 #~ msgid "_Category"
 #~ msgstr "_Kategori"
@@ -2483,9 +2611,6 @@ msgstr "Tamam"
 #~ msgid "Mouse Properties"
 #~ msgstr "Fare Özellikleri"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "HTTP Vekil Ayarları"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "GNOME ses kullanım ayarları"
 
diff --git a/po/uk.po b/po/uk.po
index a0ed53c1e..7c3917ba5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 1.0.6\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-06-16 00:18+0200\n"
 "Last-Translator: Yuriy Syrota <yuri@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,19 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, fuzzy, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Виникла помилка відображення довідки: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Неможливо імпортувати параметри AccessX з файла \"%s\""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Вибрати файл CDE AccessX"
 
@@ -47,58 +46,93 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
-"Подавати один сиґнал, коли світловий індикатор засвічується і два сиґнали, "
-"коли гасне"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "_Увімкнути спеціальні можливості клавіатури"
+msgid "Basic"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
 #, fuzzy
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr "клавішу _відкинуто"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Подавати сиґнал, коли"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "По_давати сиґнал, когли модификатор натиснуто"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr ""
+"Подавати один сиґнал, коли світловий індикатор засвічується і два сиґнали, "
+"коли гасне"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "клавішу _відкинуто"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "Затримка (с):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Увімкнути клавіші-_перемикачі"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Увімкнути від_скакуючі клавіші"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Увімкнути \"_повільні\" клавіші"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Увімкнути клавіші-по_зиціонування"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Увімкнути \"_липкі\" клавіші"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "Filters"
+msgstr "_Файл"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#, fuzzy
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Іґнорувати натиснення в період:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -106,17 +140,27 @@ msgstr ""
 "Іґнорувати всі послідовності натиснення однієї клавіші, якщо вони стаються у "
 "вказаний користувачем проміжок часу."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Властивості спеціальних можливостей клавіатури"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "_Максимальна швидкість вказівника:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Миша"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Властивості миші"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -124,7 +168,7 @@ msgstr ""
 "Приймати лише ті клавіші, які були натиснено і утримано на визначений "
 "користувачем промідок часу."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -132,85 +176,83 @@ msgstr ""
 "Ґенерувати кілька натиснень клавіш одночасно при послідовному натисненні "
 "клавіш-модифікаторів."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Властивості клавіатури"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "Починати пере_носити після довгого натиснення:"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr ""
+msgid "S_peed:"
+msgstr "Швидкість"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Час при_скорення до максимальної швидкості:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr ""
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Увімкнути клавіші-_перемикачі"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Зробити цифрову клавіатуру панеллю керування вказівником миші."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "По_давати сиґнал, когли модификатор натиснуто"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "_Вимкнути, якщо не використовується протягом "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "_Увімкнути спеціальні можливості клавіатури"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "Вибрати файл CDE AccessX"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "_Приймати натиснення лише після:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+msgid "_Repeat Keys"
 msgstr ""
-"_Вимикати \"липкі\" клавіші,\n"
-"коли дві клавіші натиснуто одночасно"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "клавішу _прийнято"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "клавішу _натиснуто"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "клавішу _відкинуто"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "мс"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "с"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "т/с"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "с"
 
@@ -271,7 +313,7 @@ msgstr "Вибрати редактор:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Отримання і збереження старих параметрів"
@@ -542,14 +584,6 @@ msgstr "Встановити типову поведінку додатків GN
 msgid "Please specify a name and a command for this editor."
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr ""
@@ -763,6 +797,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Мінімізація і максимізація"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr ""
 
@@ -1323,22 +1358,27 @@ msgstr "Стільниця"
 msgid "Window Management"
 msgstr "Керування вікнами"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Дія"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 #, fuzzy
 msgid "Shortcut"
 msgstr "Комбінації клавіш"
@@ -1364,6 +1404,11 @@ msgstr ""
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, fuzzy, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Виникла помилка відображення довідки: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Спеціальні можливості"
@@ -1430,11 +1475,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr ""
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Швидкість"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 #, fuzzy
 msgid "_Accessibility..."
@@ -1477,7 +1517,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Властивості клавіатури"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1486,49 +1526,49 @@ msgstr ""
 "<b>Невідомий курсор</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1654,10 +1694,6 @@ msgstr ""
 msgid "_Threshold:"
 msgstr "_Поріг:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Миша"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1673,41 +1709,78 @@ msgstr "Мережа"
 msgid "Network proxy preferences"
 msgstr "Властивості мережі"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Властивості мережі"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Властивості мережі"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "Порт:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "_Пароль:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-#, fuzzy
-msgid "Pro_xy requires username and password"
-msgstr "_Проксі вимагає вказання користувача і пароля"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "_Користувач:"
+msgid "Autoconfiguration _URL:"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
 #, fuzzy
-msgid "_Location:"
-msgstr "Дія"
+msgid "HTTP Proxy Details"
+msgstr "Параметри проксі HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Властивості мережі"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "Порт:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "_Викорістовувати проксі HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Викорістовувати проксі HTTP"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "_Пароль:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "_Викорістовувати проксі HTTP"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "_Користувач:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Звукові властивості"
@@ -1716,6 +1789,10 @@ msgstr "Звукові властивості"
 msgid "E_nable sound server startup"
 msgstr ""
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr ""
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1789,32 +1866,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr ""
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Тема"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr ""
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Тло"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
 #, fuzzy
-msgid "Theme Preferences"
-msgstr "Властивості теми GTK+"
+msgid "Apply _Font"
+msgstr "Застосувати негайно"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Керування інтерфейсом"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Зовнішній вигляд рамки вікна"
+msgid "Icons"
+msgstr "Лише піктограми"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr ""
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+#, fuzzy
+msgid "Theme Preferences"
+msgstr "Властивості теми GTK+"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Зовнішній вигляд рамки вікна"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "Встановити нову тему..."
@@ -1970,30 +2064,56 @@ msgstr ""
 msgid "_Save"
 msgstr "_Змаштабовано"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Налаштування вікон"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Керування інтерфейсом"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Тип"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Швидкість"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Застосувати негайно"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+msgid "Window Preferences"
+msgstr "Налаштування вікон"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Шрифт заголовка"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Зовнішній вигляд рамки вікна"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Віконний менеджер:"
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2136,7 +2256,7 @@ msgstr "Більше _не показувати цього повідомлен�
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "е вдалося завантажити звуковий файл %s як фрагмент %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "Ключ GConf %s встановлено в тип %s, а очікувався тип %s\n"
@@ -2215,50 +2335,72 @@ msgstr "_Відтворити"
 msgid "Select sound file"
 msgstr "Виберіть звуковий файл"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "_Увімкнути спеціальні можливості клавіатури"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
+#~ msgid "Beep when:"
+#~ msgstr "Подавати сиґнал, коли"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Попередній віконний менеджер продовжує працювати\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Властивості клавіатури"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Неможливо запустити '%s'.\n"
-"Повертаємося до попереднього віконного менеджера '%s'\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Починати пере_носити після довгого натиснення:"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "Вибрати файл CDE AccessX"
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "_Вимикати \"липкі\" клавіші,\n"
+#~ "коли дві клавіші натиснуто одночасно"
+
+#~ msgid "msecs"
+#~ msgstr "мс"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Властивості мережі"
+
+#, fuzzy
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "_Проксі вимагає вказання користувача і пароля"
+
+#, fuzzy
+#~ msgid "_Location:"
+#~ msgstr "Дія"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Шрифт заголовка"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Зовнішній вигляд рамки вікна"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "Гаразд"
+#~ msgid "Window Manager:"
+#~ msgstr "Віконний менеджер:"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Попередній віконний менеджер продовжує працювати\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Неможливо запустити '%s'.\n"
+#~ "Повертаємося до попереднього віконного менеджера '%s'\n"
+
+#~ msgid "OK"
+#~ msgstr "Гаразд"
 
 #~ msgid "_Category"
 #~ msgstr "Категорія"
@@ -2399,9 +2541,6 @@ msgstr "Гаразд"
 #~ msgid "Mouse Properties"
 #~ msgstr "Властивості миші"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Параметри проксі HTTP"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Налаштування використання звуку в GNOME"
 
diff --git a/po/vi.po b/po/vi.po
index a71b3e862..bab6099de 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center VERSION\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-08-17 18:23+0700\n"
 "Last-Translator: pclouds <pclouds@gmx.net>\n"
 "Language-Team: GnomeVI <gnomevi-list@lists.sourceforge.net>\n"
@@ -13,19 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, fuzzy, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Lỗi hiển thị trợ giúp: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Không thể nhập các thông số AccessX từ tập tin '%s'"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Chọn tập tin CDE AccessX"
 
@@ -47,57 +46,91 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Kêu một bíp khi LED bật và kêu hai bíp khi LED tắt."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "_Beep when enabling/disabling keyboard accessibility features"
+msgid "Basic"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
 #, fuzzy
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr "phím bị từ _chối"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Kêu bíp khi:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "Kêu bíp khi phím bổ trợ được nhấn"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "Kêu một bíp khi LED bật và kêu hai bíp khi LED tắt."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "phím bị từ _chối"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Khoảng chờ (giây):"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "Bật _Toggle Key"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "Bật _Bounce Key"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Bật Slo_w Key"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Bật _Mouse Key"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Bật _Sticky Key"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "General"
-msgstr "_Chung"
+msgid "Filters"
+msgstr "_Tập tin"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "_Bỏ qua phím nhấn trong :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -105,24 +138,34 @@ msgstr ""
 "Bỏ qua mọi chuỗi phím nhấn của CÙNG một phím nếu xảy ra trong một khoảng "
 "thời gian cho trước."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Keyboard Accessibility Configuration (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "Tốc độ con trỏ _tối đa :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Chuột"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Thông số chuột"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
 msgstr ""
 "Chỉ chấp nhận phím khi chúng được nhấn và giữ trong một khoảng thời gian."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
@@ -130,84 +173,83 @@ msgstr ""
 "Thực hiện thao tác nhấn nhiều phím đồng thời bằng cách nhấn phím bổ trợ theo "
 "thứ tự."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Thông số bàn phím"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "Bắt đầu di chuyển sau khi nhấn phím :"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr ""
+msgid "S_peed:"
+msgstr "Tốc độ"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Thời gian _tăng tốc đến tối đa :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr ""
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Bật _Toggle Key"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Dùng Keypad như bộ điều khiển chuột."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-#, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "Kêu bíp khi phím bổ trợ được nhấn"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
+msgid "_Disable if unused for:"
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
 #, fuzzy
-msgid "_Enable keyboard accessibility"
+msgid "_Enable keyboard accessibility features"
 msgstr "_Enable keyboard accessibility"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "_Nhập tập tin CDE AccessX"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "_Chỉ chấp nhận phím nhấn sau :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Tốc độ lặp"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "phím được _chấp nhận"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "phím được _nhấn"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "phím bị _từ chối"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "mili giây"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "giây"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "pixel/giây"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "giây"
 
@@ -268,7 +310,7 @@ msgstr "_Chọn trình xử lý văn bản:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Nhận và lưu thiết lập truyền thống"
@@ -557,14 +599,6 @@ msgstr "Đặt font cho ứng dụng"
 msgid "Please specify a name and a command for this editor."
 msgstr "Vui lòng đặt tên và ghi lệnh cho bộ soạn thảo văn bản này."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "_URL được chấp nhận"
@@ -774,6 +808,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Thu nhỏ và phóng to"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1336,12 +1371,17 @@ msgstr "Desktop"
 msgid "Window Management"
 msgstr "Bộ quản lý cửa sổ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Lỗi thiết lập phím tắt mới trong cơ sở dữ liệu cấu hình: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1349,11 +1389,11 @@ msgstr ""
 "Không thể tìm thấy bất cứ theme bàn phím nào. Có nghĩa là bản cài đặt Gtk+ "
 "của bạn chưa hoàn chỉnh."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Hành động"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Phím tắt"
 
@@ -1379,6 +1419,11 @@ msgstr "_Phím tắt desktop:"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, fuzzy, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Lỗi hiển thị trợ giúp: %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 #, fuzzy
 msgid "_Accessibility"
@@ -1449,11 +1494,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "Tốc độ lặp"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Tốc độ"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Accessibility..."
@@ -1495,7 +1535,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Thông số bàn phím"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1504,7 +1544,7 @@ msgstr ""
 "<b>Con trỏ lạ</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1512,7 +1552,7 @@ msgstr ""
 "<b>Con trỏ mặc định - Hiện thời</B>\n"
 "Con trỏ mặc định của X Window"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1520,7 +1560,7 @@ msgstr ""
 "<b>Con trỏ mặc định</B>\n"
 "Con trỏ mặc định của X Window"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1528,7 +1568,7 @@ msgstr ""
 "<b>Con trỏ trắng - Hiện thời</B>\n"
 "Con trỏ mặc định bị đảo màu"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1536,7 +1576,7 @@ msgstr ""
 "<b>Con trỏ trắng</B>\n"
 "Con trỏ mặc định bị đảo màu"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1544,7 +1584,7 @@ msgstr ""
 "<b>Con trỏ lớn - Hiện thời </b>\n"
 "Phiên bản lớn của con trỏ bình thường"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1552,7 +1592,7 @@ msgstr ""
 "<b>Con trỏ lớn</B>\n"
 "Phiên bản lớn của con trỏ bình thường"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1560,7 +1600,7 @@ msgstr ""
 "<b>Con trỏ trắng lớn - Hiện thời</B>\n"
 "Phiên bản lớn của con trỏ trắng"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1695,10 +1735,6 @@ msgstr "Hiện vị trí con trỏ khi phím Control được nhấn"
 msgid "_Threshold:"
 msgstr "_Ngưỡng:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Chuột"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1714,40 +1750,79 @@ msgstr "Mạng"
 msgid "Network proxy preferences"
 msgstr "Thông số mạng"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Thông số mạng"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Thông số mạng"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "_Cổng:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "_Mật khẩu:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-#, fuzzy
-msgid "Pro_xy requires username and password"
-msgstr "_Proxy yêu cầu tên người dùng và mật khẩu"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "_Tên người dùng:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Lệnh cấu hình:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "Đị_a điểm:"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Thiết lập HTTP Proxy"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Thông số mạng"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "_Cổng:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "_Dùng HTTP proxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "_Dùng HTTP proxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "_Mật khẩu:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "_Dùng HTTP proxy"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "_Tên người dùng:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Thông số âm thanh"
@@ -1756,6 +1831,11 @@ msgstr "Thông số âm thanh"
 msgid "E_nable sound server startup"
 msgstr "_Bật server âm thanh lúc khởi động"
 
+#: capplets/sound/sound-properties.glade.h:2
+#, fuzzy
+msgid "General"
+msgstr "_Chung"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1830,32 +1910,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Đặt font cho biểu tượng và desktop"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Theme"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Theme mới có thể được cài đặt bằng cách kéo nó vào cửa sổ."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Nền"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
 #, fuzzy
-msgid "Theme Preferences"
-msgstr "Thông số Theme Gtk+"
+msgid "Apply _Font"
+msgstr "Áp dụng ngay"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "Điều khiển UI"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Diện mạo biên cửa sổ"
+msgid "Icons"
+msgstr "Chỉ biểu tượng"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Theme mới có thể được cài đặt bằng cách kéo nó vào cửa sổ."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+#, fuzzy
+msgid "Theme Preferences"
+msgstr "Thông số Theme Gtk+"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Diện mạo biên cửa sổ"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "Đ_i tới thư mục theme"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "_Cài theme mới..."
@@ -2013,30 +2110,57 @@ msgstr ""
 msgid "_Save"
 msgstr "_Co dãn"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Thông số cửa sổ"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "Điều khiển UI"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Loại"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Tốc độ"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Áp dụng ngay"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Chọn cửa sổ khi con chuột đi ngang qua"
+msgid "Window Preferences"
+msgstr "Thông số cửa sổ"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Font thanh tựa đề"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Diện mạo biên cửa sổ"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Bộ quản lý cửa sổ:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Chọn cửa sổ khi con chuột đi ngang qua"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2181,7 +2305,7 @@ msgstr "Đừn_g hiện thông điệp này lần nữa"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Không thể nạp tập tin âm thanh %s làm mẫu %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "Khoá GConf %s dùng kiểu %s nhưng lẽ ra phải dùng kiểu %s\n"
@@ -2260,60 +2384,96 @@ msgstr "_Chơi"
 msgid "Select sound file"
 msgstr "Chọn tập tin âm thanh"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Đang khởi động %s\n"
-"(đợi %d giây trước khi hết hạn)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Không thể khởi động bộ quản lý cửa sổ.\n"
-"\tMột bộ quản lý cửa sổ khác vẫn đang chạy và không thể chấm dứt.\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "_Beep when enabling/disabling keyboard accessibility features"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Không thể khởi động bộ quản lý cửa sổ.\n"
-"\t'%s' không chạy\n"
+#~ msgid "Beep when:"
+#~ msgstr "Kêu bíp khi:"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Bộ quản lý cửa sổ trước đó vẫn chưa chấm dứt\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Thông số bàn phím"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Không thể khởi động '%s'.\n"
-"Quay trở về bộ quản lý cửa sổ trước đó '%s'\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Bắt đầu di chuyển sau khi nhấn phím :"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Không thể khởi động bộ quản lý cửa sổ phòng hờ.\n"
-"Vui lòng chạy bộ quản lý cửa sổ bằng tay. Bạn\n"
-"có thể làm điều đó bằng cách chọn \"Chạy chương\n"
-"trình\" trong menu chính\n"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Nhập tập tin CDE AccessX"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "Đồng ý"
+#~ msgid "msecs"
+#~ msgstr "mili giây"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Thông số mạng"
+
+#, fuzzy
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "_Proxy yêu cầu tên người dùng và mật khẩu"
+
+#~ msgid "_Location:"
+#~ msgstr "Đị_a điểm:"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Font thanh tựa đề"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Diện mạo biên cửa sổ"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Bộ quản lý cửa sổ:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Đang khởi động %s\n"
+#~ "(đợi %d giây trước khi hết hạn)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Không thể khởi động bộ quản lý cửa sổ.\n"
+#~ "\tMột bộ quản lý cửa sổ khác vẫn đang chạy và không thể chấm dứt.\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Không thể khởi động bộ quản lý cửa sổ.\n"
+#~ "\t'%s' không chạy\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Bộ quản lý cửa sổ trước đó vẫn chưa chấm dứt\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Không thể khởi động '%s'.\n"
+#~ "Quay trở về bộ quản lý cửa sổ trước đó '%s'\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Không thể khởi động bộ quản lý cửa sổ phòng hờ.\n"
+#~ "Vui lòng chạy bộ quản lý cửa sổ bằng tay. Bạn\n"
+#~ "có thể làm điều đó bằng cách chọn \"Chạy chương\n"
+#~ "trình\" trong menu chính\n"
+
+#~ msgid "OK"
+#~ msgstr "Đồng ý"
 
 #, fuzzy
 #~ msgid "Add:"
@@ -2544,9 +2704,6 @@ msgstr "Đồng ý"
 #~ msgid "Mouse Properties"
 #~ msgstr "Thuộc tính con chuột"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Thiết lập HTTP Proxy"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Cấu hình cách dùng âm thanh của GNOME"
 
@@ -2866,9 +3023,6 @@ msgstr "Đồng ý"
 #~ msgid "Command:"
 #~ msgstr "Lệnh:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Lệnh cấu hình:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Bộ quản lý của sổ được session quản lý"
 
@@ -2987,9 +3141,6 @@ msgstr "Đồng ý"
 #~ msgid "Icons and Text"
 #~ msgstr "Biểu tượng và Text"
 
-#~ msgid "Only Icons"
-#~ msgstr "Chỉ biểu tượng"
-
 #~ msgid "Only Text"
 #~ msgstr "Chỉ text"
 
diff --git a/po/wa.po b/po/wa.po
index ce3b42c01..af0ad70df 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 1.5.5\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-04-29 18:39MET\n"
 "Last-Translator: Pablo Saratxaga <pablo@mandrakesoft.com>\n"
 "Language-Team: Walon <linux-wa@chanae.alphanet.ch>\n"
@@ -19,19 +19,18 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr ""
 
@@ -52,150 +51,193 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr ""
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
+msgid "Beep when _modifier is pressed"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
-msgid "E_nable Toggle Keys"
+msgid "Beep when a _feature is turned on or off"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
-msgid "Enable Bo_unce Keys"
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
-msgid "Enable Slo_w Keys"
+msgid "Beep when key is:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
-msgid "Enable _Mouse Keys"
-msgstr ""
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_T�rdjaedje (seg):"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
-msgid "Enable _Sticky Keys"
+msgid "Delay between keypress and pointer mo_vement:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-#, fuzzy
-msgid "General"
-msgstr "_Djener�"
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+msgid "E_nable Toggle Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
+msgid "Enable Bo_unce Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
-#, fuzzy
-msgid "Keyboard Accessibility Preferences (AccessX)"
-msgstr "Pr�piet�s del taprece"
+msgid "Enable Slo_w Keys"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
-msgid "Ma_ximum pointer speed:"
+msgid "Enable _Mouse Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
-msgid ""
-"Only accept keys after they have been pressed and held for a user adjustable "
-"amount of time."
+msgid "Enable _Sticky Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
+msgid "Features"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "Pr�piet�s del taprece"
+msgid "Filters"
+msgstr "_Fitch�"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
+msgid ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
-msgstr ""
+#, fuzzy
+msgid "Keyboard Accessibility Preferences (AccessX)"
+msgstr "Pr�piet�s del taprece"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
+msgid "Ma_ximum pointer speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Turn the numeric keypad into a mouse control pad."
-msgstr ""
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Sori"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr ""
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Preferinces pol son"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+msgid ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-msgid "_Import CDE AccessX file..."
-msgstr ""
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+#, fuzzy
+msgid "S_peed:"
+msgstr "Roedeu"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+msgid "Toggle Keys"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+msgid "_Disable if unused for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
-msgstr ""
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
+msgstr "Pr�piet�s del taprece"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+msgid "_Import Feature Settings..."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
+msgid "_Only accept keys held for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
-msgstr "picsels/s"
+msgid "_Repeat Keys"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+msgid "_accepted"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
+msgstr "Roedeu"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
+msgstr "_Disfacer"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "segondes"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
+msgstr "picsels/s"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "segondes"
 
@@ -256,7 +298,7 @@ msgstr "_Tchoezi on aspougneu di tecse:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr ""
@@ -528,14 +570,6 @@ msgstr "� dfait di �'�programe chal"
 msgid "Please specify a name and a command for this editor."
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Acce_pter les h�rd�yes"
@@ -749,6 +783,7 @@ msgid "Minimizing and Maximizing"
 msgstr ""
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1308,23 +1343,28 @@ msgstr ""
 msgid "Window Management"
 msgstr "Manaedjeu di _purneas"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 #, fuzzy
 msgid "Action"
 msgstr "Accions"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr ""
 
@@ -1349,6 +1389,11 @@ msgstr ""
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr ""
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr ""
@@ -1416,11 +1461,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr ""
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "Roedeu"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr ""
@@ -1461,56 +1501,56 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "Pr�piet�s del taprece"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
 "%s"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
 msgstr ""
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1639,10 +1679,6 @@ msgstr ""
 msgid "_Threshold:"
 msgstr ""
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Sori"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1658,41 +1694,73 @@ msgstr "Preferinces pol son"
 msgid "Network proxy preferences"
 msgstr "Preferinces pol son"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-#, fuzzy
-msgid "Network Preferences"
-msgstr "Preferinces pol son"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "Preferinces pol son"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
+msgid "<b>_Direct internet connection</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
+msgid "<b>_Manual proxy configuration</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
+msgid "<b>_Use authentication</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr ""
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Comande po l' apontiaedje:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-#, fuzzy
-msgid "_Location:"
-msgstr "_Accion"
+msgid "HTTP Proxy Details"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Preferinces pol son"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+msgid "Port:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+msgid "_FTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+msgid "_HTTP proxy:"
 msgstr ""
 
+#: capplets/network/gnome-network-preferences.glade.h:15
+msgid "_Password:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+msgid "_Secure HTTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "No:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Preferinces pol son"
@@ -1701,6 +1769,11 @@ msgstr "Preferinces pol son"
 msgid "E_nable sound server startup"
 msgstr "Mete en _ouve li sierveu di sons a l'�enondaedje"
 
+#: capplets/sound/sound-properties.glade.h:2
+#, fuzzy
+msgid "General"
+msgstr "_Djener�"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1774,32 +1847,47 @@ msgid "Select themes for various parts of the desktop"
 msgstr ""
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr ""
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Fond"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-#, fuzzy
-msgid "Theme Preferences"
-msgstr "Preferinces pol son"
+msgid "Apply _Font"
+msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
+msgid "Controls"
 msgstr ""
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "Preferinces pol son"
+msgid "Icons"
+msgstr "Accions"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr ""
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+#, fuzzy
+msgid "Theme Preferences"
+msgstr "Preferinces pol son"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Preferinces pol son"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "Astaler novea tinme..."
@@ -1956,33 +2044,56 @@ msgstr ""
 msgid "_Save"
 msgstr "Al _sch�le"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+msgid "Control"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
 #, fuzzy
-msgid "Window Preferences"
-msgstr "Preferinces pol son"
+msgid "Hyper"
+msgstr "S�re"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Roedeu"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
+msgid "To _move windows, click while holding down:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+#, fuzzy
+msgid "Window Preferences"
+msgstr "Preferinces pol son"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-#, fuzzy
-msgid "Titlebar Font"
-msgstr "Protocole di transfer di fitch�s"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
+msgid "_Raise selected windows after a short time"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-#, fuzzy
-msgid "Window Manager:"
-msgstr "Manaedjeu di _purneas"
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 #, fuzzy
@@ -2123,7 +2234,7 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2197,58 +2308,45 @@ msgstr "_Djower"
 msgid "Select sound file"
 msgstr "Tchoezi on fitch� di son"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Enondaedje di %s\n"
-"(i dmeure %d segondes divant di rnonc�)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Pr�piet�s del taprece"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Network Preferences"
+#~ msgstr "Preferinces pol son"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr ""
+#, fuzzy
+#~ msgid "_Location:"
+#~ msgstr "_Accion"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Titlebar Font"
+#~ msgstr "Protocole di transfer di fitch�s"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Window Manager:"
+#~ msgstr "Manaedjeu di _purneas"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "I Va"
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Enondaedje di %s\n"
+#~ "(i dmeure %d segondes divant di rnonc�)"
+
+#~ msgid "OK"
+#~ msgstr "I Va"
 
 #, fuzzy
 #~ msgid "Add:"
 #~ msgstr "Radjouter"
 
-#~ msgid "_Delete"
-#~ msgstr "_Disfacer"
-
 #~ msgid "_Name"
 #~ msgstr "_No"
 
@@ -2433,9 +2531,6 @@ msgstr "I Va"
 #~ msgid "Command:"
 #~ msgstr "Comande:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Comande po l' apontiaedje:"
-
 #~ msgid "Name cannot be empty"
 #~ msgstr "Li no n'�pout n�n esse vude"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 32a43b3e7..79f4ea5d4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-03-17 16:15+0800\n"
 "Last-Translator: He Qiangqiang <carton@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -15,19 +15,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 #, fuzzy
 msgid "Select CDE AccessX file"
 msgstr "选择声音文件"
@@ -50,151 +49,192 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-msgid "Beep when enabling/disabling _keyboard accessibility features"
+msgid "Basic"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
+msgid "Beep when _modifier is pressed"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
-msgid "E_nable Toggle Keys"
+msgid "Beep when a _feature is turned on or off"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
-msgid "Enable Bo_unce Keys"
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
-msgid "Enable Slo_w Keys"
+msgid "Beep when key is:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
-msgid "Enable _Mouse Keys"
-msgstr ""
+#, fuzzy
+msgid "Del_ay:"
+msgstr "延时(_D)(秒)："
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
-msgid "Enable _Sticky Keys"
+msgid "Delay between keypress and pointer mo_vement:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "常规"
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+msgid "E_nable Toggle Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
+msgid "Enable Bo_unce Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
-#, fuzzy
-msgid "Keyboard Accessibility Preferences (AccessX)"
-msgstr "键盘属性"
+msgid "Enable Slo_w Keys"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
-msgid "Ma_ximum pointer speed:"
+msgid "Enable _Mouse Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
-msgid ""
-"Only accept keys after they have been pressed and held for a user adjustable "
-"amount of time."
+msgid "Enable _Sticky Keys"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
+msgid "Features"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 #, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "键盘属性"
+msgid "Filters"
+msgstr "文件(_F)"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
+msgid ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
-msgstr ""
+#, fuzzy
+msgid "Keyboard Accessibility Preferences (AccessX)"
+msgstr "键盘属性"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
+msgid "Ma_ximum pointer speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Turn the numeric keypad into a mouse control pad."
-msgstr ""
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "鼠标"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr ""
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "字体属性"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-#, fuzzy
-msgid "_Enable keyboard accessibility"
-msgstr "键盘属性"
+msgid ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "选择声音文件"
+msgid "S_peed:"
+msgstr "速度"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+msgid "Toggle Keys"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+msgid "Turn the numeric keypad into a mouse control pad."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+msgid "_Disable if unused for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
-msgstr ""
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
+msgstr "键盘属性"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+msgid "_Import Feature Settings..."
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
+msgid "_Only accept keys held for:"
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
-msgstr ""
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "重复速率"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+msgid "_accepted"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
+msgstr "速度"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
+msgstr "删除(_D)"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+msgid "milliseconds"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+msgid "pixels/second"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr ""
 
@@ -252,7 +292,7 @@ msgstr "选择编辑器(_S)："
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "取得并保存原有的设置"
@@ -537,14 +577,6 @@ msgstr "默认应用程序"
 msgid "Please specify a name and a command for this editor."
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr ""
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "接受 URL(_P)"
@@ -765,6 +797,7 @@ msgid "Minimizing and Maximizing"
 msgstr "最大最小化"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1329,23 +1362,28 @@ msgstr ""
 msgid "Window Management"
 msgstr "窗口管理器(_W)"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 #, fuzzy
 msgid "Action"
 msgstr "动作"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 #, fuzzy
 msgid "Shortcut"
 msgstr "快捷键"
@@ -1374,6 +1412,11 @@ msgstr "快捷键"
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr ""
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 #, fuzzy
 msgid "_Accessibility"
@@ -1443,11 +1486,6 @@ msgstr ""
 msgid "Repeat Keys"
 msgstr "重复速率"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "速度"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 #, fuzzy
 msgid "_Accessibility..."
@@ -1490,7 +1528,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "键盘属性"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1499,7 +1537,7 @@ msgstr ""
 "<b>未知光标</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1507,7 +1545,7 @@ msgstr ""
 "<b>默认光标－当前值</b>\n"
 "X 自带默认光标"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1515,7 +1553,7 @@ msgstr ""
 "<b>默认光标</b>\n"
 "X 自带默认光标"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1523,7 +1561,7 @@ msgstr ""
 "<b>白色光标－当前值</b>\n"
 "默认反转光标"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1531,7 +1569,7 @@ msgstr ""
 "<b>白色光标</b>\n"
 "默认反转光标"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1539,7 +1577,7 @@ msgstr ""
 "<b>大号光标－当前值</b>\n"
 "大号的普通光标"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1547,7 +1585,7 @@ msgstr ""
 "<b>大号光标</b>\n"
 "大号的普通光标"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1555,7 +1593,7 @@ msgstr ""
 "<b>大号白色光标－当前值</b>\n"
 "大号的白色光标"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1689,10 +1727,6 @@ msgstr "按下 Control 键时显示鼠标光标的位置(_S)"
 msgid "_Threshold:"
 msgstr "阈值(_T)："
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "鼠标"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1708,41 +1742,73 @@ msgstr "字体属性"
 msgid "Network proxy preferences"
 msgstr "字体属性"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-#, fuzzy
-msgid "Network Preferences"
-msgstr "字体属性"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "字体属性"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
+msgid "<b>_Direct internet connection</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
+msgid "<b>_Manual proxy configuration</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
+msgid "<b>_Use authentication</b>"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
+msgid "Autoconfiguration _URL:"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-#, fuzzy
-msgid "_Location:"
-msgstr "动作"
+msgid "HTTP Proxy Details"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "字体属性"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "短"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+msgid "_FTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+msgid "_HTTP proxy:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+msgid "_Password:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+msgid "_Secure HTTP proxy:"
 msgstr ""
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "名字"
+
 #: capplets/sound/sound-properties-capplet.c:180
 #, fuzzy
 msgid "Sound preferences"
@@ -1753,6 +1819,10 @@ msgstr "字体属性"
 msgid "E_nable sound server startup"
 msgstr "启用音效服务器"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "常规"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1827,33 +1897,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr ""
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 #, fuzzy
 msgid "Theme"
 msgstr "Gtk+ 主题"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
+#, fuzzy
+msgid "Apply _Background"
+msgstr "背景"
+
+#: capplets/theme-switcher/theme-properties.glade.h:2
+msgid "Apply _Font"
+msgstr ""
+
+#: capplets/theme-switcher/theme-properties.glade.h:3
+#, fuzzy
+msgid "Controls"
+msgstr "用户界面控件"
+
+#: capplets/theme-switcher/theme-properties.glade.h:4
+#, fuzzy
+msgid "Icons"
+msgstr "仅图标"
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
 msgid "New themes can also be installed by dragging them into the window."
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:7
 #, fuzzy
 msgid "Theme Preferences"
 msgstr "字体属性"
 
-#: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
-
-#: capplets/theme-switcher/theme-properties.glade.h:4
+#: capplets/theme-switcher/theme-properties.glade.h:8
 #, fuzzy
-msgid "Window Border Theme"
+msgid "Window Border"
 msgstr "字体属性"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr ""
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "安装新主题..."
@@ -2014,33 +2100,57 @@ msgstr ""
 msgid "_Save"
 msgstr "名字"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
 #, fuzzy
-msgid "Window Preferences"
-msgstr "字体属性"
+msgid "Control"
+msgstr "用户界面控件"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "类型"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "速度"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
+msgid "To _move windows, click while holding down:"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+#, fuzzy
+msgid "Window Preferences"
+msgstr "字体属性"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-#, fuzzy
-msgid "Titlebar Font"
-msgstr "文件传输协议"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
+msgid "_Raise selected windows after a short time"
 msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-#, fuzzy
-msgid "Window Manager:"
-msgstr "窗口管理器(_W)"
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 #, fuzzy
@@ -2182,7 +2292,7 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr ""
@@ -2265,49 +2375,38 @@ msgstr "播放"
 msgid "Select sound file"
 msgstr "选择声音文件"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "键盘属性"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "选择声音文件"
 
-#: libwindow-settings/gnome-wm-manager.c:378
 #, fuzzy
-msgid "Previous window manager did not die\n"
-msgstr "启用窗口管理器的声音事件"
+#~ msgid "Network Preferences"
+#~ msgstr "字体属性"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
+#, fuzzy
+#~ msgid "_Location:"
+#~ msgstr "动作"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Titlebar Font"
+#~ msgstr "文件传输协议"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr ""
+#, fuzzy
+#~ msgid "Window Manager:"
+#~ msgstr "窗口管理器(_W)"
+
+#, fuzzy
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "启用窗口管理器的声音事件"
 
 #, fuzzy
 #~ msgid "Add:"
@@ -2317,9 +2416,6 @@ msgstr ""
 #~ msgid "_Category"
 #~ msgstr "类别"
 
-#~ msgid "_Delete"
-#~ msgstr "删除(_D)"
-
 #, fuzzy
 #~ msgid "_Name"
 #~ msgstr "名字"
@@ -2466,9 +2562,6 @@ msgstr ""
 #~ msgid "Set the volume of the clicking sound made when pressing a key"
 #~ msgstr "设置击键时产生的声音的音量"
 
-#~ msgid "Short"
-#~ msgstr "短"
-
 #~ msgid "Slow"
 #~ msgstr "慢"
 
@@ -2699,9 +2792,6 @@ msgstr ""
 #~ msgid "Icons and Text"
 #~ msgstr "图标和文字"
 
-#~ msgid "Only Icons"
-#~ msgstr "仅图标"
-
 #~ msgid "Only Text"
 #~ msgstr "仅文字"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 344f44795..49318dc48 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 1.99.10\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-06-13 00:51+0800\n"
 "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
 "Language-Team: traditional Chinese <zh-l10n@linux.org.tw>\n"
@@ -19,19 +19,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
 #, fuzzy, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "顯示說明文件時發生錯誤：%s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "無法由檔案‘%s’匯入 AccessX 設定"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "選擇 CDE AccessX 檔案"
 
@@ -53,160 +52,206 @@ msgid ""
 msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "當某一顆 LED 亮起時響一下，而 LED 熄滅時響兩下。"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-#, fuzzy
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "當啟用或停止鍵盤輔助功能時發出聲響(_B)"
+msgid "Basic"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
 #, fuzzy
-msgid "Beep when key is re_jected"
+msgid "Beep if key is re_jected"
 msgstr "拒絕按鍵動作(_J)"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "在以下情況發出聲響："
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "拒絕按鍵動作(_J)"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "當某一顆 LED 亮起時響一下，而 LED 熄滅時響兩下。"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "拒絕按鍵動作(_J)"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "延遲時間[秒](_D)："
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 #, fuzzy
 msgid "E_nable Toggle Keys"
 msgstr "啟用滑鼠控制鍵(_M)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 #, fuzzy
 msgid "Enable Bo_unce Keys"
 msgstr "啟用滑鼠控制鍵(_M)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "啟用滑鼠控制鍵(_M)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "一般"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "檔案(_F)"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
 #, fuzzy
-msgid "I_gnore keypresses within:"
+msgid "I_gnore duplicate keypresses within:"
 msgstr "忽略以下時間內的按鍵動作(_I)："
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 #, fuzzy
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "鍵盤輔助功能設定 (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 #, fuzzy
 msgid "Ma_ximum pointer speed:"
 msgstr "鼠標速度上限(_X)："
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "滑鼠"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "滑鼠偏好設定"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
 msgstr "在使用者指定的時間內按下某鍵不放，方會接受該按鍵動作。"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-#, fuzzy
-msgid "Repeat Key Pre_ferences..."
-msgstr "鍵盤偏好設定"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 #, fuzzy
-msgid "Start mo_ving this long after keypress:"
-msgstr "放開鍵盤後鼠標繼續移動的時間(_V)："
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr ""
+msgid "S_peed:"
+msgstr "速度"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 #, fuzzy
-msgid "Time to acce_lerate to max speed:"
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "加速至最高速度所需時間(_A)："
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr ""
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "啟用滑鼠控制鍵(_M)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "使用數字鍵盤控制滑鼠。"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 #, fuzzy
-msgid "_Beep when modifier is pressed"
-msgstr "拒絕按鍵動作(_J)"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+msgid "_Disable if unused for:"
 msgstr "如果以下時間內沒有使用此功能則停止功能(_D)："
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "啟用鍵盤輔助功能(_E)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-#, fuzzy
-msgid "_Import CDE AccessX file..."
-msgstr "匯入 CDE AccessX 檔案(_I)"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 #, fuzzy
-msgid "_Only accept keypress after:"
+msgid "_Only accept keys held for:"
 msgstr "在以下的時間後方會接受按鍵動作(_O)："
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "重複速率"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "接受按鍵動作(_A)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "按下鍵盤(_P)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "拒絕按鍵動作(_R)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "毫秒"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "秒"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "像素（每秒）"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "秒"
 
@@ -267,7 +312,7 @@ msgstr "請選擇編輯器(_S)："
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "讀入舊版本的設定"
@@ -551,14 +596,6 @@ msgstr "設定應用程式預設使用的字型"
 msgid "Please specify a name and a command for this editor."
 msgstr "請指定此編輯器的名稱及執行時所用的指令。"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "可接受 URL(_P)"
@@ -765,6 +802,7 @@ msgid "Minimizing and Maximizing"
 msgstr "最小化及最大化"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 #, fuzzy
 msgid "Meta"
 msgstr "總體"
@@ -1325,22 +1363,27 @@ msgstr "桌面"
 msgid "Window Management"
 msgstr "視窗管理"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "在組態資料庫中設定新的快速鍵時出現錯誤：%s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "行動"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "捷徑鍵"
 
@@ -1366,6 +1409,11 @@ msgstr "桌面捷徑鍵(_D)："
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, fuzzy, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "顯示說明文件時發生錯誤：%s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "輔助技術(_A)"
@@ -1434,11 +1482,6 @@ msgstr "鍵盤敲擊聲"
 msgid "Repeat Keys"
 msgstr "重複速率"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-#, fuzzy
-msgid "S_peed:"
-msgstr "速度"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "輔助技術(_A)..."
@@ -1480,7 +1523,7 @@ msgstr ""
 msgid "Set your keyboard preferences"
 msgstr "鍵盤偏好設定"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1489,7 +1532,7 @@ msgstr ""
 "<b>不明的鼠標</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1497,7 +1540,7 @@ msgstr ""
 "<b>預設的鼠標 - 目前設定</b>\n"
 "X Window 預設使用的鼠標"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1505,7 +1548,7 @@ msgstr ""
 "<b>預設的鼠標</b>\n"
 "X Window 預設使用的鼠標"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1513,7 +1556,7 @@ msgstr ""
 "<b>白色鼠標 - 目前設定</b>\n"
 "和預設的鼠標顏色相反"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1521,7 +1564,7 @@ msgstr ""
 "<b>白色鼠標</b>\n"
 "和預設的鼠標顏色相反"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1529,7 +1572,7 @@ msgstr ""
 "<b>大型鼠標 - 目前設定</b>\n"
 "比正常的鼠標較大"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1537,7 +1580,7 @@ msgstr ""
 "<b>大型鼠標</b>\n"
 "比正常的鼠標較大"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1545,7 +1588,7 @@ msgstr ""
 "<b>大型白色鼠標 - 目前設定</b>\n"
 "比正常的白色鼠標較大"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1673,10 +1716,6 @@ msgstr "當按下 Control 鍵時顯示鼠標位置(_S)"
 msgid "_Threshold:"
 msgstr "距離(_T)："
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "滑鼠"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
@@ -1692,40 +1731,79 @@ msgstr "網絡"
 msgid "Network proxy preferences"
 msgstr "網絡偏好設定"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "網絡偏好設定"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-#, fuzzy
-msgid "Network Proxy Preferences"
-msgstr "網絡偏好設定"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "連接埠(_O)："
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "密碼(_W)："
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-#, fuzzy
-msgid "Pro_xy requires username and password"
-msgstr "使用代理伺服器需要用戶名稱及密碼(_X)"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "用戶名稱(_N)："
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "設定時執行："
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "位置(_L)："
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "HTTP 代理伺服器設定"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "網絡偏好設定"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "連接埠(_O)："
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+msgid "_Details"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "使用 HTTP 代理伺服器(_U)"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "使用 HTTP 代理伺服器(_U)"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "密碼(_W)："
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "使用 HTTP 代理伺服器(_U)"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "用戶名稱(_N)："
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "音效偏好設定"
@@ -1734,6 +1812,10 @@ msgstr "音效偏好設定"
 msgid "E_nable sound server startup"
 msgstr "啟動 GNOME 時啟用音效伺服程式(_N)"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "一般"
+
 #: capplets/sound/sound-properties.glade.h:3
 #, fuzzy
 msgid "Sound Events"
@@ -1808,32 +1890,49 @@ msgid "Select themes for various parts of the desktop"
 msgstr "設定桌面圖示使用的字型"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "佈景主題"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "可以將佈景主題檔案拖曳至此視窗來安裝佈景主題。"
+#, fuzzy
+msgid "Apply _Background"
+msgstr "背景圖案"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
 #, fuzzy
-msgid "Theme Preferences"
-msgstr "Gtk+ 佈景主題偏好設定"
+msgid "Apply _Font"
+msgstr "即時套用設定"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr ""
+#, fuzzy
+msgid "Controls"
+msgstr "介面控制"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
 #, fuzzy
-msgid "Window Border Theme"
-msgstr "視窗邊框外觀"
+msgid "Icons"
+msgstr "只有圖示"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "可以將佈景主題檔案拖曳至此視窗來安裝佈景主題。"
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+#, fuzzy
+msgid "Theme Preferences"
+msgstr "Gtk+ 佈景主題偏好設定"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "視窗邊框外觀"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "開啟佈景主題資料夾(_G)"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 #, fuzzy
 msgid "_Install New Theme..."
 msgstr "安裝新的佈景主題(_I)..."
@@ -1991,30 +2090,56 @@ msgstr ""
 msgid "_Save"
 msgstr "依比例縮放(_S)"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "視窗偏好設定"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "介面控制"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "類型"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "速度"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "即時套用設定"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr ""
+msgid "Window Preferences"
+msgstr "視窗偏好設定"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "視窗標題字型"
+msgid "_Double-click window titles to:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "視窗邊框外觀"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "視窗管理程式："
+msgid "_Select windows when the mouse moves over them"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2163,7 +2288,7 @@ msgstr "不再顯示此訊息(_D)"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "GConf 設定鍵 %s 的類型目前是 %s，但應該是 %s\n"
@@ -2241,59 +2366,95 @@ msgstr "播放(_P)"
 msgid "Select sound file"
 msgstr "選擇音效檔"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"正在啟動 %s\n"
-"（距離作業逾時還剩下 %d 秒）"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet：無法初始化視窗管理程式。\n"
-"\t另一個視窗管理程式已經在執行並且無法停止\n"
+#, fuzzy
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "當啟用或停止鍵盤輔助功能時發出聲響(_B)"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet：無法初始化視窗管理程式。\n"
-"\t‘%s’無法啟動\n"
+#~ msgid "Beep when:"
+#~ msgstr "在以下情況發出聲響："
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "上一個視窗管理程式尚未退出\n"
+#, fuzzy
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "鍵盤偏好設定"
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"無法啟動‘%s’。\n"
-"回到上一個視窗管理程式‘%s’\n"
+#, fuzzy
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "放開鍵盤後鼠標繼續移動的時間(_V)："
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"無法啟動後備的視窗管理程式。請自行啟動\n"
-"視窗管理程式。你可以在腳印選單中選擇\n"
-"「執行程式」來進行。\n"
+#, fuzzy
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "匯入 CDE AccessX 檔案(_I)"
+
+#~ msgid "msecs"
+#~ msgstr "毫秒"
+
+#~ msgid "Network Preferences"
+#~ msgstr "網絡偏好設定"
+
+#, fuzzy
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "使用代理伺服器需要用戶名稱及密碼(_X)"
+
+#~ msgid "_Location:"
+#~ msgstr "位置(_L)："
+
+#~ msgid "Titlebar Font"
+#~ msgstr "視窗標題字型"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "視窗邊框外觀"
+
+#~ msgid "Window Manager:"
+#~ msgstr "視窗管理程式："
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "正在啟動 %s\n"
+#~ "（距離作業逾時還剩下 %d 秒）"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet：無法初始化視窗管理程式。\n"
+#~ "\t另一個視窗管理程式已經在執行並且無法停止\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet：無法初始化視窗管理程式。\n"
+#~ "\t‘%s’無法啟動\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "上一個視窗管理程式尚未退出\n"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "確定"
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "無法啟動‘%s’。\n"
+#~ "回到上一個視窗管理程式‘%s’\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "無法啟動後備的視窗管理程式。請自行啟動\n"
+#~ "視窗管理程式。你可以在腳印選單中選擇\n"
+#~ "「執行程式」來進行。\n"
+
+#~ msgid "OK"
+#~ msgstr "確定"
 
 #, fuzzy
 #~ msgid "Add:"
@@ -2516,9 +2677,6 @@ msgstr "確定"
 #~ msgid "Mouse Properties"
 #~ msgstr "滑鼠屬性"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "HTTP 代理伺服器設定"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "設定 GNOME 使用的音效"
 
@@ -2821,9 +2979,6 @@ msgstr "確定"
 #~ msgid "Command:"
 #~ msgstr "指令："
 
-#~ msgid "Configuration Command:"
-#~ msgstr "設定時執行："
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "視窗管理程式接受作業階段管理"
 
@@ -2902,9 +3057,6 @@ msgstr "確定"
 #~ msgid "Icons and Text"
 #~ msgstr "圖示及文字"
 
-#~ msgid "Only Icons"
-#~ msgstr "只有圖示"
-
 #~ msgid "Only Text"
 #~ msgstr "只有文字"