Add checked.xpm and unchecked.xpm files.

2001-12-10  Israel Escalante <israel@ximian.com>

	* Makefile.am (pixmaps_DATA): Add checked.xpm and unchecked.xpm files.

2001-12-10  Israel Escalante <israel@ximian.com>

	* Makefile.am (sound_properties_control_LDADD): Change top_srcdir to
	top_builddir.

2001-12-10  Israel Escalante  <israel@ximian.com>

	* configure.in: Bump version to 1.5.11

ChangeLog

@@ -1,3 +1,18 @@
+2001-12-10  Israel Escalante  <israel@ximian.com>
+
+	* configure.in: Bump version to 1.5.11
+
+2001-11-30  Bradford Hovinen  <hovinen@ximian.com>
+
+	* configure.in: Hack to make sure libsounds compiles
+
+2001-11-18  Richard Hestilow  <hestilow@ximian.com>
+
+	* Makefile.am (SUBDIRS): Add libsounds to SUBDIRS.
+	
+	* configure.in: Define GNOME_CFLAGS for libsounds, and create
+	libsounds/Makefile.
+
 2001-10-18  Bradford Hovinen  <hovinen@ximian.com>
 
 	* capplets/Makefile.am (always_built_SUBDIRS): Put common in

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = archiver capplets control-center idl po intl
+SUBDIRS = archiver libsounds capplets control-center idl po intl
 #I removed the root-manager for now
 #
 # it generated this error :

NEWS

@@ -1 +1,49 @@
-First split version of this package
+
+GNOME Control Center 1.5.11
+----------------------------
+
+The GNOME control center version 1.5.11 this new version depends on GAL 0.12,
+Bonobo 0.12 and gtkhtml 0.15.0, this is a bugfix release.
+
+* Availability
+
+The new control center is available at
+ftp://ftp.gnome.org/pub/GNOME/unstable/sources/control-center/control-center-1.5.11.tar.gz
+
+The advanced capplets are available at
+ftp://ftp.gnome.org/pub/GNOME/unstable/sources/control-center-plus/control-center-plus-1.5.8.tar.gz
+
+The capplet library is available at
+ftp://ftp.gnome.org/pub/GNOME/unstable/sources/libcapplet/libcapplet-1.5.8.tar.gz
+
+* What's new
+
+ 	- Many, many bug fixes and cleanups (included bonobo and archiver issues).
+	
+	- Libsound library added, so you can set individuals sound events.
+
+	- Pilot incompatibility fixed.
+		
+* Installation instructions and prerequisites
+
+This version of the control center requires the following packages in
+addition to the GNOME 1.4 platform:
+
+* bonobo-conf 0.12, (0.12 *highly* recommended) available at
+ftp://ftp.gnome.org/pub/GNOME/unstable/sources/bonobo-conf/bonobo-conf-0.12.tar.gz
+
+* pkgconfig 0.8, available at
+http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.8.0.tar.gz
+
+* gtkhtml >= 0.15, available at
+ftp://ftp.gnome.org/pub/GNOME/unstable/sources/gtkhtml/gtkhtml-0.15.0.tar.gz
+
+* gal >= 0.12, available at
+ftp://ftp.gnome.org/pub/GNOME/unstable/sources/gal/gal-0.12.tar.gz
+
+In addition, libcapplet must be compiled before control-center or
+control-center-plus
+
+Please download and try this out. If you have any questions or comments,
+please consult gnomecc-list@gnome.org or #xst on GNOME IRC. Thank you.
+

archiver/ChangeLog

@@ -1,3 +1,28 @@
+2001-11-16  Bradford Hovinen  <hovinen@ximian.com>
+
+	* bonobo-moniker-archiver.c (archiverdb_resolve): Update based on
+	changes to bonobo_config_archiver_new
+
+	* bonobo-config-archiver.c (bonobo_config_archiver_new): Use a
+	GHashTable for the archiver db cache rather than the borken bonobo
+	URL API. Return a pointer rather than an objref
+
+2001-11-09  Bradford Hovinen  <hovinen@ximian.com>
+
+	* bonobo-config-archiver.c (bonobo_config_archiver_new): Don't
+	unref the archive and the location here; they will be unreffed
+	when the archiver_db object is destroyed
+
+	* location.c (location_destroy): Prevent reentrance
+
+	* archive.c (archive_destroy): Don't traverse the tree
+	(archive_destroy): Prevent reentrance
+
+2001-11-02  Bradford Hovinen  <hovinen@ximian.com>
+
+	* bonobo-config-archiver.c (bonobo_config_archiver_destroy): Keep
+	the object around during destroy in order to prevent reentrance
+
 2001-10-18  Bradford Hovinen  <hovinen@ximian.com>
 
 	* bonobo-config-archiver.c (get_listener_oafiid): Update listener name

archiver/archive.c

@@ -356,15 +356,6 @@ archive_load (gboolean is_global)
 	return object;
 }
 
-static gint
-free_location_cb (gchar *locid, BonoboObject *location) 
-{
-	bonobo_object_unref (location);
-	g_free (locid);
-
-	return FALSE;
-}
-
 static void 
 archive_destroy (GtkObject *object) 
 {
@@ -375,12 +366,9 @@ archive_destroy (GtkObject *object)
 
 	DEBUG_MSG ("Enter");
 
-	archive = ARCHIVE (object);
+	bonobo_object_ref (object);
 
-	g_tree_traverse (archive->locations, 
-			 (GTraverseFunc) free_location_cb,
-			 G_IN_ORDER,
-			 NULL);
+	archive = ARCHIVE (object);
 
 	g_tree_destroy (archive->locations);
 
@@ -391,6 +379,8 @@ archive_destroy (GtkObject *object)
 		bonobo_object_unref (BONOBO_OBJECT (archive->backend_list));
 
 	GTK_OBJECT_CLASS (parent_class)->destroy (GTK_OBJECT (archive));
+
+	bonobo_object_unref (object);
 }
 
 /**

archiver/bonobo-config-archiver.c

@@ -26,6 +26,8 @@
 
 static GtkObjectClass *parent_class = NULL;
 
+static GHashTable     *cache = NULL;
+
 #define CLASS(o) BONOBO_CONFIG_ARCHIVER_CLASS (GTK_OBJECT(o)->klass)
 
 #define PARENT_TYPE BONOBO_CONFIG_DATABASE_TYPE
@@ -547,16 +549,13 @@ bonobo_config_archiver_destroy (GtkObject *object)
 
 	DEBUG_MSG ("Enter");
 
+	gtk_object_ref (object);
+
 	CORBA_exception_init (&ev);
 
 	if (archiver_db->moniker != NULL) {
-		bonobo_url_unregister ("BONOBO_CONF:ARCHIVER", archiver_db->moniker, &ev);
+		g_hash_table_remove (cache, archiver_db->moniker);
 		g_free (archiver_db->moniker);
-
-		if (BONOBO_EX (&ev)) {
-			g_critical ("Could not unregister the archiver URL");
-			CORBA_exception_init (&ev);
-		}
 	}
 
 	if (archiver_db->listener_id != 0) {
@@ -589,6 +588,8 @@ bonobo_config_archiver_destroy (GtkObject *object)
 	
 	parent_class->destroy (object);
 
+	gtk_object_unref (object);
+
 	DEBUG_MSG ("Exit");
 }
 
@@ -784,37 +785,35 @@ new_rollback_cb (BonoboListener        *listener,
 	bonobo_arg_release (arg);
 }
 
-Bonobo_ConfigDatabase
+BonoboConfigArchiver *
 bonobo_config_archiver_new (Bonobo_Moniker               parent,
 			    const Bonobo_ResolveOptions *options,
 			    const char                  *moniker,
 			    CORBA_Environment           *ev)
 {
 	BonoboConfigArchiver    *archiver_db;
-	Bonobo_ConfigDatabase    db;
 	ConfigArchiver_Archive   archive;
 	ConfigArchiver_Location  location;
-	gchar                   *moniker_tmp;
 	gchar                   *backend_id;
 	gchar                   *location_id;
 	struct tm               *date;
 
 	g_return_val_if_fail (backend_id != NULL, NULL);
 
-	/* Check the Bonobo URL database to see if this archiver database has
-	 * already been created, and return it if it has */
+	/* Check whether the database object already exists, and return it if it does */
 
-	moniker_tmp = g_strdup (moniker);
-	db = bonobo_url_lookup ("BONOBO_CONF:ARCHIVER", moniker_tmp, ev);
-	g_free (moniker_tmp);
+	if (cache == NULL)
+		cache = g_hash_table_new (g_str_hash, g_str_equal);
 
-	if (BONOBO_EX (ev)) {
-		db = CORBA_OBJECT_NIL;
-		CORBA_exception_init (ev);
+	archiver_db = g_hash_table_lookup (cache, moniker);
+
+	if (archiver_db != NULL) {
+		g_message ("%s: Found database %s in the hash table", __FUNCTION__, moniker);
+		bonobo_object_ref (BONOBO_OBJECT (archiver_db));
+		return archiver_db;
 	}
 
-	if (db != CORBA_OBJECT_NIL)
-		return bonobo_object_dup_ref (db, NULL);
+	g_message ("%s: Did NOT find database %s in the hash table", __FUNCTION__, moniker);
 
 	/* Parse out the backend id, location id, and rollback date from the
 	 * moniker given */
@@ -873,8 +872,6 @@ bonobo_config_archiver_new (Bonobo_Moniker               parent,
 		g_free (filename);
 
 		if (archiver_db->doc == NULL) {
-			bonobo_object_release_unref (archiver_db->location, NULL);
-			bonobo_object_release_unref (archiver_db->archive, NULL);
 			bonobo_object_unref (BONOBO_OBJECT (archiver_db));
 			return CORBA_OBJECT_NIL;
 		}
@@ -930,13 +927,8 @@ bonobo_config_archiver_new (Bonobo_Moniker               parent,
 	else
 		archiver_db->listener_id = 0;
 
-	/* Prepare to return the database object */
+	g_message ("%s: Inserting database %s in the cache", __FUNCTION__, moniker);
+	g_hash_table_insert (cache, g_strdup (moniker), archiver_db);
 
-	db = CORBA_Object_duplicate (BONOBO_OBJREF (archiver_db), NULL);
-
-	moniker_tmp = g_strdup (moniker);
-	bonobo_url_register ("BONOBO_CONF:ARCHIVER", moniker_tmp, NULL, db, ev);
-	g_free (moniker_tmp);
-
-	return db;
+	return archiver_db;
 }

archiver/bonobo-config-archiver.h

@@ -78,7 +78,7 @@ typedef struct {
 GtkType		      
 bonobo_config_archiver_get_type  (void);
 
-Bonobo_ConfigDatabase
+BonoboConfigArchiver *
 bonobo_config_archiver_new (Bonobo_Moniker               parent,
 			    const Bonobo_ResolveOptions *options,
 			    const char                  *moniker,

archiver/bonobo-moniker-archiver.c

@@ -91,7 +91,7 @@ archiverdb_resolve (BonoboMoniker               *moniker,
 		    CORBA_Environment           *ev)
 {
 	Bonobo_Moniker          parent;
-	Bonobo_ConfigDatabase   db;
+	BonoboConfigArchiver   *archiver_db;
 	const gchar            *name;
 
 	if (strcmp (requested_interface, "IDL:Bonobo/ConfigDatabase:1.0")) {
@@ -110,14 +110,16 @@ archiverdb_resolve (BonoboMoniker               *moniker,
 
 	name = bonobo_moniker_get_name (moniker);
 
-	db = bonobo_config_archiver_new (parent, options, name, ev);
-
-	if (db == CORBA_OBJECT_NIL || BONOBO_EX (ev))
-		EX_SET_NOT_FOUND (ev);
+	archiver_db = bonobo_config_archiver_new (parent, options, name, ev);
 
 	bonobo_object_release_unref (parent, NULL);
 
-	return db;
+	if (archiver_db == NULL || BONOBO_EX (ev)) {
+		EX_SET_NOT_FOUND (ev);
+		return CORBA_OBJECT_NIL;
+	}
+
+	return CORBA_Object_duplicate (BONOBO_OBJREF (archiver_db), ev);
 }			
 
 

archiver/default-global.xml

@@ -5,7 +5,6 @@
   <contains backend="disks-conf"/>
   <contains backend="memory-conf"/>
   <contains backend="network-conf"/>
-  <contains backend="print-conf"/>
   <contains backend="shares-conf"/>
   <contains backend="time-conf"/>
   <contains backend="users-conf"/>

archiver/location.c

@@ -599,6 +599,8 @@ location_destroy (GtkObject *object)
 	g_return_if_fail (object != NULL);
 	g_return_if_fail (IS_LOCATION (object));
 
+	bonobo_object_ref (object);
+
 	location = LOCATION (object);
 
 	DEBUG_MSG ("Enter: %s", location->p->locid);
@@ -616,6 +618,8 @@ location_destroy (GtkObject *object)
 	bonobo_object_unref (BONOBO_OBJECT (location->p->archive));
 
 	GTK_OBJECT_CLASS (parent_class)->destroy (object);
+
+	bonobo_object_unref (object);
 }
 
 static void

capplets/background/ChangeLog

@@ -1,6 +1,13 @@
-2001-10-19  Jakub Steiner <jimmac@ximian.com>
+2001-12-06  Bradford Hovinen  <hovinen@ximian.com>
 
-	* background-capplet.png: more clear brush
+	* applier.c (set_root_pixmap): Don't try to grab the X window if
+	we are just setting the window property back to the same value
+	(set_root_pixmap): Don't grab pixmap_id if pixmap is NULL
+	(set_root_pixmap): Initialize pixmap_id in the other case
+
+2001-11-16  Bradford Hovinen  <hovinen@ximian.com>
+
+	* Makefile.am (EXTRA_DIST): Remove $(oaf_DATA).in
 
 2001-10-12  Bradford Hovinen  <hovinen@ximian.com>
 

capplets/background/Makefile.am

@@ -47,7 +47,7 @@ install-data-am: install-data-local
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(BONOBO_CONF_DEFINE)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA) $(oaf_DATA).in
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA)
 iconsdir   = $(GNOMECC_ICONS_DIR)
 Gladedir   = $(GNOMECC_GLADE_DIR)
 pixmapdir  = $(GNOMECC_PIXMAPS_DIR)

capplets/background/applier.c

@@ -1329,7 +1329,10 @@ set_root_pixmap (GdkPixmap *pixmap)
 	guchar *data_esetroot;
 	Pixmap pixmap_id;
 
-	pixmap_id = GDK_WINDOW_XWINDOW (pixmap);
+	if (pixmap != NULL && pixmap != (GdkPixmap *) -1)
+		pixmap_id = GDK_WINDOW_XWINDOW (pixmap);
+	else
+		pixmap_id = 0;
 
 	XGrabServer (GDK_DISPLAY ());
 

capplets/keyboard/ChangeLog

@@ -1,3 +1,7 @@
+2001-11-16  Bradford Hovinen  <hovinen@ximian.com>
+
+	* Makefile.am (EXTRA_DIST): Remove $(oaf_DATA).in
+
 2001-10-12  Bradford Hovinen  <hovinen@ximian.com>
 
 	* Makefile.am: Make OAF file creation generic

capplets/keyboard/Makefile.am

@@ -44,7 +44,7 @@ install-data-am: install-data-local
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA) $(oaf_DATA).in
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA)
 iconsdir   = $(GNOMECC_ICONS_DIR)
 Gladedir   = $(GNOMECC_GLADE_DIR)
 pixmapdir  = $(GNOMECC_PIXMAPS_DIR)

capplets/mouse/ChangeLog

@@ -1,3 +1,7 @@
+2001-11-16  Bradford Hovinen  <hovinen@ximian.com>
+
+	* Makefile.am (EXTRA_DIST): Remove $(oaf_DATA).in
+
 2001-10-18  Bradford Hovinen  <hovinen@ximian.com>
 
 	* mouse-properties-capplet.c (apply_settings): Only swap buttons 1

capplets/mouse/Makefile.am

@@ -44,7 +44,7 @@ install-data-am: install-data-local
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(oaf_DATA).in $(defaults_DATA) $(pixmap_DATA)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)  $(defaults_DATA) $(pixmap_DATA)
 iconsdir   = $(GNOMECC_ICONS_DIR)
 Gladedir   = $(GNOMECC_GLADE_DIR)
 pixmapdir  = $(GNOMECC_PIXMAPS_DIR)

capplets/screensaver/ChangeLog

@@ -1,3 +1,7 @@
+2001-12-10  Israel Escalante <israel@ximian.com>
+
+	* Makefile.am (pixmaps_DATA): Add checked.xpm and unchecked.xpm files.
+	 
 2001-10-18  Jakub Steiner <jimmac@ximian.com>
 
 	* screensaver-capplet.png: fix the icon (bug #61522)

capplets/screensaver/Makefile.am

@@ -17,9 +17,10 @@ screensaver_properties_capplet_SOURCES = \
 	daemon.c					daemon.h\
 	rc-parse.c				rc-parse.h\
 	resources.c				resources.h\
-	XScreenSaver_ad.h
+	XScreenSaver_ad.h                        
+
+pixmaps_DATA = no-hack.png blank-screen.png checked.xpm unchecked.xpm
 
-pixmaps_DATA = no-hack.png blank-screen.png
 
 ##
 ## You should not need to modify anything below this line

capplets/sound/ChangeLog

@@ -1,3 +1,28 @@
+2001-12-10  Israel Escalante <israel@ximian.com>
+
+	* Makefile.am (sound_properties_control_LDADD): Change top_srcdir to
+	top_builddir.
+
+2001-11-29  Hans Petter Jansson  <hpj@ximian.com>
+
+	* sound-properties-capplet.c (apply_settings): Added lame hack to
+	restore mixer settings here.
+	
+2001-11-18  Richard Hestilow  <hestilow@ximian.com>
+
+	* Makefile.am (sound_properties_control_LDADD): Add libsounds.a.
+
+	* prefs-widget.c (apply_settings): Export our settings to
+	gnome-config (needed by gnome-libs). Also save and reload event
+	sounds.
+	(create_dialog): Add a SoundView on the sound events.
+
+	* sound-properties.glade: Add a tab for the sound events.
+
+2001-11-16  Bradford Hovinen  <hovinen@ximian.com>
+
+	* Makefile.am (EXTRA_DIST): Remove $(oaf_DATA).in
+
 2001-10-12  Bradford Hovinen  <hovinen@ximian.com>
 
 	* Makefile.am: Make OAF file creation generic

capplets/sound/Makefile.am

@@ -3,7 +3,7 @@ cappletgroup =
 bin_PROGRAMS = sound-properties-control
 bin_SCRIPTS = sound-properties
 
-sound_properties_control_LDADD = $(GNOMECC_CAPPLETS_LIBS)
+sound_properties_control_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(top_builddir)/libsounds/libsounds.a
 
 sound_properties_control_SOURCES =		\
 	sound-properties-capplet.c
@@ -48,7 +48,7 @@ install-data-am: install-data-local
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA) $(oaf_DATA).in
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA)
 iconsdir   = $(GNOMECC_ICONS_DIR)
 Gladedir   = $(GNOMECC_GLADE_DIR)
 pixmapdir  = $(GNOMECC_PIXMAPS_DIR)

capplets/sound/prefs-widget.c

@@ -29,6 +29,7 @@
 
 #include "prefs-widget.h"
 
+
 #define WID(str) (glade_xml_get_widget (prefs_widget->dialog_data, str))
 
 enum {

capplets/sound/sound-properties-capplet.c

@@ -26,6 +26,7 @@
 #endif
 
 #include "capplet-util.h"
+#include "libsounds/sound-view.h"
 
 #include <glade/glade.h>
 
@@ -37,7 +38,10 @@
 
 /* Capplet-specific prototypes */
 
+static SoundProperties *props = NULL;
+
 static void start_esd (void);
+static void reload_foreach_cb (SoundEvent *event, gpointer data);
 
 /* apply_settings
  *
@@ -49,8 +53,10 @@ static void
 apply_settings (Bonobo_ConfigDatabase db) 
 {
 	gboolean enable_esd;
+	gboolean event_sounds;
 
 	enable_esd = bonobo_config_get_boolean (db, "/main/enable_esd", NULL);
+	event_sounds = bonobo_config_get_boolean (db, "/main/event_sounds", NULL);
 
         if (enable_esd && gnome_sound_connection < 0)
                 start_esd ();
@@ -58,8 +64,25 @@ apply_settings (Bonobo_ConfigDatabase db)
 	if (!enable_esd)
 		system ("killall esd");
 
-	/* I'm not going to deal with reloading samples until later. It's
-	 * entirely too painful */
+	system ("gmix -i");
+
+	/* gnome-libs checks this */
+	gnome_config_set_bool ("/sound/system/settings/event_sounds", event_sounds);
+	gnome_config_set_bool ("/sound/system/settings/enable_esd", enable_esd);
+	gnome_config_sync ();
+
+	/* Were we created from a dialog? */
+	if (props)
+	{
+		sound_properties_user_save (props);
+	}
+	else
+	{
+		props = sound_properties_new ();
+		sound_properties_add_defaults (props, NULL);
+	}
+	
+	sound_properties_foreach (props, reload_foreach_cb, NULL);
 }
 
 /* start_esd
@@ -96,6 +119,51 @@ start_esd (void)
         }
 #endif
 }
+ 
+/* reload_foreach_cb
+ *
+ * For a given SoundEvent, reload the sound file associate with the event. 
+ */
+static void
+reload_foreach_cb (SoundEvent *event, gpointer data)
+{
+	gchar *file, *tmp, *key;
+	int sid;
+	
+	key = sound_event_compose_key (event);
+	/* We need to free up the old sample, because
+	 * esd allows multiple samples with the same name,
+	 * putting memory to waste. */
+	sid = esd_sample_getid(gnome_sound_connection, key);
+	if (sid >= 0)
+		esd_sample_free(gnome_sound_connection, sid);
+
+	if (!event->file || !strcmp (event->file, ""))
+		return;
+	
+	file = g_strdup (event->file);
+	if (file[0] != '/')
+	{
+		tmp = gnome_sound_file (file);
+		g_free (file);
+		file = tmp;
+	}
+	
+	if (!file)
+	{
+		g_free (key);
+		return;
+	}
+
+	sid = gnome_sound_sample_load (key, file);
+	
+	if (sid < 0)
+		g_warning ("Couldn't load sound file %s as sample %s",
+			   file, key);
+
+	g_free (key);
+}
+
 
 /* create_dialog
  *
@@ -106,7 +174,7 @@ static GtkWidget *
 create_dialog (void) 
 {
 	GladeXML *data;
-	GtkWidget *widget;
+	GtkWidget *widget, *box;
 
 	data = glade_xml_new (GNOMECC_GLADE_DIR "/sound-properties.glade", "prefs_widget");
 	widget = glade_xml_get_widget (data, "prefs_widget");
@@ -116,6 +184,18 @@ create_dialog (void)
 				   GTK_SIGNAL_FUNC (gtk_object_destroy),
 				   GTK_OBJECT (data));
 
+	props = sound_properties_new ();
+	sound_properties_add_defaults (props, NULL);
+	box = glade_xml_get_widget (data, "events_vbox");
+	gtk_box_pack_start (GTK_BOX (box), sound_view_new (props),
+			    TRUE, TRUE, 0);
+
+	gtk_signal_connect_object (GTK_OBJECT (widget), "destroy",
+				   GTK_SIGNAL_FUNC (gtk_object_destroy),
+				   GTK_OBJECT (props));
+
+	gtk_widget_set_usize (widget, -1, 250);
+
 	return widget;
 }
 
@@ -135,6 +215,7 @@ setup_dialog (GtkWidget *widget, Bonobo_PropertyBag bag)
 	CREATE_PEDITOR (boolean, "event_sounds", "events_toggle");
 
 	bonobo_peditor_set_guard (WID ("events_toggle"), bag, "enable_esd");
+	bonobo_peditor_set_guard (WID ("events_vbox"), bag, "enable_esd");
 }
 
 /* get_legacy_settings

capplets/sound/sound-properties.glade

@@ -24,47 +24,97 @@
   <auto_shrink>False</auto_shrink>
 
   <widget>
-    <class>GtkVBox</class>
+    <class>GtkNotebook</class>
     <name>prefs_widget</name>
-    <homogeneous>False</homogeneous>
-    <spacing>5</spacing>
+    <can_focus>True</can_focus>
+    <show_tabs>True</show_tabs>
+    <show_border>True</show_border>
+    <tab_pos>GTK_POS_TOP</tab_pos>
+    <scrollable>False</scrollable>
+    <tab_hborder>2</tab_hborder>
+    <tab_vborder>2</tab_vborder>
+    <popup_enable>False</popup_enable>
 
     <widget>
-      <class>GtkCheckButton</class>
-      <name>enable_toggle</name>
-      <can_focus>True</can_focus>
-      <signal>
-	<name>toggled</name>
-	<handler>enable_toggled_cb</handler>
-	<last_modification_time>Sun, 08 Oct 2000 01:49:56 GMT</last_modification_time>
-      </signal>
-      <label>Enable sound server startup</label>
-      <active>False</active>
-      <draw_indicator>True</draw_indicator>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
+      <class>GtkVBox</class>
+      <name>vbox1</name>
+      <homogeneous>False</homogeneous>
+      <spacing>5</spacing>
+
+      <widget>
+	<class>GtkCheckButton</class>
+	<name>enable_toggle</name>
+	<can_focus>True</can_focus>
+	<signal>
+	  <name>toggled</name>
+	  <handler>enable_toggled_cb</handler>
+	  <last_modification_time>Sun, 08 Oct 2000 01:49:56 GMT</last_modification_time>
+	</signal>
+	<label>Enable sound server startup</label>
+	<active>False</active>
+	<draw_indicator>True</draw_indicator>
+	<child>
+	  <padding>0</padding>
+	  <expand>False</expand>
+	  <fill>False</fill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>GtkCheckButton</class>
+	<name>events_toggle</name>
+	<can_focus>True</can_focus>
+	<signal>
+	  <name>toggled</name>
+	  <handler>events_toggled_cb</handler>
+	  <last_modification_time>Sun, 08 Oct 2000 01:50:13 GMT</last_modification_time>
+	</signal>
+	<label>Sounds for events</label>
+	<active>False</active>
+	<draw_indicator>True</draw_indicator>
+	<child>
+	  <padding>0</padding>
+	  <expand>False</expand>
+	  <fill>False</fill>
+	</child>
+      </widget>
     </widget>
 
     <widget>
-      <class>GtkCheckButton</class>
-      <name>events_toggle</name>
-      <can_focus>True</can_focus>
-      <signal>
-	<name>toggled</name>
-	<handler>events_toggled_cb</handler>
-	<last_modification_time>Sun, 08 Oct 2000 01:50:13 GMT</last_modification_time>
-      </signal>
-      <label>Sounds for events</label>
-      <active>False</active>
-      <draw_indicator>True</draw_indicator>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
+      <class>GtkLabel</class>
+      <child_name>Notebook:tab</child_name>
+      <name>label1</name>
+      <label>General</label>
+      <justify>GTK_JUSTIFY_CENTER</justify>
+      <wrap>False</wrap>
+      <xalign>0.5</xalign>
+      <yalign>0.5</yalign>
+      <xpad>0</xpad>
+      <ypad>0</ypad>
+    </widget>
+
+    <widget>
+      <class>GtkVBox</class>
+      <name>events_vbox</name>
+      <homogeneous>False</homogeneous>
+      <spacing>0</spacing>
+
+      <widget>
+	<class>Placeholder</class>
+      </widget>
+    </widget>
+
+    <widget>
+      <class>GtkLabel</class>
+      <child_name>Notebook:tab</child_name>
+      <name>label2</name>
+      <label>Sound Events</label>
+      <justify>GTK_JUSTIFY_CENTER</justify>
+      <wrap>False</wrap>
+      <xalign>0.5</xalign>
+      <yalign>0.5</yalign>
+      <xpad>0</xpad>
+      <ypad>0</ypad>
     </widget>
   </widget>
 </widget>

configure.in

@@ -1,7 +1,7 @@
 AC_INIT(control-center)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(control-center, 1.5.10)
+AM_INIT_AUTOMAKE(control-center, 1.5.11)
 
 AM_MAINTAINER_MODE
 
@@ -126,6 +126,7 @@ PKG_CHECK_MODULES(RMHELPER, gnomeui gnomecanvaspixbuf)
 PKG_CHECK_MODULES(ARCHIVER, bonobo bonobo_conf >= 0.12 xml)
 PKG_CHECK_MODULES(CONFIG_ARCHIVER, bonobo gnome xml)
 PKG_CHECK_MODULES(MONIKER, bonobo bonobo_conf >= 0.12 xml)
+PKG_CHECK_MODULES(GNOME, gnome)
 
 AC_PATH_PROG(XSCREENSAVER, xscreensaver, no)
 if test "$XSCREENSAVER" = no ; then
@@ -269,5 +270,6 @@ capplets/screensaver/Makefile
 capplets/screensaver/screensavers/Makefile
 capplets/screensaver/screensavers/magic.pl
 capplets/sound/Makefile
+libsounds/Makefile
 idl/Makefile
 intl/Makefile])

po/ChangeLog

@@ -1,3 +1,51 @@
+2001-12-10  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-12-10  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-12-10  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
+2001-12-06  Christian Meyer  <chrisime@gnome.org>
+
+	* de.po: Minor update.
+
+2001-12-03  Abel Cheung  <maddog@linux.org.hk>
+
+	* zh_CN.po: Take simplified Chinese translation from HEAD branch.
+
+2001-12-01  Christian Meyer  <chrisime@gnome.org>
+
+	* de.po: Reverted last commit from Kai Lahmann, because it sucked so
+	much. Additionally, this stupid idiot still isn't able to write a
+	ChangeLog entry.
+	Started translation from *scratch*. Not finished, yet.
+
+2001-11-30  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
+2001-11-27  Roy-Magne Mo  <rmo@sunnmore.net>
+
+	* nn.po: Updated Norwegian (nynorsk) translation.
+
+2001-11-11  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
+
+	* sk.po: Updated Slovak translation.
+
+2001-10-30  Zbigniew Chyla  <cyba@gnome.pl>
+
+	* pl.po: Updated Polish translation by
+	GNOME PL Team <translators@gnome.pl>.
+
+2001-10-22  Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation.
+
 2001-10-15  Abel Cheung  <maddog@linux.org.hk>
 
 	* zh_TW.po: Trivial update to traditional Chinese translation, and

po/da.po

@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
-"POT-Creation-Date: 2001-10-12 23:09+0200\n"
+"POT-Creation-Date: 2001-12-10 23:24-0500\n"
 "PO-Revision-Date: 2001-10-13 12:25+0200\n"
 "Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
 "Language-Team: danish <dansk@klid.dk>\n"
@@ -27,7 +27,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # i hvert fald bedre end standardsted...
-#: archiver/archive.c:614
+#: archiver/archive.c:604
 msgid "Default location"
 msgstr "Hjemsted"
 
@@ -278,19 +278,19 @@ msgstr "Angivn baggrundsbillede"
 msgid "IMAGE-FILE"
 msgstr "BILLEDFIL"
 
-#: capplets/common/capplet-util.c:506
+#: capplets/common/capplet-util.c:477
 msgid "Just apply settings and quit"
 msgstr "Anvend indstillingerne og afslut"
 
-#: capplets/common/capplet-util.c:508
+#: capplets/common/capplet-util.c:479
 msgid "Initialize the session"
 msgstr "Klargør sessionen"
 
-#: capplets/common/capplet-util.c:510
+#: capplets/common/capplet-util.c:481
 msgid "Retrieve and store legacy settings"
 msgstr "Skaf og gem gamle indstillinger"
 
-#: capplets/common/capplet-util.c:519
+#: capplets/common/capplet-util.c:490
 msgid "Capplet options"
 msgstr "Kontrolcenterprogramtilvalg"
 
@@ -664,16 +664,12 @@ msgstr "F
 msgid "Custom screensaver. No description available"
 msgstr "Selvvalgt pauseskærm. Ingen beskrivelse tilgængelig."
 
-#: capplets/screensaver/prefs-widget.c:202
-msgid "Use"
-msgstr "Brug"
-
-#: capplets/screensaver/prefs-widget.c:202
+#: capplets/screensaver/prefs-widget.c:192
 #: capplets/screensaver/screensaver.desktop.in.in.h:2
 msgid "Screensaver"
 msgstr "Pauseskærm"
 
-#: capplets/screensaver/prefs-widget.c:924
+#: capplets/screensaver/prefs-widget.c:740
 #, c-format
 msgid "About %s\n"
 msgstr "Om %s\n"
@@ -1735,7 +1731,9 @@ msgid ""
 "This hack grabs an image of the screen, and then lets a transparent lens "
 "wander around the screen, magnifying whatever is underneath.  Written by "
 "Jonas Munsin."
-msgstr "Lader en gennemsigtig linse vandre omkring på skærmbilledet, mens den forstørrer det der er neden under den. Skrevet af Jonas Munsin."
+msgstr ""
+"Lader en gennemsigtig linse vandre omkring på skærmbilledet, mens den "
+"forstørrer det der er neden under den. Skrevet af Jonas Munsin."
 
 #: capplets/screensaver/screensavers/drift.xml.h:4
 msgid "Drift"
@@ -1750,7 +1748,10 @@ msgid ""
 "How could one possibly describe this except as ``drifting recursive fractal "
 "cosmic flames?''  Another fine hack from the Scott Draves collection of fine "
 "hacks."
-msgstr "Hvordan kan man overhovedet beskrive dette hvis ikke som \"rekursive, fraktale, kosmiske flammer i drift\"? En anden fin pauseskærm fra Scott Draves samling."
+msgstr ""
+"Hvordan kan man overhovedet beskrive dette hvis ikke som \"rekursive, "
+"fraktale, kosmiske flammer i drift\"? En anden fin pauseskærm fra Scott "
+"Draves samling."
 
 #: capplets/screensaver/screensavers/drift.xml.h:9
 msgid "Number of pixels to use."
@@ -1794,7 +1795,11 @@ msgid ""
 "That circle rotates around a point on the rim of another circle, and so on, "
 "several times.  These were the basis for the pre-heliocentric model of "
 "planetary motion.  Written by James Youngman."
-msgstr "Tegner den bane som fremkommer ved at følge et punkt på kanten af en cirkel. Cirklen roterer omkring kanten på en anden cirkel, osv., flere gange. Disse bevægelser var grundlaget for den præ-heliocentriske model af planetar bevægelse. Skrevet af James Youngman."
+msgstr ""
+"Tegner den bane som fremkommer ved at følge et punkt på kanten af en cirkel. "
+"Cirklen roterer omkring kanten på en anden cirkel, osv., flere gange. Disse "
+"bevægelser var grundlaget for den præ-heliocentriske model af planetar "
+"bevægelse. Skrevet af James Youngman."
 
 #: capplets/screensaver/screensavers/epicycle.xml.h:8
 #: capplets/screensaver/screensavers/flame.xml.h:12
@@ -1956,7 +1961,11 @@ msgid ""
 "built-in image is a map of the earth (extracted from `xearth'), but you can "
 "wrap any texture around the sphere, e.g., the planetary textures that come "
 "with `ssystem'."
-msgstr "Tegner en planet der tumler omkring i rummet. Skrevet af David Konerding. Det indbyggede billede er et kort over jorden (udtrukket fra 'Jorden'), men du kan få enhver tekstur foldet omkring kuglen, f.eks. de planetare billeder fra 'Solsystem'."
+msgstr ""
+"Tegner en planet der tumler omkring i rummet. Skrevet af David Konerding. "
+"Det indbyggede billede er et kort over jorden (udtrukket fra 'Jorden'), men "
+"du kan få enhver tekstur foldet omkring kuglen, f.eks. de planetare billeder "
+"fra 'Solsystem'."
 
 #: capplets/screensaver/screensavers/glplanet.xml.h:2
 msgid "GLPlanet"
@@ -2040,7 +2049,8 @@ msgstr "Firkanter"
 msgid ""
 "This draws random colored and stippled rectangles.  Written by Jamie "
 "Zawinski."
-msgstr "Tegner tilfældige farvede og stiplede rektangler. Skrevet af Jamie Zawinski."
+msgstr ""
+"Tegner tilfældige farvede og stiplede rektangler. Skrevet af Jamie Zawinski."
 
 #: capplets/screensaver/screensavers/halo.xml.h:1
 msgid "Animate circles."
@@ -2144,7 +2154,9 @@ msgstr "IFS"
 msgid ""
 "This one draws spinning, colliding iterated-function-system images.  Written "
 "by Massimino Pascal."
-msgstr "Tegner drejerende, kolliderende billeder af iterative functionssystemer. Skrevet af Massimino Pascal."
+msgstr ""
+"Tegner drejerende, kolliderende billeder af iterative functionssystemer. "
+"Skrevet af Massimino Pascal."
 
 #: capplets/screensaver/screensavers/imsmap.xml.h:1
 msgid "IMSmap"
@@ -2290,7 +2302,9 @@ msgstr "Lyn"
 msgid ""
 "This one draws crackling fractal lightning bolts.  It's simple, direct, and "
 "to the point.  If only it had sound...  Written by Keith Romberg."
-msgstr "Tegner knitrende, fraktale lynnedslag. Simpel, direkte og ligetil. Hvis bare der var lyd med... Skrevet af Keith Romberg."
+msgstr ""
+"Tegner knitrende, fraktale lynnedslag. Simpel, direkte og ligetil. Hvis bare "
+"der var lyd med... Skrevet af Keith Romberg."
 
 #: capplets/screensaver/screensavers/lisa.xml.h:5
 #: capplets/screensaver/screensavers/moire.xml.h:4
@@ -2623,7 +2637,10 @@ msgid ""
 "This simulates colonies of mold growing in a petri dish.  Growing colored "
 "circles overlap and leave spiral interference in their wake.  Written by Dan "
 "Bornstein."
-msgstr "Simulerer kolonier af mug der gror i en petriskål. Voksende, farve cirkler overlapper og efterlader spiralinterferens i deres spor. Skrevet af Dan Bornstein."
+msgstr ""
+"Simulerer kolonier af mug der gror i en petriskål. Voksende, farve cirkler "
+"overlapper og efterlader spiralinterferens i deres spor. Skrevet af Dan "
+"Bornstein."
 
 #: capplets/screensaver/screensavers/phosphor.xml.h:1
 msgid ""
@@ -2643,7 +2660,9 @@ msgstr "Eftergl
 msgid ""
 "If you've ever been in the same room with a Windows NT machine, you've "
 "probably seen this GL hack.  This version is by Marcelo Vianna."
-msgstr "Hvis du nogensinde har siddet i samme rum som en Windows NT-maskine, har du sandsynligvis set denne 3d-pauseskærm. Denne version er af Marcelo Vianna."
+msgstr ""
+"Hvis du nogensinde har siddet i samme rum som en Windows NT-maskine, har du "
+"sandsynligvis set denne 3d-pauseskærm. Denne version er af Marcelo Vianna."
 
 #: capplets/screensaver/screensavers/pipes.xml.h:2
 msgid "Pipes"
@@ -2655,7 +2674,10 @@ msgid ""
 "Draws some intersecting planes, making use of alpha blending, fog, textures, "
 "and mipmaps, plus a ``frames per second'' meter so that you can tell how "
 "fast your graphics card is...  Requires OpenGL.  Written by David Konerding."
-msgstr "Tegner nogle planer der skærer hinanden, med brug af alfablanding, tåge, teksturer og mip-kort, plus en måler med billeder pr. sekund så du kan se hvor hurtigt grafikkortet er... Kræver OpenGL. Skrevet af David Konerding."
+msgstr ""
+"Tegner nogle planer der skærer hinanden, med brug af alfablanding, tåge, "
+"teksturer og mip-kort, plus en måler med billeder pr. sekund så du kan se "
+"hvor hurtigt grafikkortet er... Kræver OpenGL. Skrevet af David Konerding."
 
 #: capplets/screensaver/screensavers/pulsar.xml.h:2
 msgid "Pulsar"
@@ -2726,7 +2748,12 @@ msgid ""
 "line segments around the screen, and uses variations on this basic motion "
 "pattern to produce all sorts of different presentations: line segments, "
 "filled polygons, overlapping translucent areas...  Written by Jamie Zawinski."
-msgstr "Dette er den schweiziske lommekniv for qix-programmer. Den lader en række linjesegmenter vandre rundt på skærmen og bruger variationer af denne grundlæggende bevægelse til at lave alle mulige forskellige former for repræsentationer: linjesegmenter, udfyldte polygoner, overlappende gennemsigtige arealer... Skrevet af Jamie Zawinski."
+msgstr ""
+"Dette er den schweiziske lommekniv for qix-programmer. Den lader en række "
+"linjesegmenter vandre rundt på skærmen og bruger variationer af denne "
+"grundlæggende bevægelse til at lave alle mulige forskellige former for "
+"repræsentationer: linjesegmenter, udfyldte polygoner, overlappende "
+"gennemsigtige arealer... Skrevet af Jamie Zawinski."
 
 #: capplets/screensaver/screensavers/qix.xml.h:22
 msgid "Trails attract each other"
@@ -2753,7 +2780,10 @@ msgid ""
 "Another variation of the `Bomb' program by Scott Draves.  This draws a grid "
 "of growing square-like shapes that, once they overtake each other, react in "
 "unpredictable ways.  ``RD'' stands for reaction-diffusion."
-msgstr "En anden variation af 'Bombe'-programmet af Scott Draves. Tegner et net af voksende, kvadratisk-lignende former der når de støder sammen, reagerer på uforudsigelige måder."
+msgstr ""
+"En anden variation af 'Bombe'-programmet af Scott Draves. Tegner et net af "
+"voksende, kvadratisk-lignende former der når de støder sammen, reagerer på "
+"uforudsigelige måder."
 
 # se ovenfor
 #: capplets/screensaver/screensavers/rd-bomb.xml.h:2
@@ -2770,7 +2800,10 @@ msgid ""
 "This draws rippling interference patterns like splashing water.  With the -"
 "water option, it manipulates your desktop image to look like something is "
 "dripping into it.  Written by Tom Hammersley."
-msgstr "Tegner krusende interferens mønstre som plaskende vand. Kan bringes til at manipulere skærmbilledet så det ser ud til at noget drypper på det. Skrevet af Tom Hammersley."
+msgstr ""
+"Tegner krusende interferens mønstre som plaskende vand. Kan bringes til at "
+"manipulere skærmbilledet så det ser ud til at noget drypper på det. Skrevet "
+"af Tom Hammersley."
 
 #: capplets/screensaver/screensavers/rocks.xml.h:1
 msgid "Rocks"
@@ -2781,7 +2814,10 @@ msgid ""
 "This draws an animation of flight through an asteroid field, with changes in "
 "rotation and direction.  It can also display 3D separations for red/blue "
 "glasses!  Mostly written by Jamie Zawinski."
-msgstr "Tegner en animation af flyvning gennem et asteroidefelt med skift i rotation og regning. Kan også vise 3d-separation til brug med rød/blå-briller! For størstepartens vedkommende skrevet af Jamie Zawinski."
+msgstr ""
+"Tegner en animation af flyvning gennem et asteroidefelt med skift i rotation "
+"og regning. Kan også vise 3d-separation til brug med rød/blå-briller! For "
+"størstepartens vedkommende skrevet af Jamie Zawinski."
 
 #: capplets/screensaver/screensavers/rorschach.xml.h:1
 msgid "Delay before next redraw"
@@ -2946,7 +2982,9 @@ msgid ""
 "!\n"
 "!"
 "============================================================================="
-msgstr "Simulerer racerkørsel gennem en klipperig minegang eller en vildt dansende orm. Skrevet af Conrad Parker."
+msgstr ""
+"Simulerer racerkørsel gennem en klipperig minegang eller en vildt dansende "
+"orm. Skrevet af Conrad Parker."
 
 #: capplets/screensaver/screensavers/speedmine.xml.h:9
 msgid "SpeedMine"
@@ -2957,7 +2995,10 @@ msgid ""
 "Another of the classic screenhacks of the distant past, this one draws "
 "shaded spheres in multiple colors.  This hack traces its lineage back to Tom "
 "Duff in 1982."
-msgstr "En anden af de klassiske skærmmanipulationer fra en fjern fortid, denne tegner 3d-agtige kugler i flere farver. Pauseskærmens aner kan spores tilbage til Tom Duff i 1982."
+msgstr ""
+"En anden af de klassiske skærmmanipulationer fra en fjern fortid, denne "
+"tegner 3d-agtige kugler i flere farver. Pauseskærmens aner kan spores "
+"tilbage til Tom Duff i 1982."
 
 #: capplets/screensaver/screensavers/sphere.xml.h:2
 msgid "Sphere"
@@ -3027,7 +3068,8 @@ msgstr "Trapper"
 msgid ""
 "by Marcelo Vianna's third Escher GL hack, this one draws an ``infinite'' "
 "staircase."
-msgstr "Marcelo Viannas tredje Escher-pauseskærm i 3d. Tegner en \"uendelig\" trappe."
+msgstr ""
+"Marcelo Viannas tredje Escher-pauseskærm i 3d. Tegner en \"uendelig\" trappe."
 
 #: capplets/screensaver/screensavers/starfish.xml.h:1
 msgid "Change to display in monochrome."
@@ -3113,7 +3155,10 @@ msgid ""
 "Ed Mackey reports that he wrote the first version of this program in BASIC "
 "on a Commodore 64 in 1987, as a 320x200 black and white wireframe.  Now it "
 "is GL and has specular reflections."
-msgstr "Ed Mackey rapporterer at han skrev den første version af dette program i BASIC på en Commodore 64 i 1987, som en 320x200 sort/hvid rammemodel. Nu er den skrevet med OpenGL og har højlysrefleksioner."
+msgstr ""
+"Ed Mackey rapporterer at han skrev den første version af dette program i "
+"BASIC på en Commodore 64 i 1987, som en 320x200 sort/hvid rammemodel. Nu er "
+"den skrevet med OpenGL og har højlysrefleksioner."
 
 # RETMIG: hvad hedder "quadrics" på dansk?
 #: capplets/screensaver/screensavers/superquadrics.xml.h:2
@@ -3144,13 +3189,17 @@ msgstr "Analogt 3d-ur"
 msgid ""
 "This draws a working analog clock composed of floating, throbbing bubbles.  "
 "Written by Bernd Paysan."
-msgstr "Tegner et værkende analogt ur sammensat af flydende, pulserende bobler. Skrevet af Bernd Paysan."
+msgstr ""
+"Tegner et værkende analogt ur sammensat af flydende, pulserende bobler. "
+"Skrevet af Bernd Paysan."
 
 #: capplets/screensaver/screensavers/triangle.xml.h:3
 msgid ""
 "Generates random mountain ranges using iterative subdivision of triangles.  "
 "Written by Tobias Gloth."
-msgstr "Tegner tilfældige bjergkæder vha. iterative underopdelinger af trekanter. Skrevet af Tobias Gloth."
+msgstr ""
+"Tegner tilfældige bjergkæder vha. iterative underopdelinger af trekanter. "
+"Skrevet af Tobias Gloth."
 
 #: capplets/screensaver/screensavers/triangle.xml.h:5
 msgid "Triangle"
@@ -3160,7 +3209,9 @@ msgstr "Trekantsbjerge"
 msgid ""
 "This draws line- and arc-based Truchet patterns that tile the screen.  "
 "Written by Adrian Likins."
-msgstr "Tegner linje- og buebaserede Truchet-mønstre der fliselægger skærmen. Skrevet af Adrian Likins."
+msgstr ""
+"Tegner linje- og buebaserede Truchet-mønstre der fliselægger skærmen. "
+"Skrevet af Adrian Likins."
 
 #: capplets/screensaver/screensavers/truchet.xml.h:2
 msgid "Truchet"
@@ -3268,7 +3319,11 @@ msgid ""
 "fractal sets.  Written by Thomas Marsh and Jan Hubicka.  This is not "
 "included with the XScreenSaver package, but if you don't have it already, "
 "you can find it at <http://limax.paru.cas.cz/~hubicka/XaoS/>."
-msgstr "XaoS genererer hurtige, løbende animationer af Mandelbrotmængden og andre fraktale mængder. Skrevet af Thomas Marsh og Jan Hubicka. XaoS er ikke inkluderet i XScreenSaver-pakken, men hvis du ikke allerede har programmet, kan du finde det på <http://limax.paru.cas.cz/~hubicka/XaoS/>."
+msgstr ""
+"XaoS genererer hurtige, løbende animationer af Mandelbrotmængden og andre "
+"fraktale mængder. Skrevet af Thomas Marsh og Jan Hubicka. XaoS er ikke "
+"inkluderet i XScreenSaver-pakken, men hvis du ikke allerede har programmet, "
+"kan du finde det på <http://limax.paru.cas.cz/~hubicka/XaoS/>."
 
 #: capplets/screensaver/screensavers/xdaliclock.xml.h:1
 msgid "XDaliClock"
@@ -3280,7 +3335,12 @@ msgid ""
 "``melting'' into their new shapes.  Written by Jamie Zawinski.  This is not "
 "included with the XScreenSaver package, but if you don't have it already, "
 "you can find it at <http://www.jwz.org/xdaliclock/>."
-msgstr "Dali-ur tegner et stort digitalt ur hvor tallene skifter ved at \"smelte\" sammen til deres nye former. Skrevet af Jamie Zawinski. Pauseskærmen bygger på programmet XDaliClock som ikke er inkluderet i XScreenSaver-pakken, men hvis du ikke allerede har programmet, kan du finde det på <http://www.jwz.org/xdaliclock/>."
+msgstr ""
+"Dali-ur tegner et stort digitalt ur hvor tallene skifter ved at \"smelte\" "
+"sammen til deres nye former. Skrevet af Jamie Zawinski. Pauseskærmen bygger "
+"på programmet XDaliClock som ikke er inkluderet i XScreenSaver-pakken, men "
+"hvis du ikke allerede har programmet, kan du finde det på <http://www.jwz."
+"org/xdaliclock/>."
 
 #: capplets/screensaver/screensavers/xearth.xml.h:1
 msgid ""
@@ -3455,23 +3515,33 @@ msgid "Enable sound server startup"
 msgstr "Aktivér lydserveropstart"
 
 #: capplets/sound/sound-properties.glade.h:2
+#, fuzzy
+msgid "General"
+msgstr "Gennemtrængning"
+
+#: capplets/sound/sound-properties.glade.h:3
+#, fuzzy
+msgid "Sound Events"
+msgstr "Lyde for hændelser"
+
+#: capplets/sound/sound-properties.glade.h:4
 msgid "Sounds for events"
 msgstr "Lyde for hændelser"
 
-#: control-center/capplet-dir-view.c:296 control-center/gnomecc.desktop.in.h:1
+#: control-center/capplet-dir-view.c:298 control-center/gnomecc.desktop.in.h:1
 msgid "GNOME Control Center"
 msgstr "Kontrolcenter"
 
-#: control-center/capplet-dir-view.c:297
+#: control-center/capplet-dir-view.c:299
 msgid "Desktop properties manager."
 msgstr "Håndtering af skrivebordsegenskaber"
 
-#: control-center/capplet-dir-view.c:408
+#: control-center/capplet-dir-view.c:413
 #, c-format
 msgid "Gnome Control Center : %s"
 msgstr "Kontrolcenter: %s"
 
-#: control-center/capplet-dir-view.c:456
+#: control-center/capplet-dir-view.c:461
 msgid ""
 "No help is available/installed. Please make sure you\n"
 "have the GNOME User's Guide installed on your system."
@@ -3479,7 +3549,7 @@ msgstr ""
 "Ingen hjælp tilgængelig/installeret. Sørg venligst for\n"
 "at du har Gnomes brugervejledning installeret på systemet."
 
-#: control-center/capplet-dir-view.c:459
+#: control-center/capplet-dir-view.c:464
 msgid "Close"
 msgstr "Luk"
 
@@ -3551,6 +3621,9 @@ msgstr "KCPROG"
 msgid "GNOME Control Center options"
 msgstr "Kontrolcentertilvalg"
 
+#~ msgid "Use"
+#~ msgstr "Brug"
+
 #~ msgid "Wallpaper Selection"
 #~ msgstr "Billedvælger"
 

po/zh_TW.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 1.5.8\n"
-"POT-Creation-Date: 2001-10-15 06:40+0800\n"
+"POT-Creation-Date: 2001-12-10 23:24-0500\n"
 "PO-Revision-Date: 2001-10-15 08:54+0800\n"
 "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
 "Language-Team: Chinese\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=Big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: archiver/archive.c:614
+#: archiver/archive.c:604
 msgid "Default location"
 msgstr "預設位置"
 
@@ -1474,8 +1474,8 @@ msgid ""
 "inclusion here."
 msgstr ""
 "它類似 `greynetic'，但沒那麼瘋狂。最初是由 Stephen Linhart 編寫這類程式的；後"
-"來 Ozymandias G. Desiderata 編寫了類似的 Java applet。那個 Java applet "
-"被 Jamie Zawinski 發現了，並被移植到 C 語言，且包括到 xscreensaver 裡。"
+"來 Ozymandias G. Desiderata 編寫了類似的 Java applet。那個 Java applet 被 "
+"Jamie Zawinski 發現了，並被移植到 C 語言，且包括到 xscreensaver 裡。"
 
 #: capplets/screensaver/screensavers/cynosure.xml.h:3
 msgid "Cynosure"
@@ -2458,8 +2458,8 @@ msgid ""
 "phosphor.  It can run any program as a source of the text it displays.  "
 "Written by Jamie Zawinski."
 msgstr ""
-"以大的像素和長期發光的燐點顯示模擬古老的終端機。它可以執行任何程式作為顯示"
-"文字的來源。由 Jamie Zawinski 編寫。"
+"以大的像素和長期發光的燐點顯示模擬古老的終端機。它可以執行任何程式作為顯示文"
+"字的來源。由 Jamie Zawinski 編寫。"
 
 #: capplets/screensaver/screensavers/phosphor.xml.h:2
 msgid "Phosphor"
@@ -3247,23 +3247,31 @@ msgid "Enable sound server startup"
 msgstr "啟動時同時啟用音效伺服程式"
 
 #: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "一般"
+
+#: capplets/sound/sound-properties.glade.h:3
+msgid "Sound Events"
+msgstr "音效事件"
+
+#: capplets/sound/sound-properties.glade.h:4
 msgid "Sounds for events"
 msgstr "事件音效"
 
-#: control-center/capplet-dir-view.c:296 control-center/gnomecc.desktop.in.h:1
+#: control-center/capplet-dir-view.c:298 control-center/gnomecc.desktop.in.h:1
 msgid "GNOME Control Center"
 msgstr "GNOME 控制台"
 
-#: control-center/capplet-dir-view.c:297
+#: control-center/capplet-dir-view.c:299
 msgid "Desktop properties manager."
 msgstr "桌面設定總管。"
 
-#: control-center/capplet-dir-view.c:408
+#: control-center/capplet-dir-view.c:413
 #, c-format
 msgid "Gnome Control Center : %s"
 msgstr "Gnome 控制台：%s"
 
-#: control-center/capplet-dir-view.c:456
+#: control-center/capplet-dir-view.c:461
 msgid ""
 "No help is available/installed. Please make sure you\n"
 "have the GNOME User's Guide installed on your system."
@@ -3271,7 +3279,7 @@ msgstr ""
 "輔助說明尚未安裝或不存在，請確定你已經安裝\n"
 "GNOME 的使用者指南到你的系統中。"
 
-#: control-center/capplet-dir-view.c:459
+#: control-center/capplet-dir-view.c:464
 msgid "Close"
 msgstr "關閉"
 
@@ -3591,18 +3599,12 @@ msgstr "GNOME
 #~ msgid "Enable"
 #~ msgstr "啟用"
 
-#~ msgid "General"
-#~ msgstr "一般"
-
 #~ msgid "Event"
 #~ msgstr "事件"
 
 #~ msgid "File to Play"
 #~ msgstr "播放的音效檔"
 
-#~ msgid "Sound Events"
-#~ msgstr "音效事件"
-
 #~ msgid "Menus"
 #~ msgstr "選單"