Translation updated by Ivar Smolin.

2005-10-04  Priit Laes  <plaes@cvs.gnome.org>

	* et.po: Translation updated by Ivar Smolin.

ChangeLog

@@ -1,3 +1,15 @@
+==================== 2.10.2 ===================
+
+2005-07-04 Kjartan Maraas  <kmaraas@gnome.org>
+
+	* configure.in: Bump to the correct version.
+
+==================== 2.10.1 ===================
+
+2005-03-31  Steve Murphy  <murf@e-tools.com>
+
+        * configure.in: Added "rw" to ALL_LINGUAS.
+
 2005-03-09  Adi Attar  <aattar@cvs.gnome.org>
 
 	* configure.in: Added "xh" to ALL_LINGUAS.

NEWS

@@ -1,3 +1,31 @@
+gnome-control-center 2.10.2
+
+default application:
+- List Thunderbird as an option (Pawel Worach)
+- Fix a warning about the window icon (Matthias Clasen)
+
+keyboard preferences:
+- Fix build with GCC 2.95 (Jens Granseuer)
+
+theme manager:
+- Fix theme preview crash with xorg composite (Colin Gibbs)
+
+settings daemon:
+- Fix some leaks (Kjartan Maraas)
+
+shell:
+- Fix order of categories (Frederic Crozat)
+
+translators:
+Adam Weinberger (en_CA), Baris Cicek (tr), Canonical Ltd (xh),
+Clytie Siddall (vi), Gabor Kelemen (hu), Iñaki Larrañaga Murgoitio (eu),
+Maxim Dziumanenko (uk), Priit Laes (et), Rhys Jones (cy),
+Steve Murphy (rw), Vladimir Petkov (bg), Woodman Tuen (zh_TW)
+
+gnome-control-center 2.10.1
+
+- Updated translations
+
 gnome-control-center 2.10.0
 
 background:

archiver/README

@@ -0,0 +1,2 @@
+This module is no longer built as a part of control-center.
+

capplets/background/ChangeLog

@@ -1,3 +1,37 @@
+2005-07-14  Rodney Dawes  <dobey@novell.com>
+
+	* gnome-wp-xml.c (gnome_wp_xml_load_xml): If xmlParseFile returns
+	NULL, then just return, rather than trying to parse the document
+
+	Fixes #310041
+
+2005-07-13  Rodney Dawes  <dobey@novell.com>
+
+	* gnome-wp-info.c (gnome_wp_info_new): Pass the md5sum to the call
+	to g_strconcat to create the path to the thumbnail file
+
+	Fixes #310293
+
+2005-07-10  Rodney Dawes  <dobey@novell.com>
+
+	* gnome-wp-capplet.[ch]:
+	(gnome_wp_icon_theme_changed):
+	(wallpaper_properties_init):
+	Update to use GtkIconTheme rather than GnomeIconTheme
+	Based on patch from Jan de Groot
+
+	Fixes #171677
+
+2005-07-10  Rodney Dawes  <dobey@novell.com>
+
+	* gnome-wp-info.c (gnome_wp_info_new): Fix some memory leaks by using
+	a separate variable to store the escaped path, and md5sum
+
+	* gnome-wp-item.c (gnome_wp_item_get_thumbnail): Fix a couple of
+	memory leaks by using a separate variable to store the escaped path
+	Don't unref the pixbuf from the thumbnail generation, and then try
+	to load it again after saving
+
 2005-02-26  Rodney Dawes  <dobey@novell.com>
 
 	* *.[ch]: Update Copyright to include current year

capplets/background/gnome-wp-capplet.c

@@ -802,69 +802,61 @@ static void gnome_wp_delay_changed (GConfClient * client, guint id,
   capplet->delay = gconf_value_get_int (entry->value);
 }
 
-static void gnome_wp_icon_theme_changed (GnomeIconTheme * theme,
+static void gnome_wp_icon_theme_changed (GtkIconTheme * theme,
 					 GnomeWPCapplet * capplet) {
   GdkPixbuf * pixbuf;
-  gchar * icofile;
+  GtkIconInfo * icon_info = NULL;
 
-  icofile = gnome_icon_theme_lookup_icon (capplet->theme,
+  icon_info = gtk_icon_theme_lookup_icon (capplet->theme,
 					  "gnome-settings-background",
-					  48, NULL, NULL);
-  if (icofile != NULL) {
-    pixbuf = gdk_pixbuf_new_from_file (icofile, NULL);
+					  48, 0);
+  if (icon_info != NULL) {
+    pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+    gtk_icon_info_free (icon_info);
     gtk_window_set_icon (GTK_WINDOW (capplet->window), NULL);
-    gtk_window_set_default_icon_from_file (icofile, NULL);
+    gtk_window_set_default_icon (pixbuf);
     g_object_unref (pixbuf);
   }
-  g_free (icofile);
 
-  icofile = gnome_icon_theme_lookup_icon (capplet->theme,
+  icon_info = gtk_icon_theme_lookup_icon (capplet->theme,
 					  "stock_wallpaper-center",
-					  16, NULL, NULL);
-  if (icofile != NULL) {
-    GdkPixbuf * pixbuf;
-
-    pixbuf = gdk_pixbuf_new_from_file (icofile, NULL);
+					  16, 0);
+  if (icon_info != NULL) {
+    pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+    gtk_icon_info_free (icon_info);
     gtk_image_set_from_pixbuf (GTK_IMAGE (capplet->citem), pixbuf);
     g_object_unref (pixbuf);
   }
-  g_free (icofile);
 
-  icofile = gnome_icon_theme_lookup_icon (capplet->theme,
+  icon_info = gtk_icon_theme_lookup_icon (capplet->theme,
 					  "stock_wallpaper-fill",
-					  16, NULL, NULL);
-  if (icofile != NULL) {
-    GdkPixbuf * pixbuf;
-
-    pixbuf = gdk_pixbuf_new_from_file (icofile, NULL);
+					  16, 0);
+  if (icon_info != NULL) {
+    pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+    gtk_icon_info_free (icon_info);
     gtk_image_set_from_pixbuf (GTK_IMAGE (capplet->fitem), pixbuf);
     g_object_unref (pixbuf);
   }
-  g_free (icofile);
 
-  icofile = gnome_icon_theme_lookup_icon (capplet->theme,
+  icon_info = gtk_icon_theme_lookup_icon (capplet->theme,
 					  "stock_wallpaper-scale",
-					  16, NULL, NULL);
-  if (icofile != NULL) {
-    GdkPixbuf * pixbuf;
-
-    pixbuf = gdk_pixbuf_new_from_file (icofile, NULL);
+					  16, 0);
+  if (icon_info != NULL) {
+    pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+    gtk_icon_info_free (icon_info);
     gtk_image_set_from_pixbuf (GTK_IMAGE (capplet->sitem), pixbuf);
     g_object_unref (pixbuf);
   }
-  g_free (icofile);
 
-  icofile = gnome_icon_theme_lookup_icon (capplet->theme,
+  icon_info = gtk_icon_theme_lookup_icon (capplet->theme,
 					  "stock_wallpaper-tile",
-					  16, NULL, NULL);
-  if (icofile != NULL) {
-    GdkPixbuf * pixbuf;
-
-    pixbuf = gdk_pixbuf_new_from_file (icofile, NULL);
+					  16, 0);
+  if (icon_info != NULL) {
+    pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+    gtk_icon_info_free (icon_info);
     gtk_image_set_from_pixbuf (GTK_IMAGE (capplet->witem), pixbuf);
     g_object_unref (pixbuf);
   }
-  g_free (icofile);
 }
 
 static GladeXML * gnome_wp_create_dialog (void) {
@@ -936,8 +928,8 @@ static void wallpaper_properties_init (poptContext ctx) {
   GtkTreeSelection * selection;
   GdkPixbuf * pixbuf;
   GdkCursor * cursor;
-  gchar * icofile;
   const gchar ** args;
+  GtkIconInfo * icon_info = NULL;
 
   gtk_rc_parse_string ("style \"wp-tree-defaults\" {\n"
 		       "  GtkTreeView::horizontal-separator = 6\n"
@@ -994,8 +986,7 @@ static void wallpaper_properties_init (poptContext ctx) {
 					   gnome_wp_item_free);
 
   capplet->thumbs = gnome_thumbnail_factory_new (GNOME_THUMBNAIL_SIZE_NORMAL);
-  capplet->theme = gnome_icon_theme_new ();
-  gnome_icon_theme_set_allow_svg (capplet->theme, TRUE);
+  capplet->theme = gtk_icon_theme_get_default ();
 
   g_signal_connect (G_OBJECT (capplet->theme), "changed",
 		    G_CALLBACK (gnome_wp_icon_theme_changed), capplet);
@@ -1003,16 +994,16 @@ static void wallpaper_properties_init (poptContext ctx) {
   dialog = gnome_wp_create_dialog ();
   capplet->window = glade_xml_get_widget (dialog,"gnome_wp_properties");
 
-  icofile = gnome_icon_theme_lookup_icon (capplet->theme,
+  icon_info = gtk_icon_theme_lookup_icon (capplet->theme,
 					  "gnome-settings-background",
-					  48, NULL, NULL);
-  if (icofile != NULL) {
-    pixbuf = gdk_pixbuf_new_from_file (icofile, NULL);
-    gtk_window_set_default_icon_from_file (icofile, NULL);
+					  48, 0);
+  if (icon_info != NULL) {
+    pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+    gtk_icon_info_free (icon_info);
+    gtk_window_set_default_icon (pixbuf);
     gtk_window_set_icon (GTK_WINDOW (capplet->window), pixbuf);
     g_object_unref (pixbuf);
   }
-  g_free (icofile);
 
   gtk_widget_realize (capplet->window);
 
@@ -1060,22 +1051,25 @@ static void wallpaper_properties_init (poptContext ctx) {
   capplet->wp_opts = glade_xml_get_widget (dialog,"style_menu");
 
   menu = gtk_menu_new ();
+
   mitem = gtk_menu_item_new ();
   set_accessible_name (mitem, _("Centered")); 
-  icofile = gnome_icon_theme_lookup_icon (capplet->theme,
+  icon_info = gtk_icon_theme_lookup_icon (capplet->theme,
 					  "stock_wallpaper-center",
-					  16, NULL, NULL);
+					  16, 0);
 
   mbox = gtk_hbox_new (FALSE, 6);
   gtk_container_add (GTK_CONTAINER (mitem), mbox);
   gtk_widget_show (mbox);
 
-  if (icofile != NULL) {
-    capplet->citem = gtk_image_new_from_file (icofile);
+  if (icon_info != NULL) {
+    pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+    gtk_icon_info_free (icon_info);
+    capplet->citem = gtk_image_new_from_pixbuf (pixbuf);
     gtk_box_pack_start (GTK_BOX (mbox), capplet->citem, FALSE, FALSE, 0);
     gtk_widget_show (capplet->citem);
+    g_object_unref (pixbuf);
   }
-  g_free (icofile);
     
   label = gtk_label_new (_("Centered"));
   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -1086,19 +1080,21 @@ static void wallpaper_properties_init (poptContext ctx) {
 
   mitem = gtk_menu_item_new ();
   set_accessible_name (mitem, _("Fill Screen"));
-  icofile = gnome_icon_theme_lookup_icon (capplet->theme,
+  icon_info = gtk_icon_theme_lookup_icon (capplet->theme,
 					  "stock_wallpaper-fill",
-					  16, NULL, NULL);
+					  16, 0);
   mbox = gtk_hbox_new (FALSE, 6);
   gtk_container_add (GTK_CONTAINER (mitem), mbox);
   gtk_widget_show (mbox);
 
-  if (icofile != NULL) {
-    capplet->fitem = gtk_image_new_from_file (icofile);
+  if (icon_info != NULL) {
+    pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+    gtk_icon_info_free (icon_info);
+    capplet->fitem = gtk_image_new_from_pixbuf (pixbuf);
     gtk_box_pack_start (GTK_BOX (mbox), capplet->fitem, FALSE, FALSE, 0);
     gtk_widget_show (capplet->fitem);
+    g_object_unref (pixbuf);
   }
-  g_free (icofile);
 
   label = gtk_label_new (_("Fill Screen"));
   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -1109,19 +1105,21 @@ static void wallpaper_properties_init (poptContext ctx) {
 
   mitem = gtk_menu_item_new ();
   set_accessible_name (mitem, _("Scaled"));
-  icofile = gnome_icon_theme_lookup_icon (capplet->theme,
+  icon_info = gtk_icon_theme_lookup_icon (capplet->theme,
 					  "stock_wallpaper-scale",
-					  16, NULL, NULL);
+					  16, 0);
   mbox = gtk_hbox_new (FALSE, 6);
   gtk_container_add (GTK_CONTAINER (mitem), mbox);
   gtk_widget_show (mbox);
 
-  if (icofile != NULL) {
-    capplet->sitem = gtk_image_new_from_file (icofile);
+  if (icon_info != NULL) {
+    pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+    gtk_icon_info_free (icon_info);
+    capplet->sitem = gtk_image_new_from_pixbuf (pixbuf);
     gtk_box_pack_start (GTK_BOX (mbox), capplet->sitem, FALSE, FALSE, 0);
     gtk_widget_show (capplet->sitem);
+    g_object_unref (pixbuf);
   }
-  g_free (icofile);
 
   label = gtk_label_new (_("Scaled"));
   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -1132,19 +1130,21 @@ static void wallpaper_properties_init (poptContext ctx) {
 
   mitem = gtk_menu_item_new ();
   set_accessible_name (mitem, _("Tiled"));
-  icofile = gnome_icon_theme_lookup_icon (capplet->theme,
+  icon_info = gtk_icon_theme_lookup_icon (capplet->theme,
 					  "stock_wallpaper-tile",
-					  16, NULL, NULL);
+					  16, 0);
   mbox = gtk_hbox_new (FALSE, 6);
   gtk_container_add (GTK_CONTAINER (mitem), mbox);
   gtk_widget_show (mbox);
 
-  if (icofile != NULL) {
-    capplet->witem = gtk_image_new_from_file (icofile);
+  if (icon_info != NULL) {
+    pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+    gtk_icon_info_free (icon_info);
+    capplet->witem = gtk_image_new_from_pixbuf (pixbuf);
     gtk_box_pack_start (GTK_BOX (mbox), capplet->witem, FALSE, FALSE, 0);
     gtk_widget_show (capplet->witem);
+    g_object_unref (pixbuf);
   }
-  g_free (icofile);
 
   label = gtk_label_new (_("Tiled"));
   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);

capplets/background/gnome-wp-capplet.h

@@ -74,7 +74,7 @@ struct _GnomeWPCapplet {
 
   /* Thumbnailing and Icon Theme stuff */
   GnomeThumbnailFactory * thumbs;
-  GnomeIconTheme * theme;
+  GtkIconTheme * theme;
 
   /* Hash Table of Wallpapers */
   GHashTable * wphash;

capplets/background/gnome-wp-info.c

@@ -27,24 +27,32 @@ GnomeWPInfo * gnome_wp_info_new (const gchar * uri,
   GnomeWPInfo * new;
   GnomeVFSFileInfo * info;
   GnomeVFSResult result;
+  gchar * escaped_path;
 
   info = gnome_vfs_file_info_new ();
-  result = gnome_vfs_get_file_info (gnome_vfs_escape_path_string (uri), info,
+  escaped_path = gnome_vfs_escape_path_string (uri);
+
+  result = gnome_vfs_get_file_info (escaped_path, info,
 				    GNOME_VFS_FILE_INFO_DEFAULT |
 				    GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
 				    GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
   if (info == NULL || info->mime_type == NULL || result != GNOME_VFS_OK) {
     if (!strcmp (uri, "(none)")) {
+      gchar * md5sum;
+
       new = g_new0 (GnomeWPInfo, 1);
 
       new->mime_type = g_strdup ("image/x-no-data");
       new->uri = g_strdup (uri);
 
+      md5sum = gnome_thumbnail_md5 (escaped_path);
+
       new->thumburi = g_strconcat (g_get_home_dir (),
 				   "/.thumbnails/normal/",
-				   gnome_thumbnail_md5 (gnome_vfs_escape_path_string (uri)),
+				   md5sum,
 				   ".png",
 				   NULL);
+      g_free (md5sum);
 
       new->name = g_strdup (_("No Wallpaper"));
 
@@ -58,14 +66,20 @@ GnomeWPInfo * gnome_wp_info_new (const gchar * uri,
     new->uri = g_strdup (uri);
 
     new->thumburi = gnome_thumbnail_factory_lookup (thumbs,
-						    gnome_vfs_escape_path_string (new->uri),
+						    escaped_path,
 						    info->mtime);
     if (new->thumburi == NULL) {
+      gchar * md5sum;
+
+      md5sum = gnome_thumbnail_md5 (escaped_path);
+
       new->thumburi = g_strconcat (g_get_home_dir (),
 				   "/.thumbnails/normal/",
-				   gnome_thumbnail_md5 (gnome_vfs_escape_path_string (uri)),
+				   md5sum,
 				   ".png",
 				   NULL);
+
+      g_free (md5sum);
     }
     new->name = g_strdup (info->name);
     new->mime_type = g_strdup (info->mime_type);
@@ -73,6 +87,7 @@ GnomeWPInfo * gnome_wp_info_new (const gchar * uri,
     new->size = info->size;
     new->mtime = info->mtime;
   }
+  g_free (escaped_path);
   gnome_vfs_file_info_unref (info);
 
   return new;

capplets/background/gnome-wp-item.c

@@ -205,14 +205,17 @@ GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem * item,
   } else if (!strcmp (item->filename, "(none)")) {
     return bgpixbuf;
   } else {
+    gchar * escaped_path;
+
+    escaped_path = gnome_vfs_escape_path_string (item->filename);
+
     pixbuf = gnome_thumbnail_factory_generate_thumbnail (thumbs,
-							 gnome_vfs_escape_path_string (item->filename),
+							 escaped_path,
 							 item->fileinfo->mime_type);
     gnome_thumbnail_factory_save_thumbnail (thumbs, pixbuf,
-					    gnome_vfs_escape_path_string (item->filename),
+					    escaped_path,
 					    item->fileinfo->mtime);
-    g_object_unref (pixbuf);
-    pixbuf = gdk_pixbuf_new_from_file (item->fileinfo->thumburi, NULL);
+    g_free (escaped_path);
   }
 
   if (pixbuf != NULL) {

capplets/background/gnome-wp-xml.c

@@ -106,6 +106,9 @@ static void gnome_wp_xml_load_xml (GnomeWPCapplet * capplet,
 
   wplist = xmlParseFile (filename);
 
+  if (!wplist)
+    return;
+
   root = xmlDocGetRootElement (wplist);
 
   for (list = root->children; list != NULL; list = list->next) {

capplets/common/ChangeLog

@@ -1,3 +1,9 @@
+2005-05-22  Sebastien Bacher  <seb128@debian.org>
+
+	* theme-thumbnail.c: (create_image): fix the theme preview crasher with
+	xorg/composite, patch from Colin Gibbs <colin@gibbsonline.net>
+	(Closes: #152490).
+
 2005-02-08  Sebastien Bacher  <seb128@debian.org>
 
 	* gnome-theme-info.c: (update_common_theme_dir_index):

capplets/common/theme-thumbnail.c

@@ -174,7 +174,7 @@ create_image (ThemeThumbnailData *theme_thumbnail_data,
 
   /* Create a pixmap */
   visual = gtk_widget_get_visual (window);
-  pixmap = gdk_pixmap_new (NULL, ICON_SIZE_WIDTH, ICON_SIZE_HEIGHT, gdk_visual_get_best_depth());
+  pixmap = gdk_pixmap_new (NULL, ICON_SIZE_WIDTH, ICON_SIZE_HEIGHT, visual->depth);
   gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (window));
 
   /* Draw the window */

capplets/default-applications/ChangeLog

@@ -1,3 +1,15 @@
+2005-05-22  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-default-applications-properties-structs.c: 
+	list "thunderbird" as program name, 
+	patch from Pawel Worach <sajd@telia.com> (Closes: #167757).
+
+2005-05-22  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-default-applications-properties.glade:
+	fix a warning about the icon, 
+	patch from Matthias Clasen <mclasen@redhat.com> (Closes: #168060).
+
 2005-01-08  Sebastien Bacher  <seb128@debian.org>
 
 	* gnome-default-applications-properties-structs.c: add evolution-2.0

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

@@ -41,6 +41,7 @@ MailerDescription possible_mailers[] = {
         { N_("Evolution Mail Reader"),		"evolution",		"evolution %s",		FALSE, FALSE, },
 	{ N_("Balsa"),        			"balsa",		"balsa -m %s",		FALSE, FALSE },
 	{ N_("KMail"),        			"kmail",		"kmail %s",		FALSE, FALSE },
+	{ N_("Thunderbird"), 			"thunderbird",		"thunderbird -mail %s", FALSE, FALSE},
 	{ N_("Thunderbird"), 			"mozilla-thunderbird",	"mozilla-thunderbird -mail %s", FALSE, FALSE},
 	{ N_("Mozilla Mail"), 			"mozilla",		"mozilla -mail %s",	FALSE, FALSE},
         { N_("Mutt") , 	  			"mutt",			"mutt %s",		TRUE,  FALSE },

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

@@ -13,7 +13,6 @@
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
   <property name="has_separator">False</property>
-  <property name="icon">gnome-settings-default-applications</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">

capplets/keyboard/ChangeLog

@@ -1,3 +1,9 @@
+2005-05-22  Sebastien Bacher  <seb128@debian.org>
+
+        * gnome-keyboard-properties-xkbot.c: (xkb_options_add_group):
+        fix the build with gcc-2.95, patch from Jens Granseuer <jensgr@gmx.net>
+        (Closes: #170159).
+
 2005-02-08  Sebastien Bacher  <seb128@debian.org>
 
 	* gnome-keyboard-properties-xkb.c: (setup_xkb_tabs):

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

@@ -242,21 +242,21 @@ xkb_options_add_group (const XklConfigItemPtr
                                          Bool allowMultipleSelection,
                                          GladeXML * dialog)
 {
-  GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
+  GtkWidget *expander, *align, *vbox;
 
-  current1stLevelId = configItem->name;
+  GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
 
   gchar *utfGroupName = xci_desc_to_utf8 (configItem);
   gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
 
-  GtkWidget *expander = gtk_expander_new (titlemarkup);
+  expander = gtk_expander_new (titlemarkup);
   g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
 
   g_free (titlemarkup);
   gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE);
-  GtkWidget *align = gtk_alignment_new (0, 0, 1, 1);
+  align = gtk_alignment_new (0, 0, 1, 1);
   gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
-  GtkWidget *vbox = gtk_vbox_new (TRUE, 6);
+  vbox = gtk_vbox_new (TRUE, 6);
   gtk_container_add (GTK_CONTAINER (align), vbox);
   gtk_container_add (GTK_CONTAINER (expander), align);
   currentVbox = vbox;
@@ -264,6 +264,7 @@ xkb_options_add_group (const XklConfigItemPtr
   currentMultiSelect = (gboolean) allowMultipleSelection;
   currentRadioGroup = NULL;
 
+  current1stLevelId = configItem->name;
   XklConfigEnumOptions (configItem->name, (ConfigItemProcessFunc)
                         xkb_options_add_option, dialog);
 

configure.in

@@ -1,4 +1,4 @@
-AC_INIT([control-center], [2.10.1],
+AC_INIT([control-center], [2.10.2],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=control-center])
 
 AC_CONFIG_SRCDIR([control-center])
@@ -35,7 +35,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 ne nl nn no nso pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta th tr uk vi wa xh zh_CN zh_TW zu"
+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 ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta th tr uk vi wa xh zh_CN zh_TW zu"
 
 GETTEXT_PACKAGE=control-center-2.0
 AC_SUBST(GETTEXT_PACKAGE)

control-center/ChangeLog

@@ -1,3 +1,8 @@
+2005-05-02  Frederic Crozat  <fcrozat@mandriva.com>
+
+	* control-center-categories.c: (populate_category):
+	append entries, so we get them in the correct order.
+
 2005-02-18  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* control-center.c: (create_control_center): Fix a

control-center/control-center-categories.c

@@ -137,8 +137,8 @@ populate_category (ControlCenterCategory *category,
 	for (l = menu_entries; l; l = l->next) {
 		MenuTreeEntry *menu_entry = l->data;
 
-		entries = g_slist_prepend (entries,
-					   control_center_entry_new (category, menu_entry));
+		entries = g_slist_append (entries,
+					  control_center_entry_new (category, menu_entry));
 
 		menu_tree_entry_unref (menu_entry);
 	}

libbackground/ChangeLog

@@ -1,3 +1,10 @@
+2005-06-10  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* applier.c: (render_wallpaper), (is_nautilus_running):
+	Fix build issues with gcc4. Remove unneeded #include <bonobo.h>
+	* applier.h: Remove #include <pthread.h> since it doesn't seem
+	to be used.
+
 2005-02-10  Rodney Dawes  <dobey@novell.com>
 
 	* Makefile.am: Don't define GNOME_ICONDIR as libbackground does not

libbackground/applier.c

@@ -35,7 +35,6 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <unistd.h>
-#include <bonobo.h>
 
 #include "applier.h"
 
@@ -891,8 +890,8 @@ render_background (BGApplier *bg_applier, const BGPreferences *prefs)
 static void
 render_wallpaper (BGApplier *bg_applier, const BGPreferences *prefs) 
 {
-	GdkRectangle  src_geom;
-	GdkRectangle  dest_geom;
+	GdkRectangle  src_geom = { 0, };
+	GdkRectangle  dest_geom = { 0, };
 	GdkRectangle  virtual_geom;
 	GdkPixbuf    *prescaled_pixbuf = NULL;
 	guint         alpha;
@@ -1757,8 +1756,8 @@ is_nautilus_running (void)
 	    bytes_after == 0 &&
 	    actual_format == 8 &&
 	    data != NULL &&
-	    !strcmp (data, "desktop_window") &&
-	    !strcmp (data + strlen (data) + 1, "Nautilus"))
+	    !strcmp ((char *)data, "desktop_window") &&
+	    !strcmp ((char *)data + strlen ((char *)data) + 1, "Nautilus"))
 		running = TRUE;
 	else
 		running = FALSE;

libbackground/applier.h

@@ -28,7 +28,6 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <X11/Xlib.h>
-#include <pthread.h>
 
 #include "preferences.h"
 

po/ChangeLog

@@ -1,3 +1,130 @@
+2005-10-04  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2005-09-24  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2005-09-07  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2005-08-16  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2005-08-11  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2005-08-06  Pawan Chitrakar  <pawan@nplinux.org>
+
+	* ne.po: Updated Nepali Translation
+
+2005-08-06  Pawan Chitrakar  <pawan@nplinux.org>
+
+	* ne.po: Updated Nepali Translation
+
+2005-07-21  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated.
+
+2005-07-15  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.
+
+2005-07-07  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated.
+
+2004-07-06  Christian Rose  <menthos@menthos.com>
+
+	* gl.po: Updated Galician translation by
+	Ignacio Casal Quinteiro <nacho.resa@gmail.com>.
+
+2005-07-01  Abel Cheung  <maddog@linuxhall.org>
+
+	* zh_TW.po: Fix typo.
+
+2005-07-01  Abel Cheung  <maddog@linuxhall.org>
+
+	* zh_TW.po: Updated traditional Chinese translation from GNOME HK Team
+
+2005-06-27  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated.
+
+2005-06-22  Abel Cheung  <maddog@linuxhall.org>
+
+	* zh_TW.po: Fix language team reference.
+
+2005-06-05  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* Fixed a typo in Italian translation.
+
+2005-06-01  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Vladimir Petkov <vpetkov@i-space.org>
+
+2005-06-01  Adi Attar  <aattar@cvs.gnome.org>
+
+	* xh.po: Updated Xhosa translation.
+
+2005-05-29  Rhys Jones  <rhys@sucs.org>
+
+	* cy.po: Updated Welsh translation.
+
+2005-05-20  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated.
+
+2005-05-13  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated.
+
+2005-05-12  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated.
+
+2005-05-12  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Vladimir Petkov <vpetkov@i-space.org>
+
+2005-05-07  Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po: Updated Vietnamese translation.
+
+2005-05-04  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated.
+
+2005-05-01  Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po: Updated Vietnamese translation.
+
+2005-04-25  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Hungarian translation updated.
+
+2005-04-12  Iñaki Larrañaga  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2005-04-06  Maxim Dziumanenko <mvd@mylinux.com.ua>
+
+	* uk.po: Updated Ukrainian translation.
+
+2005-03-31  Steve Murphy  <murf@e-tools.com>
+
+        * rw.po: Added Kinyarwanda translation.
+
+2005-03-29  Adi Attar  <aattar@cvs.gnome.org>
+
+	xh.po: Updated Xhosa translation.
+
 2005-03-17  Adam Weinberger  <adamw@gnome.org>
 
 	* en_CA.po: Updated Canadian English translation.

po/it.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-03 23:07+0100\n"
-"PO-Revision-Date: 2005-03-03 23:07+0100\n"
+"POT-Creation-Date: 2005-06-05 19:14+0200\n"
+"PO-Revision-Date: 2005-06-05 19:15+0200\n"
 "Last-Translator: Alessio Dessì <alkex@inwind.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -19,14 +19,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../capplets/about-me/gnome-about-me.desktop.in.h:1
-msgid "About me"
-msgstr "Info personali"
-
-#: ../capplets/about-me/gnome-about-me.desktop.in.h:2
-msgid "Information about myself"
-msgstr "Informazioni personali dell'utente"
-
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:1
 msgid "<b>Applications</b>"
 msgstr "<b>Applicazioni</b>"
@@ -390,7 +382,7 @@ msgstr "_Stile:"
 # il %s inizia sempre con maiuscolo!!
 #: ../capplets/background/gnome-wp-capplet.c:72
 #: ../capplets/common/capplet-util.c:340
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:326
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:329
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "Errore nel mostrare la documentazione. %s"
@@ -737,42 +729,43 @@ msgid "KMail"
 msgstr "KMail"
 
 #: ../capplets/default-applications/gnome-default-applications-properties-structs.c:44
+#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:45
 msgid "Thunderbird"
 msgstr "Thunderbird"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:45
+#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:46
 msgid "Mozilla Mail"
 msgstr "Mozilla Mail"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:46
+#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:47
 msgid "Mutt"
 msgstr "Mutt"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:57
+#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:58
 msgid "Debian Terminal Emulator"
 msgstr "Emulatore terminale di Debian"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:58
+#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:59
 msgid "GNOME Terminal"
 msgstr "Terminale di GNOME"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:59
+#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:60
 msgid "Standard XTerminal"
 msgstr "Terminale X standard"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:61
 msgid "NXterm"
 msgstr "NXterm"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:61
+#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:62
 msgid "RXVT"
 msgstr "RXVT"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:62
+#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:63
 msgid "aterm"
 msgstr "aterm"
 
-#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:63
+#: ../capplets/default-applications/gnome-default-applications-properties-structs.c:64
 msgid "ETerm"
 msgstr "ETerm"
 
@@ -1623,7 +1616,7 @@ msgstr "Mouse per ma_ncini"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:23
 msgid "_Sensitivity:"
-msgstr "Sen_bilità:"
+msgstr "Sensi_bilità:"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:24
 msgid "_Small"
@@ -2248,11 +2241,11 @@ msgstr "Volume"
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare bonobo"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:412
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:415
 msgid "Slow Keys Alert"
 msgstr "Allarme tasti ad attivazione ritardata"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:413
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:416
 msgid ""
 "You just held down the Shift key for 8 seconds.  This is the shortcut for "
 "the Slow Keys feature, which affects the way your keyboard works."
@@ -2261,19 +2254,19 @@ msgstr ""
 "scorciatoia per l'abilitazione dei tasti ad attivazione ritardata che "
 "modifica il funzionamento normale della tastiera."
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:414
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:417
 msgid "Do you want to activate Slow Keys?"
 msgstr "Attivare i tasti ad attivazione ritardata?"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:415
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:418
 msgid "Do you want to deactivate Slow Keys?"
 msgstr "Disattivare i tasti ad attivazione ritardata?"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:426
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:429
 msgid "Sticky Keys Alert"
 msgstr "Avviso per i tasti a disattivazione ritardata"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:427
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:430
 msgid ""
 "You just pressed the Shift key 5 times in a row.  This is the shortcut for "
 "the Sticky Keys feature, which affects the way your keyboard works."
@@ -2282,7 +2275,7 @@ msgstr ""
 "scorciatoia per l'abilitazione dei tasti a disattivazione ritardata che "
 "modifica il normale funzionamento della tastiera."
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:428
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:431
 msgid ""
 "You just pressed two keys at once, or pressed the Shift key 5 times in a "
 "row.  This turns off the Sticky Keys feature, which affects the way your "
@@ -2292,11 +2285,11 @@ msgstr ""
 "tasto «Maiusc». Questo disabilita i tasti a disattivazione ritardata che "
 "modificavano il normale funzionamento della tastiera."
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:429
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:432
 msgid "Do you want to activate Sticky Keys?"
 msgstr "Attivare i tasti a disattivazione ritardata?"
 
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:430
+#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:433
 msgid "Do you want to deactivate Sticky Keys?"
 msgstr "Disattivare i tasti a disattivazione ritardata?"
 

po/uk.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-center 2.0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-19 13:06+0200\n"
-"PO-Revision-Date: 2005-02-19 12:41+0300\n"
+"POT-Creation-Date: 2005-04-06 20:34+0300\n"
+"PO-Revision-Date: 2005-04-06 12:41+0300\n"
 "Last-Translator: Maxim Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,14 +17,6 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: capplets/about-me/gnome-about-me.desktop.in.h:1
-msgid "About me"
-msgstr "Про мене"
-
-#: capplets/about-me/gnome-about-me.desktop.in.h:2
-msgid "Information about myself"
-msgstr "Інформація про себе"
-
 #: capplets/accessibility/at-properties/at-enable-dialog.glade.h:1
 msgid "<b>Applications</b>"
 msgstr "<b>Програми</b>"
@@ -379,48 +371,48 @@ msgstr "_Стиль:"
 
 #: capplets/background/gnome-wp-capplet.c:72
 #: capplets/common/capplet-util.c:340
-#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:326
+#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:329
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "Помилка відображення довідки: %s"
 
-#: capplets/background/gnome-wp-capplet.c:1061
-#: capplets/background/gnome-wp-capplet.c:1077
+#: capplets/background/gnome-wp-capplet.c:1064
+#: capplets/background/gnome-wp-capplet.c:1080
 msgid "Centered"
 msgstr "У центрі"
 
-#: capplets/background/gnome-wp-capplet.c:1085
-#: capplets/background/gnome-wp-capplet.c:1100
+#: capplets/background/gnome-wp-capplet.c:1088
+#: capplets/background/gnome-wp-capplet.c:1103
 msgid "Fill Screen"
 msgstr "На весь екран"
 
-#: capplets/background/gnome-wp-capplet.c:1108
-#: capplets/background/gnome-wp-capplet.c:1123
+#: capplets/background/gnome-wp-capplet.c:1111
+#: capplets/background/gnome-wp-capplet.c:1126
 msgid "Scaled"
 msgstr "Масштабувати"
 
-#: capplets/background/gnome-wp-capplet.c:1131
-#: capplets/background/gnome-wp-capplet.c:1146
+#: capplets/background/gnome-wp-capplet.c:1134
+#: capplets/background/gnome-wp-capplet.c:1149
 msgid "Tiled"
 msgstr "Черепицею"
 
-#: capplets/background/gnome-wp-capplet.c:1170
-#: capplets/background/gnome-wp-capplet.c:1179
+#: capplets/background/gnome-wp-capplet.c:1173
+#: capplets/background/gnome-wp-capplet.c:1182
 msgid "Solid Color"
 msgstr "Суцільний колір"
 
-#: capplets/background/gnome-wp-capplet.c:1187
-#: capplets/background/gnome-wp-capplet.c:1196
+#: capplets/background/gnome-wp-capplet.c:1190
+#: capplets/background/gnome-wp-capplet.c:1199
 msgid "Horizontal Gradient"
 msgstr "Горизонтальний градієнт"
 
-#: capplets/background/gnome-wp-capplet.c:1204
-#: capplets/background/gnome-wp-capplet.c:1213
+#: capplets/background/gnome-wp-capplet.c:1207
+#: capplets/background/gnome-wp-capplet.c:1216
 msgid "Vertical Gradient"
 msgstr "Вертикальний градієнт"
 
 #. Create the file chooser dialog stuff here
-#: capplets/background/gnome-wp-capplet.c:1260
+#: capplets/background/gnome-wp-capplet.c:1263
 msgid "Add Wallpaper"
 msgstr "Додавання фонового малюнка"
 
@@ -1026,7 +1018,7 @@ msgstr "Подробиці відтворення шрифтів"
 
 #: capplets/font/font-properties.glade.h:11
 msgid "Go _to font folder"
-msgstr "Перейти _до теки шрифтів"
+msgstr "Пере_йти до теки шрифтів"
 
 #: capplets/font/font-properties.glade.h:12
 msgid "Gra_yscale"
@@ -1657,7 +1649,7 @@ msgstr "<b>_Безпосереднє з'єднання з Інтернетом</
 
 #: capplets/network/gnome-network-preferences.glade.h:6
 msgid "<b>_Manual proxy configuration</b>"
-msgstr "<b>_Ручна конфігурація проксі</b>"
+msgstr "<b>Р_учна конфігурація проксі</b>"
 
 #: capplets/network/gnome-network-preferences.glade.h:7
 msgid "<b>_Use authentication</b>"
@@ -1701,7 +1693,7 @@ msgstr "_Користувач:"
 
 #: capplets/network/gnome-network-preferences.glade.h:17
 msgid "_Details"
-msgstr "По_дробиці"
+msgstr "_Подробиці"
 
 #: capplets/network/gnome-network-preferences.glade.h:18
 msgid "_FTP proxy:"
@@ -1713,7 +1705,7 @@ msgstr "_Пароль:"
 
 #: capplets/network/gnome-network-preferences.glade.h:20
 msgid "_Secure HTTP proxy:"
-msgstr "_Безпечний проксі HTTP"
+msgstr "Б_езпечний проксі HTTP"
 
 #: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
@@ -2229,11 +2221,11 @@ msgstr "Гучність"
 msgid "Could not initialize Bonobo"
 msgstr "Не вдається встановити Bonobo"
 
-#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:412
+#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:415
 msgid "Slow Keys Alert"
 msgstr "Сповіщення про режим \"Повільні клавіші\""
 
-#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:413
+#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:416
 msgid ""
 "You just held down the Shift key for 8 seconds.  This is the shortcut for "
 "the Slow Keys feature, which affects the way your keyboard works."
@@ -2242,19 +2234,19 @@ msgstr ""
 "для ввімкнення режиму \"Повільні клавіші\", який впливає на роботу "
 "клавіатури."
 
-#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:414
+#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:417
 msgid "Do you want to activate Slow Keys?"
 msgstr "Бажаєте ввімкнути режим \"Повільні клавіші\"?"
 
-#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:415
+#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:418
 msgid "Do you want to deactivate Slow Keys?"
 msgstr "Бажаєте вимкнути режим \"Повільні клавіші\"?"
 
-#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:426
+#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:429
 msgid "Sticky Keys Alert"
 msgstr "Сповіщення про режим \"Липкі клавіші\""
 
-#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:427
+#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:430
 msgid ""
 "You just pressed the Shift key 5 times in a row.  This is the shortcut for "
 "the Sticky Keys feature, which affects the way your keyboard works."
@@ -2262,7 +2254,7 @@ msgstr ""
 "Ви щойно утримували натиснутою клавішу Shift протягом 5 секунд. Це сигнал "
 "для ввімкнення режиму \"Липкі клавіші\", який впливає на роботу клавіатури."
 
-#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:428
+#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:431
 msgid ""
 "You just pressed two keys at once, or pressed the Shift key 5 times in a "
 "row.  This turns off the Sticky Keys feature, which affects the way your "
@@ -2272,11 +2264,11 @@ msgstr ""
 "Shift протягом 5 секунд. Це сигнал для вимкнення режиму \"Липкі клавіші\", "
 "який впливає на роботу клавіатури."
 
-#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:429
+#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:432
 msgid "Do you want to activate Sticky Keys?"
 msgstr "Бажаєте ввімкнути режим \"Липкі клавіші\"?"
 
-#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:430
+#: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:433
 msgid "Do you want to deactivate Sticky Keys?"
 msgstr "Бажаєте вимкнути режим \"Повільні клавіші\"?"
 
@@ -2328,7 +2320,7 @@ msgstr ""
 "Помилка при спробі запуску (%s)\n"
 "що пов'язаний з клавішею (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:99
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:105
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2359,7 +2351,7 @@ msgstr ""
 "- результат %s\n"
 "- результат %s"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:113
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:119
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2370,11 +2362,11 @@ msgstr ""
 "Вона має відому помилку з складними конфігураціями XKB.\n"
 "Спробуйте використовувати простішу конфігурацію або поновіть систему XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:226
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:232
 msgid "Do _not show this warning again"
 msgstr "_Не показувати більше це повідомлення"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:237
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:243
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2382,11 +2374,11 @@ msgstr ""
 "Системна клавіатура X відрізняється від ваших параметрів клавіатури GNOME. "
 "Які з параметрів ви бажаєте використовувати?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:247
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:253
 msgid "Use X settings"
 msgstr "Використовувати параметри X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:255
 msgid "Use GNOME settings"
 msgstr "Використовувати параметри GNOME"
 
@@ -3145,3 +3137,9 @@ msgstr "Чи створювати мініатюри для встановлен
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "Чи створювати мініатюри тем"
+
+#~ msgid "About me"
+#~ msgstr "Про мене"
+
+#~ msgid "Information about myself"
+#~ msgstr "Інформація про себе"