(Note: Somehow I committed only the ChangeLog for this before without

2005-02-01  Elijah Newren  <newren@gmail.com>

	(Note: Somehow I committed only the ChangeLog for this before
	without committing the actual patch.)

        Fix an infinite loop that was bringing single-CPU systems to their
        knees.  Approved by Kjartan.  #160803

        * gnome-theme-manager.c: (window_settings_changed): keep track of
        the window manager theme last selected and just exit if we are
        already using the one we want

ChangeLog

@@ -1,3 +1,33 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+	* Release 2.8.2.
+
+2005-01-04  Shakti Sen <shprasad@novell.com>
+
+	* configure.in: Defined PREFIX to <prefix> 
+	bug #153203
+	
+2005-01-03  Dan Winship  <danw@novell.com>
+
+	* configure.in: Remove redundant check for ngettext, since
+	AM_GLIB_GNU_GETTEXT already checks for it (in both libc and
+	libintl).
+	
+2004-12-13  Dwayne Bailey  <dwayne@translate.org.za>
+
+	* configure.in: Added "zu" to ALL_LINGUAS.
+
+2004-11-28  Dwayne Bailey  <dwayne@translate.org.za>
+
+	* configure.in: Added "nso" to ALL_LINGUAS.
+
+2004-11-01  Jeff Waugh  <jdub@perkypants.org>
+
+	* po/POTFILES.in, vfs-methods/fontilus/Makefile.am,
+	  vfs-methods/fontilus/gnome-font-viewer.desktop.in,
+	  vfs-methods/fontilus/.cvsignore: Add a .desktop file for the
+	  font viewer, need it for the MIME loving. D'oh!
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* configure.in : post release bump

NEWS

@@ -1,3 +1,23 @@
+gnome-control-center 2.8.2
+
+- Add desktop file for the font method. (Jeff Waugh).
+- Fix theme thumbnailing. Closes bug #153203 and bug #165778.
+  (Sebastien Bacher and Shakti Sen)
+- Fix a leak in the font method. Closes bug #165312. (Kjartan)
+- Fix widget expansion in the keyboard preferences. Closes
+  bug #151588. Patch from Ross Burton 
+- Handle backspace in multilayout setups correctly. Closes
+  bug #154492. Patch from Michal Bukovjan 
+- Build fixes (Dan Winship, Shakti Sen; closes bug #153203.
+- Theme manager: Fix an infinite loop. Closes bug #160803. Patch
+  from Elijah Newren
+- Mask the "Text Editor" tab since the new mime system doesn't use this
+setting.
+- use a temporary filename to not overwrite existant files in ~/.themes 
+(Closes: #97180).
+- theme-thumbnailer doesn't require an absolute path (Closes: #153203).
+- updated translations (bg, da, id, it, nso, sq, zh_CN, zu)
+
 gnome-control-center 2.8.1
 
 - Some tweaking of the available default applications

capplets/background/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

capplets/common/ChangeLog

@@ -1,3 +1,13 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
+2005-01-27  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gnome-theme-info.c: (top_theme_dir_changed),
+	(top_icon_theme_dir_changed), (real_add_top_theme_dir_monitor):
+	Merge fix for bug #149236.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

capplets/common/gnome-theme-info.c

@@ -527,7 +527,7 @@ update_theme_index (GnomeVFSURI       *index_uri,
 	    theme_info->has_metacity = TRUE;
 
 	  g_hash_table_insert (theme_hash_by_uri, g_strdup (common_theme_dir), theme_info);
-	  add_data_to_hash_by_name (theme_hash_by_name, theme_info->name, theme_info);
+	  add_data_to_hash_by_name (theme_hash_by_name, g_strdup (theme_info->name), theme_info);
 	  handle_change_signal (GNOME_THEME_TYPE_REGULAR, theme_info, GNOME_THEME_CHANGE_CREATED, key_element);
 	}
     }
@@ -953,7 +953,6 @@ top_theme_dir_changed (GnomeVFSMonitorHandle *handle,
 	  g_hash_table_remove (handle_hash, name);
 	  g_free (monitor_data);
 	}
-      g_free (name);
     }
   gnome_vfs_uri_unref (common_theme_dir_uri);
 }
@@ -1005,7 +1004,6 @@ top_icon_theme_dir_changed (GnomeVFSMonitorHandle    *handle,
 	  g_hash_table_remove (handle_hash, name);
 	  g_free (monitor_data);
 	}
-      g_free (name);
     }
   gnome_vfs_uri_unref (common_icon_theme_dir_uri);
 }
@@ -1187,7 +1185,7 @@ real_add_top_theme_dir_monitor (GnomeVFSURI  *uri,
    * use it to remove the monitor handles when a dir is removed.
    */
   tuple = g_new0 (CallbackTuple, 1);
-  tuple->handle_hash = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, NULL);
+  tuple->handle_hash = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)g_free);
   tuple->priority = priority;
 
   /* Check the URI */

capplets/default-applications/ChangeLog

@@ -1,3 +1,20 @@
+2004-11-26  Sebastien Bacher  <seb128@debian.org>
+
+       * gnome-default-applications-properties.glade: Mask the "Text Editor"
+       tab since it's not used by the new mime system.
+
+2004-10-21  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-default-applications-properties.c: (read_browser),
+	(read_mailer):
+	don't crash if the browser list or the mailer list is empty
+	(Closes: #151672).
+
+2004-10-17  J.H.M. Dassen (Ray) <jdassen@debian.org>
+
+	* gnome-default-applications-properties-structs.c: Corrected confused
+	Firefox entry. Corrected w3m binary name.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

capplets/default-applications/gnome-default-applications-properties-structs.c

@@ -11,12 +11,12 @@ BrowserDescription possible_browsers[] = {
         { N_("Encompass"), 		"encompass",	"encompass %s",		FALSE, FALSE },
         { N_("Firebird/FireFox"),  "mozilla-firebird",  "mozilla-firebird %s",  FALSE, FALSE },
         { N_("Firebird/FireFox"),  "mozilla-firefox",	"mozilla-firebird %s",  FALSE, FALSE },
-        { N_("Firebird/FireFox"),  	"firefox",	"mozilla-firebird %s",	FALSE, FALSE },
+        { N_("Firebird/FireFox"),  	"firefox",	"mozilla-firefox %s",	FALSE, FALSE },
         { N_("Mozilla/Netscape 6"), 	"mozilla-1.6",	"mozilla-1.6 %s",	FALSE, FALSE },
         { N_("Mozilla/Netscape 6"), 	"mozilla",	"mozilla %s",		FALSE, FALSE },
         { N_("Netscape Communicator"), 	"netscape",	"netscape %s",		FALSE, FALSE },
         { N_("Konqueror"), 		"konqueror",	"konqueror %s",		FALSE, FALSE },
-        { N_("W3M Text Browser"),	"w3n",		"w3m %s",		TRUE,  FALSE },
+        { N_("W3M Text Browser"),	"w3m",		"w3m %s",		TRUE,  FALSE },
         { N_("Lynx Text Browser"),	"lynx",		"lynx %s",		TRUE,  FALSE },
         { N_("Links Text Browser") , 	"links",	"links %s",		TRUE,  FALSE }
 };

capplets/default-applications/gnome-default-applications-properties.c

@@ -423,7 +423,7 @@ read_browser (GConfClient *client,
 			return;
 		}
 	}
-	if (strlen(browser) != 0) {
+	if (browser && strlen(browser) != 0) {
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("web_select_radio")), TRUE);
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("web_custom_radio")), TRUE);
 	} else {
@@ -468,7 +468,7 @@ read_mailer (GConfClient *client,
 		}
         }
 		
-	if (strlen(mailer) != 0) {
+	if (mailer && strlen(mailer) != 0) {
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("mail_select_radio")), TRUE);
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("mail_custom_radio")), TRUE);
 	} else {

capplets/default-applications/gnome-default-applications-properties.glade

@@ -641,7 +641,6 @@
 	  <child>
 	    <widget class="GtkFrame" id="frame1">
 	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
 	      <property name="label_xalign">0</property>
 	      <property name="label_yalign">0.5</property>
 	      <property name="shadow_type">GTK_SHADOW_NONE</property>

capplets/file-types/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

capplets/font/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

capplets/keybindings/ChangeLog

@@ -1,3 +1,13 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
+2004-11-30  Bastien Nocera  <hadess@hadess.net>
+
+	* eggcellrendererkeys.c: (grab_key_callback): Patch from
+	Michal Bukovjan <bukovjan@mbox.dkm.cz> to handle backspace in multi-
+	layout setups correctly (Closes: #154492)
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

capplets/keybindings/eggcellrendererkeys.c

@@ -435,9 +435,9 @@ grab_key_callback (GtkWidget    *widget,
   /* filter consumed/ignored modifiers */
 
   if (keys->accel_mode == EGG_CELL_RENDERER_KEYS_MODE_GTK)
-    accel_mods = event->state & ~(consumed_modifiers | ignored_modifiers);
+    accel_mods = event->state & GDK_MODIFIER_MASK & ~(consumed_modifiers | ignored_modifiers);
   else if (keys->accel_mode == EGG_CELL_RENDERER_KEYS_MODE_X)
-    accel_mods = event->state & ~(ignored_modifiers);
+    accel_mods = event->state & GDK_MODIFIER_MASK & ~(ignored_modifiers);
   else
     g_assert_not_reached ();
     
@@ -458,9 +458,6 @@ grab_key_callback (GtkWidget    *widget,
 	  accel_keyval = 0;
 	  accel_mods = 0;
 	}
-
-      /* Remove modifiers like super and hyper, as GTK+ ignores them. */
-      accel_mods = accel_mods & GDK_MODIFIER_MASK;
     }
   
   edited = TRUE;

capplets/keyboard/ChangeLog

@@ -1,3 +1,13 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
+2004-10-21  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-keyboard-properties.glade:
+	patch by Ross Burton <ross@burtonini.com> to fix the widget expansion
+	(Closes: #151588).
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

capplets/keyboard/gnome-keyboard-properties.glade

@@ -1199,8 +1199,8 @@
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
 		    </packing>
 		  </child>
 		</widget>

capplets/network/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

capplets/rollback/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

capplets/sound/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

capplets/theme-switcher/ChangeLog

@@ -1,3 +1,21 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
+2005-02-01  Elijah Newren  <newren@gmail.com>
+
+	Fix an infinite loop that was bringing single-CPU systems to their
+	knees.  Approved by Kjartan.  #160803
+
+	* gnome-theme-manager.c: (window_settings_changed): keep track of
+	the window manager theme last selected and just exit if we are
+	already using the one we want
+
+2005-01-03  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-theme-installer.c: (install_dialog_response): use a temporary
+	filename to not overwrite existant files in ~/.themes (Closes: #97180).
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

capplets/theme-switcher/gnome-theme-installer.c

@@ -157,6 +157,27 @@ install_dialog_response (GtkWidget *widget, int response_id, gpointer data)
 		else
 			path = g_build_filename (g_get_home_dir (), ".themes", base, NULL);
 
+		while(TRUE) {
+		  gchar *file_tmp;
+		  int len = strlen (base);
+
+		  if (base && len > 7 && !strcmp (base + len - 7, ".tar.gz"))
+		    file_tmp = g_strdup_printf("gnome-theme-%d.tar.gz", rand ());
+		  else if (base && len > 8 && !strcmp (base + len - 8, ".tar.bz2"))
+		    file_tmp = g_strdup_printf("gnome-theme-%d.tar.bz2", rand ());
+		  else
+		    return;
+
+		  if (icon_theme)
+		    path = g_build_filename (g_get_home_dir (), ".icons", file_tmp, NULL);
+		  else
+		    path = g_build_filename (g_get_home_dir (), ".themes", file_tmp, NULL);
+
+		  g_free(file_tmp);
+		  if (!gnome_vfs_uri_exists (gnome_vfs_uri_new (path)))
+		    break;
+		}
+
 		/* To avoid the copy of /root/.themes to /root/.themes/.themes 
 		 * which causes an infinite loop. The user asks to transfer the all 
          * contents of a folder, to a folder under itseld. So ignore the 		

capplets/theme-switcher/gnome-theme-manager.c

@@ -920,7 +920,19 @@ static void
 window_settings_changed (GnomeWindowManager *window_manager,
 			 GladeXML           *dialog)
 {
-  /* There is no way to know what changed, so we just check it all */
+  static gchar *window_theme = NULL;
+  GnomeWMSettings wm_settings;
+
+  wm_settings.flags = GNOME_WM_SETTING_THEME;
+  gnome_window_manager_get_settings (window_manager, &wm_settings);
+  if (window_theme == NULL || strcmp (wm_settings.theme, window_theme) != 0)
+    {
+      g_free (window_theme);
+      window_theme = g_strdup (wm_settings.theme);
+    }
+  else
+    return;
+
   update_settings_from_gconf ();
   gnome_theme_details_update_from_gconf ();
 }

capplets/ui-properties/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

capplets/url-properties/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

capplets/windows/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

capplets/wm-properties/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

configure.in

@@ -1,7 +1,7 @@
 AC_INIT(control-center)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(control-center, 2.9.0)
+AM_INIT_AUTOMAKE(control-center, 2.8.3)
 
 AM_MAINTAINER_MODE
 
@@ -32,7 +32,7 @@ fi
 changequote([,])dnl
 
 # Internationalization support
-ALL_LINGUAS="af am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko lt lv mk ml mn ms nb nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta th tr uk vi wa zh_CN zh_TW"
+ALL_LINGUAS="af am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko lt lv mk ml mn ms nb nl nn no nso pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta th tr uk vi wa zh_CN zh_TW zu"
 
 GETTEXT_PACKAGE=control-center-2.0
 AC_SUBST(GETTEXT_PACKAGE)
@@ -43,11 +43,6 @@ AM_GLIB_GNU_GETTEXT
 AC_CHECK_FUNCS(usleep)
 AC_CHECK_FUNCS(putenv)
 AC_CHECK_FUNCS(setenv)
-AC_CHECK_FUNCS(ngettext, have_ngettext=yes)
-
-if test x"$have_ngettext" != "xyes"; then
-	AC_MSG_ERROR([Your Gettext installation doesn't seem to support ngettext to handle translation of plural forms. Please install GNU Gettext])
-fi;
 
 AC_PATH_XTRA
 x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
@@ -485,6 +480,7 @@ else
 fi
 
 AC_DEFINE_UNQUOTED(GNOMECC_DATA_DIR, "${real_prefix}/share/${GETTEXT_PACKAGE}",[Path to gnomecc data files])
+AC_DEFINE_UNQUOTED(PREFIX, "$prefix", [install prefix])
 GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
 AC_SUBST(GNOMECC_ICONS_DIR)
 GNOMECC_DESKTOP_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/capplets'

control-center/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

gnome-settings-daemon/ChangeLog

@@ -1,3 +1,36 @@
+2005-02-17  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* gnome-settings-multimedia-keys.c: (do_www_action):
+	Don't set any url when starting browser.
+
+2004-12-16  Bastien Nocera  <hadess@hadess.net>
+
+	* actions/acme-volume-alsa.c: (acme_volume_alsa_set_mute): mute
+	properly when the system has hardware mute, patch from Pierre Ossman
+	<drzeus-bugzilla@drzeus.cx> (Closes: #144489)
+
+2004-12-09  Christophe Fergeau  <teuf@gnome.org>
+
+	* actions/acme-volume-gstreamer.c: don't always fail when opening the
+	mixer, fix some console warnings due to invalid casts of GstMixerTrack
+
+2004-11-30  Sebastien Bacher  <seb128@debian.org>
+
+	* actions/acme-volume-gstreamer.c:
+	(acme_volume_gstreamer_finalize), (acme_volume_gstreamer_set_mute),
+	(acme_volume_gstreamer_get_mute),
+	(acme_volume_gstreamer_get_volume),
+	(acme_volume_gstreamer_set_volume),
+	(acme_volume_gstreamer_close_real), (acme_volume_gstreamer_open),
+	(acme_volume_gstreamer_close), (acme_volume_gstreamer_init):
+	free the alsa device, after 4 seconds, with gstreamer too. 
+	Patch from Arnaud Patard <Arnaud Patard> (Closes: #141793).
+
+2004-11-30  Bastien Nocera  <hadess@hadess.net>
+
+	* gnome-settings-multimedia-keys.c: (do_exit_action): hack
+	to get the logout action working (Closes: #141472)
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

gnome-settings-daemon/actions/acme-volume-alsa.c

@@ -92,7 +92,7 @@ acme_volume_alsa_set_mute (AcmeVolume *vol, gboolean val)
 	/* If we have a hardware mute */
 	if (self->_priv->has_mute)
 	{
-		snd_mixer_selem_set_playback_volume_all
+		snd_mixer_selem_set_playback_switch_all
 			(self->_priv->elem, !val);
 		acme_volume_alsa_close (self);
 		return;

gnome-settings-daemon/actions/acme-volume-gstreamer.c

@@ -33,10 +33,13 @@
 
 #include <string.h>
 
+#define TIMEOUT	4000
+ 
 struct AcmeVolumeGStreamerPrivate
 {
-	GstMixer      *mixer;
-	GstMixerTrack *track;
+  	GstMixer      *mixer;
+  	GstMixerTrack *track;
+ 	guint timer_id;
 };
 
 static GObjectClass *parent_class = NULL;
@@ -45,6 +48,9 @@ G_DEFINE_TYPE (AcmeVolumeGStreamer, acme_volume_gstreamer, ACME_TYPE_VOLUME)
 
 static int acme_volume_gstreamer_get_volume (AcmeVolume *self);
 static void acme_volume_gstreamer_set_volume (AcmeVolume *self, int val);
+static gboolean acme_volume_gstreamer_open (AcmeVolumeGStreamer *self);
+static void acme_volume_gstreamer_close (AcmeVolumeGStreamer *self);
+static gboolean acme_volume_gstreamer_close_real (AcmeVolumeGStreamer *self);
 
 static void
 acme_volume_gstreamer_finalize (GObject *object)
@@ -57,12 +63,14 @@ acme_volume_gstreamer_finalize (GObject *object)
 	self = ACME_VOLUME_GSTREAMER (object);
 
 	g_return_if_fail (self->_priv != NULL);
-
-	if (self->_priv->mixer != NULL) {
-		g_object_unref (self->_priv->mixer);
-		g_object_unref (self->_priv->track);
+	
+	if (self->_priv->timer_id != 0)
+	{
+		g_source_remove (self->_priv->timer_id);
+		self->_priv->timer_id = 0;
 	}
-
+	acme_volume_gstreamer_close_real (self);
+				
 	g_free (self->_priv);
 
 	G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -72,25 +80,32 @@ static void
 acme_volume_gstreamer_set_mute (AcmeVolume *vol, gboolean val)
 {
 	AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol;
-
-	if (self->_priv->mixer == NULL)
+	
+	if (acme_volume_gstreamer_open (self) == FALSE)
 		return;
-
+		
 	gst_mixer_set_mute (self->_priv->mixer,
 			    self->_priv->track,
 			    val);
+	
+	acme_volume_gstreamer_close (self);
 }
 
 static gboolean
 acme_volume_gstreamer_get_mute (AcmeVolume *vol)
 {
 	AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol;
+	gboolean mute;
 
-	if (self->_priv->mixer == NULL)
+	if (acme_volume_gstreamer_open (self) == FALSE)
 		return FALSE;
 
-	return GST_MIXER_TRACK_HAS_FLAG (self->_priv->track,
+	mute = GST_MIXER_TRACK_HAS_FLAG (self->_priv->track,
 					 GST_MIXER_TRACK_MUTE);
+
+	acme_volume_gstreamer_close (self);
+
+	return mute;
 }
 
 static int
@@ -101,7 +116,7 @@ acme_volume_gstreamer_get_volume (AcmeVolume *vol)
 	AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol;
 	GstMixerTrack *track;
 	
-	if (self->_priv->mixer == NULL)
+	if (acme_volume_gstreamer_open (self) == FALSE)
 		return 0;
 
 	track = self->_priv->track;
@@ -112,6 +127,8 @@ acme_volume_gstreamer_get_volume (AcmeVolume *vol)
 		vol_total += volumes[i];
 	g_free (volumes);
 
+	acme_volume_gstreamer_close (self);
+	
 	volume = vol_total / (double)track->num_channels;
 
 	/* Normalize the volume to the [0, 100] scale that acme expects. */
@@ -126,11 +143,12 @@ acme_volume_gstreamer_set_volume (AcmeVolume *vol, int val)
 	gint i, *volumes;
 	double volume;
 	AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol;
-	GstMixerTrack *track = self->_priv->track;
+	GstMixerTrack *track;
 
-	if (self->_priv->mixer == NULL)
+	if (acme_volume_gstreamer_open (self) == FALSE)
 		return;
 
+	track = self->_priv->track;
 	val = CLAMP (val, 0, 100);
 
 	/* Rescale the volume from [0, 100] to [track min, track max]. */
@@ -141,17 +159,47 @@ acme_volume_gstreamer_set_volume (AcmeVolume *vol, int val)
 		volumes[i] = (gint) volume;
 	gst_mixer_set_volume (self->_priv->mixer, track, volumes);
 	g_free (volumes);
+ 	
+ 	acme_volume_gstreamer_close (self);
+}
+ 
+static gboolean
+acme_volume_gstreamer_close_real (AcmeVolumeGStreamer *self)
+{
+	if (self->_priv == NULL)
+		return FALSE;
+	
+	if (self->_priv->mixer != NULL)
+	{
+		gst_element_set_state (GST_ELEMENT(self->_priv->mixer), GST_STATE_NULL);
+		gst_object_unref (GST_OBJECT (self->_priv->mixer));	    
+		g_object_unref (G_OBJECT (self->_priv->track));
+		self->_priv->mixer=NULL;
+		self->_priv->track=NULL;
+	}
+	
+	self->_priv->timer_id = 0;
+	return FALSE;
 }
 
 /* This is a modified version of code from gnome-media's gst-mixer */
-static void
-acme_volume_gstreamer_init (AcmeVolumeGStreamer *self)
+static gboolean
+acme_volume_gstreamer_open (AcmeVolumeGStreamer *vol)
 {
-	const GList *elements;
-	gint num = 0;
-
-	self->_priv = g_new0 (AcmeVolumeGStreamerPrivate, 1);
-
+  	AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol;
+  	const GList *elements;
+  	gint num = 0;
+  
+	if (self->_priv == NULL)
+		return FALSE;
+	
+	if (self->_priv->timer_id != 0)
+	{
+		g_source_remove (self->_priv->timer_id);
+		self->_priv->timer_id = 0;
+		return TRUE;
+	}
+		
 	/* Go through all elements of a certain class and check whether
 	 * they implement a mixer. If so, walk through the tracks and look
 	 * for first one named "volume".
@@ -220,8 +268,9 @@ acme_volume_gstreamer_init (AcmeVolumeGStreamer *self)
 
 					g_object_ref (self->_priv->mixer);
 					g_object_ref (self->_priv->track);
-
-					break;
+					if (array)
+						g_value_array_free (array);
+					return TRUE;
 				}
 			}
 			
@@ -239,8 +288,36 @@ acme_volume_gstreamer_init (AcmeVolumeGStreamer *self)
 			g_value_array_free (array);
 		g_free (title);
 	}
+	return FALSE;
 }
 
+static void
+acme_volume_gstreamer_close (AcmeVolumeGStreamer *self)
+{
+	self->_priv->timer_id = g_timeout_add (TIMEOUT,
+			(GSourceFunc) acme_volume_gstreamer_close_real, self);
+}
+
+static void
+acme_volume_gstreamer_init (AcmeVolumeGStreamer *self)
+{
+	
+	self->_priv = g_new0 (AcmeVolumeGStreamerPrivate, 1);
+	
+	if (acme_volume_gstreamer_open (self) == FALSE)
+	{
+		g_free (self->_priv);
+		self->_priv = NULL;
+		return;
+	}
+	
+	if (self->_priv->mixer != NULL) {
+		acme_volume_gstreamer_close_real (self);
+		return;
+	}
+}
+
+
 static void
 acme_volume_gstreamer_class_init (AcmeVolumeGStreamerClass *klass)
 {

gnome-settings-daemon/gnome-settings-multimedia-keys.c

@@ -630,7 +630,7 @@ do_www_action (Acme *acme, const char *url)
 	}
 
 	if (url == NULL)
-		command = g_strdup_printf (string, "about:blank");
+		command = g_strdup_printf (string, "");
 	else
 		command = g_strdup_printf (string, url);
 
@@ -643,17 +643,7 @@ do_www_action (Acme *acme, const char *url)
 static void
 do_exit_action (Acme *acme)
 {
-	GnomeClient *master;
-
-	master = gnome_master_client();
-	g_return_if_fail(master != NULL);
-
-	gnome_client_request_save(master,
-			GNOME_SAVE_BOTH,
-			TRUE,
-			GNOME_INTERACT_ANY,
-			FALSE,
-			TRUE);
+	execute ("gnome-session-save --kill", FALSE);
 }
 
 static void

help/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

libbackground/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

libwindow-settings/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

po/ChangeLog

@@ -1,3 +1,59 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
+2005-01-31  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation by Elian Myftiu.
+
+2005-01-29  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation by Elian Myftiu.
+
+2004-12-13  Dwayne Bailey  <dwayne@translate.org.za>
+
+	* zu.po: Added Zulu translation by
+	Zuza Software Foundation <info@translate.org.za>.
+
+2004-11-29  Dwayne Bailey  <dwayne@translate.org.za>
+
+	* nso.po: Updated Northern Sotho translation.
+
+2004-11-28  Dwayne Bailey  <dwayne@translate.org.za>
+
+	* nso.po: Added Northern Sotho translation by
+	Zuza Software Foundation <info@translate.org.za>.
+
+2004-11-28  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation
+
+2004-11-24  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
+2004-11-22  Martin Willemoes Hansen  <mwh@sysrq.dk>
+
+	* da.po: Updated Danish translation.
+
+2004-11-08  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Vladimir Petkov <vpetkov@i-space.org>
+
+2004-10-31  Hendrik Richter <hendrik@gnome-de.org>
+
+	* de.po: Updated German translation.
+	Fix by Moritz Mekelburger <moritz@unix-ag.org>
+
+2004-10-26  Mohammad DAMT  <mdamt@bisnisweb.com>
+
+	* id.po: Updated Indonesian translation
+
+2004-10-24  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

po/da.po

@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
-"PO-Revision-Date: 2004-10-07 19:59+0200\n"
+"POT-Creation-Date: 2004-11-22 16:31+0100\n"
+"PO-Revision-Date: 2004-11-22 16:31+0100\n"
 "Last-Translator: Martin Willemoes Hansen <mwh@sysrq.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
@@ -2473,11 +2473,14 @@ msgstr "Mappe for kontrolcenter-program som denne visning viser"
 #: control-center/capplet-dir-view.c:348
 msgid "translator_credits"
 msgstr ""
-"Birger Langkjer <birger.langkjer@image.dk>\n"
-"Keld Simonsen <keld@dkuug.dk>\n"
-"Kenneth Christiansen <kenneth@ripen.dk>\n"
-"Martin Willemoes Hansen <mwh@sysrq.dk>\n"
-"Ole Laursen <olau@hardworking.dk>"
+"Birger Langkjer\n"
+"Keld Simonsen\n"
+"Kenneth Christiansen\n"
+"Martin Willemoes Hansen\n"
+"Ole Laursen\n"
+"\n"
+"Dansk-gruppen <dansk@klid.dk>\n"
+"Mere info: http://www.klid.dk/dansk/"
 
 #: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
 msgid "GNOME Control Center"

po/de.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-10-31 13:38+0100\n"
 "PO-Revision-Date: 2004-08-07 09:33+0200\n"
 "Last-Translator: Hendrik Richter <hendrik@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -2889,7 +2889,7 @@ msgstr "_Wiedergabe"
 #, c-format
 msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Fenstermanager »%s« wurde nicht als Konfigurationswerkzeug registriert\n"
+"Für den Fenstermanager »%s« wurde kein Konfigurationswerkzeug registriert\n"
 
 #: libwindow-settings/metacity-window-manager.c:378
 msgid "Maximize"

po/gu.po

@@ -1,20 +1,21 @@
+# translation of gnome-control-center.gnome-2-8.gu.po to Gujarati
 # translation of gnome-control-center.HEAD.gu.po to Gujarati
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # MagNet <magnet@magnet-i.com>, 2004.
 # Ankit Patel <ankit@redhat.com>, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center.HEAD.gu\n"
+"Project-Id-Version: gnome-control-center.gnome-2-8.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
-"PO-Revision-Date: 2004-10-14 09:49+0530\n"
+"POT-Creation-Date: 2004-10-26 04:28+0200\n"
+"PO-Revision-Date: 2004-10-26 13:11+0530\n"
 "Last-Translator: Ankit Patel <ankit@redhat.com>\n"
 "Language-Team: Gujarati\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "<magnet@magnet-i.com>\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
 "\n"
 "\n"
 "\n"
@@ -48,7 +49,7 @@ msgstr "બંધ કરો અને બહાર નીકળો (_L)"
 
 #: capplets/accessibility/at-properties/at-enable-dialog.glade.h:6
 msgid "Start these assistive technologies every time you log in:"
-msgstr "દરેક વખતે તમે પ્રવેશ કરાે આ સહાયક તકનીકીઓને શરુ કરો:"
+msgstr "દરેક વખતે તમે પ્રવેશ કરો આ સહાયક તકનીકીઓને શરુ કરો:"
 
 #: capplets/accessibility/at-properties/at-enable-dialog.glade.h:7
 msgid "_Enable assistive technologies"
@@ -81,7 +82,7 @@ msgid ""
 "'gnopernicus' package must be installed for screenreading and magnifying "
 "capabilities."
 msgstr ""
-"તમારી સિસ્ટમ પર કાેઈ જ સહાયક તકનીકી ઉપ્લબ્ધ નથી. સ્ક્રીન પરના કીબોર્ડના આધાર માટે "
+"તમારી સિસ્ટમ પર કોઈ જ સહાયક તકનીકી ઉપ્લબ્ધ નથી. સ્ક્રીન પરના કીબોર્ડના આધાર માટે "
 "'gok' પેકેજનું ક્રમબદ્ધ સ્થાપન થવુ જ જોઈએ, અને સ્ક્રીન વાંચન માટે અને વિસ્તૃતિકરણ ક્ષમતા માટે "
 "'gnopernicus' પેકેજનું સ્થાપન થયેલુ હોવું જ જોઈએ."
 
@@ -129,7 +130,7 @@ msgstr "કીબોર્ડ"
 
 #: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
 msgid "Set your keyboard accessibility preferences"
-msgstr "કીબાેર્ડની સુલભતા માટેની પસંદગીઓ સુયોજિત કરો"
+msgstr "કીબોર્ડની સુલભતા માટેની પસંદગીઓ સુયોજિત કરો"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c:59
 msgid ""
@@ -201,11 +202,11 @@ msgstr "જ્યારે લક્ષણ કીબોર્ડ પરથી
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Beep when _modifier is pressed"
-msgstr "જ્યારે બદલનાર દબાયેલ હાેય ત્યારે બીપ વગાડો (_m)"
+msgstr "જ્યારે બદલનાર દબાયેલ હોય ત્યારે બીપ વગાડો (_m)"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "જ્યારે LED ચાલુ થાય ત્યારે એક બીપ વગાડો અને બંધ હાેય ત્યારે બે બીપ વગાડો."
+msgstr "જ્યારે LED ચાલુ થાય ત્યારે એક બીપ વગાડો અને બંધ હોય ત્યારે બે બીપ વગાડો."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Beep when key is:"
@@ -240,7 +241,7 @@ msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
 msgstr ""
-"વપરાશકર્તાના પસંદ કરેલા સમયાંતર વચ્ચે જો એક પછી એક અેક જ કીને દબાવવામાં આવે તો તેને "
+"વપરાશકર્તાના પસંદ કરેલા સમયાંતર વચ્ચે જો એક પછી એક એક જ કીને દબાવવામાં આવે તો તેને "
 "અવગણો."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
@@ -269,8 +270,7 @@ msgstr "કીના દબાવ્યા પછી તેને સ્વી
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
-msgstr ""
-"બદલનાર કીને ક્રમબધ્ધ દબાવીને કી દબાવવાથી એક સમયે થતી ઘણી બધી પ્રક્રિયાઓ કાર્યરત કરો."
+msgstr "બદલનાર કીને ક્રમબધ્ધ દબાવીને કી દબાવવાથી એક સમયે થતી ઘણી બધી પ્રક્રિયાઓ કાર્યરત કરો."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:28
@@ -295,7 +295,7 @@ msgstr "કીબોર્ડની પ્રાપ્ય લાક્ષણિ
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
 msgid "_Import Feature Settings..."
-msgstr "લક્ષણ સુયોજનાને આયાત કરાે (_I)..."
+msgstr "લક્ષણ સુયોજનાને આયાત કરો (_I)..."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
 msgid "_Only accept keys held for:"
@@ -437,7 +437,7 @@ msgid ""
 "settings manager."
 msgstr ""
 "સુયોજન સંપાદક 'gnome-settings-daemon' શરુ કરવા સમર્થ નથી.\n"
-" જીનાેમ સુયોજન સંચાલક ચાલુ થયા વગર, અમુક પસંદગીઓ અસર કરશે નહિં. આ બતાવે છે કે બોનોબો "
+"જીનોમ સુયોજન સંચાલક ચાલુ થયા વગર, અમુક પસંદગીઓ અસર કરશે નહિં. આ બતાવે છે કે બોનોબો "
 "સાથે સમસ્યા હશે, અથવા જીનોમ વગરનું (દા.ત. કેડીઈ) સુયોજન સંપાદક પહેલેથી જ કાર્યરત હશે અને "
 "જીનોમ સુયોજન સંપાદક સાથે મતભેદ થાય."
 
@@ -549,18 +549,15 @@ msgid "Change set"
 msgstr "બદલનાર સમૂહ"
 
 #: capplets/common/gconf-property-editor.c:184
-msgid ""
-"GConf change set containing data to be forwarded to the gconf client on apply"
-msgstr ""
-"જીકોન્ફ બદલનાર સમૂહ પાસે માહિતી હોય છે જે અમલમાં મૂકતાં જીકોન્ફ ક્લાયન્ટને મોકલાય છે"
+msgid "GConf change set containing data to be forwarded to the gconf client on apply"
+msgstr "જીકોન્ફ બદલનાર સમૂહ પાસે માહિતી હોય છે જે અમલમાં મૂકતાં જીકોન્ફ ક્લાયન્ટને મોકલાય છે"
 
 #: capplets/common/gconf-property-editor.c:189
 msgid "Conversion to widget callback"
 msgstr "વિજેટ કોલબેકમાં ફેરવો"
 
 #: capplets/common/gconf-property-editor.c:190
-msgid ""
-"Callback to be issued when data are to be converted from GConf to the widget"
+msgid "Callback to be issued when data are to be converted from GConf to the widget"
 msgstr "જ્યારે માહિતી જીકોન્ફમાંથી વિજેટમાં ફેરવાય છે ત્યારે કોલબેક અપાય છે"
 
 #: capplets/common/gconf-property-editor.c:195
@@ -568,8 +565,7 @@ msgid "Conversion from widget callback"
 msgstr "વિજેટ કોલબેકમાંથી ફેરવો"
 
 #: capplets/common/gconf-property-editor.c:196
-msgid ""
-"Callback to be issued when data are to be converted to GConf from the widget"
+msgid "Callback to be issued when data are to be converted to GConf from the widget"
 msgstr "જ્યારે માહિતી વિજેટમાંથી જીકોન્ફમાં ફેરવાય છે ત્યારે કોલબેક અપાય છે"
 
 #: capplets/common/gconf-property-editor.c:201
@@ -667,7 +663,7 @@ msgstr "નેટસ્કેપ કમ્યુનિકેટર"
 
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:18
 msgid "Konqueror"
-msgstr "કોન્કર"
+msgstr "કોન્કરર"
 
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:19
 msgid "W3M Text Browser"
@@ -843,7 +839,7 @@ msgstr "વેબ બ્રાઉઝર"
 # gnome-session/splash.c:71
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 msgid "Window Manager"
-msgstr "વિન્ડો સંચાલક"
+msgstr "વિન્ડો વ્યવસ્થાપક"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 #: capplets/file-types/file-types-properties.glade.h:23
@@ -980,7 +976,7 @@ msgstr ""
 
 #: capplets/file-types/file-types-capplet.c:158
 msgid "Are you sure you want to permanently delete this entry?"
-msgstr "શુ તમે ખરેખર આ પ્રવેશને કાયમ માટે કાઢી નાખવા માંગો છો?"
+msgstr "શું તમે ખરેખર આ પ્રવેશને કાયમ માટે કાઢી નાખવા માંગો છો?"
 
 #: capplets/file-types/file-types-capplet.c:210
 #: vfs-methods/themus/themus-properties-view.c:167
@@ -1035,7 +1031,7 @@ msgstr "મૂળભુત ક્રિયા (_a):"
 #: capplets/file-types/file-types-properties.glade.h:10
 #: capplets/file-types/mime-edit-dialog.c:208
 msgid "Edit file type"
-msgstr "ફાઈલના પ્રકારમાં ફ્ેરફાર કરો"
+msgstr "ફાઈલના પ્રકારમાં ફેરફાર કરો"
 
 #: capplets/file-types/file-types-properties.glade.h:12
 msgid "Filename extensions:"
@@ -1216,7 +1212,7 @@ msgstr "વિડિયો"
 
 #: capplets/file-types/mime-type-info.c:764
 msgid "Audio"
-msgstr "અોડિયો"
+msgstr "ઓડિયો"
 
 #: capplets/file-types/mime-types-model.c:167
 #: capplets/file-types/mime-types-model.c:168
@@ -1345,7 +1341,7 @@ msgstr "ફોન્ટને ઘાટ આપવાની વિગતો"
 
 #: capplets/font/font-properties.glade.h:11
 msgid "Go _to font folder"
-msgstr "ફોન્ટના ફાેલ્ડરમાં જાઓ (_t)"
+msgstr "ફોન્ટના ફોલ્ડરમાં જાઓ (_t)"
 
 #: capplets/font/font-properties.glade.h:12
 msgid "Gra_yscale"
@@ -1369,7 +1365,7 @@ msgstr "ડેસ્કટોપ પરના ચિહ્નો માટે
 
 #: capplets/font/font-properties.glade.h:17
 msgid "Set the monospace font for terminals and similar applications"
-msgstr "ટર્મિનલો અને તેના જેવા જ કાર્યક્રમો માટે માનાેસ્પેસ ફોન્ટ ગોઠવો"
+msgstr "ટર્મિનલો અને તેના જેવા જ કાર્યક્રમો માટે માનોસ્પેસ ફોન્ટ ગોઠવો"
 
 #: capplets/font/font-properties.glade.h:18
 msgid "Sub_pixel (LCDs)"
@@ -1406,7 +1402,7 @@ msgstr "સાધારણ (_M)"
 
 #: capplets/font/font-properties.glade.h:26
 msgid "_Monochrome"
-msgstr "માેનોક્રોમ (_M)"
+msgstr "મોનોક્રોમ (_M)"
 
 #: capplets/font/font-properties.glade.h:27
 msgid "_None"
@@ -1519,7 +1515,7 @@ msgstr "નિષ્ક્રિય"
 
 #: capplets/keybindings/gnome-keybinding-properties.c:538
 msgid "<Unknown Action>"
-msgstr "&lt;Unknown Action&gt;"
+msgstr "<અજ્ઞાત ક્રિયા>"
 
 # #-#-#-#-#  gnome-panel.gnome-2-2.hi.po (gnome-panel 2.2)  #-#-#-#-#
 # gnome-session/splash.c:72
@@ -1613,10 +1609,8 @@ msgstr "સુલભતા (_A)"
 #: capplets/keyboard/gnome-keyboard-properties.c:222
 #: capplets/sound/sound-properties-capplet.c:240
 #: capplets/sound/sound-properties-capplet.c:242
-msgid ""
-"Just apply settings and quit (compatibility only; now handled by daemon)"
-msgstr ""
-"સુયોજનાઓ અમલમાં મૂકો અને બહાર નીકળો (સુગમતા ખાતર; હમણા ડીમન દ્વારા નિયંત્રિત થાય છે)"
+msgid "Just apply settings and quit (compatibility only; now handled by daemon)"
+msgstr "સુયોજનાઓ અમલમાં મૂકો અને બહાર નીકળો (સુગમતા ખાતર; હમણા ડીમન દ્વારા નિયંત્રિત થાય છે)"
 
 #: capplets/keyboard/gnome-keyboard-properties.c:226
 msgid "Start the page with the typing break settings showing"
@@ -1680,7 +1674,7 @@ msgstr "કર્સર લખાણ ખાનાંઓ અને ક્ષે
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:17
 msgid "Duration of the break when typing is disallowed"
-msgstr "જ્યારે લખવાની પરવાનગી ના હાેય ત્યારે બ્રેકને લાગતો સમય"
+msgstr "જ્યારે લખવાની પરવાનગી ના હોય ત્યારે બ્રેકને લાગતો સમય"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "Duration of work before forcing a break"
@@ -1714,7 +1708,7 @@ msgstr "કીબોર્ડના પુનરાવર્તનથી થત
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:26
 msgid "Microsoft Natural Keyboard"
-msgstr "મોઈક્રોસોફ્ટ પ્રાકૃતિક કીબોર્ડ"
+msgstr "Microsoft પ્રાકૃતિક કીબોર્ડ"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:27
 msgid "Reset to de_faults"
@@ -1768,7 +1762,7 @@ msgstr "મિનિટો"
 
 #: capplets/keyboard/keyboard.desktop.in.h:2
 msgid "Set your keyboard preferences"
-msgstr "તમારા કીબાેર્ડની પસંદગીઓ ગોઠવો"
+msgstr "તમારા કીબોર્ડની પસંદગીઓ ગોઠવો"
 
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
@@ -2000,7 +1994,7 @@ msgstr "પોર્ટ:"
 
 #: capplets/network/gnome-network-preferences.glade.h:14
 msgid "S_ocks host:"
-msgstr "S_ocks host:"
+msgstr "સોકેટ યજમાન (_o):"
 
 #: capplets/network/gnome-network-preferences.glade.h:15
 msgid "Secure HTTP proxy port"
@@ -2102,8 +2096,7 @@ msgstr "સ્થાપન કરવા માટે કોઈ થીમ ફા
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
 "selected as the source location"
-msgstr ""
-"%s એ પથ છે કે જ્યાં થીમ ફાઈલોનું સ્થાપન થાય છે. આ સ્રોત જગ્યા તરીકે પસંદિત થઈ શકે નહિ"
+msgstr "%s એ પથ છે કે જ્યાં થીમ ફાઈલોનું સ્થાપન થાય છે. આ સ્રોત જગ્યા તરીકે પસંદિત થઈ શકે નહિ"
 
 #: capplets/theme-switcher/gnome-theme-manager.c:677
 msgid "Custom theme"
@@ -2205,7 +2198,7 @@ msgstr "થીમની પસંદગીઓ (_D)"
 
 #: capplets/theme-switcher/theme-properties.glade.h:14
 msgid "This theme does not suggest any particular font or background."
-msgstr "આ થીમ કોઈ ખાસ ફાેન્ટ અથવા પાશ્વભાગનુું સૂચન કરતી નથી."
+msgstr "આ થીમ કોઈ ખાસ ફોન્ટ અથવા પાશ્વભાગનું સૂચન કરતી નથી."
 
 #: capplets/theme-switcher/theme-properties.glade.h:15
 msgid "This theme suggests a background:"
@@ -2423,7 +2416,7 @@ msgstr "આ ક્રિયા કરવા માટે સાધનપટ્
 
 #: capplets/windows/gnome-window-properties.glade.h:7
 msgid "_Interval before raising:"
-msgstr "માેટું કરવા પહેલાંનો સમયાંતર (_I):"
+msgstr "મોટું કરવા પહેલાંનો સમયાંતર (_I):"
 
 #: capplets/windows/gnome-window-properties.glade.h:8
 msgid "_Raise selected windows after an interval"
@@ -2484,7 +2477,7 @@ msgstr "કેપ્લેટના આ દર્શન માટે દેખ
 
 #: control-center/capplet-dir-view.c:165
 msgid "Capplet directory object"
-msgstr "કેપ્લેટ ડિરેક્ટરી આેબ્જેક્ટ"
+msgstr "કેપ્લેટ ડિરેક્ટરી ઓબ્જેક્ટ"
 
 #: control-center/capplet-dir-view.c:166
 msgid "Capplet directory that this view is viewing"
@@ -2494,7 +2487,7 @@ msgstr "કેપ્લેટ ડિરેક્ટરી કે જે આ દ
 msgid "translator_credits"
 msgstr ""
 "નીરવ <nirav@magnet-i.com>\n"
-"અંકિત <ankit644@linux.net>\n"
+"અંકિત <ankit644@yahoo.com>\n"
 "અંકુર <ankur_surti@linux.net>\n"
 "અતિત <shahatit_84@linux.net>\n"
 "ભાવિન <bhavinshah@linux.net>\n"
@@ -2508,7 +2501,7 @@ msgstr "જીનોમ નિયંત્રણ કેન્દ્ર"
 
 #: control-center/capplet-dir-view.c:360
 msgid "Desktop properties manager."
-msgstr "ડેસ્કટોપ ગુણધર્મ સંચાલક."
+msgstr "ડેસ્કટોપ ગુણધર્મ વ્યવસ્થાપક."
 
 #: control-center/capplet-dir-view.c:498
 #, c-format
@@ -2645,7 +2638,7 @@ msgstr "કી જોડાણ (%s) અયોગ્ય છે\n"
 #: gnome-settings-daemon/gnome-settings-keybindings.c:290
 #, c-format
 msgid "It seems that another application already has access to key '%d'."
-msgstr "એવું લાગે છે કે બીજા કોઈ કાર્યક્રમને આ '%d'કી પહેલેથી જ પ્રાપ્ત કરી લીધી છે."
+msgstr "એવું લાગે છે કે બીજા કોઈ કાર્યક્રમને આ '%d' કી પહેલેથી જ પ્રાપ્ત કરી લીધી છે."
 
 #: gnome-settings-daemon/gnome-settings-keybindings.c:359
 #, c-format
@@ -2676,7 +2669,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 "XKB રુપરેખાંકનને સક્રિય કરવામાં ભૂલ.\n"
-"કદાચ અાંતરિક X સર્વરની સમસ્યા હોઈ શકે.\n"
+"કદાચ આંતરિક X સર્વરની સમસ્યા હોઈ શકે.\n"
 "\n"
 "X સર્વરની આવૃત્તિની માહિતી:\n"
 "%s\n"
@@ -2712,7 +2705,7 @@ msgstr "X સુયોજનો વાપરો"
 
 #: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
 msgid "Use GNOME settings"
-msgstr "GNOME સુયોજનો વાપરો"
+msgstr "જીનોમ સુયોજનો વાપરો"
 
 #: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
 #, c-format
@@ -2801,7 +2794,7 @@ msgid ""
 "Type of bg_applier: BG_APPLIER_ROOT for root window or BG_APPLIER_PREVIEW "
 "for preview"
 msgstr ""
-"bg_applier નો પ્રકારઃ  રુટ વિન્ડો માટે BG_APPLIER_ROOT અને પૂર્વદર્શન માટે "
+"bg_applier નો પ્રકાર: રુટ વિન્ડો માટે BG_APPLIER_ROOT અને પૂર્વદર્શન માટે "
 "BG_APPLIER_PREVIEW"
 
 #: libbackground/applier.c:264
@@ -2810,7 +2803,7 @@ msgstr "પૂર્વદર્શનની પહોળાઈ"
 
 #: libbackground/applier.c:265
 msgid "Width if applier is a preview: Defaults to 64."
-msgstr "પહોળાઈ જ્યારે એપ્પલાયર પૂર્વદર્શનમાં હોય ત્યારેઃ  ૬૪ મૂળભુત છે."
+msgstr "પહોળાઈ જ્યારે એપ્પલાયર પૂર્વદર્શનમાં હોય ત્યારે: ૬૪ મૂળભુત છે."
 
 #: libbackground/applier.c:272
 msgid "Preview Height"
@@ -2818,7 +2811,7 @@ msgstr "પૂર્વદર્શનની ઊંચાઈ"
 
 #: libbackground/applier.c:273
 msgid "Height if applier is a preview: Defaults to 48."
-msgstr "ઊંચાઈ જ્યારે એપ્પલાયર પૂર્વદર્શનમાં હોય ત્યારેઃ  ૪૮ મૂળભુત છે."
+msgstr "ઊંચાઈ જ્યારે એપ્પલાયર પૂર્વદર્શનમાં હોય ત્યારે: ૪૮ મૂળભુત છે."
 
 #: libbackground/applier.c:280
 msgid "Screen"
@@ -2845,7 +2838,7 @@ msgstr ""
 #: libsounds/sound-view.c:192
 #, c-format
 msgid "The file %s is not a valid wav file"
-msgstr "ફાઈલ %s એ યોગ્ય વેવ ફાઈલ નથી"
+msgstr "ફાઈલ %s એ યોગ્ય waw ફાઈલ નથી"
 
 #: libsounds/sound-view.c:257
 msgid "Event"
@@ -2885,9 +2878,8 @@ msgid "Roll up"
 msgstr "ગબડાવો"
 
 #: schemas/apps_gnome_settings_daemon_default_editor.schemas.in.h:1
-msgid ""
-"If true, the mime handlers for text/plain and text/* will be kept in sync"
-msgstr "જો સાચુું હોય તો, લખાણ/સાદું અને લખાણ/* માટે માઈમ હેન્ડલર સિંકમાં સાચવી રાખો"
+msgid "If true, the mime handlers for text/plain and text/* will be kept in sync"
+msgstr "જો સાચું હોય તો, લખાણ/સાદું અને લખાણ/* માટે માઈમ હેન્ડલર સિંકમાં સાચવી રાખો"
 
 #: schemas/apps_gnome_settings_daemon_default_editor.schemas.in.h:2
 msgid "Sync text/plain and text/* handlers"
@@ -3057,7 +3049,7 @@ msgstr "અવાજ વધારવાનું ટુંકાણ."
 
 #: schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:1
 msgid "Display a dialog when there are errors running XScreenSaver"
-msgstr "જ્યારે એક્સસ્ક્રીનસેવર ચાલુ કરતાં ભૂલ આવે ત્યારે સંવાદ વાપરાે"
+msgstr "જ્યારે એક્સસ્ક્રીનસેવર ચાલુ કરતાં ભૂલ આવે ત્યારે સંવાદ વાપરો"
 
 #: schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:2
 msgid "Run XScreenSaver at login"
@@ -3088,8 +3080,7 @@ msgid "RGBA Order"
 msgstr "RGBA અનુક્રમ"
 
 #: schemas/desktop_gnome_font_rendering.schemas.in.h:5
-msgid ""
-"Resolution used for converting font sizes to pixel sizes, in dots per inch"
+msgid "Resolution used for converting font sizes to pixel sizes, in dots per inch"
 msgstr "ફોન્ટના માપને પિક્સેલના માપમાં, બિંદુઓમાં પ્રતિ ઈંચમાં ફેરવવા માટે રીઝોલ્યુશન વપરાય છે"
 
 #: schemas/desktop_gnome_font_rendering.schemas.in.h:6
@@ -3118,7 +3109,7 @@ msgid ""
 "\" - no hinting, \"slight\", \"medium\", and \"full\" - as much hinting as "
 "possible; may cause distortion of letter forms."
 msgstr ""
-"ફોન્ટને ઘાટ અાપતી વખતની સુચનાઓના પ્રકાર. શક્ય કિંમતો છેઃ: \"કંઈ જ નહિ\" - કોઈ જ સુચના "
+"ફોન્ટને ઘાટ આપતી વખતની સુચનાઓના પ્રકાર. શક્ય કિંમતો છેઃ: \"કંઈ જ નહિ\" - કોઈ જ સુચના "
 "નહિ, \"ઓછી\", \"સામાન્ય\", અથવા \"આખી\" -બધી સુચનાઓ સંભવિત છે ; અક્ષરોની આકૃતિઓનો "
 "નાશ થઈ શકે છે."
 
@@ -3185,7 +3176,7 @@ msgstr " નીચેની ભૂલની સાથે લખતા અટક
 
 #: typing-break/drwright.c:631
 msgid "About GNOME Typing Monitor"
-msgstr "જીનોમ ટાઈપીંગ માેનિટર વિશે "
+msgstr "જીનોમ ટાઈપીંગ મોનિટર વિશે "
 
 #: typing-break/drwright.c:655
 msgid "A computer break reminder."
@@ -3244,7 +3235,7 @@ msgstr "આવૃત્તિ:"
 
 #: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
 msgid "Copyright:"
-msgstr "મદ્રણાધિકાર:"
+msgstr "Copyright:"
 
 #: vfs-methods/fontilus/font-view.c:324
 msgid "Description:"
@@ -3276,8 +3267,7 @@ msgid "If set to true, then Type1 fonts will be thumbnailed."
 msgstr "જો ખરુ સુયોજીત હોય, તો ટાઈપ૧ ફોન્ટ મોટાં ચિહ્નો બનશે."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:5
-msgid ""
-"Set this key to the command used to create thumbnails for OpenType fonts."
+msgid "Set this key to the command used to create thumbnails for OpenType fonts."
 msgstr "ઓપન ટાઈપ ફોન્ટને મોટાં ચિહ્નો બનાવવા માટેનાં આદેશને કી પર સુયોજીત કરો."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:6
@@ -3285,8 +3275,7 @@ msgid "Set this key to the command used to create thumbnails for PCF fonts."
 msgstr "PCF ફોન્ટને મોટાં ચિહ્નો બનાવવા માટેનાં આદેશને કી પર સુયોજીત કરો."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:7
-msgid ""
-"Set this key to the command used to create thumbnails for TrueType fonts."
+msgid "Set this key to the command used to create thumbnails for TrueType fonts."
 msgstr "ટ્રુ ટાઈપ ફોન્ટને મોટાં ચિહ્નો બનાવવા માટેનાં આદેશને કી પર સુયોજીત કરો."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:8
@@ -3409,8 +3398,7 @@ msgid "If set to true, then themes will be thumbnailed."
 msgstr "જો સુયોજીત હોય, તો થીમ મોટાં ચિહ્ન રુપે દર્શાવાશે."
 
 #: vfs-methods/themus/themus.schemas.in.h:3
-msgid ""
-"Set this key to the command used to create thumbnails for installed themes."
+msgid "Set this key to the command used to create thumbnails for installed themes."
 msgstr "સ્થાપિત થીમ માટે મોટાં ચિહ્નો બનાવવા માટેનાં આદેશને કી પર સુયોજીત કરો."
 
 #: vfs-methods/themus/themus.schemas.in.h:4
@@ -3433,11 +3421,3 @@ msgstr "સ્થાપિત થીમ માટે મોટાં ચિહ
 msgid "Whether to thumbnail themes"
 msgstr "થીમ માટે મોટાં ચિહ્નો બનાવવા કે નહિ નક્કી કરો"
 
-#~ msgid "Debian Sensible Browser"
-#~ msgstr "ડેબિયન સંવેદનશીલ બ્રાઉઝર"
-
-#~ msgid "FireFox"
-#~ msgstr "ફાયરફોક્સ"
-
-#~ msgid "Debian Terminal Emulator"
-#~ msgstr "ડેબિયન ટર્મિનલ ઈમ્યુલેટર"

po/it.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
-"PO-Revision-Date: 2004-09-11 01:56+0200\n"
+"POT-Creation-Date: 2004-10-24 18:00+0200\n"
+"PO-Revision-Date: 2004-10-24 17:59+0200\n"
 "Last-Translator: Alessio Dessì <alkex@inwind.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -942,7 +942,7 @@ msgid "Options"
 msgstr "Opzioni"
 
 #: capplets/display/main.c:580
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Testing the new settings. If you don't respond in %d second the previous "
 "settings will be restored."
@@ -951,14 +951,10 @@ msgid_plural ""
 "settings will be restored."
 msgstr[0] ""
 "Verifica delle nuove impostazioni in corso. Se non si conferma entro %d "
-"secondo verranno ripristinate le impostazioni precedenti.Verifica delle "
-"nuove impostazioni in corso. Se non si conferma entro %d secondi verranno "
-"ripristinate le impostazioni precedenti."
+"secondo verranno ripristinate le impostazioni precedenti."
 msgstr[1] ""
 "Verifica delle nuove impostazioni in corso. Se non si conferma entro %d "
-"secondo verranno ripristinate le impostazioni precedenti.Verifica delle "
-"nuove impostazioni in corso. Se non si conferma entro %d secondi verranno "
-"ripristinate le impostazioni precedenti."
+"secondi verranno ripristinate le impostazioni precedenti."
 
 #: capplets/display/main.c:626
 msgid "Keep Resolution"
@@ -1454,7 +1450,7 @@ msgid "Font may be too large"
 msgstr "Il carattere potrebbe essere troppo grande"
 
 #: capplets/font/main.c:507
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The font selected is %d point large, and may make it difficult to "
 "effectively use the computer.  It is recommended that you select a size "
@@ -1466,18 +1462,14 @@ msgid_plural ""
 msgstr[0] ""
 "Il carattere selezionato ha una dimensione di %d punto e potrebbe rendere "
 "difficoltoso l'utilizzo del computer. Si raccomanda di selezionarne uno di "
-"dimensione più piccola di %d.Il carattere selezionato ha una dimensione di %"
-"d punti e potrebbe rendere difficoltoso l'utilizzo del computer. Si "
-"raccomanda di selezionarne uno di dimensione più piccola di %d."
+"dimensione più piccola di %d."
 msgstr[1] ""
-"Il carattere selezionato ha una dimensione di %d punto e potrebbe rendere "
+"Il carattere selezionato ha una dimensione di %d punti e potrebbe rendere "
 "difficoltoso l'utilizzo del computer. Si raccomanda di selezionarne uno di "
-"dimensione più piccola di %d.Il carattere selezionato ha una dimensione di %"
-"d punti e potrebbe rendere difficoltoso l'utilizzo del computer. Si "
-"raccomanda di selezionarne uno di dimensione più piccola di %d."
+"dimensione più piccola di %d."
 
 #: capplets/font/main.c:514
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The font selected is %d point large, and may make it difficult to "
 "effectively use the computer.  It is recommended that you select a smaller "
@@ -1489,15 +1481,11 @@ msgid_plural ""
 msgstr[0] ""
 "Il carattere selezionato ha una dimensione di %d punto e potrebbe rendere "
 "difficoltoso l'utilizzo del computer. Si raccomanda di selezionarne uno di "
-"dimensione più piccola.Il carattere selezionato ha una dimensione di %d "
-"punti e potrebbe rendere difficoltoso l'utilizzo del computer. Si raccomanda "
-"di selezionarne uno di dimensione più piccola."
+"dimensione più piccola."
 msgstr[1] ""
-"Il carattere selezionato ha una dimensione di %d punto e potrebbe rendere "
+"Il carattere selezionato ha una dimensione di %d punti e potrebbe rendere "
 "difficoltoso l'utilizzo del computer. Si raccomanda di selezionarne uno di "
-"dimensione più piccola.Il carattere selezionato ha una dimensione di %d "
-"punti e potrebbe rendere difficoltoso l'utilizzo del computer. Si raccomanda "
-"di selezionarne uno di dimensione più piccola."
+"dimensione più piccola."
 
 #: capplets/keybindings/eggcellrendererkeys.c:21
 msgid "New accelerator..."
@@ -2712,15 +2700,15 @@ msgid "Use GNOME settings"
 msgstr "Usare le impostazioni di GNOME"
 
 #: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
 "contents will now be ignored. You can use the keyboard preferences to "
 "restore them."
 msgstr ""
 "Nella propria cartella personale è disponibile un file (%s) per rimappare la "
-"tastiera che sarà ignorato. Aggiungerlo in /desktop/gnome/peripherals/"
-"keyboard/xkb/update_handlers"
+"tastiera il cui contenuto sarà ignorato. Si possono usare le preferenze "
+"della tastiera per ripristinarlo."
 
 #: gnome-settings-daemon/gnome-settings-multimedia-keys.c:114
 #, c-format

po/sq.po

@@ -1,16 +1,16 @@
 # Përkthimi i mesazheve të gnome-control-center në shqip
 # This file is distributed under the same license as the gnome-control-center package.
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# Elian Myftiu <elian@lycos.com>, 2003, 2004.
+# Elian Myftiu <elian@alblinux.net>, 2003, 2004.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2005-01-31 14:35+0100\n"
 "PO-Revision-Date: 2004-09-06 11:49+0200\n"
-"Last-Translator: Elian Myftiu <elian@lycos.com>\n"
+"Last-Translator: Elian Myftiu <elian@alblinux.net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2074,7 +2074,7 @@ msgid "The theme file location specified to install is invalid"
 msgstr ""
 "Vendndodhja e file të temës, përcaktuar për instalim, nuk është e vlefshme"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:194
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2455,7 +2455,7 @@ msgstr "Kartela e capplet që shfaq kjo pamje"
 
 #: control-center/capplet-dir-view.c:348
 msgid "translator_credits"
-msgstr "Elian Myftiu <elian@lycos.com>"
+msgstr "Elian Myftiu <elian@alblinux.net>"
 
 #: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
 msgid "GNOME Control Center"

po/zh_CN.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-11-24 12:21+0100\n"
 "PO-Revision-Date: 2004-09-26 23:12+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -3242,7 +3242,7 @@ msgstr "主题属性内容查看组件"
 
 #: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
 msgid "Themus Theme Properties view"
-msgstr "Themus 主体属性查看"
+msgstr "Themus 主题属性查看"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "

typing-break/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

vfs-methods/fontilus/.cvsignore

@@ -13,3 +13,4 @@ font-method.directory
 fontilus.schemas
 fontilus.server
 fontilus.server.in
+gnome-font-viewer.desktop

vfs-methods/fontilus/ChangeLog

@@ -1,3 +1,12 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
+2005-02-02  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* font-method.c: (ensure_font_list), (fill_file_info):
+	Merge fix for bug #165312 and also a NULL vs. 0 fix.
+
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

vfs-methods/fontilus/Makefile.am

@@ -42,6 +42,11 @@ server_DATA = fontilus.server
 fontilus.server.in: fontilus.server.in.in
 	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
 
+desktopdir = $(datadir)/applications
+desktop_in_files = gnome-font-viewer.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	if test -z "$(DESTDIR)"; then \
@@ -63,4 +68,5 @@ EXTRA_DIST = \
   fontilus.applications \
   fontilus.server.in.in \
   fontilus.schemas	\
-  fontilus.schemas.in
+  fontilus.schemas.in \
+  gnome-font-viewer.desktop.in

vfs-methods/fontilus/font-method.c

@@ -161,7 +161,7 @@ ensure_font_list(void)
     pat = FcPatternCreate();
     os = FcObjectSetBuild(FC_FILE, FC_FAMILY, FC_WEIGHT, FC_SLANT, 0);
 
-    font_list = FcFontList(0, pat, os);
+    font_list = FcFontList(NULL, pat, os);
 
     FcPatternDestroy(pat);
     FcObjectSetDestroy(os);
@@ -250,6 +250,7 @@ fill_file_info(GnomeVFSFileInfo *file_info, GnomeVFSFileInfoOptions options,
 
     uri = gnome_vfs_get_uri_from_local_path(file);
     result = gnome_vfs_get_file_info(uri, file_info, options);
+    g_free (uri);
     if (result == GNOME_VFS_OK) {
 	g_free(file_info->name);
 	file_info->name = g_strdup(name);

vfs-methods/fontilus/gnome-font-viewer.desktop.in

@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=GNOME Font Viewer
+_Comment=The GNOME configuration tool
+Icon=gnome-settings-font
+Exec=gnome-font-viewer
+Terminal=false
+Type=Application
+StartupNotify=true
+NoDisplay=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=control-center
+X-GNOME-Bugzilla-Component=font properties
+MimeType=application/x-font-ttf;application/x-font-pcf;application/x-font-type1;application/x-font-otf;

vfs-methods/themus/ChangeLog

@@ -1,3 +1,18 @@
+2005-02-21  Kjartan Maraas <kmaraas@gnome.org>
+
+        * Release 2.8.2.
+
+2005-02-09  Sebastien Bacher  <seb128@debian.org>
+
+	* theme-thumbnailer.c: (main): change back to the previous code,
+        that fixes the themes:/// thumbnails (Closes: #165778).
+	
+2005-01-04  Shakti Sen <shprasad@novell.com>
+
+	* theme-thumbnailer.c (main): Added the full path of the theme
+	so that it will create the thumbnail.
+	Fixes bug #153203
+	
 2004-10-14  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.8.1

vfs-methods/themus/theme-thumbnailer.c

@@ -141,10 +141,16 @@ main(int argc, char **argv)
 	theme = gnome_theme_read_meta_theme (uri);
 	gnome_vfs_uri_unref (uri);
 
-	pixbuf = generate_theme_thumbnail (theme, TRUE);
-
-	save_pixbuf(pixbuf, argv[2]);
-	gdk_pixbuf_unref(pixbuf);
-
+	if (theme) {
+	    pixbuf = generate_theme_thumbnail (theme, TRUE);
+	    
+	    save_pixbuf(pixbuf, argv[2]);
+	    gdk_pixbuf_unref(pixbuf);
+	}
+	else {
+	    g_printerr("usage: gnome-theme-thumbnailer theme output-image\n");
+	    return 1;	    
+	}
+	
 	return 0;
 }