Release 2.0.1.1

2002-08-21  Jody Goldberg <jody@gnome.org>

	* Release 2.0.1.1

ChangeLog

@@ -1,3 +1,19 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-07  Jody Goldberg <jody@gnome.org>
+
+	* po/POTFILES.in : remove bogus file.
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* configure.in : post release version bump
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-07-10  Jody Goldberg <jody@gnome.org>
 	patch from Brian Cameron
 

archiver/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0

archiver/tests/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0

capplets/accessibility/keyboard/ChangeLog

@@ -1,3 +1,15 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
+2002-08-02  jacob berkman  <jacob@ximian.com>
+
+	* *.c: merge recent fixes from HEAD
+
 2002-06-21  Satyajit Kanungo  <satyajit.kanungo@wipro.com>
 
 	* gnome-accessibility-keyboard-properties.c :

capplets/accessibility/keyboard/Makefile.am

@@ -1,14 +1,10 @@
 noinst_LIBRARIES = libaccessibility-keyboard.a
+bin_PROGRAMS = gnome-accessibility-keyboard-properties
 
 libaccessibility_keyboard_a_SOURCES =		\
     accessibility-keyboard.c			\
     accessibility-keyboard.h
 
-# in case we need to forward port the sun accessX extension
-#    AccessXcomm.c
-
-bin_PROGRAMS = gnome-accessibility-keyboard-properties
-
 gnome_accessibility_keyboard_properties_SOURCES = gnome-accessibility-keyboard-properties.c
 gnome_accessibility_keyboard_properties_LDADD = \
 	libaccessibility-keyboard.a $(GNOMECC_CAPPLETS_LIBS)

capplets/accessibility/keyboard/accessibility-keyboard.c

@@ -226,9 +226,27 @@ cb_launch_keyboard_capplet (GtkButton *button, GtkWidget *dialog)
 			err);
 }
 
+static void
+cb_master_enable_toggle (GtkToggleButton *btn, GladeXML *dialog)
+{
+	int i = G_N_ELEMENTS (features);
+	gboolean flag = gtk_toggle_button_get_active (btn);
+
+	while (i-- > 0)
+		gtk_widget_set_sensitive (WID (features [i].checkbox), flag);
+}
+
 static void
 setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
 {
+	GtkWidget *master_enable = WID ("master_enable");
+	g_signal_connect (master_enable,
+		"toggled",
+		G_CALLBACK (cb_master_enable_toggle), dialog);
+	gconf_peditor_new_boolean (changeset,
+		CONFIG_ROOT "/enable",
+		GTK_WIDGET (master_enable), NULL);
+
 	setup_images (dialog);
 	setup_ranges (dialog, changeset);
 	setup_toggles (dialog, changeset);
@@ -444,7 +462,7 @@ 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_repeat_button")),
+	g_signal_connect (G_OBJECT (WID ("launch_keyboard_capplet")),
 		"clicked",
 		G_CALLBACK (cb_launch_keyboard_capplet), toplevel);
 

capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c

@@ -37,12 +37,20 @@ dialog_response (GtkWidget *widget,
 		 gint       response_id,
 		 GConfChangeSet *changeset)
 {
-	if (response_id == GTK_RESPONSE_HELP)
+	switch (response_id) {
+	case GTK_RESPONSE_HELP:
 		capplet_help (GTK_WINDOW (widget),
 			      "wgoscustaccess.xml",
 			      "goscustaccess-2");
-	else
+		break;
+	case GTK_RESPONSE_DELETE_EVENT:
+	case GTK_RESPONSE_CLOSE:
 		gtk_main_quit ();
+		break;
+	default:
+		/* Import CDE AccessX File */
+		break;
+	}
 }
 
 int

capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade

@@ -15,16 +15,13 @@
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="border_width">2</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">10</property>
 
 	  <child>
 	    <widget class="GtkButton" id="help_button">
@@ -507,9 +504,9 @@ two keys pressed simultaneously</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"/>
+			    <atkrelation target="slowkeys_label" type="labelled-by"/>
+			    <atkrelation target="slowkeys_title" type="labelled-by"/>
 			  </accessibility>
 			</widget>
 			<packing>
@@ -786,9 +783,9 @@ two keys pressed simultaneously</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"/>
+			    <atkrelation target="bouncekeys_label" type="labelled-by"/>
+			    <atkrelation target="bouncekeys_title" type="labelled-by"/>
 			  </accessibility>
 			</widget>
 			<packing>
@@ -1018,9 +1015,9 @@ two keys pressed simultaneously</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"/>
+			<atkrelation target="mousekeys_max_speed_title" type="labelled-by"/>
+			<atkrelation target="mousekeys_accel_time_slide" type="controlled-by"/>
 		      </accessibility>
 		    </widget>
 		    <packing>
@@ -1095,9 +1092,9 @@ two keys pressed simultaneously</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"/>
+			<atkrelation target="mousekeys_init_delay_title" type="labelled-by"/>
+			<atkrelation target="mousekeys_init_delay_slide" type="controlled-by"/>
 		      </accessibility>
 		    </widget>
 		    <packing>
@@ -1121,9 +1118,9 @@ two keys pressed simultaneously</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"/>
+			<atkrelation target="mousekeys_accel_time_title" type="labelled-by"/>
+			<atkrelation target="mousekeys_max_speed_slide" type="controlled-by"/>
 		      </accessibility>
 		    </widget>
 		    <packing>
@@ -1270,6 +1267,24 @@ two keys pressed simultaneously</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>

capplets/background/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-07-12  Jody Goldberg <jody@gnome.org>
 
 	* background-properties.glade : The last of the ui-review.

capplets/common/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-07-16  Jody Goldberg <jody@gnome.org>
 
 	* gconf-property-editor.c (gconf_value_int_to_float) : add a peditor

capplets/default-applications/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0

capplets/desktop-links/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0

capplets/file-types/ChangeLog

@@ -1,3 +1,53 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-10  Jody Goldberg <jody@gnome.org>
+
+	* file-types-properties.glade : fix missed capitalization for the
+	ui-review.
+
+2002-08-07  Jody Goldberg <jody@gnome.org>
+
+	* mime-edit-dialog.c (mime_edit_dialog_get_app) : Be extra anal, just
+	  in case the db is corrupt.
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=87056
+	* mime-edit-dialog.c (mime_edit_dialog_get_app) : remove bogus extra
+	  semicolon.
+
+2002-08-05  Jody Goldberg <jody@gnome.org>
+
+	* mime-edit-dialog.c (mime_edit_dialog_get_app) : work around
+	  gnome_file_entry's propensity for prepending the current dir if none
+	  is specified.  This allows a user to type a nme with no
+	  qualifications and have it look things up in the path.
+
+	* mime-type-info.c (mime_category_info_save) : lobotomize this just in
+	  case.
+
+2002-08-03  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=88775
+	* file-types-properties.glade : make the other sub dialogs modal too.
+
+2002-08-01  Federico Mena Quintero  <federico@ximian.com>
+
+	* file-types-properties.glade: Made the file entries modal as they
+	live in modal dialogs.  Fixes #89370.
+
+	* service-edit-dialog.c (service_add_dialog_new): Return a
+	GObject, not a GtkWidget.
+
+	* file-types-capplet.c (add_service_cb): Do not assign a GtkWidget
+	to a GObject.
+
 2002-07-17  Jody Goldberg <jody@gnome.org>
 
 	* mime-type-info.c (mime_type_info_new) : no need to preload the icon.

capplets/file-types/Makefile.am

@@ -25,4 +25,4 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(VFS_CAPPLET_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) category-names.h
+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)

capplets/file-types/category-names.h

@@ -1,27 +0,0 @@
-/*
- * Translatable strings file
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Documents");
-gchar *s = N_("Word Processor");
-gchar *s = N_("Published Materials");
-gchar *s = N_("Spreadsheet");
-gchar *s = N_("Presentation");
-gchar *s = N_("Diagram");
-gchar *s = N_("TeX");
-gchar *s = N_("Vector Graphics");
-gchar *s = N_("World Wide Web");
-gchar *s = N_("Plain Text");
-gchar *s = N_("Extended Markup Language (XML)");
-gchar *s = N_("Information");
-gchar *s = N_("Financial");
-gchar *s = N_("Calendar");
-gchar *s = N_("Contacts");
-gchar *s = N_("Packages");
-gchar *s = N_("Software Development");
-gchar *s = N_("Source Code");
-gchar *s = N_("Audio");
-gchar *s = N_("Images");
-gchar *s = N_("Video");

capplets/file-types/file-types-capplet.c

@@ -63,12 +63,11 @@ add_service_cb (GtkButton *button, GladeXML *dialog)
 {
 	GtkTreeView     *treeview;
 	GtkTreeModel    *model;
-	GtkWidget	*add_dialog;
 
 	treeview = GTK_TREE_VIEW (WID ("mime_types_tree"));
 	model = gtk_tree_view_get_model (treeview);
 
-	add_dialog = service_add_dialog_new (model);
+	service_add_dialog_new (model);
 }
 
 static GObject *

capplets/file-types/file-types-properties.glade

@@ -132,7 +132,7 @@
                   <widget class="GtkButton" id="add_mime_button">
                     <property name="can_default">yes</property>
                     <property name="can_focus">yes</property>
-                    <property name="label" translatable="yes">Add _file type...</property>
+                    <property name="label" translatable="yes">Add _File Type...</property>
 		    <property name="use_underline">yes</property>
                     <property name="relief">GTK_RELIEF_NORMAL</property>
                     <property name="visible">yes</property>
@@ -143,7 +143,7 @@
                   <widget class="GtkButton" id="add_service_button">
                     <property name="can_default">yes</property>
                     <property name="can_focus">yes</property>
-                    <property name="label" translatable="yes">Add _service...</property>
+                    <property name="label" translatable="yes">Add _Service...</property>
 		    <property name="use_underline">yes</property>
                     <property name="relief">GTK_RELIEF_NORMAL</property>
                     <property name="visible">yes</property>
@@ -199,7 +199,7 @@
   <property name="title" translatable="yes">Edit file type</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
+  <property name="modal">True</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
   <property name="has_separator">True</property>
@@ -755,7 +755,7 @@
 			  <property name="visible">True</property>
 			  <property name="max_saved">10</property>
 			  <property name="directory_entry">False</property>
-			  <property name="modal">False</property>
+			  <property name="modal">True</property>
 
 			  <child internal-child="entry">
 			    <widget class="GtkEntry" id="combo-entry1">
@@ -843,7 +843,7 @@
 
   <widget class="GtkDialog" id="internet_service_dialog">
     <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="modal">no</property>
+    <property name="modal">True</property>
     <property name="allow_shrink">no</property>
     <property name="allow_grow">no</property>
     <property name="visible">no</property>
@@ -1105,7 +1105,7 @@
 
                         <child>
                           <widget class="GnomeFileEntry" id="custom_program_entry">
-                            <property name="modal">no</property>
+                            <property name="modal">True</property>
                             <property name="directory_entry">no</property>
                             <property name="visible">yes</property>
 
@@ -1175,7 +1175,7 @@
   </widget>
   <widget class="GtkDialog" id="mime_category_edit_dialog">
     <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="modal">no</property>
+    <property name="modal">True</property>
     <property name="allow_shrink">no</property>
     <property name="allow_grow">no</property>
     <property name="visible">no</property>
@@ -1387,7 +1387,7 @@
 
                         <child>
                           <widget class="GnomeFileEntry" id="program_entry">
-                            <property name="modal">no</property>
+                            <property name="modal">True</property>
                             <property name="directory_entry">no</property>
                             <property name="visible">yes</property>
 

capplets/file-types/mime-edit-dialog.c

@@ -671,21 +671,28 @@ mime_edit_dialog_get_app (GladeXML *glade, char const *mime_type,
 	GnomeVFSMimeApplication *res, *app = g_object_get_data (item, "app");
 
 	if (app == NULL) {
-		char *cmd = gnome_file_entry_get_full_path (
-			GNOME_FILE_ENTRY (glade_xml_get_widget (glade, "program_entry")), FALSE);
+		GnomeFileEntry *program_entry =
+			GNOME_FILE_ENTRY (glade_xml_get_widget (glade, "program_entry"));
+		char *cmd = gnome_file_entry_get_full_path (program_entry, TRUE);
 		gboolean requires_terminal = gtk_toggle_button_get_active (
 			GTK_TOGGLE_BUTTON (glade_xml_get_widget (glade, "needs_terminal_toggle")));
 		char *base_cmd;
 
 		GList *ptr, *app_list = NULL;
 		
-		/* I have no idea what semantics people want, but I'll be anal
-		 * and avoid NULL
+		/* If the cmd is NULL its possible that the user just types a
+		 * command name in their path.  Because the file picker seems
+		 * to insist that it only return a valid path we ask it to
+		 * verify the app exists so that we can catch it here and just
+		 * use the raw non-absolute name here.
 		 */
-		if (cmd == NULL)
-			cmd = g_strdup ("");
+		if (cmd == NULL) {
+			char const *tmp = gtk_entry_get_text (
+				GTK_ENTRY (gnome_file_entry_gtk_entry (program_entry)));
+			cmd = g_strdup (tmp == NULL ? "" : tmp);
+		}
 		base_cmd = g_path_get_basename  (cmd);
-		if (base_cmd == NULL);
+		if (base_cmd == NULL)
 			base_cmd = g_strdup ("");
 
 		app_list = gnome_vfs_application_registry_get_applications (NULL);
@@ -695,7 +702,7 @@ mime_edit_dialog_get_app (GladeXML *glade, char const *mime_type,
 
 			/* Look for a matching application (with or without path) */
 			if (app_cmd != NULL &&
-			    (!strcmp (cmd, app_cmd) || !strcmp (base_cmd, app_cmd))) {
+			    (!strcmp (cmd, app_cmd) || (*base_cmd && !strcmp (base_cmd, app_cmd)))) {
 				gboolean ok, app_req = gnome_vfs_application_registry_get_bool_value (ptr->data,
 					GNOME_VFS_APPLICATION_REGISTRY_REQUIRES_TERMINAL, &ok);
 				if (ok && app_req == requires_terminal)

capplets/file-types/mime-type-info.c

@@ -392,6 +392,9 @@ mime_category_info_save (MimeCategoryInfo *category)
 	gchar   *key, *basename;
 	gboolean set_ids;
 
+	g_warning ("Do not call this, nothing actually observes the gconf settings");
+	return;
+
 	/* Be really anal about validating this action */
 	if (category->default_action != NULL) {
 		if ( category->default_action->command == NULL ||

capplets/file-types/service-edit-dialog.c

@@ -310,14 +310,13 @@ service_edit_dialog_new (GtkTreeModel *model, ServiceInfo *info)
 			     NULL);
 }
 
-GtkWidget *
+GObject *
 service_add_dialog_new (GtkTreeModel *model) 
 {
-	GObject *res = g_object_new (service_edit_dialog_get_type (),
+	return g_object_new (service_edit_dialog_get_type (),
 			     "model", model,
 			     "is-add", TRUE,
 			     NULL);
-	return GTK_WIDGET (res);
 }
 
 static void

capplets/file-types/service-edit-dialog.h

@@ -54,7 +54,7 @@ GType service_edit_dialog_get_type (void);
 
 GObject *service_edit_dialog_new   (GtkTreeModel *model,
 				      ServiceInfo  *info);
-GtkWidget *service_add_dialog_new    (GtkTreeModel *model);
+GObject *service_add_dialog_new    (GtkTreeModel *model);
 
 G_END_DECLS
 

capplets/font/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-07-02  Jody Goldberg <jody@gnome.org>
 
 	http://bugzilla.gnome.org/show_bug.cgi?id=85629

capplets/keybindings/ChangeLog

@@ -1,3 +1,21 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+Mon Aug 19 17:51:35 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gnome-keybinding-properties.c (metacity_key_list): fix bindings
+	to match metacity.
+
+2002-08-15  Jody Goldberg <jody@gnome.org>
+
+	* gnome-keybinding-properties.c : Add a pile of missing metacity
+	  bindings.
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-06-27  Jody Goldberg <jody@gnome.org>
 
 	* gnome-keybinding-properties.c (setup_dialog) : fix and move the code

capplets/keybindings/gnome-keybinding-properties.c

@@ -49,9 +49,14 @@ const KeyListEntry metacity_key_list[] =
   { "/apps/metacity/window_keybindings/toggle_maximized",          ALWAYS_VISIBLE,  0 },
   { "/apps/metacity/window_keybindings/toggle_shaded",             ALWAYS_VISIBLE,  0 },
   { "/apps/metacity/window_keybindings/close",                     ALWAYS_VISIBLE,  0 },
+  { "/apps/metacity/window_keybindings/minimize",                  ALWAYS_VISIBLE,  0 },
   { "/apps/metacity/window_keybindings/begin_move",                ALWAYS_VISIBLE,  0 },
   { "/apps/metacity/window_keybindings/begin_resize",              ALWAYS_VISIBLE,  0 },
   { "/apps/metacity/window_keybindings/toggle_on_all_workspaces",  N_WORKSPACES_GT, 1 },
+  /* These next three are out of order compared to the schemas file. */
+  { "/apps/metacity/window_keybindings/raise_or_lower",            ALWAYS_VISIBLE,  0 },
+  { "/apps/metacity/window_keybindings/raise",                     ALWAYS_VISIBLE,  0 },
+  { "/apps/metacity/window_keybindings/lower",                     ALWAYS_VISIBLE,  0 },
   { "/apps/metacity/window_keybindings/move_to_workspace_1",       N_WORKSPACES_GT, 1 },
   { "/apps/metacity/window_keybindings/move_to_workspace_2",       N_WORKSPACES_GT, 1 },
   { "/apps/metacity/window_keybindings/move_to_workspace_3",       N_WORKSPACES_GT, 2 },
@@ -70,7 +75,8 @@ const KeyListEntry metacity_key_list[] =
   { "/apps/metacity/window_keybindings/move_to_workspace_down",    N_WORKSPACES_GT, 1 },
   { "/apps/metacity/global_keybindings/switch_windows",            ALWAYS_VISIBLE,  0 },
   { "/apps/metacity/global_keybindings/switch_panels",             ALWAYS_VISIBLE,  0 },
-  { "/apps/metacity/global_keybindings/focus_previous_window",     ALWAYS_VISIBLE,  0 },
+  { "/apps/metacity/global_keybindings/cycle_windows",             ALWAYS_VISIBLE,  0 },
+  { "/apps/metacity/global_keybindings/cycle_panels",              ALWAYS_VISIBLE,  0 },
   { "/apps/metacity/global_keybindings/show_desktop",              ALWAYS_VISIBLE,  0 },
   { "/apps/metacity/global_keybindings/switch_to_workspace_1",     N_WORKSPACES_GT, 1 },
   { "/apps/metacity/global_keybindings/switch_to_workspace_2",     N_WORKSPACES_GT, 1 },

capplets/keyboard/ChangeLog

@@ -1,3 +1,21 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-15  Jody Goldberg <jody@gnome.org>
+
+	* gnome-keyboard-properties.glade : fix label and make consistent with
+	  mouse capplet.
+	* gnome-keyboard-properties.c (create_dialog) : use size groups.
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
+2002-08-01  Federico Mena Quintero  <federico@ximian.com>
+
+	* gnome-keyboard-properties.glade: Made the file entry modal.
+
 2002-07-16  Jody Goldberg <jody@gnome.org>
 
 	* gnome-keyboard-properties.c (setup_dialog) : use the gconf_value_int_to_float

capplets/keyboard/gnome-keyboard-properties.c

@@ -47,9 +47,25 @@ static GladeXML *
 create_dialog (void)
 {
 	GladeXML *dialog;
+	GtkSizeGroup *size_group;
 
 	dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-keyboard-properties.glade", "keyboard_dialog", NULL);
 
+	size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+	gtk_size_group_add_widget (size_group, WID ("repeat_slow_label"));
+	gtk_size_group_add_widget (size_group, WID ("delay_short_label"));
+	gtk_size_group_add_widget (size_group, WID ("blink_slow_label"));
+
+	size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+	gtk_size_group_add_widget (size_group, WID ("repeat_fast_label"));
+	gtk_size_group_add_widget (size_group, WID ("delay_long_label"));
+	gtk_size_group_add_widget (size_group, WID ("blink_fast_label"));
+
+	size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+	gtk_size_group_add_widget (size_group, WID ("repeat_delay_scale"));
+	gtk_size_group_add_widget (size_group, WID ("repeat_speed_scale"));
+	gtk_size_group_add_widget (size_group, WID ("cursor_blink_time_scale"));
+
 	return dialog;
 }
 

capplets/keyboard/gnome-keyboard-properties.glade

@@ -22,10 +22,8 @@
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">10</property>
 
 	  <child>
 	    <widget class="GtkButton" id="helpbutton1">
@@ -216,18 +214,38 @@
 			  <child>
 			    <widget class="GtkTable" id="repeat_table">
 			      <property name="visible">True</property>
-			      <property name="n_rows">2</property>
+			      <property name="n_rows">4</property>
 			      <property name="n_columns">3</property>
 			      <property name="homogeneous">False</property>
 			      <property name="row_spacing">4</property>
 			      <property name="column_spacing">4</property>
 
+			      <child>
+				<widget class="GtkHScale" id="repeat_delay_scale">
+				  <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">500 50 1510 10 10 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">fill</property>
+				</packing>
+			      </child>
+
 			      <child>
 				<widget class="GtkLabel" id="label3">
 				  <property name="visible">True</property>
 				  <property name="label" translatable="yes">_Delay:</property>
 				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
+				  <property name="use_markup">True</property>
 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
 				  <property name="wrap">False</property>
 				  <property name="selectable">False</property>
@@ -239,7 +257,7 @@
 				</widget>
 				<packing>
 				  <property name="left_attach">0</property>
-				  <property name="right_attach">1</property>
+				  <property name="right_attach">3</property>
 				  <property name="top_attach">0</property>
 				  <property name="bottom_attach">1</property>
 				  <property name="x_options">fill</property>
@@ -262,6 +280,30 @@
 				  <property name="ypad">0</property>
 				  <property name="mnemonic_widget">repeat_speed_scale</property>
 				</widget>
+				<packing>
+				  <property name="left_attach">0</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"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="delay_short_label">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Short&lt;/i&gt;&lt;/small&gt;</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">True</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">1</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">10</property>
+				  <property name="ypad">0</property>
+				</widget>
 				<packing>
 				  <property name="left_attach">0</property>
 				  <property name="right_attach">1</property>
@@ -273,22 +315,74 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkHScale" id="repeat_delay_scale">
+				<widget class="GtkLabel" id="delay_long_label">
 				  <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">500 50 1510 10 10 0</property>
+				  <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Long&lt;/i&gt;&lt;/small&gt;</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">True</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">2</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="y_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">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="repeat_fast_label">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Fast&lt;/i&gt;&lt;/small&gt;</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">True</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">2</property>
+				  <property name="right_attach">3</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="repeat_slow_label">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Slow&lt;/i&gt;&lt;/small&gt;</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">True</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">1</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">10</property>
+				  <property name="ypad">0</property>
+				</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"></property>
 				</packing>
 			      </child>
 
@@ -306,60 +400,11 @@
 				<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="top_attach">3</property>
+				  <property name="bottom_attach">4</property>
 				  <property name="y_options">fill</property>
 				</packing>
 			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label20">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">faster</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">2</property>
-				  <property name="right_attach">3</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="label21">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">faster</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">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"></property>
-				</packing>
-			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -476,10 +521,13 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkHBox" id="cursor_hbox">
+				<widget class="GtkTable" id="cursor_hbox">
 				  <property name="visible">True</property>
+				  <property name="n_rows">2</property>
+				  <property name="n_columns">3</property>
 				  <property name="homogeneous">False</property>
-				  <property name="spacing">4</property>
+				  <property name="row_spacing">0</property>
+				  <property name="column_spacing">0</property>
 
 				  <child>
 				    <widget class="GtkLabel" id="cursor_label">
@@ -490,16 +538,67 @@
 				      <property name="justify">GTK_JUSTIFY_CENTER</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">0</property>
 				      <property name="ypad">0</property>
 				      <property name="mnemonic_widget">cursor_blink_time_scale</property>
 				    </widget>
 				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
+				      <property name="left_attach">0</property>
+				      <property name="right_attach">3</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="blink_slow_label">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Slow&lt;/i&gt;&lt;/small&gt;</property>
+				      <property name="use_underline">False</property>
+				      <property name="use_markup">True</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">1</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">10</property>
+				      <property name="ypad">0</property>
+				    </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"></property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkLabel" id="blink_fast_label">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Fast&lt;/i&gt;&lt;/small&gt;</property>
+				      <property name="use_underline">False</property>
+				      <property name="use_markup">True</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">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"></property>
 				    </packing>
 				  </child>
 
@@ -513,39 +612,13 @@
 				      <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
 				      <property name="inverted">False</property>
 				      <property name="adjustment">1000 100 2500 200 200 0</property>
-				      <accessibility>
-					<atkrelation target="cursor_label" type="labelled-by"/>
-					<atkrelation target="fast_label" type="labelled-by"/>
-				      </accessibility>
 				    </widget>
 				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="fast_label">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">faster</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_CENTER</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>
-				      <accessibility>
-					<atkrelation target="cursor_blink_time_scale" type="label-for"/>
-				      </accessibility>
-				    </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">2</property>
+				      <property name="top_attach">1</property>
+				      <property name="bottom_attach">2</property>
+				      <property name="y_options">fill</property>
 				    </packing>
 				  </child>
 				</widget>
@@ -961,7 +1034,7 @@
 				      <property name="sensitive">False</property>
 				      <property name="max_saved">10</property>
 				      <property name="directory_entry">False</property>
-				      <property name="modal">False</property>
+				      <property name="modal">True</property>
 
 				      <child internal-child="entry">
 					<widget class="GtkEntry" id="bell_custom_entry">

capplets/mime-type/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0

capplets/mouse/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-07-16  Jody Goldberg <jody@gnome.org>
 
 	* gnome-mouse-properties.c (main) : set icon.

capplets/network/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-07-10  Jody Goldberg <jody@gnome.org>
 
 	http://bugzilla.gnome.org/show_bug.cgi?id=85929

capplets/rollback/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0

capplets/sound/ChangeLog

@@ -1,3 +1,16 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
+2002-07-31  Federico Mena Quintero  <federico@ximian.com>
+
+	* sound-properties-capplet.c (main): Do not pass -1 for the dialog
+	flags; just pass GTK_DIALOG_NO_SEPARATOR.  Fixes #89408 and #88614.
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0

capplets/sound/sound-properties-capplet.c

@@ -177,7 +177,7 @@ main (int argc, char **argv)
 #endif
 
 		dialog_win = gtk_dialog_new_with_buttons
-			(_("Sound preferences"), NULL, -1,
+			(_("Sound preferences"), NULL, GTK_DIALOG_NO_SEPARATOR,
 			 GTK_STOCK_HELP, GTK_RESPONSE_HELP,
 			 GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 			 NULL);

capplets/theme-switcher/ChangeLog

@@ -1,3 +1,25 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-01  Christophe Fergeau  <teuf@users.sourceforge.net>
+
+ 	* capplets/theme-switcher/theme-switcher.c: correctly deal with bzip2
+ 	  compressed theme files
+
+2002-08-07  Jody Goldberg <jody@gnome.org>
+	Patch from JRB for 88443
+
+	* theme-switcher.c (read_themes) : store the current cursor
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
+2002-07-31  Federico Mena Quintero  <federico@ximian.com>
+
+	* theme-install.glade: Made the file entry modal.  Fixes #89410.
+
 2002-07-10  Jody Goldberg <jody@gnome.org>
 
 	* theme-switcher.c (show_install_dialog) : create and destroy the

capplets/theme-switcher/theme-install.glade

@@ -182,7 +182,7 @@
 		  <property name="visible">True</property>
 		  <property name="max_saved">10</property>
 		  <property name="directory_entry">False</property>
-		  <property name="modal">False</property>
+		  <property name="modal">True</property>
 
 		  <child internal-child="entry">
 		    <widget class="GtkEntry" id="install_theme_combo_entry">

capplets/theme-switcher/theme-switcher.c

@@ -141,18 +141,9 @@ read_themes (GladeXML *dialog)
 
       if (strcmp (current_theme, info->name) == 0)
 	{
-	  GtkTreeSelection *selection;
-
-	  selection = gtk_tree_view_get_selection (tree_view);
-	  gtk_tree_selection_select_iter (selection, &iter);
-	  if (initial_scroll)
-	    {
-	      GtkTreePath *path;
-
-	      path = gtk_tree_model_get_path (model, &iter);
+	  GtkTreePath *path = gtk_tree_model_get_path (model, &iter);
 	      row_ref = gtk_tree_row_reference_new (model, path);
 	      gtk_tree_path_free (path);
-	    }
 	  current_theme_found = TRUE;
 	}
 
@@ -169,36 +160,34 @@ read_themes (GladeXML *dialog)
 
   if (! current_theme_found)
     {
-      GtkTreeSelection *selection = gtk_tree_view_get_selection (tree_view);
       GtkTreeIter iter;
+      GtkTreePath *path;
 
       gtk_list_store_prepend (GTK_LIST_STORE (model), &iter);
       gtk_list_store_set (GTK_LIST_STORE (model), &iter,
 			  THEME_NAME_COLUMN, current_theme,
 			  -1);
-      gtk_tree_selection_select_iter (selection, &iter);
-      if (initial_scroll)
-	{
-	  GtkTreePath *path;
 
 	  path = gtk_tree_model_get_path (model, &iter);
 	  row_ref = gtk_tree_row_reference_new (model, path);
 	  gtk_tree_path_free (path);
 	}
-    }
 
-
-  if (row_ref && initial_scroll)
+  if (row_ref)
     {
       GtkTreePath *path;
 
       path = gtk_tree_row_reference_get_path (row_ref);
+      gtk_tree_view_set_cursor (tree_view,path, NULL, FALSE);
 
+      if (initial_scroll)
+	{
       gtk_tree_view_scroll_to_cell (tree_view, path, NULL, TRUE, 0.5, 0.0);
+	  initial_scroll = FALSE;
+	}
       
       gtk_tree_path_free (path);
       gtk_tree_row_reference_free (row_ref);
-      initial_scroll = FALSE;
     }
   setting_model = FALSE;
 
@@ -267,7 +256,7 @@ transfer_cancel_cb (GtkWidget *dlg, gchar *path)
  * see bugzilla.gnome.org #86141 for details
  */
 static gboolean
-transfer_done_idle_cb (gpointer data)
+transfer_done_targz_idle_cb (gpointer data)
 {
 	int status;
 	gchar *command;
@@ -284,12 +273,43 @@ transfer_done_idle_cb (gpointer data)
 	return FALSE;
 }
 
+
+/* this works around problems when doing fork/exec in a threaded app
+ * with some locks being held/waited on in different threads.
+ *
+ * we do the idle callback so that the async xfer has finished and
+ * cleaned up its vfs job.  otherwise it seems the slave thread gets
+ * woken up and it removes itself from the job queue before it is
+ * supposed to.  very strange.
+ *
+ * see bugzilla.gnome.org #86141 for details
+ */
+static gboolean
+transfer_done_tarbz2_idle_cb (gpointer data)
+{
+	int status;
+	gchar *command;
+	gchar *path = data;
+
+	/* this should be something more clever and nonblocking */
+	command = g_strdup_printf ("sh -c 'bzip2 -d -c < \"%s\" | tar xf - -C \"%s/.themes\"'",
+				   path, g_get_home_dir ());
+	if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0)
+		gnome_vfs_unlink (path);
+	g_free (command);
+	g_free (path);
+
+	return FALSE;
+}
+
 static void
 transfer_done_cb (GtkWidget *dlg, gchar *path)
 {
 	int len = strlen (path);
 	if (path && len > 7 && !strcmp (path + len - 7, ".tar.gz"))
-		g_idle_add (transfer_done_idle_cb, path);
+		g_idle_add (transfer_done_targz_idle_cb, path);
+	if (path && len > 8 && !strcmp (path + len - 8, ".tar.bz2"))
+		g_idle_add (transfer_done_tarbz2_idle_cb, path);
 	gtk_widget_destroy (dlg);
 }
 

capplets/ui-properties/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-07-17  Jody Goldberg <jody@gnome.org>
 
 	* gnome-ui-properties.glade :  Use stock names

capplets/url-properties/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0

capplets/windows/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0

capplets/wm-properties/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0

configure.in

@@ -1,7 +1,7 @@
 AC_INIT(control-center)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(control-center, 2.0.0)
+AM_INIT_AUTOMAKE(control-center, 2.0.1.1)
 
 AM_MAINTAINER_MODE
 
@@ -196,7 +196,6 @@ dnl End: Variables for config_archiverConf.sh.in
 dnl =======================================
 
 AC_OUTPUT([
-control-center.spec
 Makefile
 po/Makefile.in
 idl/Makefile
@@ -224,4 +223,8 @@ capplets/accessibility/keyboard/Makefile
 capplets/network/Makefile
 capplets/windows/Makefile
 schemas/Makefile
-libsounds/Makefile])
+libsounds/Makefile
+control-center.spec
+])
+dnl due to a bug in intltool we need to expand something from the root last
+dnl make sure that control-center.spec is listed last

control-center/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-06-18  Jody Goldberg <jody@gnome.org>
 
  	http://bugzilla.gnome.org/show_bug.cgi?id=85003

gnome-settings-daemon/ChangeLog

@@ -1,3 +1,42 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-15  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=90778
+	* gnome-settings-accessibility-keyboard.c (set_gconf_from_server) :
+	  Add a heuristic so that we do not disable features in gconf just
+	  because they are disabled in the X server.  If the master switch is
+	  already disabled in gconf we can guess that most of the time it
+	  means that people want to keep their flags.
+
+2002-08-14  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=90778
+	* gnome-settings-default-editor.c (vfs_change_cb) : be more careful
+
+2002-08-07  Michael Meeks  <michael@ximian.com>
+
+	* gnome-settings-sound.c (stop_esd): flag that
+	we scuppered the remote daemon.
+	(apply_settings): resume it if we killed it,
+	don't kill it more than once.
+	Don't iterate over all the sounds and try to
+	push to the server if we have sound disabled,
+	saves a chunk of time.
+	This fixes the 'toggle sound a lot breaks it' bug.
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
+2002-08-03  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=88634
+	* gnome-settings-mouse.c (set_left_handed) : merge in a variant of the
+	  proposed patch.
+ 
 2002-06-19  jacob berkman  <jacob@ximian.com>
 
 	* Makefile.am: fix build

gnome-settings-daemon/gnome-settings-accessibility-keyboard.c

@@ -111,14 +111,17 @@ set_int (GConfClient *client, char const *key, int val)
 	}
 }
 
-static void
-set_bool (GConfClient *client, char const *key, int val)
+static gboolean
+set_bool (GConfClient *client, gboolean in_gconf, char const *key, int val)
 {
 	GError *err;
+	if (!in_gconf && !val)
+		return FALSE;
 	if (!gconf_client_set_bool (client, key, val ? TRUE : FALSE, &err)) {
 		g_warning (err->message);
 		g_error_free (err);
 	}
+	return val;
 }
 
 static unsigned long
@@ -271,10 +274,10 @@ set_server_from_gconf (GConfEntry *ignored)
 static void
 set_gconf_from_server (GConfEntry *ignored)
 {
+	gboolean	in_gconf;
 	GConfClient	*client = gconf_client_get_default ();
-	XkbDescRec	*desc;
+	XkbDescRec	*desc = get_xkb_desc_rec ();
 
-	desc = get_xkb_desc_rec ();
 	if (!desc) {
 		d ("No XKB present\n");
 		return;
@@ -291,23 +294,31 @@ set_gconf_from_server (GConfEntry *ignored)
 	g_return_if_fail (!we_are_changing_xkb_state);
 	we_are_changing_xkb_state = TRUE;
 
-	set_bool (client, CONFIG_ROOT "/enable",
+	/* always toggle this irrespective of the state */
+	set_bool (client, TRUE, CONFIG_ROOT "/enable",
 		desc->ctrls->enabled_ctrls & (XkbAccessXKeysMask | XkbAccessXFeedbackMask));
-	set_bool (client, CONFIG_ROOT "/feature_state_change_beep",
+
+	/* if master is disabled in gconf do not change gconf state of subordinates
+	 * to match the server.  However, we should enable the master if one of the subordinates
+	 * get enabled.
+	 */
+	in_gconf = gconf_client_get_bool (client, CONFIG_ROOT "/enable", NULL);
+
+	set_bool (client, in_gconf, CONFIG_ROOT "/feature_state_change_beep",
 		desc->ctrls->ax_options & (XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask));
-	set_bool (client, CONFIG_ROOT "/timeout_enable",
+	set_bool (client, in_gconf, CONFIG_ROOT "/timeout_enable",
 		desc->ctrls->enabled_ctrls & XkbAccessXTimeoutMask);
 	set_int (client, CONFIG_ROOT "/timeout",
 		desc->ctrls->ax_timeout);
 
-	set_bool (client, CONFIG_ROOT "/bouncekeys_enable",
+	set_bool (client, in_gconf, CONFIG_ROOT "/bouncekeys_enable",
 		desc->ctrls->enabled_ctrls & XkbBounceKeysMask);
 	set_int (client, CONFIG_ROOT "/bouncekeys_delay",
 		desc->ctrls->debounce_delay);
-	set_bool (client, CONFIG_ROOT "/bouncekeys_beep_reject",
+	set_bool (client, TRUE, CONFIG_ROOT "/bouncekeys_beep_reject",
 		desc->ctrls->ax_options & XkbAX_BKRejectFBMask);
 
-	set_bool (client, CONFIG_ROOT "/mousekeys_enable",
+	set_bool (client, in_gconf, CONFIG_ROOT "/mousekeys_enable",
 		desc->ctrls->enabled_ctrls & XkbMouseKeysMask);
 	set_int (client, CONFIG_ROOT "/mousekeys_max_speed",
 		desc->ctrls->mk_max_speed * (1000 / desc->ctrls->mk_interval));
@@ -317,25 +328,25 @@ set_gconf_from_server (GConfEntry *ignored)
 	set_int (client, CONFIG_ROOT "/mousekeys_init_delay",
 		desc->ctrls->mk_delay);
 
-	set_bool (client, CONFIG_ROOT "/slowkeys_enable",
+	set_bool (client, in_gconf, CONFIG_ROOT "/slowkeys_enable",
 		desc->ctrls->enabled_ctrls & XkbSlowKeysMask);
-	set_bool (client, CONFIG_ROOT "/slowkeys_beep_press",
+	set_bool (client, TRUE, CONFIG_ROOT "/slowkeys_beep_press",
 		desc->ctrls->ax_options & XkbAX_SKPressFBMask);
-	set_bool (client, CONFIG_ROOT "/slowkeys_beep_accept",
+	set_bool (client, TRUE, CONFIG_ROOT "/slowkeys_beep_accept",
 		desc->ctrls->ax_options & XkbAX_SKAcceptFBMask);
-	set_bool (client, CONFIG_ROOT "/slowkeys_beep_reject",
+	set_bool (client, TRUE, CONFIG_ROOT "/slowkeys_beep_reject",
 		desc->ctrls->ax_options & XkbAX_SKRejectFBMask);
 	set_int (client, CONFIG_ROOT "/slowkeys_delay",
 		desc->ctrls->slow_keys_delay);
 
-	set_bool (client, CONFIG_ROOT "/stickykeys_enable",
+	set_bool (client, in_gconf, CONFIG_ROOT "/stickykeys_enable",
 		desc->ctrls->enabled_ctrls & XkbStickyKeysMask);
-	set_bool (client, CONFIG_ROOT "/stickykeys_two_key_off",
+	set_bool (client, TRUE, CONFIG_ROOT "/stickykeys_two_key_off",
 		desc->ctrls->ax_options & XkbAX_TwoKeysMask);
-	set_bool (client, CONFIG_ROOT "/stickykeys_modifier_beep",
+	set_bool (client, TRUE, CONFIG_ROOT "/stickykeys_modifier_beep",
 		desc->ctrls->ax_options & XkbAX_StickyKeysFBMask);
 
-	set_bool (client, CONFIG_ROOT "/togglekeys_enable",
+	set_bool (client, in_gconf, CONFIG_ROOT "/togglekeys_enable",
 		desc->ctrls->ax_options & XkbAX_IndicatorFBMask);
 
 	we_are_changing_xkb_state = FALSE;

gnome-settings-daemon/gnome-settings-default-editor.c

@@ -92,6 +92,8 @@ vfs_change_cb (GnomeVFSMIMEMonitor *monitor, GConfClient *client)
 	star_app  = gnome_vfs_mime_get_default_application ("text/*");
 	plain_app = gnome_vfs_mime_get_default_application ("text/plain");
 
+	if (star_app == NULL || plain_app == NULL)
+		return;
 	if (!strcmp (star_app->id, plain_app->id))
 		return;
 

gnome-settings-daemon/gnome-settings-mouse.c

@@ -8,16 +8,21 @@
 #include "gnome-settings-locate-pointer.h"
 #include "gnome-settings-daemon.h"
 
-#define MAX_BUTTONS 10
+#define DEFAULT_PTR_MAP_SIZE 128
 
 static void
 set_left_handed (gboolean left_handed)
 {
-  unsigned char buttons[MAX_BUTTONS];
+  unsigned char *buttons;
   gint n_buttons, i;
   gint idx_1 = 0, idx_3 = 1;
 
-  n_buttons = XGetPointerMapping (GDK_DISPLAY (), buttons, MAX_BUTTONS);
+  buttons = g_alloca (DEFAULT_PTR_MAP_SIZE);
+  n_buttons = XGetPointerMapping (GDK_DISPLAY (), buttons, DEFAULT_PTR_MAP_SIZE);
+  if (n_buttons > DEFAULT_PTR_MAP_SIZE) {
+    buttons = g_alloca (n_buttons);
+    n_buttons = XGetPointerMapping (GDK_DISPLAY (), buttons, n_buttons);
+  }
 
   for (i = 0; i < n_buttons; i++)
     {

gnome-settings-daemon/gnome-settings-sound.c

@@ -73,6 +73,8 @@ start_esd (void)
         }
 }
 
+static gboolean set_standby = FALSE;
+
 /* stop_esd
  *
  * Stop the Enlightenment Sound Daemon. 
@@ -82,6 +84,7 @@ stop_esd (void)
 {
 	/* Can't think of a way to do this reliably, so we fake it for now */
 	esd_standby (gnome_sound_connection_get ());
+	set_standby = TRUE;
 }
 
 /* reload_foreach_cb
@@ -146,12 +149,20 @@ apply_settings (void)
 	event_sounds      = gconf_client_get_bool (client, "/desktop/gnome/sound/event_sounds", NULL);
 	event_changed_new = gconf_client_get_int  (client, "/desktop/gnome/sound/event_changed", NULL);
 
-	if (enable_esd && gnome_sound_connection_get () < 0)
-		start_esd ();
-	else if (!enable_esd)
+	if (enable_esd) {
+		if (gnome_sound_connection_get () < 0) 
+			start_esd ();
+
+		else if (set_standby) {
+			esd_resume (gnome_sound_connection_get ());
+			set_standby = FALSE;
+		}
+
+	} else if (!enable_esd && !set_standby)
 		stop_esd ();
 
-	if (!inited || event_changed_old != event_changed_new)
+	if ((enable_esd && event_sounds) &&
+	    (!inited || event_changed_old != event_changed_new))
 	{
 		SoundProperties *props;
 		
@@ -164,7 +175,7 @@ apply_settings (void)
 		gtk_object_destroy (GTK_OBJECT (props));
 	}
 
-	g_object_unref (G_OBJECT (client));
+	g_object_unref (client);
 }
 
 void

gnome-settings-daemon/gnome-settings-wm.c

@@ -81,6 +81,7 @@ gnome_settings_wm_init (GConfClient *client)
 void
 gnome_settings_wm_load (GConfClient *client)
 {
-	
+	set_number_of_workspaces (gconf_client_get_int (client, "/desktop/gnome/applications/window_manager/number_of_workspaces", NULL));
+	set_workspace_names (gconf_client_get_list (client, "/desktop/gnome/applications/window_manager/workspace_names", GCONF_VALUE_LIST, NULL));
 }
 

help/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0

libbackground/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-06-18  Jody Goldberg <jody@gnome.org>
 
 	http://bugzilla.gnome.org/show_bug.cgi?id=85224

libwindow-settings/ChangeLog

@@ -1,3 +1,11 @@
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
 2002-06-17  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.0.0

po/ChangeLog

@@ -1,4 +1,173 @@
-2002-07-17  Tõivo Leedjärv  <toivo@linux.ee>
+2002-08-21  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1.1
+
+2002-08-20  Peteris Krisjanis <peteris.krisjanis@os.lv>
+
+	* lv.po: Updated Latvian translation.
+
+2002-08-20  Gustavo Noronha Silva  <kov@debian.org>
+
+	* pt_BR.po: translation update
+
+2002-08-19  Yanko Kaneti <yaneti@declera.com>
+
+	* bg.po: Updated Bulgarian translation.
+
+2002-08-18  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian (bokmål) translation.
+		
+2002-08-17  Duarte Loreto <happyguy_pt@hotmail.com>
+
+        * pt.po: Updated Portuguese translation.
+
+2002-08-17  Christian Meyer  <chrisime@gnome.org>
+
+	* de.po: Updated German translation.
+
+2002-08-16  Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>
+
+	* nl.po: Dutch translation updated by Reinout van Schouwen.
+
+2002-08-16  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
+2002-08-16  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
+
+	* ru.po: updated Russian translation.
+
+2002-08-15  Ole Laursen  <olau@hardworking.dk>
+
+	* da.po: Updated Danish translation.
+
+	* POTFILES.in: Removed nonexisting file.
+
+2002-08-15  Tõivo Leedjärv  <toivo@linux.ee>
+
+	* et.po: Updated Estonian translation.
+
+2002-08-14  Peteris Krisjanis <peteris.krisjanis@os.lv>
+
+	* lv.po: Updated Latvian translation.
+
+2002-08-14  He Qiangqiang  <carton@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
+2002-08-13  Andras Timar  <timar@gnome.hu>
+
+        * hu.po: Updated Hungarian translation.
+
+2002-08-12  Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
+
+	* sk.po: Updated Slovak translation.
+
+2002-08-11  Christian Meyer  <chrisime@gnome.org>
+
+	* de.po: Updated German translation.
+
+2002-08-09  Gustavo Noronha Silva  <kov@debian.org>
+
+	* pt_BR: updated translation.
+
+2002-08-09  Christian Meyer  <chrisime@gnome.org>
+
+	* de.po: Updated German translation.
+
+2002-08-08  Zbigniew Chyla  <cyba@gnome.pl>
+
+	* pl.po: Updated Polish translation by
+	GNOME PL Team <translators@gnome.pl>.
+
+2002-08-08  Duarte Loreto <happyguy_pt@hotmail.com>
+
+        * pt.po: Updated Portuguese translation.
+
+2002-08-07  Christophe Merlet  <christophe@merlet.net>
+
+	* fr.po: Updated French translation.
+
+2002-08-06  Jody Goldberg <jody@gnome.org>
+
+	* Release 2.0.1
+
+2002-08-06  Simos Xenitellis  <simos@hellug.gr>
+
+	* el.po: Updated Greek translation (contributions 
+	by Nikos Charonitakis, Ta Panta Rei).
+
+2002-08-03  Tõivo Leedjärv  <toivo@linux.ee>
+
+	* et.po: Updated Estonian translation.
+
+2002-08-01  Andras Timar <timar@gnome.hu>
+
+	* hu.po: Update Hungarian translation by Zelin.
+
+2002-07-30  Hasbullah Bin Pit <sebol@ikhlas.com>
+
+	* ms.po: Updated Malay Translation.
+
+2002-07-28  Christophe Fergeau  <teuf@users.sourceforge.net>
+
+	* fr.po: Updated French translation.
+	
+2002-07-26  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* vi.po: Updated Vietnamese file
+
+2002-07-24  Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
+
+	* sk.po: Updated Slovak translation.
+
+2002-07-23  Yanko Kaneti <yaneti@declera.com>
+
+	* bg.po: Updated Bulgarian translation.
+
+2002-07-22  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated Catalan translation.
+
+2002-07-21  Christophe Merlet  <christophe@merlet.net>
+
+	* fr.po: Updated French translation.
+
+2002-07-21  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2002-07-21  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian (bokmål) translation.
+		
+2002-07-19  Ole Laursen  <olau@hardworking.dk>
+
+	* da.po: Updated Danish translation.
+
+2002-07-19  Pauli Virtanen <pauli.virtanen@hut.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2002-07-19  Zbigniew Chyla  <chyla@gnome.pl>
+
+	* pl.po: Updated Polish translation by
+	GNOME PL Team <translators@gnome.pl>.
+
+2002-07-19  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
+
+	* ru.po: updated Russian translation.
+
+2002-07-18  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
+
+	* ru.po: updated Russian translation.
+
+2002-07-18  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
+2002-07-17  Tõivo Leedjärv  <toivo@linux.ee>
 
 	* et.po: Updated Estonian translation.
 
@@ -33,7 +202,7 @@
 
 2002-06-05  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 		
 2002-07-13  Ole Laursen  <olau@hardworking.dk>
 
@@ -69,7 +238,7 @@
 	* pl.po: Updated Polish translation by
 	GNOME PL Team <translators@gnome.pl>.
 
-2002-07-06  Tõivo Leedjärv  <toivo@linux.ee>
+2002-07-06  Tõivo Leedjärv  <toivo@linux.ee>
 
 	* et.po: Updated Estonian translation.
 
@@ -89,7 +258,7 @@
 
 	* vi.po: Updated Vietnamese file
 
-2002-06-30  Tõivo Leedjärv  <toivo@linux.ee>
+2002-06-30  Tõivo Leedjärv  <toivo@linux.ee>
 
 	* et.po: Updated Estonian translation.
 
@@ -100,7 +269,7 @@
 2002-06-26  Jesus Bravo Alvarez  <jba@pobox.com>
 
 	* gl.po: Updated Galician translation from
-	  Xabier García <xabigf@gmx.net>
+	  Xabier García <xabigf@gmx.net>
 
 2002-06-25  Changwoo Ryu  <cwryu@debian.org>
 
@@ -201,7 +370,7 @@
 
 	* ca.po: Catalan fixes.
 
-2002-06-09  Carlos Perelló Marín <carlos@gnome-db.org>
+2002-06-09  Carlos Perelló Marín <carlos@gnome-db.org>
 
         * es.po: Updated Spanish translation.
 
@@ -217,14 +386,14 @@
 
 	* sv.po: Updated Swedish translation.
 
-2002-06-09  Carlos Perelló Marín <carlos@gnome-db.org>
+2002-06-09  Carlos Perelló Marín <carlos@gnome-db.org>
 
 	* pt_BR.po: Gustavo Noronha Silva <kov@debian.org>
   
 2002-06-05  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* POTFILES.in: Also add one file: gnome-settings-keybindings.c
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 		
 2002-06-08  Pauli Virtanen <pauli.virtanen@hut.fi>
 
@@ -259,7 +428,7 @@
 
 	* POTFILES.in: Remove wm-properties capplet. It's not being shipped
 	for 2.0.0. Also add one file from libwindow-settings (gnome-wm-manager.c)
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 		
 2002-06-05  Gediminas Paulauskas <menesis@delfi.lt>
 
@@ -291,7 +460,7 @@
 	* pl.po: Updated Polish translation by
 	GNOME PL Team <translators@gnome.pl>.
 
-2002-06-04  Tõivo Leedjärv  <toivo@linux.ee>
+2002-06-04  Tõivo Leedjärv  <toivo@linux.ee>
 
 	* et.po: Updated Estonian translation.
 
@@ -315,15 +484,15 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 	* sv.po: Updated Swedish translation.
 
-2002-06-03  Carlos Perelló Marín <carlos@gnome-db.org>
+2002-06-03  Carlos Perelló Marín <carlos@gnome-db.org>
 
 	* es.po: Added '\n' to all emails at translation_credits.
 
-2002-06-03  Carlos Perelló Marín <carlos@gnome-db.org>
+2002-06-03  Carlos Perelló Marín <carlos@gnome-db.org>
 
 	* es.po: Full translation.
 
-2002-06-03  Germán Poo-Caamaño <gpoo@ubiobio.cl
+2002-06-03  Germán Poo-Caamaño <gpoo@ubiobio.cl
 
 	* es.po: Updated Spanish translation from
 	Lucas Di Pentima <lucas@lunix.com.ar>
@@ -394,7 +563,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-05-31  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-05-31  Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
 
@@ -432,7 +601,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-05-27  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-05-27  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
 
@@ -448,7 +617,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-05-22  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-05-21  Pauli Virtanen <pauli.virtanen@hut.fi>
 
@@ -475,7 +644,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-05-19  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-05-18  Jacob Berkman  <jacob@ximian.com>
 
@@ -487,7 +656,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-05-17  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-05-16  Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
 
@@ -532,7 +701,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-05-12  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-05-12  Ole Laursen  <olau@hardworking.dk>
 
@@ -551,7 +720,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-05-07  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-05-06  Changwoo Ryu  <cwryu@debian.org>
 
@@ -565,20 +734,20 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 	* nl.po: Updated Dutch translation (Huib Kleinhout) UTF-8.
 	
-2002-05-01  Germán Poo-Caamaño  <gpoo@ubiobio.cl>
+2002-05-01  Germán Poo-Caamaño  <gpoo@ubiobio.cl>
 
 	* es.po: Updated Spanish translation from
-	Héctor García Álvarez <hector@scouts-es.org>
+	Héctor García Ã<>lvarez <hector@scouts-es.org>
 
 2002-04-30  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* POTFILES.in: added gnome-settings-daemon/*
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-04-30  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* POTFILES.in: added capplets/common/file-transfer-dialog.c
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-04-29  Pablo Saratxaga  <pablo@mandrakesoft.com>
 
@@ -588,7 +757,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 2002-04-29  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* POTFILES.in: Do not use .glade.h files, but the .glade file directly.
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-04-28  jacob berkman  <jacob@localhost.localdomain>
 
@@ -619,13 +788,13 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 	* fi.po: Updated Finnish translation.
 
-2002-04-24  Tõivo Leedjärv  <toivo@linux.ee>
+2002-04-24  Tõivo Leedjärv  <toivo@linux.ee>
 
 	* et.po: Updated Estonian translation.
 
 2002-04-23  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-04-22  Christophe Merlet  <christophe@merlet.net>
 
@@ -664,7 +833,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-04-19  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-04-19  Pauli Virtanen  <pauli.virtanen@hut.fi>
 
@@ -681,11 +850,11 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-04-16  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-04-15  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-04-15  Valek Filippov  <frob@df.ru>
 
@@ -746,7 +915,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-03-28  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-03-28  Zbigniew Chyla  <cyba@gnome.pl>
 
@@ -775,7 +944,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-03-25  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-03-24  jacob berkman  <jacob@ximian.com>
 
@@ -795,7 +964,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 	* da.po: Updated Danish translation.
 
-2002-03-22  Tõivo Leedjärv  <toivo@linux.ee>
+2002-03-22  Tõivo Leedjärv  <toivo@linux.ee>
 
 	* et.po: Updated Estonian translation.
 
@@ -832,7 +1001,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 2002-03-17  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* POTFILES.in: Update this some more.
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-03-16  Wang Jian  <lark@linux.net.cn>
 
@@ -856,7 +1025,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-03-12  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-03-12  Zbigniew Chyla  <cyba@gnome.pl>
 
@@ -934,14 +1103,14 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-03-03  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-03-03  Abel Cheung  <maddog@linux.org.hk>
 
 	* en_GB.po: Remove duplicate entry which is causing
 	  error in status page generation.
 
-2002-03-02  Tõivo Leedjärv  <leedjarv@interest.ee>
+2002-03-02  Tõivo Leedjärv  <leedjarv@interest.ee>
 
 	* et.po: Updated Estonian translation.
 
@@ -960,7 +1129,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-02-27  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 	* POTFILES.in: Added missing file.
 	
 2002-02-27  Zbigniew Chyla  <cyba@gnome.pl>
@@ -992,7 +1161,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-02-23  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-02-23  Ole Laursen  <olau@hardworking.dk>
 
@@ -1004,11 +1173,11 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-02-22  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-02-21  Fatih Demir <kabalak@gtranslator.org>
 
-	* tr.po: Committed updated Turkish translation by Görkem.
+	* tr.po: Committed updated Turkish translation by Görkem.
 
 2002-02-20  Abel Cheung  <maddog@linux.org.hk>
 
@@ -1028,11 +1197,11 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-02-12  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-02-10  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 	* POTFILES.in: Added some files.
 	
 2002-02-09  Pauli Virtanen  <ptvirtan@cc.hut.fi>
@@ -1069,7 +1238,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2002-01-30  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 	* POTFILES.in: Added some files.
 	
 2002-01-30  Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
@@ -1134,7 +1303,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2001-12-13  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokmål) translation.
+	* no.po: Updated Norwegian (bokmål) translation.
 
 2002-01-09  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
 
@@ -1170,14 +1339,14 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2001-12-13  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokm�) translation.
+	* no.po: Updated Norwegian (bokm�) translation.
 	* POTFILES.in: Updated this too.
 	
 2001-12-13  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
 
 	* sk.po: Updated Slovak translation.
 
-2001-12-11  H�tor Garc� �varez  <hector@scouts-es.org>
+2001-12-11  H�tor Garc� �varez  <hector@scouts-es.org>
 
 	* es.po: Updated Spanish Translation.
 
@@ -1265,7 +1434,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2001-10-13  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokm�) translation.
+	* no.po: Updated Norwegian (bokm�) translation.
 	* nn.po: Updated Norwegian (nynorsk) translation.
 
 2001-10-13  Valek Filippov  <frob@df.ru>
@@ -1291,7 +1460,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2001-09-23  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokm�) translation.
+	* no.po: Updated Norwegian (bokm�) translation.
 	* nn.po: Updated Norwegian (nynorsk) translation.
 	* POTFILES.in: Updated.
 	
@@ -1435,7 +1604,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 
 2001-07-25  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* no.po: Updated Norwegian (bokm�) translation.
+	* no.po: Updated Norwegian (bokm�) translation.
 	* nn.po: Updated Norwegian (nynorsk) translation.
 	* POTFILES.in: Updated.
 	
@@ -1463,7 +1632,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 2001-07-20  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* nn.po: Updated Norwegian (nynorsk) translation.
-	* no.po: Updated Norwegian (bokm�) translation.
+	* no.po: Updated Norwegian (bokm�) translation.
 	
 2001-07-20  Pablo Saratxaga  <pablo@mandrakesoft.com>
 
@@ -1500,7 +1669,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 2001-07-18  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* nn.po: Updated Norwegian (nynorsk) translation.
-	* no.po: Updated Norwegian (bokm�) translation.
+	* no.po: Updated Norwegian (bokm�) translation.
 	
 2001-07-17  Carlos Perells Marmn <carlos@gnome-db.org>
 
@@ -1527,7 +1696,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 2001-07-15  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* nn.po: Added Norwegian (nynorsk) translation.
-	* no.po: Updated Norwegian (bokm�) translation.
+	* no.po: Updated Norwegian (bokm�) translation.
 	
 2001-07-10  Kai Lahmann  <kl@linuxfaqs.de>
 
@@ -2458,7 +2627,7 @@ Mon Jun 03 18:39:53 2002  George Lebl <jirka@5z.com>
 	Removed references to applets/slashapp.
 	Removed references to gemvt.
 
-1998-09-15  Ville Hautam�i <villeh@cs.joensuu.fi>
+1998-09-15  Ville Hautam�i <villeh@cs.joensuu.fi>
 
 	* fi.po: Updated.
 	

po/POTFILES.in

@@ -29,7 +29,6 @@ capplets/desktop-links/Sawfish/placement-properties.desktop.in
 capplets/desktop-links/Sawfish/sound-properties.desktop.in
 capplets/desktop-links/Sawfish/workspace-properties.desktop.in
 capplets/desktop-links/legacy-applications.desktop.in.in
-capplets/file-types/category-names.h
 capplets/file-types/file-types-capplet.c
 capplets/file-types/file-types-capplet.desktop.in
 capplets/file-types/file-types-properties.glade

po/ms.po

@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center HEAD\n"
-"POT-Creation-Date: 2002-07-18 02:28+0800\n"
+"POT-Creation-Date: 2002-08-21 10:05-0400\n"
 "PO-Revision-Date: 2002-03-18 00:54+0800\n"
 "Last-Translator: Khairulanuar Abd Majid <khairul@ikhlas.com>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@lists.sourceforge.org>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: capplets/accessibility/keyboard/accessibility-keyboard.c:225
-#: capplets/keyboard/gnome-keyboard-properties.c:143
+#: capplets/keyboard/gnome-keyboard-properties.c:159
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
 msgstr "Terdapat ralat melancarkan caplet papan kekunci: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:291
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:309
 #, 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:403
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:421
 msgid "Select CDE AccessX file"
 msgstr "Pilih fail AccessX CDE"
 
 #: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:6
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:10
 #: capplets/keyboard/keyboard.desktop.in.h:1
 msgid "Keyboard"
 msgstr "Papan Kekunci"
@@ -138,18 +138,23 @@ msgid "_Disable if unused for "
 msgstr "_Dimatikan jika tidak digunakan selama"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
+#, fuzzy
+msgid "_Enable keyboard accessibility"
+msgstr "Hidupkan kebolehaksesan Papan Kekunci"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid "_Ignore keypresses within  :"
 msgstr "_Abaikan tekanan kekunci dalam tempoh :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
+#: 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:26
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 msgid "_Only accept keypress after :"
 msgstr "_Hanya terima tekanan kekunci selepas :"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
 msgid ""
 "_Turn off Sticky Keys when\n"
 "two keys pressed simultaneously"
@@ -157,27 +162,27 @@ msgstr ""
 "Ma_tikan Kekunci Lekat bila \n"
 "dua kekunci ditekan serentak"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 msgid "key is _accepted"
 msgstr "Kekunci dite_rima"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
 msgid "key is _pressed"
 msgstr "kekunci dite_kan"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
 msgid "key is _rejected"
 msgstr "kekunci di_lepaskan"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 msgid "msecs"
 msgstr "msaat"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
 msgid "pixels/sec"
 msgstr "piksel/saat"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
 msgid "seconds"
 msgstr "saat"
 
@@ -231,7 +236,7 @@ msgstr "_Pilih gambar:"
 #: capplets/background/background-properties-capplet.c:561
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
-#: capplets/keyboard/gnome-keyboard-properties.c:277
+#: capplets/keyboard/gnome-keyboard-properties.c:293
 #: capplets/mouse/gnome-mouse-properties.c:752
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
@@ -324,6 +329,11 @@ msgid ""
 "settings manager may already be active and conflicting with the GNOME "
 "settings manager."
 msgstr ""
+"Gagal memulakan pengurus tetapan 'gnome-setting-daemon'.\n"
+"Tanpa pengurus tetapan GNOME terlaksana, setengah keutamaan tak dapat "
+"bertindak. Ini menunjukkan masalah dengan Bonobo, atau pengurus tetapan "
+"bukan-GNOME (ie. KDE) sudah tersedia aktif dan konflik dengan pengurus "
+"tetapan GNOME."
 
 #: capplets/common/capplet-util.c:239 capplets/common/capplet-util.c:241
 msgid "Just apply settings and quit"
@@ -700,11 +710,11 @@ msgstr "Penampilan"
 
 #: capplets/desktop-links/Sawfish/appearance-properties.desktop.in.h:2
 msgid "Select themes and fonts for your windows"
-msgstr ""
+msgstr "Pilih tema dan font bagi tetingkap anda"
 
 #: capplets/desktop-links/Sawfish/bindings-properties.desktop.in.h:1
 msgid "Customize shortcut keys for your windows"
-msgstr ""
+msgstr "Personalisasi kekunci pintasan bagi tetingkap anda"
 
 #: capplets/desktop-links/Sawfish/bindings-properties.desktop.in.h:2
 msgid "Shortcuts"
@@ -720,7 +730,7 @@ msgstr "Kelakuan fokus"
 
 #: capplets/desktop-links/Sawfish/match-properties.desktop.in.h:1
 msgid "Configure matched windows to have particular characteristics"
-msgstr "KOnfigurasikan tetingkap sepadan supaya mempunyai sifat tertentu"
+msgstr "Konfigurasikan tetingkap sepadan supaya mempunyai sifat tertentu"
 
 #: capplets/desktop-links/Sawfish/match-properties.desktop.in.h:2
 msgid "Matched Windows"
@@ -740,7 +750,7 @@ msgstr "Meta"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:2
 msgid "Select your Sawfish user level"
-msgstr ""
+msgstr "Pilih tahap pengguna Sawfish anda"
 
 #: capplets/desktop-links/Sawfish/misc-properties.desktop.in.h:1
 msgid "Miscellaneous"
@@ -760,7 +770,7 @@ msgstr "Pindah dan Ubahsaiz"
 
 #: capplets/desktop-links/Sawfish/placement-properties.desktop.in.h:1
 msgid "Configure positioning of windows on the desktop"
-msgstr ""
+msgstr "Konfigurasi penempatan tetingkap pada desktop"
 
 #: capplets/desktop-links/Sawfish/placement-properties.desktop.in.h:2
 msgid "Placement"
@@ -771,7 +781,7 @@ msgid "Associate sounds with window manager events"
 msgstr "Kaitkan bunyi dengan acara pengurus tetingkap"
 
 #: capplets/desktop-links/Sawfish/sound-properties.desktop.in.h:2
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:13
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:17
 #: capplets/sound/sound.desktop.in.h:2
 msgid "Sound"
 msgstr "Bunyi"
@@ -792,103 +802,11 @@ msgstr "Aplikasi Warisan"
 msgid "Legacy applications settings (grdb)"
 msgstr "Tetapan aplikasi warisan (grdb)"
 
-#.
-#. * Translatable strings file
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: capplets/file-types/category-names.h:7
-msgid "Documents"
-msgstr "Dokumen"
-
-#: capplets/file-types/category-names.h:8
-msgid "Word Processor"
-msgstr "Pemproses Perkataan"
-
-#: capplets/file-types/category-names.h:9
-msgid "Published Materials"
-msgstr "Bahan Penerbitan"
-
-#: capplets/file-types/category-names.h:10
-msgid "Spreadsheet"
-msgstr "Hamparan helaian"
-
-#: capplets/file-types/category-names.h:11
-msgid "Presentation"
-msgstr "Persembahan"
-
-#: capplets/file-types/category-names.h:12
-msgid "Diagram"
-msgstr "Gambarajah"
-
-#: capplets/file-types/category-names.h:13
-msgid "TeX"
-msgstr "TeX"
-
-#: capplets/file-types/category-names.h:14
-msgid "Vector Graphics"
-msgstr "Grafik Vektor"
-
-#: capplets/file-types/category-names.h:15
-msgid "World Wide Web"
-msgstr "World Wide Web"
-
-#: capplets/file-types/category-names.h:16
-msgid "Plain Text"
-msgstr "Teks jernih"
-
-#: capplets/file-types/category-names.h:17
-msgid "Extended Markup Language (XML)"
-msgstr "Extended Markup Language (XML)"
-
-#: capplets/file-types/category-names.h:18
-msgid "Information"
-msgstr "Maklumat"
-
-#: capplets/file-types/category-names.h:19
-msgid "Financial"
-msgstr "Kewangan"
-
-#: capplets/file-types/category-names.h:20
-msgid "Calendar"
-msgstr "Kalendar"
-
-#: capplets/file-types/category-names.h:21
-msgid "Contacts"
-msgstr "Kenalan"
-
-#: capplets/file-types/category-names.h:22
-msgid "Packages"
-msgstr "Pakej"
-
-#: capplets/file-types/category-names.h:23
-msgid "Software Development"
-msgstr "Pembangunan Perisian"
-
-#: capplets/file-types/category-names.h:24
-msgid "Source Code"
-msgstr "Kod Sumber"
-
-#: capplets/file-types/category-names.h:25
-#: capplets/file-types/mime-type-info.c:673
-msgid "Audio"
-msgstr "Audio"
-
-#: capplets/file-types/category-names.h:26
-#: capplets/file-types/mime-type-info.c:669
-msgid "Images"
-msgstr "Imej"
-
-#: capplets/file-types/category-names.h:27
-#: capplets/file-types/mime-type-info.c:671
-msgid "Video"
-msgstr "Video"
-
-#: capplets/file-types/file-types-capplet.c:215
+#: capplets/file-types/file-types-capplet.c:214
 msgid "Description"
 msgstr "Huraian"
 
-#: capplets/file-types/file-types-capplet.c:237
+#: capplets/file-types/file-types-capplet.c:236
 msgid "Extensions"
 msgstr "Penghujungan"
 
@@ -907,11 +825,13 @@ msgid "Actions"
 msgstr "Aksi"
 
 #: capplets/file-types/file-types-properties.glade.h:3
-msgid "Add _file type..."
+#, fuzzy
+msgid "Add _File Type..."
 msgstr "Tambah jenis _fail..."
 
 #: capplets/file-types/file-types-properties.glade.h:4
-msgid "Add _service..."
+#, fuzzy
+msgid "Add _Service..."
 msgstr "Tambah _servis..."
 
 #: capplets/file-types/file-types-properties.glade.h:5
@@ -1025,8 +945,8 @@ msgstr "Struktur mengandungi maklumat pada kategori MIME"
 #: capplets/file-types/mime-category-edit-dialog.c:344
 #: capplets/file-types/mime-edit-dialog.c:490
 #: capplets/file-types/mime-edit-dialog.c:594
-#: capplets/file-types/service-edit-dialog.c:359
-#: capplets/file-types/service-edit-dialog.c:408
+#: capplets/file-types/service-edit-dialog.c:358
+#: capplets/file-types/service-edit-dialog.c:407
 msgid "Custom"
 msgstr "Tersendiri"
 
@@ -1059,7 +979,7 @@ msgid "Add File Type"
 msgstr "Tambah jenis fail"
 
 #: capplets/file-types/mime-edit-dialog.c:435
-#: capplets/file-types/mime-type-info.c:675
+#: capplets/file-types/mime-type-info.c:673
 msgid "Misc"
 msgstr "Lain-lain"
 
@@ -1068,24 +988,38 @@ msgstr "Lain-lain"
 msgid "None"
 msgstr "Tiada"
 
-#: capplets/file-types/mime-edit-dialog.c:847
+#: capplets/file-types/mime-edit-dialog.c:854
 msgid ""
 "Please enter a valid MIME type.  It should be of the form class/type and may "
 "not contain any spaces."
 msgstr ""
+"Sila masukkkan jenis MIME yang sah. Ia patut dalam bentuk kelas/jenis dan "
+"tak boleh mengandungi ruang."
 
-#: capplets/file-types/mime-edit-dialog.c:854
+#: capplets/file-types/mime-edit-dialog.c:861
 msgid "A MIME type with that name already exists, overwrite ?."
-msgstr ""
+msgstr "Jenis MIME dengan nama itu sudah ada, Tindih?."
 
-#: capplets/file-types/mime-edit-dialog.c:919
+#: capplets/file-types/mime-edit-dialog.c:926
 msgid "Category"
 msgstr "Kategori"
 
-#: capplets/file-types/mime-edit-dialog.c:924
+#: capplets/file-types/mime-edit-dialog.c:931
 msgid "Choose a file category"
 msgstr "Pilih kategori fail"
 
+#: capplets/file-types/mime-type-info.c:667
+msgid "Images"
+msgstr "Imej"
+
+#: capplets/file-types/mime-type-info.c:669
+msgid "Video"
+msgstr "Video"
+
+#: capplets/file-types/mime-type-info.c:671
+msgid "Audio"
+msgstr "Audio"
+
 #: capplets/file-types/mime-types-model.c:167
 #: capplets/file-types/mime-types-model.c:168
 msgid "Model for categories only"
@@ -1119,18 +1053,18 @@ msgstr "BENAR jika ianya dialog penambahan servis"
 msgid "Add Service"
 msgstr "Tambah Servis"
 
-#: capplets/file-types/service-edit-dialog.c:498
+#: capplets/file-types/service-edit-dialog.c:497
 msgid "Please enter a protocol name."
 msgstr "Sila masukkan nama protokol."
 
-#: capplets/file-types/service-edit-dialog.c:510
+#: capplets/file-types/service-edit-dialog.c:509
 msgid ""
 "Invalid protocol name. Please enter a protocol name without any spaces or "
 "punctuation."
 msgstr ""
 "Nama protokol tidak sah. Sila masukkan nama protokol tanpa ruang atau koma"
 
-#: capplets/file-types/service-edit-dialog.c:524
+#: capplets/file-types/service-edit-dialog.c:523
 msgid "There is already a protocol by that name."
 msgstr "Sudah wujud protokol dengan nama itu."
 
@@ -1201,7 +1135,7 @@ msgid "Accelerator key"
 msgstr "Kekunci pemecut"
 
 #: capplets/keybindings/eggcellrendererkeys.c:206
-#: capplets/keybindings/gnome-keybinding-properties.c:173
+#: capplets/keybindings/gnome-keybinding-properties.c:179
 #: libbackground/applier.c:521
 msgid "Disabled"
 msgstr "Dimatikan"
@@ -1212,24 +1146,24 @@ msgstr "Dimatikan"
 msgid "Type a new shortcut"
 msgstr "Taip pemecut baru"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:440
+#: capplets/keybindings/gnome-keybinding-properties.c:446
 msgid "<Unknown Action>"
 msgstr "<Aksi Tidak diketahui>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:459
+#: capplets/keybindings/gnome-keybinding-properties.c:465
 msgid "Desktop"
 msgstr "Desktop"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:463
+#: capplets/keybindings/gnome-keybinding-properties.c:469
 msgid "Window Management"
 msgstr "Pengurusan Tetingkap"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:560
+#: capplets/keybindings/gnome-keybinding-properties.c:566
 #, 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:711
+#: capplets/keybindings/gnome-keybinding-properties.c:717
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1237,11 +1171,11 @@ msgstr ""
 "Tak dapat menjumpai tema papankekunci. Ini bermaksud pemasangan GTK+ tidak "
 "dipasang dengan sempurna."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:733
+#: capplets/keybindings/gnome-keybinding-properties.c:739
 msgid "Action"
 msgstr "Aksi"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:749
+#: capplets/keybindings/gnome-keybinding-properties.c:755
 msgid "Shortcut"
 msgstr "Pintasan"
 
@@ -1265,14 +1199,14 @@ msgstr "Pintasan _Desktop:"
 
 #: capplets/keybindings/keybinding.desktop.in.h:1
 msgid "Assign shortcut keys to commands"
-msgstr ""
+msgstr "Umpuk kekunci pintasan pada arahan"
 
-#: capplets/keyboard/gnome-keyboard-properties.c:256
+#: capplets/keyboard/gnome-keyboard-properties.c:272
 msgid "_Accessibility"
 msgstr "Keboleh_capaikan"
 
-#: capplets/keyboard/gnome-keyboard-properties.c:273
-#: capplets/keyboard/gnome-keyboard-properties.c:275
+#: capplets/keyboard/gnome-keyboard-properties.c:289
+#: capplets/keyboard/gnome-keyboard-properties.c:291
 #: capplets/sound/sound-properties-capplet.c:145
 #: capplets/sound/sound-properties-capplet.c:147
 msgid ""
@@ -1282,80 +1216,91 @@ msgstr ""
 "deamon)"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:2
-msgid "Bee_p"
+msgid "<small><i>Fast</i></small>"
 msgstr ""
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:3
+msgid "<small><i>Long</i></small>"
+msgstr ""
+
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:4
+msgid "<small><i>Short</i></small>"
+msgstr ""
+
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:5
+msgid "<small><i>Slow</i></small>"
+msgstr ""
+
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:6
+msgid "Bee_p"
+msgstr ""
+
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:7
 msgid "C_ustom:"
 msgstr "Ter_sendiri:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:4
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:8
 msgid "Clic_k on keypress"
 msgstr "Kli_k pada tekanan kekunci"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:5
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:9
 msgid "Cursor Blinks"
 msgstr "Kerdipan Kursor"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:7
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:11
 msgid "Keyboard Bell"
 msgstr "Bunyi Papan Kekunci"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:8
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:12
 msgid "Keyboard Preferences"
 msgstr "Keutamaan Papan Kekunci"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:9
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:13
 msgid "Keyboard _repeats when key is held down"
 msgstr "_Ulangan apabila kekunci ditekan"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:10
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:14
 msgid "Keypress Click"
 msgstr ""
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:11
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:15
 msgid "Repeat Keys"
 msgstr "Kekunci Ulangan"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:12
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 msgid "S_peed:"
 msgstr "Ke_lajuan:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:14
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "Keboleh_capaian..."
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:15
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:19
 msgid "_Blinks in text boxes and fields"
 msgstr "_Kerdipan  pada kekotak dan medan teks"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:20
 msgid "_Delay:"
 msgstr "_Sela:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:17
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:21
 msgid "_Off"
-msgstr ""
+msgstr "_Off"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:18
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:22
 msgid "_Speed:"
 msgstr "Ke_lajuan:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:19
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:23
 msgid "_Volume:"
 msgstr "_Volum:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#, fuzzy
-msgid "faster"
-msgstr "Pantas"
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:21
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:24
 #, fuzzy
 msgid "loud"
 msgstr "Bunyi"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:22
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:25
 msgid "quiet"
 msgstr "senyap"
 
@@ -1528,7 +1473,7 @@ msgstr "Keutamaan Tetikus"
 #: capplets/mouse/gnome-mouse-properties.glade.h:20
 msgid "Set the distance you need to move your cursor before dragging an item."
 msgstr ""
-"Tetapkan jarak yang diperlukan untuk menggerakkan kurson sebelum mengheret "
+"Tetapkan jarak yang diperlukan untuk menggerakkan kursor sebelum mengheret "
 "sesuatu item."
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:21
@@ -1662,7 +1607,6 @@ msgid "Submenu"
 msgstr "Submenu"
 
 #: capplets/theme-switcher/control/control.c:74
-#: capplets/ui-properties/gnome-ui-properties.glade.h:4
 msgid "Item 1"
 msgstr "Item 1"
 
@@ -1732,7 +1676,7 @@ msgstr "_Lokasi bagi tema baru:"
 
 #: capplets/ui-properties/behavior.desktop.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
-msgstr ""
+msgstr "Personalisasi penampilan toolbar dan bar menu pada aplikasi"
 
 #: capplets/ui-properties/behavior.desktop.in.h:2
 msgid "Menus & Toolbars"
@@ -1755,100 +1699,108 @@ msgid "A preview of what a toolbar looks like with these settings."
 msgstr "Prebiu bagaimana toolbar menu dilihat dengan tetapan ini."
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:3
+msgid "C_ut"
+msgstr "_Potong"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:4
+msgid "Edit Menu"
+msgstr "Edit Menu"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:5
 msgid "Icons Only"
 msgstr "Ikon Sahaja"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:5
-msgid "Item 2"
-msgstr "Item 2"
-
 #: capplets/ui-properties/gnome-ui-properties.glade.h:6
-msgid "Item 3"
-msgstr "Item 3"
-
-#: capplets/ui-properties/gnome-ui-properties.glade.h:7
-msgid "Menu Item 1"
-msgstr "Item Menu 1"
-
-#: capplets/ui-properties/gnome-ui-properties.glade.h:8
-msgid "Menu Item 2"
-msgstr "Item Menu 2"
-
-#: capplets/ui-properties/gnome-ui-properties.glade.h:9
-msgid "Menu Item 3"
-msgstr "Item Menu 3"
-
-#: capplets/ui-properties/gnome-ui-properties.glade.h:10
-msgid "Menu Item 4"
-msgstr "Item Menu 4"
-
-#: capplets/ui-properties/gnome-ui-properties.glade.h:11
-msgid "Menu Item 5"
-msgstr "Item Menu 5"
-
-#: capplets/ui-properties/gnome-ui-properties.glade.h:12
 msgid "Menu and Toolbar Preferences"
 msgstr "Keutamaan Menu dan Toolbar"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:13
+#: capplets/ui-properties/gnome-ui-properties.glade.h:7
 msgid "Menus"
 msgstr "Menu"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:14
+#: capplets/ui-properties/gnome-ui-properties.glade.h:8
 msgid "New File"
 msgstr "Fail Baru"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:15
+#: capplets/ui-properties/gnome-ui-properties.glade.h:9
 msgid "Open File"
 msgstr "Buka Fail"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:16
+#: capplets/ui-properties/gnome-ui-properties.glade.h:10
 msgid "Priority Text Beside Icons"
 msgstr "Prioriti Teks Sebelah Ikon"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:17
+#: capplets/ui-properties/gnome-ui-properties.glade.h:11
 msgid "Sample menubar:"
 msgstr "Bar Menu contoh:"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:18
+#: capplets/ui-properties/gnome-ui-properties.glade.h:12
 msgid "Sample toolbar:"
 msgstr "Toolbar contoh:"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:19
+#: capplets/ui-properties/gnome-ui-properties.glade.h:13
 msgid "Save File"
 msgstr "Simpan Fail"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:20
+#: capplets/ui-properties/gnome-ui-properties.glade.h:14
 msgid "Select the toolbar style."
 msgstr "Pilih gaya toolbar."
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:21
+#: capplets/ui-properties/gnome-ui-properties.glade.h:15
 msgid "Text Below Icons"
 msgstr "Teks Dibawah Ikon"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:22
+#: capplets/ui-properties/gnome-ui-properties.glade.h:16
 msgid "Text Only"
 msgstr "Teks Sahaja"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:23
+#: capplets/ui-properties/gnome-ui-properties.glade.h:17
 msgid "Toolbar"
 msgstr "Toolbar"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:24
+#: capplets/ui-properties/gnome-ui-properties.glade.h:18
 msgid "Toolbars can be _detached and moved around"
 msgstr "Toolbar boleh di_pisahkan dan dipindahkan"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:25
+#: capplets/ui-properties/gnome-ui-properties.glade.h:19
 msgid "_Button Labels: "
 msgstr "Label _Butang: "
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:26
+#: capplets/ui-properties/gnome-ui-properties.glade.h:20
+msgid "_Copy"
+msgstr ""
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:21
 msgid "_Menu"
 msgstr "_Menu"
 
+#: capplets/ui-properties/gnome-ui-properties.glade.h:22
+msgid "_New"
+msgstr "Ba_ru"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:23
+msgid "_Open"
+msgstr "_Buka"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:24
+msgid "_Paste"
+msgstr "_Tepek"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:25
+msgid "_Print"
+msgstr "_Cetak"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:26
+msgid "_Quit"
+msgstr "_Keluar"
+
 #: capplets/ui-properties/gnome-ui-properties.glade.h:27
+msgid "_Save"
+msgstr "_Simpan"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:28
 msgid "_Show icons in menus"
-msgstr ""
+msgstr "_Papar ikon pada menu"
 
 #: capplets/windows/gnome-window-properties.c:282
 #: capplets/windows/gnome-window-properties.glade.h:6
@@ -1927,7 +1879,7 @@ msgstr "Perihal aplikasi ini"
 
 #: control-center/gnomecc-ui.xml.h:2
 msgid "Overview of the control center"
-msgstr ""
+msgstr "Gambaran pusat kawalan"
 
 #: control-center/gnomecc-ui.xml.h:3
 msgid "_About..."
@@ -1963,31 +1915,33 @@ msgid ""
 "Cannot create the directory \"%s\".\n"
 "This is needed to allow changing cursors."
 msgstr ""
+"Tak dapat mencipta direktori \"%s\".\n"
+"Ini diperlukan untuk membolehkan penukaran kursor."
 
 #: gnome-settings-daemon/gnome-settings-keybindings.c:106
 #, c-format
 msgid "Key Binding (%s) has its action defined multiple times\n"
-msgstr ""
+msgstr "Ikatan Kekunci (%s) imempunyai aksi yang ditakrifkan beberapa kali\n"
 
 #: gnome-settings-daemon/gnome-settings-keybindings.c:119
 #, c-format
 msgid "Key Binding (%s) has its binding defined multiple times\n"
-msgstr ""
+msgstr "Ikatan Kekunci (%s) mempunyai ikatan ditakrifkan banyak kali\n"
 
 #: gnome-settings-daemon/gnome-settings-keybindings.c:125
 #, c-format
 msgid "Key Binding (%s) is incomplete\n"
-msgstr ""
+msgstr "Ikatan kekunci (%s) tidak selesai\n"
 
 #: gnome-settings-daemon/gnome-settings-keybindings.c:153
 #, c-format
 msgid "Key Binding (%s) is invalid\n"
-msgstr ""
+msgstr "Ikatan Kekunci (%s) tidak sah\n"
 
 #: gnome-settings-daemon/gnome-settings-keybindings.c:241
 #, c-format
 msgid "Key Binding (%s) is already in use\n"
-msgstr ""
+msgstr "Ikatan Kekunci (%s) telah digunakan\n"
 
 #: gnome-settings-daemon/gnome-settings-keybindings.c:292
 #, c-format
@@ -2012,7 +1966,7 @@ msgstr ""
 msgid "_Do not show this message again"
 msgstr "_Jangan papar mesej ini lagi"
 
-#: gnome-settings-daemon/gnome-settings-sound.c:125
+#: gnome-settings-daemon/gnome-settings-sound.c:128
 #, c-format
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Tak dapat memuatkan fail bunyi %s sebagai contoh %s"
@@ -2103,6 +2057,8 @@ 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"
 
 #: libwindow-settings/gnome-wm-manager.c:326
 #, c-format
@@ -2110,6 +2066,8 @@ 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"
 
 #: libwindow-settings/gnome-wm-manager.c:375
 msgid "Previous window manager did not die\n"
@@ -2136,6 +2094,84 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
+#~ msgid "Documents"
+#~ msgstr "Dokumen"
+
+#~ msgid "Word Processor"
+#~ msgstr "Pemproses Perkataan"
+
+#~ msgid "Published Materials"
+#~ msgstr "Bahan Penerbitan"
+
+#~ msgid "Spreadsheet"
+#~ msgstr "Hamparan helaian"
+
+#~ msgid "Presentation"
+#~ msgstr "Persembahan"
+
+#~ msgid "Diagram"
+#~ msgstr "Gambarajah"
+
+#~ msgid "TeX"
+#~ msgstr "TeX"
+
+#~ msgid "Vector Graphics"
+#~ msgstr "Grafik Vektor"
+
+#~ msgid "World Wide Web"
+#~ msgstr "World Wide Web"
+
+#~ msgid "Plain Text"
+#~ msgstr "Teks jernih"
+
+#~ msgid "Extended Markup Language (XML)"
+#~ msgstr "Extended Markup Language (XML)"
+
+#~ msgid "Information"
+#~ msgstr "Maklumat"
+
+#~ msgid "Financial"
+#~ msgstr "Kewangan"
+
+#~ msgid "Calendar"
+#~ msgstr "Kalendar"
+
+#~ msgid "Contacts"
+#~ msgstr "Kenalan"
+
+#~ msgid "Packages"
+#~ msgstr "Pakej"
+
+#~ msgid "Software Development"
+#~ msgstr "Pembangunan Perisian"
+
+#~ msgid "Source Code"
+#~ msgstr "Kod Sumber"
+
+#~ msgid "faster"
+#~ msgstr "lebih pantas"
+
+#~ msgid "Item 2"
+#~ msgstr "Item 2"
+
+#~ msgid "Item 3"
+#~ msgstr "Item 3"
+
+#~ msgid "Menu Item 1"
+#~ msgstr "Item Menu 1"
+
+#~ msgid "Menu Item 2"
+#~ msgstr "Item Menu 2"
+
+#~ msgid "Menu Item 3"
+#~ msgstr "Item Menu 3"
+
+#~ msgid "Menu Item 4"
+#~ msgstr "Item Menu 4"
+
+#~ msgid "Menu Item 5"
+#~ msgstr "Item Menu 5"
+
 #~ msgid "_Add..."
 #~ msgstr "_Tambah..."
 
@@ -2294,10 +2330,6 @@ msgstr "OK"
 #~ msgid "Change how toolbars and menus are displayed"
 #~ msgstr "Tukar bagaimana toolbar dan menu dipaparkan"
 
-#, fuzzy
-#~ msgid "_Enable keyboard accessibility"
-#~ msgstr "Hidupkan kebolehaksesan Papan Kekunci"
-
 #~ msgid "<b>Test</b>"
 #~ msgstr "<i>Ujian</i>"
 
@@ -2361,10 +2393,6 @@ msgstr "OK"
 #~ msgid "Remove"
 #~ msgstr "Buang"
 
-#, fuzzy
-#~ msgid "Open"
-#~ msgstr "Buka Fail"
-
 #, fuzzy
 #~ msgid "Select a file..."
 #~ msgstr "Pilih fail bunyi"
@@ -2373,10 +2401,6 @@ msgstr "OK"
 #~ msgid "View"
 #~ msgstr "Video"
 
-#, fuzzy
-#~ msgid "Edit"
-#~ msgstr "Edit..."
-
 #, fuzzy
 #~ msgid "Mime Type"
 #~ msgstr "Jenis MIME"
@@ -2556,10 +2580,10 @@ msgstr "OK"
 #~ msgstr "Tetapkan ke Default"
 
 #~ msgid "Keybinding"
-#~ msgstr "Pengikatan Kekunci"
+#~ msgstr "Ikatan Kekunci"
 
 #~ msgid "Keybinding Properties"
-#~ msgstr "Ciri-ciri Pengikatan Kekunci"
+#~ msgstr "Ciri-ciri Ikatan Kekunci"
 
 #~ msgid "Screensaver"
 #~ msgstr "Screensaver"

po/sv.po

@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
-"POT-Creation-Date: 2002-07-17 10:54+0200\n"
-"PO-Revision-Date: 2002-07-17 10:54+0200\n"
+"POT-Creation-Date: 2002-08-21 10:05-0400\n"
+"PO-Revision-Date: 2002-08-16 11:53+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: capplets/accessibility/keyboard/accessibility-keyboard.c:225
-#: capplets/keyboard/gnome-keyboard-properties.c:143
+#: capplets/keyboard/gnome-keyboard-properties.c:159
 #, 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/accessibility/keyboard/accessibility-keyboard.c:291
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:309
 #, 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:403
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:421
 msgid "Select CDE AccessX file"
 msgstr "Välj CDE AccessX-fil"
 
 #: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:6
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:10
 #: capplets/keyboard/keyboard.desktop.in.h:1
 msgid "Keyboard"
 msgstr "Tangentbord"
@@ -153,18 +153,22 @@ msgid "_Disable if unused for "
 msgstr "I_naktivera om oanvänd i "
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
+msgid "_Enable keyboard accessibility"
+msgstr "_Använd tangentbordshjälpmedel"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid "_Ignore keypresses within  :"
 msgstr "_Ignorera tangenttryckningar inom:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
 msgid "_Import CDE AccessX file"
 msgstr "_Importera CDE AccessX-fil"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
 msgid "_Only accept keypress after :"
 msgstr "_Godtag endast tangenttryckningar efter:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
 msgid ""
 "_Turn off Sticky Keys when\n"
 "two keys pressed simultaneously"
@@ -172,27 +176,27 @@ msgstr ""
 "_Slå av klistriga tangenter då\n"
 "två tangenter trycks ned samtidigt"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 msgid "key is _accepted"
 msgstr "tangenten är _godtagen"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
 msgid "key is _pressed"
 msgstr "tangenten är _nedtryckt"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
 msgid "key is _rejected"
 msgstr "tangenten är _förkastad"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 msgid "msecs"
 msgstr "millisekunder"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
 msgid "pixels/sec"
 msgstr "bildpunkter/sekund"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
 msgid "seconds"
 msgstr "sekunder"
 
@@ -246,7 +250,7 @@ msgstr "Välj _bild:"
 #: capplets/background/background-properties-capplet.c:561
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
-#: capplets/keyboard/gnome-keyboard-properties.c:277
+#: capplets/keyboard/gnome-keyboard-properties.c:293
 #: capplets/mouse/gnome-mouse-properties.c:752
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
@@ -787,7 +791,7 @@ msgid "Associate sounds with window manager events"
 msgstr "Associera ljud med fönsterhanterarhändelser"
 
 #: capplets/desktop-links/Sawfish/sound-properties.desktop.in.h:2
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:13
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:17
 #: capplets/sound/sound.desktop.in.h:2
 msgid "Sound"
 msgstr "Ljud"
@@ -808,103 +812,11 @@ msgstr "Gamla program"
 msgid "Legacy applications settings (grdb)"
 msgstr "Inställningar för gamla program (grdb)"
 
-#.
-#. * Translatable strings file
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: capplets/file-types/category-names.h:7
-msgid "Documents"
-msgstr "Dokument"
-
-#: capplets/file-types/category-names.h:8
-msgid "Word Processor"
-msgstr "Ordbehandlare"
-
-#: capplets/file-types/category-names.h:9
-msgid "Published Materials"
-msgstr "Publicerade material"
-
-#: capplets/file-types/category-names.h:10
-msgid "Spreadsheet"
-msgstr "Kalkylblad"
-
-#: capplets/file-types/category-names.h:11
-msgid "Presentation"
-msgstr "Presentation"
-
-#: capplets/file-types/category-names.h:12
-msgid "Diagram"
-msgstr "Diagram"
-
-#: capplets/file-types/category-names.h:13
-msgid "TeX"
-msgstr "TeX"
-
-#: capplets/file-types/category-names.h:14
-msgid "Vector Graphics"
-msgstr "Vektorgrafik"
-
-#: capplets/file-types/category-names.h:15
-msgid "World Wide Web"
-msgstr "World Wide Web (WWW)"
-
-#: capplets/file-types/category-names.h:16
-msgid "Plain Text"
-msgstr "Vanlig text"
-
-#: capplets/file-types/category-names.h:17
-msgid "Extended Markup Language (XML)"
-msgstr "Extended Markup Language (XML)"
-
-#: capplets/file-types/category-names.h:18
-msgid "Information"
-msgstr "Information"
-
-#: capplets/file-types/category-names.h:19
-msgid "Financial"
-msgstr "Ekonomi"
-
-#: capplets/file-types/category-names.h:20
-msgid "Calendar"
-msgstr "Kalender"
-
-#: capplets/file-types/category-names.h:21
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: capplets/file-types/category-names.h:22
-msgid "Packages"
-msgstr "Paket"
-
-#: capplets/file-types/category-names.h:23
-msgid "Software Development"
-msgstr "Programvaruutveckling"
-
-#: capplets/file-types/category-names.h:24
-msgid "Source Code"
-msgstr "Källkod"
-
-#: capplets/file-types/category-names.h:25
-#: capplets/file-types/mime-type-info.c:673
-msgid "Audio"
-msgstr "Ljud"
-
-#: capplets/file-types/category-names.h:26
-#: capplets/file-types/mime-type-info.c:669
-msgid "Images"
-msgstr "Bilder"
-
-#: capplets/file-types/category-names.h:27
-#: capplets/file-types/mime-type-info.c:671
-msgid "Video"
-msgstr "Grafik"
-
-#: capplets/file-types/file-types-capplet.c:215
+#: capplets/file-types/file-types-capplet.c:214
 msgid "Description"
 msgstr "Beskrivning"
 
-#: capplets/file-types/file-types-capplet.c:237
+#: capplets/file-types/file-types-capplet.c:236
 msgid "Extensions"
 msgstr "Tillägg"
 
@@ -923,11 +835,11 @@ msgid "Actions"
 msgstr "Åtgärder"
 
 #: capplets/file-types/file-types-properties.glade.h:3
-msgid "Add _file type..."
+msgid "Add _File Type..."
 msgstr "Lägg till _filtyp..."
 
 #: capplets/file-types/file-types-properties.glade.h:4
-msgid "Add _service..."
+msgid "Add _Service..."
 msgstr "Lägg till _tjänst..."
 
 #: capplets/file-types/file-types-properties.glade.h:5
@@ -1041,8 +953,8 @@ msgstr "Struktur som innehåller information om MIME-kategorin"
 #: capplets/file-types/mime-category-edit-dialog.c:344
 #: capplets/file-types/mime-edit-dialog.c:490
 #: capplets/file-types/mime-edit-dialog.c:594
-#: capplets/file-types/service-edit-dialog.c:359
-#: capplets/file-types/service-edit-dialog.c:408
+#: capplets/file-types/service-edit-dialog.c:358
+#: capplets/file-types/service-edit-dialog.c:407
 msgid "Custom"
 msgstr "Anpassad"
 
@@ -1080,7 +992,7 @@ msgstr "Lägg till filtyp"
 # Jag vill ha "Diverse"
 #
 #: capplets/file-types/mime-edit-dialog.c:435
-#: capplets/file-types/mime-type-info.c:675
+#: capplets/file-types/mime-type-info.c:673
 msgid "Misc"
 msgstr "Diverse"
 
@@ -1089,7 +1001,7 @@ msgstr "Diverse"
 msgid "None"
 msgstr "Ingen"
 
-#: capplets/file-types/mime-edit-dialog.c:847
+#: capplets/file-types/mime-edit-dialog.c:854
 msgid ""
 "Please enter a valid MIME type.  It should be of the form class/type and may "
 "not contain any spaces."
@@ -1097,18 +1009,30 @@ msgstr ""
 "Ange en giltig MIME-typ. Den bör vara på formen klass/typ och får inte "
 "innehålla några blanksteg."
 
-#: capplets/file-types/mime-edit-dialog.c:854
+#: capplets/file-types/mime-edit-dialog.c:861
 msgid "A MIME type with that name already exists, overwrite ?."
 msgstr "En MIME-typ med det namnet finns redan, skriva över?"
 
-#: capplets/file-types/mime-edit-dialog.c:919
+#: capplets/file-types/mime-edit-dialog.c:926
 msgid "Category"
 msgstr "Kategori"
 
-#: capplets/file-types/mime-edit-dialog.c:924
+#: capplets/file-types/mime-edit-dialog.c:931
 msgid "Choose a file category"
 msgstr "Välj en filkategori"
 
+#: capplets/file-types/mime-type-info.c:667
+msgid "Images"
+msgstr "Bilder"
+
+#: capplets/file-types/mime-type-info.c:669
+msgid "Video"
+msgstr "Grafik"
+
+#: capplets/file-types/mime-type-info.c:671
+msgid "Audio"
+msgstr "Ljud"
+
 #: capplets/file-types/mime-types-model.c:167
 #: capplets/file-types/mime-types-model.c:168
 msgid "Model for categories only"
@@ -1142,11 +1066,11 @@ msgstr "SANT om detta är en tilläggsdialog"
 msgid "Add Service"
 msgstr "Lägg till tjänst"
 
-#: capplets/file-types/service-edit-dialog.c:498
+#: capplets/file-types/service-edit-dialog.c:497
 msgid "Please enter a protocol name."
 msgstr "Ange ett protokollnamn."
 
-#: capplets/file-types/service-edit-dialog.c:510
+#: capplets/file-types/service-edit-dialog.c:509
 msgid ""
 "Invalid protocol name. Please enter a protocol name without any spaces or "
 "punctuation."
@@ -1154,7 +1078,7 @@ msgstr ""
 "Ogiltigt protokollnamn. Ange ett protokollnamn utan några blanksteg eller "
 "kommatering."
 
-#: capplets/file-types/service-edit-dialog.c:524
+#: capplets/file-types/service-edit-dialog.c:523
 msgid "There is already a protocol by that name."
 msgstr "Det finns redan ett protokoll med det namnet."
 
@@ -1225,7 +1149,7 @@ msgid "Accelerator key"
 msgstr "Snabbtangent"
 
 #: capplets/keybindings/eggcellrendererkeys.c:206
-#: capplets/keybindings/gnome-keybinding-properties.c:173
+#: capplets/keybindings/gnome-keybinding-properties.c:179
 #: libbackground/applier.c:521
 msgid "Disabled"
 msgstr "Avslagen"
@@ -1236,24 +1160,24 @@ msgstr "Avslagen"
 msgid "Type a new shortcut"
 msgstr "Tryck en ny snabbtangent"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:440
+#: capplets/keybindings/gnome-keybinding-properties.c:446
 msgid "<Unknown Action>"
 msgstr "<Okänd åtgärd>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:459
+#: capplets/keybindings/gnome-keybinding-properties.c:465
 msgid "Desktop"
 msgstr "Skrivbord"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:463
+#: capplets/keybindings/gnome-keybinding-properties.c:469
 msgid "Window Management"
 msgstr "Fönsterhantering"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:560
+#: capplets/keybindings/gnome-keybinding-properties.c:566
 #, 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:711
+#: capplets/keybindings/gnome-keybinding-properties.c:717
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1261,11 +1185,11 @@ msgstr ""
 "Kan inte hitta några tangentbordsteman. Detta betyder att din GTK+-"
 "installation inte har installerats korrekt."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:733
+#: capplets/keybindings/gnome-keybinding-properties.c:739
 msgid "Action"
 msgstr "Åtgärd"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:749
+#: capplets/keybindings/gnome-keybinding-properties.c:755
 msgid "Shortcut"
 msgstr "Genväg"
 
@@ -1290,12 +1214,12 @@ msgstr "_Textredigeringsgenvägar:"
 msgid "Assign shortcut keys to commands"
 msgstr "Associera snabbtangenter med kommandon"
 
-#: capplets/keyboard/gnome-keyboard-properties.c:256
+#: capplets/keyboard/gnome-keyboard-properties.c:272
 msgid "_Accessibility"
 msgstr "_Åtkomlighet"
 
-#: capplets/keyboard/gnome-keyboard-properties.c:273
-#: capplets/keyboard/gnome-keyboard-properties.c:275
+#: capplets/keyboard/gnome-keyboard-properties.c:289
+#: capplets/keyboard/gnome-keyboard-properties.c:291
 #: capplets/sound/sound-properties-capplet.c:145
 #: capplets/sound/sound-properties-capplet.c:147
 msgid ""
@@ -1305,78 +1229,90 @@ msgstr ""
 "av demon)"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:2
+msgid "<small><i>Fast</i></small>"
+msgstr "<small><i>Snabb</i></small>"
+
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:3
+msgid "<small><i>Long</i></small>"
+msgstr "<small><i>Lång</i></small>"
+
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:4
+msgid "<small><i>Short</i></small>"
+msgstr "<small><i>Kort</i></small>"
+
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:5
+msgid "<small><i>Slow</i></small>"
+msgstr "<small><i>Långsam</i></small>"
+
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:6
 msgid "Bee_p"
 msgstr "_Pip"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:3
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:7
 msgid "C_ustom:"
 msgstr "A_npassad:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:4
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:8
 msgid "Clic_k on keypress"
 msgstr "_Klicka vid tangenttryckning"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:5
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:9
 msgid "Cursor Blinks"
 msgstr "Markörblink"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:7
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:11
 msgid "Keyboard Bell"
 msgstr "Tangentbordssignal"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:8
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:12
 msgid "Keyboard Preferences"
 msgstr "Tangentbordsinställningar"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:9
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:13
 msgid "Keyboard _repeats when key is held down"
 msgstr "Tangentbordet _upprepar då tangent hålls ned"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:10
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:14
 msgid "Keypress Click"
 msgstr "Tangentklick"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:11
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:15
 msgid "Repeat Keys"
 msgstr "Repeteringstangenter"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:12
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
 msgid "S_peed:"
 msgstr "Hasti_ghet:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:14
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Åtkomlighet..."
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:15
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:19
 msgid "_Blinks in text boxes and fields"
 msgstr "_Blinkar i textrutor och textfält"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:20
 msgid "_Delay:"
 msgstr "_Fördröjning:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:17
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:21
 msgid "_Off"
 msgstr "_Av"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:18
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:22
 msgid "_Speed:"
 msgstr "_Hastighet:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:19
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:23
 msgid "_Volume:"
 msgstr "_Volym:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-msgid "faster"
-msgstr "snabbare"
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:21
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:24
 msgid "loud"
 msgstr "ljudlig"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:22
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:25
 msgid "quiet"
 msgstr "tyst"
 
@@ -1684,7 +1620,6 @@ msgid "Submenu"
 msgstr "Undermeny"
 
 #: capplets/theme-switcher/control/control.c:74
-#: capplets/ui-properties/gnome-ui-properties.glade.h:4
 msgid "Item 1"
 msgstr "Objekt 1"
 
@@ -1778,98 +1713,106 @@ msgstr ""
 "En förhandsvisning av hur en verktygsrad ser ut med dessa inställningar."
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:3
+msgid "C_ut"
+msgstr "Klipp _ut"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:4
+msgid "Edit Menu"
+msgstr "Redigerameny"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:5
 msgid "Icons Only"
 msgstr "Endast ikoner"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:5
-msgid "Item 2"
-msgstr "Objekt 2"
-
 #: capplets/ui-properties/gnome-ui-properties.glade.h:6
-msgid "Item 3"
-msgstr "Objekt 3"
-
-#: capplets/ui-properties/gnome-ui-properties.glade.h:7
-msgid "Menu Item 1"
-msgstr "Menyobjekt 1"
-
-#: capplets/ui-properties/gnome-ui-properties.glade.h:8
-msgid "Menu Item 2"
-msgstr "Menyobjekt 2"
-
-#: capplets/ui-properties/gnome-ui-properties.glade.h:9
-msgid "Menu Item 3"
-msgstr "Menyobjekt 3"
-
-#: capplets/ui-properties/gnome-ui-properties.glade.h:10
-msgid "Menu Item 4"
-msgstr "Menyobjekt 4"
-
-#: capplets/ui-properties/gnome-ui-properties.glade.h:11
-msgid "Menu Item 5"
-msgstr "Menyobjekt 5"
-
-#: capplets/ui-properties/gnome-ui-properties.glade.h:12
 msgid "Menu and Toolbar Preferences"
 msgstr "Meny- och verktygsradsinställningar"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:13
+#: capplets/ui-properties/gnome-ui-properties.glade.h:7
 msgid "Menus"
 msgstr "Menyer"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:14
+#: capplets/ui-properties/gnome-ui-properties.glade.h:8
 msgid "New File"
 msgstr "Ny fil"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:15
+#: capplets/ui-properties/gnome-ui-properties.glade.h:9
 msgid "Open File"
 msgstr "Öppna fil"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:16
+#: capplets/ui-properties/gnome-ui-properties.glade.h:10
 msgid "Priority Text Beside Icons"
 msgstr "Prioritetstext bredvid ikoner"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:17
+#: capplets/ui-properties/gnome-ui-properties.glade.h:11
 msgid "Sample menubar:"
 msgstr "Exempelmenyrad:"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:18
+#: capplets/ui-properties/gnome-ui-properties.glade.h:12
 msgid "Sample toolbar:"
 msgstr "Exempelverktygsrad:"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:19
+#: capplets/ui-properties/gnome-ui-properties.glade.h:13
 msgid "Save File"
 msgstr "Spara fil"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:20
+#: capplets/ui-properties/gnome-ui-properties.glade.h:14
 msgid "Select the toolbar style."
 msgstr "Välj stilen på verktygsrader."
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:21
+#: capplets/ui-properties/gnome-ui-properties.glade.h:15
 msgid "Text Below Icons"
 msgstr "Text under ikoner"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:22
+#: capplets/ui-properties/gnome-ui-properties.glade.h:16
 msgid "Text Only"
 msgstr "Endast text"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:23
+#: capplets/ui-properties/gnome-ui-properties.glade.h:17
 msgid "Toolbar"
 msgstr "Verktygsrad"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:24
+#: capplets/ui-properties/gnome-ui-properties.glade.h:18
 msgid "Toolbars can be _detached and moved around"
 msgstr "Verktygsrader kan _tas loss och flyttas runt"
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:25
+#: capplets/ui-properties/gnome-ui-properties.glade.h:19
 msgid "_Button Labels: "
 msgstr "_Knappetiketter: "
 
-#: capplets/ui-properties/gnome-ui-properties.glade.h:26
+#: capplets/ui-properties/gnome-ui-properties.glade.h:20
+msgid "_Copy"
+msgstr "_Kopiera"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:21
 msgid "_Menu"
 msgstr "_Meny"
 
+#: capplets/ui-properties/gnome-ui-properties.glade.h:22
+msgid "_New"
+msgstr "_Ny"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:23
+msgid "_Open"
+msgstr "_Öppna"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:24
+msgid "_Paste"
+msgstr "Klistra _in"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:25
+msgid "_Print"
+msgstr "Skriv _ut"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:26
+msgid "_Quit"
+msgstr "_Avsluta"
+
 #: capplets/ui-properties/gnome-ui-properties.glade.h:27
+msgid "_Save"
+msgstr "_Spara"
+
+#: capplets/ui-properties/gnome-ui-properties.glade.h:28
 msgid "_Show icons in menus"
 msgstr "_Visa ikoner i menyer"
 
@@ -2045,7 +1988,7 @@ msgstr ""
 msgid "_Do not show this message again"
 msgstr "_Visa inte detta meddelande igen"
 
-#: gnome-settings-daemon/gnome-settings-sound.c:125
+#: gnome-settings-daemon/gnome-settings-sound.c:128
 #, c-format
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Kunde inte läsa in ljudfilen %s som prov %s"
@@ -2176,11 +2119,6 @@ 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:439
 msgid ""
 "Could not start fallback window manager.\n"
@@ -2197,6 +2135,84 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
+#~ msgid "Documents"
+#~ msgstr "Dokument"
+
+#~ msgid "Word Processor"
+#~ msgstr "Ordbehandlare"
+
+#~ msgid "Published Materials"
+#~ msgstr "Publicerade material"
+
+#~ msgid "Spreadsheet"
+#~ msgstr "Kalkylblad"
+
+#~ msgid "Presentation"
+#~ msgstr "Presentation"
+
+#~ msgid "Diagram"
+#~ msgstr "Diagram"
+
+#~ msgid "TeX"
+#~ msgstr "TeX"
+
+#~ msgid "Vector Graphics"
+#~ msgstr "Vektorgrafik"
+
+#~ msgid "World Wide Web"
+#~ msgstr "World Wide Web (WWW)"
+
+#~ msgid "Plain Text"
+#~ msgstr "Vanlig text"
+
+#~ msgid "Extended Markup Language (XML)"
+#~ msgstr "Extended Markup Language (XML)"
+
+#~ msgid "Information"
+#~ msgstr "Information"
+
+#~ msgid "Financial"
+#~ msgstr "Ekonomi"
+
+#~ msgid "Calendar"
+#~ msgstr "Kalender"
+
+#~ msgid "Contacts"
+#~ msgstr "Kontakter"
+
+#~ msgid "Packages"
+#~ msgstr "Paket"
+
+#~ msgid "Software Development"
+#~ msgstr "Programvaruutveckling"
+
+#~ msgid "Source Code"
+#~ msgstr "Källkod"
+
+#~ msgid "faster"
+#~ msgstr "snabbare"
+
+#~ msgid "Item 2"
+#~ msgstr "Objekt 2"
+
+#~ msgid "Item 3"
+#~ msgstr "Objekt 3"
+
+#~ msgid "Menu Item 1"
+#~ msgstr "Menyobjekt 1"
+
+#~ msgid "Menu Item 2"
+#~ msgstr "Menyobjekt 2"
+
+#~ msgid "Menu Item 3"
+#~ msgstr "Menyobjekt 3"
+
+#~ msgid "Menu Item 4"
+#~ msgstr "Menyobjekt 4"
+
+#~ msgid "Menu Item 5"
+#~ msgstr "Menyobjekt 5"
+
 #~ msgid "Add"
 #~ msgstr "Lägg till"
 
@@ -2400,9 +2416,6 @@ msgstr "OK"
 #~ msgid "A MIME type with that name already exists, overwrite?"
 #~ msgstr "En MIME-typ med det namnet finns redan, skriva över?"
 
-#~ msgid "_Enable keyboard accessibility"
-#~ msgstr "_Använd tangentbordshjälpmedel"
-
 #~ msgid "<b>Test</b>"
 #~ msgstr "<b>Test</b>"
 
@@ -2498,18 +2511,12 @@ msgstr "OK"
 #~ msgid "Example: emacs %f"
 #~ msgstr "Exempel: emacs %f"
 
-#~ msgid "Open"
-#~ msgstr "Öppna"
-
 #~ msgid "Select a file..."
 #~ msgstr "Välj en fil..."
 
 #~ msgid "View"
 #~ msgstr "Visa"
 
-#~ msgid "Edit"
-#~ msgstr "Redigera"
-
 # SUN NEW TRANSLATION
 #~ msgid "Set actions for %s"
 #~ msgstr "Ange åtgärder för %s"
@@ -2547,54 +2554,6 @@ msgstr "OK"
 #~ msgid "This mime-type already exists"
 #~ msgstr "Den här mime-typen finns redan"
 
-# SUN NEW TRANSLATION
-#~ msgid ""
-#~ "We are unable to create the directory\n"
-#~ "~/.gnome/mime-info\n"
-#~ "\n"
-#~ "We will not be able to save the state."
-#~ msgstr ""
-#~ "Det går inte att skapa katalogen\n"
-#~ "˜/.gnome/mime-info\n"
-#~ "\n"
-#~ "Tillståndet kommer inte att kunna sparas."
-
-# SUN NEW TRANSLATION
-#~ msgid ""
-#~ "We are unable to access the directory\n"
-#~ "~/.gnome/mime-info\n"
-#~ "\n"
-#~ "We will not be able to save the state."
-#~ msgstr ""
-#~ "Det går inte att komma åt katalogen\n"
-#~ "˜/.gnome/mime-info\n"
-#~ "\n"
-#~ "Tillståndet kommer inte att kunna sparas."
-
-# SUN NEW TRANSLATION
-#~ msgid ""
-#~ "Cannot create the file\n"
-#~ "~/.gnome/mime-info/user.mime\n"
-#~ "\n"
-#~ "We will not be able to save the state"
-#~ msgstr ""
-#~ "Det går inte att skapa filen\n"
-#~ "˜/.gnome/mime-info/ user.mime\n"
-#~ "\n"
-#~ "Tillståndet kommer inte att kunna sparas"
-
-# SUN NEW TRANSLATION
-#~ msgid ""
-#~ "Cannot create the file\n"
-#~ "~/.gnome/mime-info/user.keys.\n"
-#~ "\n"
-#~ "We will not be able to save the state"
-#~ msgstr ""
-#~ "Det går inte att skapa filen\n"
-#~ "˜/.gnome/mime-info/ user.keys\n"
-#~ "\n"
-#~ "Tillståndet kommer inte att kunna sparas"
-
 #~ msgid "Configure how files are associated and started"
 #~ msgstr "Konfigurera hur filer associeras och startas"