Merge from trunkrandr-12

svn path=/branches/randr-12/; revision=8761

60 files changed, 17204 insertions, 6106 deletions

diff --git a/ChangeLog b/ChangeLog
index 5b93ba41f..1c0045a61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2008-06-16  Rodrigo Moya <rodrigo@gnome-db.org>
+
+	* NEWS:
+	* configure.in: update for 2.23.4
+	Increased gnome-desktop version requirement
+
+==================== 2.23.3 ====================
+
+2008-06-04  Jens Granseuer  <jensgr@gmx.net>
+
+	* NEWS: updated for 2.23.3
+
+2008-06-01  Thomas Wood  <thos@gnome.org>
+
+	* configure.in:
+	* vfs-methods/Makefile.am:
+	Remove themus from build.
+
+2008-05-17  Vincent Untz  <vuntz@gnome.org>
+
+	* configure.in: post-release bump to 2.23.3
+
+==================== 2.23.2 ====================
+
+2008-05-17  Sebastien Bacher  <seb128@ubuntu.com>
+
+	* configure.in: don't require libbackground to build
+
+2008-05-17  Jens Granseuer  <jensgr@gmx.net>
+
+	* NEWS:
+	* configure.in: updated for 2.23.2
+
+Fri May 16 21:55:52 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* libbackground: Delete this directory since it's not used any
+	more
+
 2008-04-28  Sergey Udaltsov <svu@gnome.org>
 
 	* configure.in: Dependency on iso-codes moved to libxklavier
diff --git a/Makefile.am b/Makefile.am
index fbfbab1c9..f771b98c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = po libsounds libbackground libwindow-settings libslab capplets shell help vfs-methods $(TYPING_BREAK)
+SUBDIRS = po libsounds libwindow-settings libslab capplets shell help vfs-methods $(TYPING_BREAK)
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/NEWS b/NEWS
index f59465739..5419ef839 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,98 @@
+gnome-control-center 2.23.4 (2008-06-16)
+
+default applications:
+- Convert to use GConfPropertyEditor and remove a lot of duplicated code in
+  the process (Thomas Wood)
+- Provide a Tango style application icon (Jakub Steiner, Thomas Wood) (#397312)
+
+typing break:
+- When postponing a voluntary break, go back to the state before taking the
+  break instead of going to warn state (Andrey Gusev) (#134595)
+
+general:
+- Increased gnome-desktop requirement (Rodrigo Moya)
+
+updated translations:
+- ar (Djihed Afifi)
+- es (Jorge Gonzalez)
+- hu (Gabor Kelemen)
+- nb (Kjartan Maraas)
+- th (Theppitak Karoonboonyanan)
+- zh_CN (Funda Wang)
+------------------------------------------------------------------------------
+gnome-control-center 2.23.3 (2008-06-04)
+
+appearance:
+- Remove the last traces of gnome-vfs (Lincoln de Sousa) (#524401)
+- Fix theme deletion (Jens Granseuer)
+- Update to match API changes in gnome-desktop (Soeren Sandmann)
+- Fix "zoom" mode (Soeren Sandmann)
+- Use URIs instead of paths for drag and drop (Soeren Sandmann)
+- Delay creation of the wallaper file chooser for increased startup
+  performance (Thomas Wood)
+
+default-applications:
+- Major refactoring to use GConfPropertyEditor and reduce code duplication
+  (Thomas Wood)
+
+keybindings:
+- Don't use deprecated GTK+ symbol (William Jon McCann)
+- Add support for editing custom keybindings (create/delete not yet
+  implemented) (Jens Granseuer)
+
+general:
+- Remove themus vfs-method (Thomas Wood)
+- Minor cleanup in capplet-util and gconf-property-editor (Thomas Wood,
+  Jens Granseuer)
+
+updated translations:
+- ar (Djihed Afifi)
+- gl (Ignacio Casal Quinteiro)
+- vi (Clytie Siddall)
+
+------------------------------------------------------------------------------
+gnome-control-center 2.23.2 (2008-05-17)
+
+about-me:
+- Fix image scaling on the photo button (Ben LeMasurier) (#309629)
+- Fix build on Solaris (Laszlo Peter) (#532893)
+- Properly handle errors when no icon is available (Jens Granseuer)
+- Fix handling of Home and Work email addresses (Jens Granseuer) (#317835)
+- Close a memory leak (Jens Granseuer)
+
+appearance:
+- Convert some more parts to gio (Lincoln de Sousa, Jens Granseuer)
+- Show errors for incomplete control themes (Jens Granseuer)
+- Add support for installing missing GTK+ theme engines via PackageKit
+  (Jens Granseuer) (#511065)
+
+keyboard:
+- Don't close the Keyboard Layout Options window when the Help button is
+  clicked (Thomas Wood) (#529772)
+- Access keyboard layouts by country or language (Sergey Udaltsov)
+
+network;
+- Drop gnome-vfs dependency (Jens Granseuer)
+
+sound:
+- Add support for OSS4 mixers (Tim-Phillip Mueller) (#529720)
+
+general:
+- libbackground is no longer needed (Soeren Sandmann)
+- Remove iso-codes dependency again (Sergey Udaltsov)
+- Require libxklavier 3.6 (Sergey Udaltsov)
+- Port theme handling code from gnome-vfs to gio (Jens Granseuer)
+
+updated translations:
+- es (Jorge Gonzalez)
+- fr (Stephane Raimbault)
+- gl (Ignacio Casal Quinteiro)
+- he (Yair Hershkovitz)
+- hu (Gabor Kelemen)
+- nb (Kjartan Maraas)
+- pt_BR (Leonardo Ferreira Fontenelle)
+
+------------------------------------------------------------------------------
 gnome-control-center 2.23.1
 
 about-me:
diff --git a/capplets/about-me/ChangeLog b/capplets/about-me/ChangeLog
index ae5d152d4..0195c89bf 100644
--- a/capplets/about-me/ChangeLog
+++ b/capplets/about-me/ChangeLog
@@ -1,3 +1,5 @@
+==================== 2.23.2 ====================
+
 2008-05-13  Jens Granseuer  <jensgr@gmx.net>
 
 	Patch by: Laszlo Peter <laca@sun.com>
diff --git a/capplets/accessibility/at-properties/ChangeLog b/capplets/accessibility/at-properties/ChangeLog
index 01cf4a805..d29f6e72b 100644
--- a/capplets/accessibility/at-properties/ChangeLog
+++ b/capplets/accessibility/at-properties/ChangeLog
@@ -1,3 +1,5 @@
+==================== 2.23.2 ====================
+
 2008-04-16  Jens Granseuer  <jensgr@gmx.net>
 
 	* main.c: (cb_at_preferences): open the preferred applications dialog
diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog
index 546ac6cd6..12cf0a626 100644
--- a/capplets/appearance/ChangeLog
+++ b/capplets/appearance/ChangeLog
@@ -1,3 +1,64 @@
+2008-06-01  Thomas Wood  <thos@gnome.org>
+
+	* appearance-desktop.c: (wp_props_wp_selected), (wp_load_stuffs),
+	(wp_select_after_realize), (desktop_init), (desktop_shutdown):
+
+	Delay the creation of the wallpaper file chooser dialog to save time on
+	start up.
+
+Sat May 31 02:05:32 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* appearance-desktop.c (wp_drag_get_data): Make sure the data we
+	produce is actually a list of uris, not a list of paths. (Prevents
+	crash when someone drags a thumbnail back into the list).
+	
+	* appearance-desktop.c (wp_add_image): Be robust against NULL
+	filenames; this can happen if someone drops an http url on the
+	dialog.
+
+Sat May 31 00:41:20 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* gnome-wp-item.c (options_lookup): The gconf string is "zoom",
+	not "zoomed".
+
+Fri May 30 23:01:57 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* gnome-wp-item.c (set_bg_properties): Update to match API change
+	in libgnome-desktop.
+
+2008-05-24  Jens Granseuer  <jensgr@gmx.net>
+
+	* theme-util.c: (theme_is_writable), (theme_delete): expect
+	a path instead of an URI in theme_info->path
+
+2008-05-24  Jens Granseuer  <jensgr@gmx.net>
+
+	* theme-util.c: (directory_delete_recursive): also delete the
+	directory itself
+
+2008-05-24  Jens Granseuer  <jensgr@gmx.net>
+
+	* theme-installer.c: (cleanup_tmp_dir): fix up last commit
+
+2008-05-24  Jens Granseuer  <jensgr@gmx.net>
+
+	Based on a patch by: Lincoln de Sousa <lincoln@minaslivre.org>
+
+	Port the last remaining bits of gnome-vfs to gio (bug
+	#524401).
+
+	* appearance-main.c: (init_appearance_data):
+	* theme-installer.c: (cleanup_tmp_dir), (file_theme_type),
+	(transfer_cancel_cb), (gnome_theme_install_real),
+	(transfer_done_cb): use gio instead of gnome-vfs
+
+	* theme-util.c:
+	* theme-util.h: make file_delete_recursive public
+
+	* gnome-wp-info.c: include string.h to avoid warning
+
+==================== 2.23.2 ====================
+
 2008-05-08  Jens Granseuer  <jensgr@gmx.net>
 
 	* appearance-style.c: (style_message_area_response_cb),
diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
index e96d7daf1..d0323277b 100644
--- a/capplets/appearance/appearance-desktop.c
+++ b/capplets/appearance/appearance-desktop.c
@@ -1,7 +1,8 @@
 /*
- * Copyright (C) 2007 The GNOME Foundation
+ * Copyright (C) 2007,2008 The GNOME Foundation
  * Written by Rodney Dawes <dobey@ximian.com>
  *            Denis Washington <denisw@svn.gnome.org>
+ *            Thomas Wood <thos@gnome.org>
  * All Rights Reserved
  *
  * This program is free software; you can redistribute it and/or modify
@@ -46,6 +47,9 @@ static const GtkTargetEntry drag_types[] = {
   {"text/uri-list", GTK_TARGET_OTHER_WIDGET, TARGET_URI_LIST}
 };
 
+
+static void wp_update_preview (GtkFileChooser *chooser, AppearanceData *data);
+
 static void
 select_item (AppearanceData *data,
              GnomeWPItem * item,
@@ -177,6 +181,9 @@ wp_add_image (AppearanceData *data,
 {
   GnomeWPItem *item;
 
+  if (!filename)
+    return NULL;
+  
   item = g_hash_table_lookup (data->wp_hash, filename);
 
   if (item != NULL)
@@ -422,7 +429,8 @@ wp_uri_changed (const gchar *uri,
     if (item == NULL)
       item = wp_add_image (data, uri);
 
-    select_item (data, item, TRUE);
+    if (item)
+      select_item (data, item, TRUE);
   }
 }
 
@@ -611,12 +619,72 @@ wp_props_wp_selected (GtkTreeSelection *selection,
   }
 }
 
+void
+wp_create_filechooser (AppearanceData *data)
+{
+  const char *start_dir, *pictures = NULL;
+  GtkFileFilter *filter;
+
+  data->wp_filesel = GTK_FILE_CHOOSER (
+  		     gtk_file_chooser_dialog_new_with_backend (_("Add Wallpaper"),
+                     GTK_WINDOW (glade_xml_get_widget (data->xml, "appearance_window")),
+                     GTK_FILE_CHOOSER_ACTION_OPEN,
+                     "gtk+",
+                     GTK_STOCK_CANCEL,
+                     GTK_RESPONSE_CANCEL,
+                     GTK_STOCK_OPEN,
+                     GTK_RESPONSE_OK,
+                     NULL));
+
+  gtk_dialog_set_default_response (GTK_DIALOG (data->wp_filesel), GTK_RESPONSE_OK);
+  gtk_file_chooser_set_select_multiple (data->wp_filesel, TRUE);
+  gtk_file_chooser_set_use_preview_label (data->wp_filesel, FALSE);
+
+  start_dir = g_get_home_dir ();
+
+  if (g_file_test ("/usr/share/backgrounds", G_FILE_TEST_IS_DIR)) {
+    gtk_file_chooser_add_shortcut_folder (data->wp_filesel,
+                                          "/usr/share/backgrounds", NULL);
+    start_dir = "/usr/share/backgrounds";
+  }
+
+  pictures = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);
+  if (pictures != NULL && g_file_test (pictures, G_FILE_TEST_IS_DIR)) {
+    gtk_file_chooser_add_shortcut_folder (data->wp_filesel, pictures, NULL);
+    start_dir = pictures;
+  }
+
+  gtk_file_chooser_set_current_folder (data->wp_filesel, start_dir);
+
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_add_pixbuf_formats (filter);
+  gtk_file_filter_set_name (filter, _("Images"));
+  gtk_file_chooser_add_filter (data->wp_filesel, filter);
+
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("All files"));
+  gtk_file_filter_add_pattern (filter, "*");
+  gtk_file_chooser_add_filter (data->wp_filesel, filter);
+
+  data->wp_image = gtk_image_new ();
+  gtk_file_chooser_set_preview_widget (data->wp_filesel, data->wp_image);
+  gtk_widget_set_size_request (data->wp_image, 128, -1);
+
+  gtk_widget_show (data->wp_image);
+
+  g_signal_connect (data->wp_filesel, "update-preview",
+                    (GCallback) wp_update_preview, data);
+}
+
 static void
 wp_file_open_dialog (GtkWidget *widget,
                      AppearanceData *data)
 {
   GSList *files;
 
+  if (!data->wp_filesel)
+    wp_create_filechooser (data);
+
   switch (gtk_dialog_run (GTK_DIALOG (data->wp_filesel)))
   {
   case GTK_RESPONSE_OK:
@@ -684,8 +752,14 @@ wp_drag_get_data (GtkWidget *widget,
     GnomeWPItem *item = get_selected_item (data, NULL);
 
     if (item != NULL) {
-      gchar *uris[] = { item->filename, NULL };
+      char *uris[2];
+
+      uris[0] = g_filename_to_uri (item->filename, NULL, NULL);
+      uris[1] = NULL;
+    
       gtk_selection_data_set_uris (selection_data, uris);
+
+      g_free (uris[0]);
     }
   }
 }
@@ -858,7 +932,8 @@ wp_load_stuffs (void *user_data)
   else if (strcmp (style, "none") != 0)
   {
     item = wp_add_image (data, imagepath);
-    select_item (data, item, FALSE);
+    if (item)
+      select_item (data, item, FALSE);
   }
 
   item = g_hash_table_lookup (data->wp_hash, "(none)");
@@ -913,9 +988,6 @@ desktop_init (AppearanceData *data,
 {
   GtkWidget *add_button;
   GtkCellRenderer *cr;
-  GtkFileFilter *filter;
-  const gchar *pictures;
-  const gchar *start_dir;
 
   g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL);
 
@@ -1033,55 +1105,9 @@ desktop_init (AppearanceData *data,
 
   wp_set_sensitivities (data);
 
-  data->wp_filesel = GTK_FILE_CHOOSER (
-  		     gtk_file_chooser_dialog_new_with_backend (_("Add Wallpaper"),
-                     GTK_WINDOW (glade_xml_get_widget (data->xml, "appearance_window")),
-                     GTK_FILE_CHOOSER_ACTION_OPEN,
-                     "gtk+",
-                     GTK_STOCK_CANCEL,
-                     GTK_RESPONSE_CANCEL,
-                     GTK_STOCK_OPEN,
-                     GTK_RESPONSE_OK,
-                     NULL));
-
-  gtk_dialog_set_default_response (GTK_DIALOG (data->wp_filesel), GTK_RESPONSE_OK);
-  gtk_file_chooser_set_select_multiple (data->wp_filesel, TRUE);
-  gtk_file_chooser_set_use_preview_label (data->wp_filesel, FALSE);
-
-  start_dir = g_get_home_dir ();
-
-  if (g_file_test ("/usr/share/backgrounds", G_FILE_TEST_IS_DIR)) {
-    gtk_file_chooser_add_shortcut_folder (data->wp_filesel,
-                                          "/usr/share/backgrounds", NULL);
-    start_dir = "/usr/share/backgrounds";
-  }
-
-  pictures = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);
-  if (pictures != NULL && g_file_test (pictures, G_FILE_TEST_IS_DIR)) {
-    gtk_file_chooser_add_shortcut_folder (data->wp_filesel, pictures, NULL);
-    start_dir = pictures;
-  }
-
-  gtk_file_chooser_set_current_folder (data->wp_filesel, start_dir);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_pixbuf_formats (filter);
-  gtk_file_filter_set_name (filter, _("Images"));
-  gtk_file_chooser_add_filter (data->wp_filesel, filter);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("All files"));
-  gtk_file_filter_add_pattern (filter, "*");
-  gtk_file_chooser_add_filter (data->wp_filesel, filter);
-
-  data->wp_image = gtk_image_new ();
-  gtk_file_chooser_set_preview_widget (data->wp_filesel, data->wp_image);
-  gtk_widget_set_size_request (data->wp_image, 128, -1);
-
-  gtk_widget_show (data->wp_image);
+  /* create the file selector later to save time on startup */
+  data->wp_filesel = NULL;
 
-  g_signal_connect (data->wp_filesel, "update-preview",
-                    (GCallback) wp_update_preview, data);
 }
 
 void
@@ -1090,6 +1116,9 @@ desktop_shutdown (AppearanceData *data)
   gnome_wp_xml_save_list (data);
   g_slist_foreach (data->wp_uris, (GFunc) g_free, NULL);
   g_slist_free (data->wp_uris);
-  g_object_ref_sink (data->wp_filesel);
-  g_object_unref (data->wp_filesel);
+  if (data->wp_filesel)
+  {
+    g_object_ref_sink (data->wp_filesel);
+    g_object_unref (data->wp_filesel);
+  }
 }
diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c
index 609d071f8..e332b2cc5 100644
--- a/capplets/appearance/appearance-main.c
+++ b/capplets/appearance/appearance-main.c
@@ -49,7 +49,6 @@ init_appearance_data (int *argc, char ***argv)
   g_thread_init (NULL);
   theme_thumbnail_factory_init (*argc, *argv);
   gtk_init (argc, argv);
-  gnome_vfs_init ();
   activate_settings_daemon ();
 
   /* set up the data */
diff --git a/capplets/appearance/gnome-wp-info.c b/capplets/appearance/gnome-wp-info.c
index 2642a53e2..be1a79317 100644
--- a/capplets/appearance/gnome-wp-info.c
+++ b/capplets/appearance/gnome-wp-info.c
@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include <string.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include "gnome-wp-info.h"
diff --git a/capplets/appearance/gnome-wp-item.c b/capplets/appearance/gnome-wp-item.c
index 41d6cd7f6..25d85e84e 100644
--- a/capplets/appearance/gnome-wp-item.c
+++ b/capplets/appearance/gnome-wp-item.c
@@ -30,7 +30,7 @@ static GConfEnumStringPair options_lookup[] = {
   { GNOME_BG_PLACEMENT_CENTERED, "centered" },
   { GNOME_BG_PLACEMENT_FILL_SCREEN, "stretched" },
   { GNOME_BG_PLACEMENT_SCALED, "scaled" },
-  { GNOME_BG_PLACEMENT_ZOOMED, "zoomed" },
+  { GNOME_BG_PLACEMENT_ZOOMED, "zoom" },
   { GNOME_BG_PLACEMENT_TILED, "wallpaper" },
   { 0, NULL }
 };
@@ -69,7 +69,7 @@ GnomeBGColorType wp_item_string_to_shading (const gchar *shade_type)
 static void set_bg_properties (GnomeWPItem *item)
 {
   if (item->filename)
-    gnome_bg_set_uri (item->bg, item->filename);
+    gnome_bg_set_filename (item->bg, item->filename);
 
   gnome_bg_set_color (item->bg, item->shade_type, item->pcolor, item->scolor);
   gnome_bg_set_placement (item->bg, item->options);
diff --git a/capplets/appearance/theme-installer.c b/capplets/appearance/theme-installer.c
index 291dc1404..197d44bcf 100644
--- a/capplets/appearance/theme-installer.c
+++ b/capplets/appearance/theme-installer.c
@@ -26,6 +26,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
+#include <glib/gstdio.h>
 
 #include "file-transfer-dialog.h"
 #include "theme-installer.h"
@@ -48,17 +49,18 @@ enum {
 	DIRECTORY
 };
 
-static void
-cleanup_tmp_dir (const gchar *tmp_dir)
+static gboolean
+cleanup_tmp_dir (GIOSchedulerJob *job,
+		 GCancellable *cancellable,
+		 const gchar *tmp_dir)
 {
-	if (gnome_vfs_remove_directory (tmp_dir) == GNOME_VFS_ERROR_DIRECTORY_NOT_EMPTY) {
-		GList *list;
+	GFile *directory;
 
-		list = g_list_prepend (NULL, gnome_vfs_uri_new (tmp_dir));
-		gnome_vfs_xfer_delete_list (list, GNOME_VFS_XFER_RECURSIVE,
-					GNOME_VFS_XFER_ERROR_MODE_ABORT, NULL, NULL);
-		gnome_vfs_uri_list_free (list);
-	}
+	directory = g_file_new_for_path (tmp_dir);
+	file_delete_recursive (directory, NULL);
+	g_object_unref (directory);
+
+	return FALSE;
 }
 
 static int
@@ -74,16 +76,12 @@ file_theme_type (const gchar *dir)
 	exists = g_file_test (filename, G_FILE_TEST_IS_REGULAR);
 
 	if (exists) {
-		GPatternSpec *pattern = NULL;
+		GPatternSpec *pattern;
 		gchar *file_contents = NULL;
-		gint file_size;
-		gchar *uri;
+		gsize file_size;
 		gboolean match;
 
-		uri = gnome_vfs_get_uri_from_local_path (filename);
-		g_free (filename);
-		gnome_vfs_read_entire_file (uri, &file_size, &file_contents);
-		g_free (uri);
+		g_file_get_contents (filename, &file_contents, &file_size, NULL);
 
 		pattern = g_pattern_spec_new ("*[Icon Theme]*");
 		match = g_pattern_match_string (pattern, file_contents);
@@ -93,6 +91,7 @@ file_theme_type (const gchar *dir)
 			pattern = g_pattern_spec_new ("*Directories=*");
 			match = g_pattern_match_string (pattern, file_contents);
 			g_pattern_spec_free (pattern);
+			g_free (file_contents);
 
 			if (match) {
 				/* check if we have a cursor, too */
@@ -111,6 +110,7 @@ file_theme_type (const gchar *dir)
 		pattern = g_pattern_spec_new ("*[X-GNOME-Metatheme]*");
 		match = g_pattern_match_string (pattern, file_contents);
 		g_pattern_spec_free (pattern);
+		g_free (file_contents);
 
 		if (match)
 			return THEME_GNOME;
@@ -153,7 +153,12 @@ file_theme_type (const gchar *dir)
 static void
 transfer_cancel_cb (GtkWidget *dlg, gchar *path)
 {
-	gnome_vfs_unlink (path);
+	GFile *todelete;
+
+	todelete = g_file_new_for_path (path);
+	g_file_delete (todelete, NULL, NULL);
+
+	g_object_unref (todelete);
 	g_free (path);
 	gtk_widget_destroy (dlg);
 }
@@ -259,8 +264,8 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
 {
 	gboolean success = TRUE;
 	GtkWidget *dialog, *apply_button;
-	int xfer_options;
-	GnomeVFSURI *theme_source_dir, *theme_dest_dir;
+	GFile *theme_source_dir, *theme_dest_dir;
+	GError *error = NULL;
 	gint theme_type;
 	gchar *user_message = NULL;
 	gchar *target_dir = NULL;
@@ -307,13 +312,25 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
 		    && (file_theme_type (path) == THEME_ICON))
 		{
 			gchar *new_path, *update_icon_cache;
+			GFile *new_file;
+			GFile *src_file;
 
+			src_file = g_file_new_for_path (path);
 			new_path = g_build_path (G_DIR_SEPARATOR_S,
 						 g_get_home_dir (),
 						 ".icons",
 						 theme_name, NULL);
-			/* XXX: make some noise if we couldn't install it? */
-			gnome_vfs_move (path, new_path, FALSE);
+			new_file = g_file_new_for_path (new_path);
+
+			if (!g_file_move (src_file, new_file, G_FILE_COPY_NONE,
+					  NULL, NULL, NULL, &error)) {
+				g_warning ("Error while moving from `%s' to `%s': %s",
+					   path, new_path, error->message);
+				g_error_free (error);
+				error = NULL;
+			}
+			g_object_unref (new_file);
+			g_object_unref (src_file);
 
 			/* update icon cache - shouldn't really matter if this fails */
 			update_icon_cache = g_strdup_printf ("gtk-update-icon-cache %s", new_path);
@@ -326,17 +343,12 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
 	}
 
 	/* Move the dir to the target dir */
-	theme_source_dir = gnome_vfs_uri_new (tmp_dir);
-	theme_dest_dir = gnome_vfs_uri_new (target_dir);
-
-	xfer_options = GNOME_VFS_XFER_RECURSIVE;
-	if (filetype != DIRECTORY)
-		xfer_options |= GNOME_VFS_XFER_REMOVESOURCE;
+	theme_source_dir = g_file_new_for_path (tmp_dir);
+	theme_dest_dir = g_file_new_for_path (target_dir);
 
-	if (gnome_vfs_xfer_uri (theme_source_dir, theme_dest_dir, xfer_options,
-				GNOME_VFS_XFER_ERROR_MODE_ABORT,
-				GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
-				NULL, NULL) != GNOME_VFS_OK) {
+	if (!g_file_move (theme_source_dir, theme_dest_dir,
+			  G_FILE_COPY_OVERWRITE, NULL, NULL,
+			  NULL, &error)) {
 		gchar *str;
 
 		str = g_strdup_printf (_("Installation for theme \"%s\" failed."), theme_name);
@@ -345,7 +357,13 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
 					GTK_MESSAGE_ERROR,
 					GTK_BUTTONS_OK,
 					str);
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+							  error->message);
+
 		g_free (str);
+		g_error_free (error);
+		error = NULL;
+
 		gtk_dialog_run (GTK_DIALOG (dialog));
 		gtk_widget_destroy (dialog);
 		success = FALSE;
@@ -475,12 +493,13 @@ transfer_done_cb (GtkWidget *dlg, gchar *path)
 		gchar *tmp_dir;
 		gboolean ok;
 		gint n_themes;
+		GFile *todelete;
 
 		tmp_dir = g_strdup_printf ("%s/.themes/.theme-%u",
 					   g_get_home_dir (),
 					   g_random_int ());
 
-		if ((gnome_vfs_make_directory (tmp_dir, 0700)) != GNOME_VFS_OK) {
+		if ((g_mkdir (tmp_dir, 0700)) != 0) {
 			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
 							GTK_BUTTONS_OK,
 							_("Failed to create temporary directory"));
@@ -491,17 +510,20 @@ transfer_done_cb (GtkWidget *dlg, gchar *path)
 			return;
 		}
 
-
 		if (!transfer_done_archive (filetype, tmp_dir, path) ||
 		    ((dir = g_dir_open (tmp_dir, 0, NULL)) == NULL))
 		{
-			cleanup_tmp_dir (tmp_dir);
+			g_io_scheduler_push_job ((GIOSchedulerJobFunc) cleanup_tmp_dir,
+						 g_strdup (tmp_dir), g_free,
+						 G_PRIORITY_DEFAULT, NULL);
 			g_free (tmp_dir);
 			g_free (path);
 			return;
 		}
 
-		gnome_vfs_unlink (path);
+		todelete = g_file_new_for_path (path);
+		g_file_delete (todelete, NULL, NULL);
+		g_object_unref (todelete);
 
 		/* See whether we have multiple themes to install. If so,
 		 * we won't ask the user whether to apply the new theme
@@ -547,9 +569,9 @@ transfer_done_cb (GtkWidget *dlg, gchar *path)
 			gtk_dialog_run (GTK_DIALOG (dialog));
 			gtk_widget_destroy (dialog);
 		}
-
-		cleanup_tmp_dir (tmp_dir);
-		g_free (tmp_dir);
+		g_io_scheduler_push_job ((GIOSchedulerJobFunc) cleanup_tmp_dir,
+					 tmp_dir, g_free,
+					 G_PRIORITY_DEFAULT, NULL);
 	}
 
 	g_free (path);
diff --git a/capplets/appearance/theme-util.c b/capplets/appearance/theme-util.c
index ee016e200..51372a784 100644
--- a/capplets/appearance/theme-util.c
+++ b/capplets/appearance/theme-util.c
@@ -59,10 +59,13 @@ directory_delete_recursive (GFile *directory, GError **error)
   }
   g_file_enumerator_close (enumerator, NULL, NULL);
 
+  if (success)
+    success = g_file_delete (directory, NULL, error);
+
   return success;
 }
 
-static gboolean
+gboolean
 file_delete_recursive (GFile *file, GError **error)
 {
   GFileInfo *info;
@@ -97,7 +100,7 @@ theme_is_writable (const gpointer theme)
   if (info == NULL || info->path == NULL)
     return FALSE;
 
-  file = g_file_new_for_uri (info->path);
+  file = g_file_new_for_path (info->path);
   file_info = g_file_query_info (file,
                                  G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE,
                                  G_FILE_QUERY_INFO_NONE,
@@ -165,7 +168,7 @@ theme_delete (const gchar *name, ThemeType type)
       return FALSE;
   }
 
-  dir = g_file_new_for_uri (theme_dir);
+  dir = g_file_new_for_path (theme_dir);
   g_free (theme_dir);
 
   if (!file_delete_recursive (dir, NULL)) {
diff --git a/capplets/appearance/theme-util.h b/capplets/appearance/theme-util.h
index 033cd1282..17b04e7b4 100644
--- a/capplets/appearance/theme-util.h
+++ b/capplets/appearance/theme-util.h
@@ -60,3 +60,4 @@ gboolean theme_find_in_model (GtkTreeModel *model, const gchar *name, GtkTreeIte
 
 void     theme_install_file (GtkWindow *parent, const gchar *path);
 gboolean packagekit_available (void);
+gboolean file_delete_recursive (GFile *directory, GError **error);
diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index b60d377e7..6800772bd 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,48 @@
+2008-06-01  Thomas Wood  <thos@gnome.org>
+
+	* capplet-util.c:
+	* capplet-util.h:
+
+	Remove some redundant and unused code
+
+2008-05-24  Jens Granseuer  <jensgr@gmx.net>
+
+	* gnome-theme-info.c: (gnome_theme_read_meta_theme),
+	(read_icon_theme), (read_cursor_theme), (read_cursor_fonts),
+	(update_theme_index): return to using paths instead of URIs since
+	most of the code using them expects paths
+
+2008-05-18  Thomas Wood  <thos@gnome.org>
+
+	* gconf-property-editor.c: (gconf_property_editor_class_init),
+	(gconf_property_editor_get_prop): Allow the data property to be
+	read as well as written.
+
+2008-05-18  Jens Granseuer  <jensgr@gmx.net>
+
+	* gconf-property-editor.c: (gconf_property_editor_init),
+	(gconf_property_editor_class_init),
+	(gconf_property_editor_finalize), (gconf_peditor_new),
+	(gconf_peditor_new_boolean), (gconf_peditor_new_integer_valist),
+	(gconf_peditor_new_string_valist), (gconf_peditor_new_color),
+	(gconf_peditor_new_combo_box),
+	(gconf_peditor_new_combo_box_with_enum),
+	(gconf_peditor_new_select_radio),
+	(gconf_peditor_new_numeric_range),
+	(gconf_peditor_widget_set_guard), (gconf_peditor_new_enum_toggle),
+	(peditor_image_set_filename), (peditor_image_clicked_cb),
+	(gconf_peditor_new_image),
+	(gconf_peditor_new_select_radio_with_enum): use G_DEFINE_TYPE to
+	get rid of the boilerplate code and remove a number of unnecessary
+	casts
+
+==================== 2.23.2 ====================
+
+2008-05-17  Jens Granseuer  <jensgr@gmx.net>
+
+	* bonobo-property-editor-range.c:
+	* bonobo-property-editor-range.h: remove unused files
+
 2008-05-07  Jens Granseuer  <jensgr@gmx.net>
 
 	* gnome-theme-info.c: (gtk_theme_info_missing_engine),
diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am
index ac0fbca3f..6b0d40d16 100644
--- a/capplets/common/Makefile.am
+++ b/capplets/common/Makefile.am
@@ -7,7 +7,6 @@ INCLUDES = \
 	-DG_LOG_DOMAIN=\"capplet-common\"				\
 	-DINSTALL_PREFIX=\"$(prefix)\"					\
 	-I$(top_srcdir)							\
-	-I$(top_srcdir)/libbackground					\
 	-I$(top_srcdir)/libwindow-settings				\
 	$(DBUS_CFLAGS)							\
 	$(GNOME_DESKTOP_CFLAGS)						\
@@ -41,7 +40,7 @@ libcommon_la_SOURCES = \
 	wm-common.c			\
 	wm-common.h
 
-libcommon_la_LIBADD = $(top_builddir)/libbackground/libbackground.la	\
+libcommon_la_LIBADD =							\
 	$(top_builddir)/libwindow-settings/libgnome-window-settings.la  \
 	$(METACITY_LIBS)							\
 	$(DBUS_LIBS)							\
diff --git a/capplets/common/bonobo-property-editor-range.c b/capplets/common/bonobo-property-editor-range.c
deleted file mode 100644
index f4069b63e..000000000
--- a/capplets/common/bonobo-property-editor-range.c
+++ /dev/null
@@ -1,70 +0,0 @@
-#include <bonobo-conf/bonobo-property-editor.h>
-#include <gtk/gtkrange.h>
-#include <gtk/gtksignal.h>
-#include <bonobo.h>
-
-static void
-changed_cb (GtkAdjustment *adj, BonoboPEditor *editor)
-{
-	CORBA_Environment ev;
-	DynamicAny_DynAny dyn;
-	BonoboArg *arg;
-	gulong val;
-
-	CORBA_exception_init (&ev);
-
-	val = adj->value;
-
-	dyn = CORBA_ORB_create_basic_dyn_any (bonobo_orb (), TC_ulong, &ev);
-	DynamicAny_DynAny_insert_ulong (dyn, val, &ev);
-
-	if (BONOBO_EX (&ev) || dyn == NULL)
-		return;
-
-	arg = DynamicAny_DynAny_to_any (dyn, &ev);
-	bonobo_peditor_set_value (editor, arg, &ev);
-
-	bonobo_arg_release (arg);
-	CORBA_Object_release ((CORBA_Object) dyn, &ev);
-	CORBA_exception_free (&ev);
-}
-
-static void
-adj_set_value_cb (BonoboPEditor     *editor,
-		  BonoboArg 	    *value,
-		  CORBA_Environment *ev)
-{
-	GtkAdjustment *adj;
-	gulong v;
-
-	adj = gtk_range_get_adjustment (GTK_RANGE (bonobo_peditor_get_widget (editor)));
-
-	if (!bonobo_arg_type_is_equal (value->_type, TC_ulong, NULL))
-		return;
-
-	v = BONOBO_ARG_GET_GENERAL (value, TC_ulong, CORBA_unsigned_long, NULL);
-
-	gtk_signal_handler_block_by_func (GTK_OBJECT (adj), changed_cb,
-					  editor);
-	
-	gtk_adjustment_set_value (adj, v);
-
-	gtk_signal_handler_unblock_by_func (GTK_OBJECT (adj), changed_cb,
-					    editor);
-}
-
-GtkObject* bonobo_peditor_range_construct (GtkWidget *widget)
-{
-	BonoboPEditor *editor;
-	GtkAdjustment *adj;
-
-	g_return_val_if_fail (widget != NULL, NULL);
-	g_return_val_if_fail (GTK_IS_RANGE (widget), NULL);
-
-	editor = bonobo_peditor_construct (widget, adj_set_value_cb, TC_ulong); 
-	adj = gtk_range_get_adjustment (GTK_RANGE (widget));
-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
-		       	    GTK_SIGNAL_FUNC (changed_cb), editor);
-
-	return GTK_OBJECT (editor);
-}
diff --git a/capplets/common/bonobo-property-editor-range.h b/capplets/common/bonobo-property-editor-range.h
deleted file mode 100644
index a0167d48d..000000000
--- a/capplets/common/bonobo-property-editor-range.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __BONOBO_PROPERTY_RANGE_SCALE_H__
-#define __BONOBO_PROPERTY_RANGE_SCALE_H__
-
-#include <gtk/gtkwidget.h>
-
-GtkObject* bonobo_peditor_range_construct (GtkWidget *widget);
-
-#endif /* __BONOBO_PROPERTY_RANGE_SCALE_H__ */
diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c
index afdc7956e..a1c6c6c9b 100644
--- a/capplets/common/capplet-util.c
+++ b/capplets/common/capplet-util.c
@@ -34,271 +34,7 @@
 
 #include "capplet-util.h"
 
-#if 0
-
-/* apply_cb
- *
- * Callback issued when the user clicks "Apply" or "Ok". This function is
- * responsible for making sure the current settings are properly saved.
- */
-
 static void
-apply_cb (BonoboPropertyControl *pc, Bonobo_PropertyControl_Action action) 
-{
-	if (action == Bonobo_PropertyControl_APPLY)
-		gconf_engine_commit_change_set (gconf_engine_get_default (),
-						changeset, TRUE, NULL);
-}
-
-/* properties_changed_cb
- *
- * Callback issued when some setting has changed
- */
-
-static void
-properties_changed_cb (GConfEngine *engine, guint cnxn_id, GConfEntry *entry, gpointer user_data) 
-{
-	if (apply_settings_cb != NULL)
-		apply_settings_cb ();
-}
-
-/* get_control_cb
- *
- * Callback to construct the main dialog box for this capplet; invoked by Bonobo
- * whenever capplet activation is requested. Returns a BonoboObject representing
- * the control that encapsulates the object.
- */
-
-static BonoboObject *
-get_control_cb (BonoboPropertyControl *property_control, gint page_number) 
-{
-	BonoboControl        *control;
-	GtkWidget            *widget;
-
-	widget = create_dialog_cb ();
-
-	if (widget == NULL)
-		return NULL;
-
-	control = bonobo_control_new (widget);
-	setup_property_editors_cb (widget, changeset);
-
-	bonobo_control_set_automerge (control, TRUE);
-
-	return BONOBO_OBJECT (control);
-}
-
-/* create_control_cb
- *
- * Small function to create the PropertyControl and return it.
- */
-
-static BonoboObject *
-create_control_cb (BonoboGenericFactory *factory, const gchar *component_id) 
-{
-	BonoboObject                  *obj;
-	BonoboPropertyControl         *property_control;
-
-	static const gchar            *prefix1 = "OAFIID:Bonobo_Control_Capplet_";
-
-	g_message ("%s: Enter", G_GNUC_FUNCTION);
-
-	if (!strncmp (component_id, prefix1, strlen (prefix1))) {
-		property_control = bonobo_property_control_new
-			((BonoboPropertyControlGetControlFn) get_control_cb, 1, NULL);
-		g_signal_connect (G_OBJECT (property_control), "action",
-				  G_CALLBACK (apply_cb), NULL);
-		obj = BONOBO_OBJECT (property_control);
-	} else {
-		g_critical ("Not creating %s", component_id);
-		obj = NULL;
-	}
-
-	return obj;
-}
-
-/* get_factory_name
- *
- * Construct the OAF IID of the factory from the binary name
- */
-
-static gchar *
-get_factory_name (const gchar *binary) 
-{
-	gchar *s, *tmp, *tmp1, *res;
-
-	s = g_strdup (binary);
-	tmp = strrchr (s, '/');
-	if (tmp == NULL) tmp = s;
-	else tmp++;
-	if ((tmp1 = strstr (tmp, "-control")) != NULL) *tmp1 = '\0';
-	if ((tmp1 = strstr (tmp, "-capplet")) != NULL) *tmp1 = '\0';
-	while ((tmp1 = strchr (tmp, '-')) != NULL) *tmp1 = '_';
-
-	res = g_strconcat ("OAFIID:Bonobo_", tmp, "_Factory", NULL);
-	g_free (s);
-	return res;
-}
-
-/* get_property_name
- *
- * Get the property name associated with this capplet
- */
-
-static gchar *
-get_property_name (const gchar *binary) 
-{
-	gchar *s, *tmp, *tmp1, *res;
-
-	s = g_strdup (binary);
-	tmp = strrchr (s, '/');
-	if (tmp == NULL) tmp = s;
-	else tmp++;
-	if ((tmp1 = strstr (tmp, "-control")) != NULL) *tmp1 = '\0';
-	if ((tmp1 = strstr (tmp, "-capplet")) != NULL) *tmp1 = '\0';
-
-	for (tmp1 = tmp; *tmp1 != '\0'; tmp1++) {
-		*tmp1 = toupper (*tmp1);
-		if (*tmp1 == '-') *tmp1 = '_';
-	}
-
-	res = g_strconcat ("GNOME_", tmp, NULL);
-	g_free (s);
-	return res;
-}
-
-#endif
-
-/* setup_session_mgmt
- *
- * Make sure the capplet launches and applies its settings next time the user
- * logs in
- */
-
-void
-setup_session_mgmt (const gchar *binary_name) 
-{
-/* Disabled. I never really understood this code anyway, and I am absolutely
- * unclear about how to port it to GNOME 2.0 */
-#if 0
-	GnomeClient *client;
-	GnomeClientFlags flags;
-	gint token;
-	gchar *restart_args[3];
-	gchar *prop_name;
-
-	g_return_if_fail (binary_name != NULL);
-
-	client = gnome_master_client ();
-	flags = gnome_client_get_flags (client);
-
-	if (flags & GNOME_CLIENT_IS_CONNECTED) {
-		prop_name = get_property_name (binary_name);
-		token = gnome_startup_acquire_token
-			(prop_name, gnome_client_get_id (client));
-		g_free (prop_name);
-
-		if (token) {
-			gnome_client_set_priority (client, 20);
-			gnome_client_set_restart_style
-				(client, GNOME_RESTART_ANYWAY);
-			restart_args[0] = g_strdup (binary_name);
-			restart_args[1] = "--init-session-settings";
-			restart_args[2] = NULL;
-			gnome_client_set_restart_command
-				(client, 2, restart_args);
-			g_free (restart_args[0]);
-		} else {
-			gnome_client_set_restart_style
-				(client, GNOME_RESTART_NEVER);
-		}
-	}
-#endif
-}
-
-#if 0
-
-/* capplet_init -- see documentation in capplet-util.h
- */
-
-void
-capplet_init (int                      argc,
-	      char                   **argv,
-	      ApplySettingsFn          apply_fn,
-	      CreateDialogFn           create_dialog_fn,
-	      SetupPropertyEditorsFn   setup_fn,
-	      GetLegacySettingsFn      get_legacy_fn) 
-{
-	gchar                         *factory_iid;
-	BonoboGenericFactory          *factory;
-	GOptionContext                *context;
-
-	static gboolean apply_only;
-	static gboolean get_legacy;
-	static GOptionEntry cap_options[] = {
-		{ "apply", 0, 0, G_OPTION_ARG_NONE, &apply_only,
-		  N_("Just apply settings and quit"), NULL },
-		{ "init-session-settings", 0, 0, G_OPTION_ARG_NONE, &apply_only,
-		  N_("Just apply settings and quit"), NULL },
-		{ "get-legacy", 0, 0, G_OPTION_ARG_NONE, &get_legacy,
-		  N_("Retrieve and store legacy settings"), NULL },
-		{ NULL }
-	};
-
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
-
-	context = g_option_context_new (NULL);
-	g_option_context_add_main_entries (context, cap_options, GETTEXT_PACKAGE);
-
-	gnome_program_init (argv[0], VERSION, LIBGNOMEUI_MODULE, argc, argv,
-			    GNOME_PARAM_GOPTION_CONTEXT, context,
-			    NULL);
-
-	if (!bonobo_init (&argc, argv))
-		g_error ("Cannot initialize bonobo");
-
-	if (apply_only && apply_fn != NULL) {
-		setup_session_mgmt (argv[0]);
-		apply_fn ();
-	}
-	else if (get_legacy && get_legacy_fn != NULL) {
-		setup_session_mgmt (argv[0]);
-		get_legacy_fn ();
-	} else {
-		setup_session_mgmt (argv[0]);
-
-		create_dialog_cb = create_dialog_fn;
-		apply_settings_cb = apply_fn;
-		setup_property_editors_cb = setup_fn;
-
-		factory_iid = get_factory_name (argv[0]);
-		factory = bonobo_generic_factory_new
-			(factory_iid, (BonoboFactoryCallback) create_control_cb, NULL);
-		g_free (factory_iid);
-		bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));
-
-		changeset = gconf_change_set_new ();
-
-		bonobo_main ();
-
-		gconf_change_set_unref (changeset);
-	}
-}
-
-#endif
-
-
-/**
- * capplet_error_dialog :
- *
- * @parent :
- * @msg : already translated.
- * @err :
- *
- */
-void
 capplet_error_dialog (GtkWindow *parent, char const *msg, GError *err)
 {
 	if (err != NULL) {
diff --git a/capplets/common/capplet-util.h b/capplets/common/capplet-util.h
index 5fa179d2f..f28e99299 100644
--- a/capplets/common/capplet-util.h
+++ b/capplets/common/capplet-util.h
@@ -42,49 +42,8 @@
 	if (!def)                                                               \
 		gconf_client_set_##type (client, key, val_##type, NULL);
 
-/* Callback to apply the settings in the given database */
-typedef void (*ApplySettingsFn) (void);
+/* Some miscellaneous functions useful to all capplets */
 
-/* Callback to set up the dialog proper */
-typedef GtkWidget *(*CreateDialogFn) (void);
-
-/* Callback to set up property editors for the dialog */
-typedef void (*SetupPropertyEditorsFn) (GtkWidget *dialog, GConfChangeSet *changeset);
-
-/* Callback to retrieve legacy settings and store them in the new configuration
- * database */
-typedef void (*GetLegacySettingsFn) (void);
-
-/* Set up the session management so that this capplet will apply its
- * settings on every startup
- */
-
-void setup_session_mgmt (const gchar *binary_name);
-
-/* Wrapper function for the entire capplet. This handles all initialization and
- * runs the capplet for you. Just supply the appropriate callbacks and your argc
- * and argv from main()
- *
- * This function makes several assumptions, requiring that all capplets follow a
- * particular convention. In particular, suppose the name of the capplet binary
- * is foo-properties-capplet. Then:
- *
- *   - The factory IID is Bonobo_Control_Capplet_foo_properties_Factory
- *   - The default configuration moniker is archiver:foo-properties
- *
- * Following this convention yields capplets that are more uniform and thus
- * easier to maintain, and simplifies the interfaces quite a bit. All capplet in
- * this package are required to follow this convention.
- */
-
-void capplet_init (int                      argc,
-		   gchar                  **argv,
-		   ApplySettingsFn          apply_fn,
-		   CreateDialogFn           create_dialog_fn,
-		   SetupPropertyEditorsFn   setup_property_editors_fn,
-		   GetLegacySettingsFn      get_legacy_settings_fn);
-
-void capplet_error_dialog (GtkWindow *parent, char const *msg, GError *err);
 void capplet_help (GtkWindow *parent, char const *helpfile, char const *section);
 void capplet_set_icon (GtkWidget *window, char const *icon_file_name);
 
diff --git a/capplets/common/gconf-property-editor.c b/capplets/common/gconf-property-editor.c
index 6c1ef00aa..728b528e5 100644
--- a/capplets/common/gconf-property-editor.c
+++ b/capplets/common/gconf-property-editor.c
@@ -48,8 +48,6 @@ enum {
 	PROP_DATA_FREE_CB
 };
 
-typedef void (*GConfPropertyEditorDataFreeCb) (gpointer data);
-
 struct _GConfPropertyEditorPrivate
 {
 	gchar                   *key;
@@ -61,8 +59,8 @@ struct _GConfPropertyEditorPrivate
 	GConfClientNotifyFunc    callback;
 	gboolean                 inited;
 
-	gpointer 		      data;
-	GConfPropertyEditorDataFreeCb data_free_cb;
+	gpointer 		 data;
+	GFreeFunc                data_free_cb;
 };
 
 typedef struct
@@ -76,13 +74,6 @@ typedef struct
 
 static guint peditor_signals[LAST_SIGNAL];
 
-static GObjectClass *parent_class;
-
-static void gconf_property_editor_init        (GConfPropertyEditor      *gconf_property_editor,
-					       GConfPropertyEditorClass *class);
-static void gconf_property_editor_class_init  (GConfPropertyEditorClass *class);
-static void gconf_property_editor_base_init   (GConfPropertyEditorClass *class);
-
 static void gconf_property_editor_set_prop    (GObject      *object,
 					       guint         prop_id,
 					       const GValue *value,
@@ -103,33 +94,11 @@ static GObject *gconf_peditor_new             (const gchar           *key,
 					       const gchar	     *first_custom,
 					       ...);
 
-GType
-gconf_property_editor_get_type (void)
-{
-	static GType gconf_property_editor_type = 0;
-
-	if (!gconf_property_editor_type) {
-		GTypeInfo gconf_property_editor_info = {
-			sizeof (GConfPropertyEditorClass),
-			(GBaseInitFunc) gconf_property_editor_base_init,
-			NULL, /* GBaseFinalizeFunc */
-			(GClassInitFunc) gconf_property_editor_class_init,
-			NULL, /* GClassFinalizeFunc */
-			NULL, /* user-supplied data */
-			sizeof (GConfPropertyEditor),
-			0, /* n_preallocs */
-			(GInstanceInitFunc) gconf_property_editor_init,
-			NULL
-		};
-
-		gconf_property_editor_type =
-			g_type_register_static (G_TYPE_OBJECT,
-						"GConfPropertyEditor",
-						&gconf_property_editor_info, 0);
-	}
+G_DEFINE_TYPE (GConfPropertyEditor, gconf_property_editor, G_TYPE_OBJECT)
+
+#define GCONF_PROPERTY_EDITOR_GET_PRIVATE(object) \
+        (G_TYPE_INSTANCE_GET_PRIVATE ((object), gconf_property_editor_get_type (), GConfPropertyEditorPrivate))
 
-	return gconf_property_editor_type;
-}
 
 static GConfValue*
 gconf_property_editor_conv_default (GConfPropertyEditor *peditor,
@@ -139,21 +108,15 @@ gconf_property_editor_conv_default (GConfPropertyEditor *peditor,
 }
 
 static void
-gconf_property_editor_init (GConfPropertyEditor      *gconf_property_editor,
-			    GConfPropertyEditorClass *class)
+gconf_property_editor_init (GConfPropertyEditor *gconf_property_editor)
 {
-	gconf_property_editor->p = g_new0 (GConfPropertyEditorPrivate, 1);
+	gconf_property_editor->p = GCONF_PROPERTY_EDITOR_GET_PRIVATE (gconf_property_editor);
 	gconf_property_editor->p->conv_to_widget_cb = gconf_property_editor_conv_default;
 	gconf_property_editor->p->conv_from_widget_cb = gconf_property_editor_conv_default;
 	gconf_property_editor->p->inited = FALSE;
 }
 
 static void
-gconf_property_editor_base_init (GConfPropertyEditorClass *class)
-{
-}
-
-static void
 gconf_property_editor_class_init (GConfPropertyEditorClass *class)
 {
 	GObjectClass *object_class;
@@ -216,7 +179,7 @@ gconf_property_editor_class_init (GConfPropertyEditorClass *class)
 		 g_param_spec_pointer ("data",
 				       _("Property editor object data"),
 				       _("Custom data required by the specific property editor"),
-				       G_PARAM_WRITABLE));
+				       G_PARAM_READWRITE));
 
 	g_object_class_install_property
 		(object_class, PROP_DATA_FREE_CB,
@@ -225,8 +188,7 @@ gconf_property_editor_class_init (GConfPropertyEditorClass *class)
 				       _("Callback to be issued when property editor object data is to be freed"),
 				       G_PARAM_WRITABLE));
 
-	parent_class = G_OBJECT_CLASS
-		(g_type_class_ref (G_TYPE_OBJECT));
+	g_type_class_add_private (class, sizeof (GConfPropertyEditorPrivate));
 }
 
 static void
@@ -314,6 +276,9 @@ gconf_property_editor_get_prop (GObject    *object,
 		g_value_set_pointer (value, peditor->p->changeset);
 		break;
 
+	case PROP_DATA:
+		g_value_set_pointer (value, peditor->p->data);
+		break;
 	default:
 		g_warning ("Bad argument get");
 		break;
@@ -344,9 +309,7 @@ gconf_property_editor_finalize (GObject *object)
 		g_object_unref (client);
 	}
 
-	g_free (gconf_property_editor->p);
-
-	G_OBJECT_CLASS (parent_class)->finalize (object);
+	G_OBJECT_CLASS (gconf_property_editor_parent_class)->finalize (object);
 }
 
 static GObject *
@@ -388,7 +351,7 @@ gconf_peditor_new (const gchar           *key,
 	GCONF_PROPERTY_EDITOR (obj)->p->callback (client, 0, gconf_entry, obj);
 	GCONF_PROPERTY_EDITOR (obj)->p->inited = TRUE;
 	gconf_entry_free (gconf_entry);
-	g_object_unref (G_OBJECT (client));
+	g_object_unref (client);
 
 	return obj;
 }
@@ -490,7 +453,7 @@ gconf_peditor_new_boolean (GConfChangeSet *changeset,
 
 	va_end (var_args);
 
-	g_signal_connect_swapped (G_OBJECT (checkbox), "toggled",
+	g_signal_connect_swapped (checkbox, "toggled",
 				  (GCallback) peditor_boolean_widget_changed, peditor);
 
 	return peditor;
@@ -559,7 +522,7 @@ gconf_peditor_new_integer_valist (GConfChangeSet *changeset,
 		 first_property_name,
 		 var_args, NULL);
 
-	g_signal_connect_swapped (G_OBJECT (entry), "changed",
+	g_signal_connect_swapped (entry, "changed",
 				  (GCallback) peditor_integer_widget_changed, peditor);
 
 	return peditor;
@@ -653,7 +616,7 @@ gconf_peditor_new_string_valist (GConfChangeSet *changeset,
 		 first_property_name,
 		 var_args, NULL);
 
-	g_signal_connect_swapped (G_OBJECT (entry), "changed",
+	g_signal_connect_swapped (entry, "changed",
 				  (GCallback) peditor_string_widget_changed, peditor);
 
 	return peditor;
@@ -788,7 +751,7 @@ gconf_peditor_new_color (GConfChangeSet *changeset,
 
 	va_end (var_args);
 
-	g_signal_connect_swapped (G_OBJECT (cb), "color_set",
+	g_signal_connect_swapped (cb, "color_set",
 				  (GCallback) peditor_color_widget_changed, peditor);
 
 	return peditor;
@@ -941,7 +904,7 @@ gconf_peditor_new_combo_box (GConfChangeSet *changeset,
 
 	va_end (var_args);
 
-	g_signal_connect_swapped (G_OBJECT (combo_box), "changed",
+	g_signal_connect_swapped (combo_box, "changed",
 				  (GCallback) peditor_combo_box_widget_changed, peditor);
 
 	return peditor;
@@ -991,7 +954,7 @@ gconf_peditor_new_combo_box_with_enum	(GConfChangeSet *changeset,
 
 	va_end (var_args);
 
-	g_signal_connect_swapped (G_OBJECT (combo_box), "changed",
+	g_signal_connect_swapped (combo_box, "changed",
 				  (GCallback) peditor_combo_box_widget_changed, peditor);
 
 	return peditor;
@@ -1078,7 +1041,7 @@ gconf_peditor_new_select_radio (GConfChangeSet *changeset,
 	va_end (var_args);
 
 	for (item = radio_group; item != NULL; item = item->next)
-		g_signal_connect_swapped (G_OBJECT (item->data), "toggled",
+		g_signal_connect_swapped (item->data, "toggled",
 					  (GCallback) peditor_select_radio_widget_changed, peditor);
 
 	return peditor;
@@ -1190,7 +1153,7 @@ gconf_peditor_new_numeric_range (GConfChangeSet *changeset,
 		(key,
 		 (GConfClientNotifyFunc) peditor_numeric_range_value_changed,
 		 changeset,
-		 G_OBJECT (adjustment),
+		 adjustment,
 		 first_property_name,
 		 var_args, NULL);
 
@@ -1237,7 +1200,6 @@ gconf_peditor_widget_set_guard (GConfPropertyEditor *peditor,
 	g_return_if_fail (GTK_IS_WIDGET (widget));
 
 	client = gconf_client_get_default ();
-
 	value = gconf_client_get (client, peditor->p->key, NULL);
 	g_object_unref (client);
 
@@ -1248,7 +1210,7 @@ gconf_peditor_widget_set_guard (GConfPropertyEditor *peditor,
                 g_warning ("NULL GConf value: %s: possibly incomplete setup", peditor->p->key);
 	}
 
-	g_signal_connect (G_OBJECT (peditor), "value-changed", (GCallback) guard_value_changed, widget);
+	g_signal_connect (peditor, "value-changed", (GCallback) guard_value_changed, widget);
 }
 
 GConfValue *
@@ -1442,7 +1404,7 @@ gconf_peditor_new_enum_toggle  (GConfChangeSet		*changeset,
 
 	va_end (var_args);
 
-	g_signal_connect_swapped (G_OBJECT (checkbox), "toggled",
+	g_signal_connect_swapped (checkbox, "toggled",
 				  (GCallback) peditor_boolean_widget_changed, peditor);
 
 	return peditor;
@@ -1519,7 +1481,7 @@ peditor_image_set_filename (GConfPropertyEditor *peditor, const gchar *filename)
 	}
 
 	gtk_image_set_from_pixbuf (image, pixbuf);
-	g_object_unref (G_OBJECT (pixbuf));
+	g_object_unref (pixbuf);
 
 	return TRUE;
 }
@@ -1637,10 +1599,10 @@ peditor_image_clicked_cb (GConfPropertyEditor *peditor, GtkButton *button)
 	if (filename && strcmp (filename, ""))
 		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (chooser), filename);
 
-	g_signal_connect (G_OBJECT (chooser), "update-preview",
+	g_signal_connect (chooser, "update-preview",
 			  G_CALLBACK (peditor_image_chooser_update_preview_cb),
 			  preview);
-	g_signal_connect (G_OBJECT (chooser), "response",
+	g_signal_connect (chooser, "response",
 			  G_CALLBACK (peditor_image_chooser_response_cb),
 			  peditor);
 
@@ -1700,7 +1662,7 @@ gconf_peditor_new_image (GConfChangeSet	  *changeset,
 
 	va_end (var_args);
 
-	g_signal_connect_swapped (G_OBJECT (button), "clicked",
+	g_signal_connect_swapped (button, "clicked",
 				  (GCallback) peditor_image_clicked_cb, peditor);
 
 	return peditor;
@@ -1754,7 +1716,7 @@ gconf_peditor_new_select_radio_with_enum (GConfChangeSet *changeset,
 	va_end (var_args);
 
 	for (item = radio_group; item != NULL; item = item->next)
-		g_signal_connect_swapped (G_OBJECT (item->data), "toggled",
+		g_signal_connect_swapped (item->data, "toggled",
 					  (GCallback) peditor_select_radio_widget_changed, peditor);
 
 	return peditor;
diff --git a/capplets/common/gnome-theme-info.c b/capplets/common/gnome-theme-info.c
index b9edbcdf1..98941ad4f 100644
--- a/capplets/common/gnome-theme-info.c
+++ b/capplets/common/gnome-theme-info.c
@@ -269,14 +269,14 @@ gnome_theme_read_meta_theme (GFile *meta_theme_uri)
 
   meta_theme_file = g_file_get_uri (meta_theme_uri);
   meta_theme_ditem = gnome_desktop_item_new_from_uri (meta_theme_file, 0, NULL);
-  if (meta_theme_ditem == NULL) {
-    g_free (meta_theme_file);
+  g_free (meta_theme_file);
+
+  if (meta_theme_ditem == NULL)
     return NULL;
-  }
 
   common_theme_dir_uri = g_file_get_parent (meta_theme_uri);
   meta_theme_info = gnome_theme_meta_info_new ();
-  meta_theme_info->path = meta_theme_file;
+  meta_theme_info->path = g_file_get_path (meta_theme_uri);
   meta_theme_info->name = g_file_get_basename (common_theme_dir_uri);
   g_object_unref (common_theme_dir_uri);
 
@@ -390,15 +390,14 @@ read_icon_theme (GFile *icon_theme_uri)
 
   icon_theme_file = g_file_get_uri (icon_theme_uri);
   icon_theme_ditem = gnome_desktop_item_new_from_uri (icon_theme_file, 0, NULL);
-  if (icon_theme_ditem == NULL) {
-    g_free (icon_theme_file);
+  g_free (icon_theme_file);
+
+  if (icon_theme_ditem == NULL)
     return NULL;
-  }
 
   name = gnome_desktop_item_get_string (icon_theme_ditem, "Icon Theme/Name");
   if (name == NULL) {
     gnome_desktop_item_unref (icon_theme_ditem);
-    g_free (icon_theme_file);
     return NULL;
   }
 
@@ -406,7 +405,6 @@ read_icon_theme (GFile *icon_theme_uri)
   directories = gnome_desktop_item_get_string (icon_theme_ditem, "Icon Theme/Directories");
   if (directories == NULL) {
     gnome_desktop_item_unref (icon_theme_ditem);
-    g_free (icon_theme_file);
     return NULL;
   }
 
@@ -416,13 +414,12 @@ read_icon_theme (GFile *icon_theme_uri)
     gchar *dir_name;
     icon_theme_info = gnome_theme_icon_info_new ();
     icon_theme_info->readable_name = g_strdup (name);
-    icon_theme_info->path = icon_theme_file;
-    dir_name = g_path_get_dirname (icon_theme_file);
+    icon_theme_info->path = g_file_get_path (icon_theme_uri);
+    dir_name = g_path_get_dirname (icon_theme_info->path);
     icon_theme_info->name = g_path_get_basename (dir_name);
     g_free (dir_name);
   } else {
     icon_theme_info = NULL;
-    g_free (icon_theme_file);
   }
 
   gnome_desktop_item_unref (icon_theme_ditem);
@@ -538,7 +535,7 @@ read_cursor_theme (GFile *cursor_theme_uri)
       }
 
       cursor_theme_info = gnome_theme_cursor_info_new ();
-      cursor_theme_info->path = g_file_get_uri (parent_uri);
+      cursor_theme_info->path = g_file_get_path (parent_uri);
       cursor_theme_info->name = name;
       cursor_theme_info->sizes = sizes;
       cursor_theme_info->thumbnail = thumbnail;
@@ -664,7 +661,7 @@ read_cursor_fonts (void)
     theme_info->thumbnail = gdk_pixbuf_new_from_file (filename, NULL);
     g_free (filename);
 
-    theme_info->path = g_build_filename ("file://" GNOMECC_DATA_DIR, builtins[i][0], NULL);
+    theme_info->path = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL);
     theme_info->name = g_strdup (theme_info->path);
 
     if (!strcmp (theme_info->path, cursor_font))
@@ -759,7 +756,7 @@ update_theme_index (GFile            *index_uri,
   /* Next, we see what currently exists */
   parent = g_file_get_parent (index_uri);
   common_theme_dir_uri = g_file_get_parent (parent);
-  common_theme_dir = g_file_get_uri (common_theme_dir_uri);
+  common_theme_dir = g_file_get_path (common_theme_dir_uri);
 
   theme_info = g_hash_table_lookup (theme_hash_by_uri, common_theme_dir);
   if (theme_info == NULL) {
diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index 9f1059b7b..2db63a36d 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,18 @@
+2008-06-15  Thomas Wood  <thos@gnome.org>
+
+	* Makefile.am:
+	* icons/*:
+
+	Provide a Tango style application icon for Preferred Applications
+	capplet (bug 397312). Artwork by Jakub Steiner <jimmac@ximian.com>.
+
+2008-05-18  Thomas Wood  <thos@gnome.org>
+
+	* gnome-da-capplet.c: Convert to use GConfPropertyEditor and remove
+	a lot of duplicated code in the process.
+
+==================== 2.23.2 ====================
+
 2008-04-16  Jens Granseuer  <jensgr@gmx.net>
 
 	* gnome-da-capplet.c: (show_dialog), (main):
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index 3fc3b9bc3..d464f9aea 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -42,5 +42,30 @@ INCLUDES   = 					\
 	-DGNOMECC_GLADE_DIR=\""$(gladedir)"\"	\
 	-DGNOMECC_DATA_DIR=\""$(pkgdatadir)"\"
 
+
+icons16dir = $(datadir)/icons/hicolor/16x16/apps
+dist_icons16_DATA = icons/16x16/gnome-settings-default-applications.png
+icons22dir = $(datadir)/icons/hicolor/22x22/apps
+dist_icons22_DATA = icons/22x22/gnome-settings-default-applications.png
+icons24dir = $(datadir)/icons/hicolor/24x24/apps
+dist_icons24_DATA = icons/24x24/gnome-settings-default-applications.png
+icons32dir = $(datadir)/icons/hicolor/32x32/apps
+dist_icons32_DATA = icons/32x32/gnome-settings-default-applications.png
+icons48dir = $(datadir)/icons/hicolor/48x48/apps
+dist_icons48_DATA = icons/48x48/gnome-settings-default-applications.png
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+uninstall-hook: update-icon-cache
+install-data-hook: update-icon-cache
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
+
+
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xmldata_DATA) $(autostart_DATA) $(bin_SCRIPTS)
 EXTRA_DIST = $(xmldata_in_files)
diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c
index f09e318e0..76b2b8482 100644
--- a/capplets/default-applications/gnome-da-capplet.c
+++ b/capplets/default-applications/gnome-da-capplet.c
@@ -2,6 +2,7 @@
  *  Authors: Luca Cavalli <loopback@slackit.org>
  *
  *  Copyright 2005-2006 Luca Cavalli
+ *  Copyright 2008 Thomas Wood <thos@gnome.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of version 2 of the GNU General Public License
@@ -26,13 +27,12 @@
 #include <gnome.h>
 #include <glib/gi18n.h>
 
+#include "gconf-property-editor.h"
 #include "gnome-da-capplet.h"
 #include "gnome-da-xml.h"
 #include "gnome-da-item.h"
 #include "capplet-util.h"
 
-/* TODO: it doesn't use GConfPropertyEditor, use it when/if moved to control-center */
-
 enum
 {
     PIXBUF_COL,
@@ -52,89 +52,6 @@ close_cb (GtkWidget *window, gint response, gpointer user_data)
     }
 }
 
-static gboolean
-entry_focus_out_event_cb (GtkWidget *widget, GdkEventFocus *event, GnomeDACapplet *capplet)
-{
-    const gchar *text;
-    GError *error = NULL;
-
-    text = gtk_entry_get_text (GTK_ENTRY (widget));
-
-    if (widget == capplet->web_browser_command_entry) {
-	gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, text, &error);
-    }
-    else if (widget == capplet->mail_reader_command_entry) {
-	gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_MAILER_EXEC, text, &error);
-    }
-    else if (widget == capplet->terminal_command_entry) {
-	gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_EXEC, text, &error);
-    }
-    else if (widget == capplet->terminal_exec_flag_entry) {
-	gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG, text, &error);
-    }
-    else if (widget == capplet->media_player_command_entry) {
-	gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_MEDIA_EXEC, text, &error);
-    }
-
-    if (error != NULL) {
-	g_warning (_("Error saving configuration: %s"), error->message);
-	g_error_free (error);
-    }
-    else if (widget == capplet->visual_command_entry) {
-	gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_VISUAL_EXEC, text, NULL);
-    }
-    else if (widget == capplet->mobility_command_entry) {
-	gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_MOBILITY_EXEC, text, NULL);
-    }
-
-    return FALSE;
-}
-
-static void
-terminal_checkbutton_toggled_cb (GtkWidget *togglebutton, GnomeDACapplet *capplet)
-{
-    gboolean is_active;
-    GError *error = NULL;
-
-    is_active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
-
-    if (togglebutton == capplet->web_browser_terminal_checkbutton) {
-	gconf_client_set_bool (capplet->gconf, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, is_active, &error);
-    }
-    else if (togglebutton == capplet->mail_reader_terminal_checkbutton) {
-	gconf_client_set_bool (capplet->gconf, DEFAULT_APPS_KEY_MAILER_NEEDS_TERM, is_active, &error);
-    }
-    else if (togglebutton == capplet->media_player_terminal_checkbutton) {
-	gconf_client_set_bool (capplet->gconf, DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM, is_active, &error);
-    }
-
-    if (error != NULL) {
-	g_warning (_("Error saving configuration: %s"), error->message);
-	g_error_free (error);
-    }
-}
-
-static void
-a11y_checkbutton_toggled_cb (GtkWidget *togglebutton, GnomeDACapplet *capplet)
-{
-    gboolean is_active;
-    GError *error = NULL;
-
-    is_active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
-
-    if (togglebutton == capplet->visual_startup_checkbutton) {
-	gconf_client_set_bool (capplet->gconf, DEFAULT_APPS_KEY_VISUAL_STARTUP, is_active, &error);
-    }
-    else if (togglebutton == capplet->mobility_startup_checkbutton) {
-	gconf_client_set_bool (capplet->gconf, DEFAULT_APPS_KEY_MOBILITY_STARTUP, is_active, &error);
-    }
-
-    if (error != NULL) {
-	g_warning (_("Error saving configuration: %s"), error->message);
-	g_error_free (error);
-    }
-}
-
 static void
 set_icon (GtkImage *image, GtkIconTheme *theme, const char *name)
 {
@@ -182,61 +99,24 @@ web_radiobutton_toggled_cb (GtkWidget *togglebutton, GnomeDACapplet *capplet)
 static void
 web_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
 {
-    GtkTreeIter iter;
-    GtkTreePath *path;
     guint current_index;
     gboolean is_custom_active;
     gboolean has_net_remote;
     GnomeDAWebItem *item;
-    GConfChangeSet *cs;
-    GError *error = NULL;
-    char *http_cmd;
 
-    gtk_combo_box_get_active_iter (combo, &iter);
-    path = gtk_tree_model_get_path (gtk_combo_box_get_model (combo), &iter);
-    current_index = gtk_tree_path_get_indices (path)[0];
-    gtk_tree_path_free (path);
+    current_index = gtk_combo_box_get_active (combo);
 
     if (current_index < g_list_length (capplet->web_browsers)) {
-	gchar *command;
 
 	item = (GnomeDAWebItem*) g_list_nth_data (capplet->web_browsers, current_index);
 	has_net_remote = item->netscape_remote;
 	is_custom_active = FALSE;
 
-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton)) && has_net_remote == TRUE)
-	    command = item->win_command;
-	else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton)) && has_net_remote == TRUE)
-	    command = item->tab_command;
-	else
-	    command = item->generic.command;
-
-	cs = gconf_change_set_new ();
-
-	gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_HTTP_EXEC, command);
-	gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, item->run_in_terminal);
-
-	gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);
-
-	if (error != NULL) {
-	    g_warning (_("Error saving configuration: %s"), error->message);
-	    g_error_free (error);
-	}
-
-	gconf_change_set_unref (cs);
     }
     else {
-	has_net_remote = FALSE;
-	is_custom_active = TRUE;
+        has_net_remote = FALSE;
+        is_custom_active = TRUE;
     }
-
-    http_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, NULL);
-    gtk_entry_set_text (GTK_ENTRY (capplet->web_browser_command_entry),
-			http_cmd ? http_cmd : "");
-    g_free (http_cmd);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->web_browser_terminal_checkbutton),
-				  gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, NULL));
-
     gtk_widget_set_sensitive (capplet->default_radiobutton, has_net_remote);
     gtk_widget_set_sensitive (capplet->new_win_radiobutton, has_net_remote);
     gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote);
@@ -250,48 +130,11 @@ web_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
 static void
 mail_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
 {
-    GtkTreeIter iter;
-    GtkTreePath *path;
     guint current_index;
     gboolean is_custom_active;
-    GnomeDASimpleItem *item;
-    GConfChangeSet *cs;
-    GError *error = NULL;
-    char *mailer_cmd;
-
-    gtk_combo_box_get_active_iter (combo, &iter);
-    path = gtk_tree_model_get_path (gtk_combo_box_get_model (combo), &iter);
-    current_index = gtk_tree_path_get_indices (path)[0];
-    gtk_tree_path_free (path);
-
-    if (current_index < g_list_length (capplet->mail_readers)) {
-	item = (GnomeDASimpleItem*) g_list_nth_data (capplet->mail_readers, current_index);
-	is_custom_active = FALSE;
-
-	cs = gconf_change_set_new ();
-
-	gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_MAILER_EXEC, item->generic.command);
-	gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_MAILER_NEEDS_TERM, item->run_in_terminal);
-
-	gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);
-
-	if (error != NULL) {
-	    g_warning (_("Error saving configuration: %s"), error->message);
-	    g_error_free (error);
-	}
-
-	gconf_change_set_unref (cs);
-    }
-    else {
-	is_custom_active = TRUE;
-    }
 
-    mailer_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_MAILER_EXEC, NULL);
-    gtk_entry_set_text (GTK_ENTRY (capplet->mail_reader_command_entry),
-			mailer_cmd ? mailer_cmd : "");
-    g_free (mailer_cmd);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->mail_reader_terminal_checkbutton),
-				  gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_MAILER_NEEDS_TERM, NULL));
+    current_index = gtk_combo_box_get_active (combo);
+    is_custom_active = (current_index >= g_list_length (capplet->mail_readers));
 
     gtk_widget_set_sensitive (capplet->mail_reader_command_entry, is_custom_active);
     gtk_widget_set_sensitive (capplet->mail_reader_command_label, is_custom_active);
@@ -301,48 +144,11 @@ mail_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
 static void
 media_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
 {
-    GtkTreeIter iter;
-    GtkTreePath *path;
     guint current_index;
     gboolean is_custom_active;
-    GnomeDASimpleItem *item;
-    GConfChangeSet *cs;
-    GError *error = NULL;
-    char *media_cmd;
-
-    gtk_combo_box_get_active_iter (combo, &iter);
-    path = gtk_tree_model_get_path (gtk_combo_box_get_model (combo), &iter);
-    current_index = gtk_tree_path_get_indices (path)[0];
-    gtk_tree_path_free (path);
-
-    if (current_index < g_list_length (capplet->media_players)) {
-	item = (GnomeDASimpleItem *) g_list_nth_data (capplet->media_players, current_index);
-	is_custom_active = FALSE;
-
-	cs = gconf_change_set_new ();
-
-	gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_MEDIA_EXEC, item->generic.command);
-	gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM, item->run_in_terminal);
 
-	gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);
-
-	if (error != NULL) {
-	    g_warning (_("Error saving configuration: %s"), error->message);
-	    g_error_free (error);
-	}
-
-	gconf_change_set_unref (cs);
-    }
-    else {
-	is_custom_active = TRUE;
-    }
-
-    media_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_MEDIA_EXEC, NULL);
-    gtk_entry_set_text (GTK_ENTRY (capplet->media_player_command_entry),
-    			media_cmd ? media_cmd : "");
-    g_free (media_cmd);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->media_player_terminal_checkbutton),
-				  gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM, NULL));
+    current_index = gtk_combo_box_get_active (combo);
+    is_custom_active = (current_index >= g_list_length (capplet->media_players));
 
     gtk_widget_set_sensitive (capplet->media_player_command_entry, is_custom_active);
     gtk_widget_set_sensitive (capplet->media_player_command_label, is_custom_active);
@@ -352,49 +158,11 @@ media_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
 static void
 terminal_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
 {
-    GtkTreeIter iter;
-    GtkTreePath *path;
     guint current_index;
     gboolean is_custom_active;
-    GnomeDATermItem *item;
-    GConfChangeSet *cs;
-    GError *error = NULL;
-    char *terminal_cmd, *terminal_cmd_arg;
-
-    gtk_combo_box_get_active_iter (combo, &iter);
-    path = gtk_tree_model_get_path (gtk_combo_box_get_model (combo), &iter);
-    current_index = gtk_tree_path_get_indices (path)[0];
-    gtk_tree_path_free (path);
-
-    if (current_index < g_list_length (capplet->terminals)) {
-	item = (GnomeDATermItem*) g_list_nth_data (capplet->terminals, current_index);
-	is_custom_active = FALSE;
-
-	cs = gconf_change_set_new ();
-
-	gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_TERMINAL_EXEC, item->generic.command);
-	gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG, item->exec_flag);
-
-	gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);
-
-	if (error != NULL) {
-	    g_warning (_("Error saving configuration: %s"), error->message);
-	    g_error_free (error);
-	}
 
-	gconf_change_set_unref (cs);
-    }
-    else {
-	is_custom_active = TRUE;
-    }
-    terminal_cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_EXEC, NULL);
-    terminal_cmd_arg = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG, NULL);
-    gtk_entry_set_text (GTK_ENTRY (capplet->terminal_command_entry),
-			terminal_cmd ? terminal_cmd : "");
-    gtk_entry_set_text (GTK_ENTRY (capplet->terminal_exec_flag_entry),
-			terminal_cmd_arg ? terminal_cmd_arg : "");
-    g_free (terminal_cmd);
-    g_free (terminal_cmd_arg);
+    current_index = gtk_combo_box_get_active (combo);
+    is_custom_active = (current_index >= g_list_length (capplet->terminals));
 
     gtk_widget_set_sensitive (capplet->terminal_command_entry, is_custom_active);
     gtk_widget_set_sensitive (capplet->terminal_command_label, is_custom_active);
@@ -405,97 +173,24 @@ terminal_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
 static void
 visual_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
 {
-    GtkTreeIter iter;
-    GtkTreePath *path;
     guint current_index;
     gboolean is_custom_active;
-    GnomeDAVisualItem *item;
-    GConfChangeSet *cs;
-    GError *error = NULL;
-    gchar *cmd;
-
-    gtk_combo_box_get_active_iter (combo, &iter);
-    path = gtk_tree_model_get_path (gtk_combo_box_get_model (combo), &iter);
-    current_index = gtk_tree_path_get_indices (path)[0];
-    gtk_tree_path_free (path);
-
-    if (current_index < g_list_length (capplet->visual_ats)) {
-	item = (GnomeDAVisualItem *) g_list_nth_data (capplet->visual_ats, current_index);
-	is_custom_active = FALSE;
-
-	cs = gconf_change_set_new ();
-
-	gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_VISUAL_EXEC, item->generic.command);
-	gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_VISUAL_STARTUP, item->run_at_startup);
 
-	gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);
-
-	if (error != NULL) {
-	    g_warning (_("Error saving configuration: %s"), error->message);
-	    g_error_free (error);
-	}
-
-	gconf_change_set_unref (cs);
-    }
-    else {
-	is_custom_active = TRUE;
-    }
-
-    cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_VISUAL_EXEC, NULL);
-    gtk_entry_set_text (GTK_ENTRY (capplet->visual_command_entry), cmd ? cmd : "");
-    g_free (cmd);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->visual_startup_checkbutton),
-				  gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_VISUAL_STARTUP, NULL));
+    current_index = gtk_combo_box_get_active (combo);
+    is_custom_active = (current_index >= g_list_length (capplet->visual_ats));
 
     gtk_widget_set_sensitive (capplet->visual_command_entry, is_custom_active);
     gtk_widget_set_sensitive (capplet->visual_command_label, is_custom_active);
-
 }
 
 static void
 mobility_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
 {
-    GtkTreeIter iter;
-    GtkTreePath *path;
     guint current_index;
     gboolean is_custom_active;
-    GnomeDAMobilityItem *item;
-    GConfChangeSet *cs;
-    GError *error = NULL;
-    gchar *cmd;
-
-    gtk_combo_box_get_active_iter (combo, &iter);
-    path = gtk_tree_model_get_path (gtk_combo_box_get_model (combo), &iter);
-    current_index = gtk_tree_path_get_indices (path)[0];
-    gtk_tree_path_free (path);
-
-    if (current_index < g_list_length (capplet->mobility_ats)) {
-	item = (GnomeDAMobilityItem *) g_list_nth_data (capplet->mobility_ats, current_index);
-	is_custom_active = FALSE;
-
-	cs = gconf_change_set_new ();
 
-	gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_MOBILITY_EXEC, item->generic.command);
-	gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_MOBILITY_STARTUP, item->run_at_startup);
-
-	gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);
-
-	if (error != NULL) {
-	    g_warning (_("Error saving configuration: %s"), error->message);
-	    g_error_free (error);
-	}
-
-	gconf_change_set_unref (cs);
-    }
-    else {
-	is_custom_active = TRUE;
-    }
-
-    cmd = gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_MOBILITY_EXEC, NULL);
-    gtk_entry_set_text (GTK_ENTRY (capplet->mobility_command_entry), cmd ? cmd : "");
-    g_free (cmd);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->mobility_startup_checkbutton),
-				  gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_MOBILITY_STARTUP, NULL));
+    current_index = gtk_combo_box_get_active (combo);
+    is_custom_active = (current_index >= g_list_length (capplet->mobility_ats));
 
     gtk_widget_set_sensitive (capplet->mobility_command_entry, is_custom_active);
     gtk_widget_set_sensitive (capplet->mobility_command_label, is_custom_active);
@@ -607,247 +302,20 @@ web_item_comp (gconstpointer item, gconstpointer command)
 }
 
 static void
-web_browser_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
-{
-    GList *entry;
-    gint index;
-    gboolean is_custom_active;
-
-    entry = g_list_find_custom (capplet->web_browsers, command, (GCompareFunc) web_item_comp);
-
-    if (entry) {
-	index = g_list_position (capplet->web_browsers, entry);
-	is_custom_active = FALSE;
-    }
-    else {
-	/* index of 'Custom' combo box entry */
-	index = g_list_length (capplet->web_browsers) + 1;
-	is_custom_active = TRUE;
-    }
-
-    /* TODO: Remove when GConfPropertyEditor will be used */
-    gtk_entry_set_text (GTK_ENTRY (capplet->web_browser_command_entry), command);
-
-    gtk_widget_set_sensitive (capplet->web_browser_command_entry, is_custom_active);
-    gtk_widget_set_sensitive (capplet->web_browser_command_label, is_custom_active);
-    gtk_widget_set_sensitive (capplet->web_browser_terminal_checkbutton, is_custom_active);
-
-    if (gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->web_combo_box)) != index)
-	gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->web_combo_box), index);
-}
-
-static void
-web_browser_update_radio_buttons (GnomeDACapplet *capplet, const gchar *command)
+web_gconf_changed_cb (GConfPropertyEditor *peditor, gchar *key, GConfValue *value, GnomeDACapplet *capplet)
 {
-    GList *entry;
-    gboolean has_net_remote;
-
-    entry = g_list_find_custom (capplet->web_browsers, command, (GCompareFunc) web_item_comp);
-
-    if (entry) {
-	GnomeDAWebItem *item = (GnomeDAWebItem *) entry->data;
-
-	has_net_remote = item->netscape_remote;
-
-	if (has_net_remote) {
-	    /* disable "toggle" signal emitting, thus preventing calling this function twice */
-	    g_signal_handlers_block_matched (capplet->default_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
-					     0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
-	    g_signal_handlers_block_matched (capplet->new_tab_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
-					     0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
-	    g_signal_handlers_block_matched (capplet->new_win_radiobutton,G_SIGNAL_MATCH_FUNC, 0,
-					     0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
-
-	    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->default_radiobutton),
-					  strcmp (item->generic.command, command) == 0);
-	    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton),
-					  strcmp (item->tab_command, command) == 0);
-	    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton),
-					  strcmp (item->win_command, command) == 0);
-
-	    g_signal_handlers_unblock_matched (capplet->default_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
-					       0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
-	    g_signal_handlers_unblock_matched (capplet->new_tab_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
-					       0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
-	    g_signal_handlers_unblock_matched (capplet->new_win_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
-					       0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
-	}
-    }
-    else {
-	has_net_remote = FALSE;
-    }
-
-    gtk_widget_set_sensitive (capplet->default_radiobutton, has_net_remote);
-    gtk_widget_set_sensitive (capplet->new_win_radiobutton, has_net_remote);
-    gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote);
-}
-
-/* FIXME: Refactor these two functions below into single one... */
-static void
-mail_reader_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
-{
-    GList *entry;
-    gint index;
-    gboolean is_custom_active;
-
-    entry = g_list_find_custom (capplet->mail_readers, command, (GCompareFunc) generic_item_comp);
-
-    if (entry) {
-	index = g_list_position (capplet->mail_readers, entry);
-	is_custom_active = FALSE;
-    }
-    else {
-	/* index of 'Custom' combo box entry */
-	index = g_list_length (capplet->mail_readers) + 1;
-	is_custom_active = TRUE;
-    }
-
-    gtk_entry_set_text (GTK_ENTRY (capplet->mail_reader_command_entry), command);
-
-    gtk_widget_set_sensitive (capplet->mail_reader_command_entry, is_custom_active);
-    gtk_widget_set_sensitive (capplet->mail_reader_command_label, is_custom_active);
-    gtk_widget_set_sensitive (capplet->mail_reader_terminal_checkbutton, is_custom_active);
-
-    if (gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->mail_combo_box)) != index)
-	gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->mail_combo_box), index);
-}
-
-static void
-media_player_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
-{
-    GList *entry;
-    gint index;
-    gboolean is_custom_active;
-
-    entry = g_list_find_custom (capplet->media_players, command, (GCompareFunc) generic_item_comp);
-
-    if (entry) {
-	index = g_list_position (capplet->media_players, entry);
-	is_custom_active = FALSE;
-    }
-    else {
-	/* index of 'Custom' combo box entry */
-	index = g_list_length (capplet->media_players) + 1;
-	is_custom_active = TRUE;
-    }
-
-    gtk_entry_set_text (GTK_ENTRY (capplet->media_player_command_entry), command);
-
-    gtk_widget_set_sensitive (capplet->media_player_command_entry, is_custom_active);
-    gtk_widget_set_sensitive (capplet->media_player_command_label, is_custom_active);
-    gtk_widget_set_sensitive (capplet->media_player_terminal_checkbutton, is_custom_active);
-
-    if (gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->media_combo_box)) != index)
-	gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->media_combo_box), index);
-}
-
-static void
-terminal_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
-{
-    GList *entry;
-    gint index;
-    gboolean is_custom_active;
-
-    entry = g_list_find_custom (capplet->terminals, command, (GCompareFunc) generic_item_comp);
-
-    if (entry) {
-	index = g_list_position (capplet->terminals, entry);
-	is_custom_active = FALSE;
-    }
-    else {
-	/* index of 'Custom' combo box entry */
-	index = g_list_length (capplet->terminals) + 1;
-	is_custom_active = TRUE;
-    }
-
-    gtk_entry_set_text (GTK_ENTRY (capplet->terminal_command_entry), command);
-
-    gtk_widget_set_sensitive (capplet->terminal_command_entry, is_custom_active);
-    gtk_widget_set_sensitive (capplet->terminal_command_label, is_custom_active);
-    gtk_widget_set_sensitive (capplet->terminal_exec_flag_entry, is_custom_active);
-    gtk_widget_set_sensitive (capplet->terminal_exec_flag_label, is_custom_active);
-
-    if (gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->term_combo_box)) != index)
-	gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->term_combo_box), index);
-}
-
-static void
-visual_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
-{
-    GList *entry;
-    gint index;
-    gboolean is_custom_active;
-
-    entry = g_list_find_custom (capplet->visual_ats, command, (GCompareFunc) generic_item_comp);
-
-    if (entry) {
-	index = g_list_position (capplet->visual_ats, entry);
-	is_custom_active = FALSE;
-    }
-    else {
-	/* index of 'Custom' combo box entry */
-	index = g_list_length (capplet->visual_ats) + 1;
-	is_custom_active = TRUE;
-    }
-
-    gtk_entry_set_text (GTK_ENTRY (capplet->visual_command_entry), command);
-
-    gtk_widget_set_sensitive (capplet->visual_command_entry, is_custom_active);
-    gtk_widget_set_sensitive (capplet->visual_command_label, is_custom_active);
-
-    if (gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->visual_combo_box)) != index)
-	gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->visual_combo_box), index);
-}
-
-
-static void
-mobility_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
-{
-    GList *entry;
-    gint index;
-    gboolean is_custom_active;
-
-    entry = g_list_find_custom (capplet->mobility_ats, command, (GCompareFunc) generic_item_comp);
-
-    if (entry) {
-	index = g_list_position (capplet->mobility_ats, entry);
-	is_custom_active = FALSE;
-    }
-    else {
-	/* index of 'Custom' combo box entry */
-	index = g_list_length (capplet->mobility_ats) + 1;
-	is_custom_active = TRUE;
-    }
-
-    gtk_entry_set_text (GTK_ENTRY (capplet->mobility_command_entry), command);
-
-    gtk_widget_set_sensitive (capplet->mobility_command_entry, is_custom_active);
-    gtk_widget_set_sensitive (capplet->mobility_command_label, is_custom_active);
-
-    if (gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->mobility_combo_box)) != index)
-	gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->mobility_combo_box), index);
-}
-
-static void
-web_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
-{
-    GConfValue *value;
     GConfChangeSet *cs;
     GError *error = NULL;
     GList *list_entry;
 
-    g_return_if_fail (gconf_entry_get_key (entry) != NULL);
-
-    if (!(value = gconf_entry_get_value (entry)))
-	return;
+    /* This function is used to update HTTPS,ABOUT and UNKNOWN handlers, which
+     * should also use the same value as HTTP
+     */
 
-    if (strcmp (entry->key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0) {
+    if (strcmp (key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0) {
 	gchar *short_browser, *pos;
 	const gchar *value_str = gconf_value_get_string (value);
 
-	web_browser_update_combo_box (capplet, value_str);
-	web_browser_update_radio_buttons (capplet, value_str);
-
 	cs = gconf_change_set_new ();
 
 	gconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, value);
@@ -881,8 +349,7 @@ web_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDAC
 
 	gconf_change_set_unref (cs);
     }
-    /* TODO: Remove when GConfPropertyEditor will be used */
-    else if (strcmp (entry->key, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM) == 0) {
+    else if (strcmp (key, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM) == 0) {
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->web_browser_terminal_checkbutton),
 				      gconf_value_get_bool (value));
 
@@ -905,105 +372,188 @@ web_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDAC
     }
 }
 
-/* FIXME: Refactor these two functions below into single one... */
 static void
-mail_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
+web_browser_update_radio_buttons (GnomeDACapplet *capplet, const gchar *command)
 {
-    GConfValue *value;
+    GList *entry;
+    gboolean has_net_remote;
 
-    g_return_if_fail (gconf_entry_get_key (entry) != NULL);
+    entry = g_list_find_custom (capplet->web_browsers, command, (GCompareFunc) web_item_comp);
 
-    if (!(value = gconf_entry_get_value (entry)))
-	return;
+    if (entry) {
+	GnomeDAWebItem *item = (GnomeDAWebItem *) entry->data;
+
+	has_net_remote = item->netscape_remote;
+
+	if (has_net_remote) {
+	    /* disable "toggle" signal emitting, thus preventing calling this function twice */
+	    g_signal_handlers_block_matched (capplet->default_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
+					     0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
+	    g_signal_handlers_block_matched (capplet->new_tab_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
+					     0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
+	    g_signal_handlers_block_matched (capplet->new_win_radiobutton,G_SIGNAL_MATCH_FUNC, 0,
+					     0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
+
+	    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->default_radiobutton),
+					  strcmp (item->generic.command, command) == 0);
+	    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton),
+					  strcmp (item->tab_command, command) == 0);
+	    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton),
+					  strcmp (item->win_command, command) == 0);
 
-    if (strcmp (entry->key, DEFAULT_APPS_KEY_MAILER_EXEC) == 0) {
-	mail_reader_update_combo_box (capplet, gconf_value_get_string (value));
+	    g_signal_handlers_unblock_matched (capplet->default_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
+					       0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
+	    g_signal_handlers_unblock_matched (capplet->new_tab_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
+					       0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
+	    g_signal_handlers_unblock_matched (capplet->new_win_radiobutton, G_SIGNAL_MATCH_FUNC, 0,
+					       0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL);
+	}
     }
-    /* TODO: Remove when GConfPropertyEditor will be used */
-    else if (strcmp (entry->key, DEFAULT_APPS_KEY_MAILER_NEEDS_TERM) == 0) {
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->mail_reader_terminal_checkbutton),
-				      gconf_value_get_bool (value));
+    else {
+	has_net_remote = FALSE;
     }
+
+    gtk_widget_set_sensitive (capplet->default_radiobutton, has_net_remote);
+    gtk_widget_set_sensitive (capplet->new_win_radiobutton, has_net_remote);
+    gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote);
 }
 
-static void
-media_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
+static GConfValue*
+web_combo_conv_to_widget (GConfPropertyEditor *peditor, const GConfValue *value)
 {
-    GConfValue *value;
+    GConfValue *ret;
+    GList *entry, *handlers;
+    const gchar *command;
+    gint index;
+    GnomeDACapplet *capplet;
 
-    g_return_if_fail (gconf_entry_get_key (entry) != NULL);
+    g_object_get (G_OBJECT (peditor), "data", &capplet, NULL);
 
-    if (!(value = gconf_entry_get_value (entry)))
-	return;
+    command = gconf_value_get_string (value);
+    handlers = capplet->web_browsers;
 
-    if (strcmp (entry->key, DEFAULT_APPS_KEY_MEDIA_EXEC) == 0) {
-	media_player_update_combo_box (capplet, gconf_value_get_string (value));
+    if (handlers)
+    {
+      entry = g_list_find_custom (handlers, command, (GCompareFunc) web_item_comp);
+      if (entry)
+          index = g_list_position (handlers, entry);
+      else
+          index = g_list_length (handlers) + 1;
     }
-    /* TODO: Remove when GConfPropertyEditor will be used */
-    else if (strcmp (entry->key, DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM) == 0) {
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->media_player_terminal_checkbutton),
-				      gconf_value_get_bool (value));
+    else
+    {
+      /* if the item has no handlers lsit then select the Custom item */
+      index = 1;
     }
+
+    web_browser_update_radio_buttons (capplet, command);
+
+    ret = gconf_value_new (GCONF_VALUE_INT);
+    gconf_value_set_int (ret, index);
+    return ret;
 }
 
-static void
-term_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
+static GConfValue*
+web_combo_conv_from_widget (GConfPropertyEditor *peditor, const GConfValue *value)
 {
-    GConfValue *value;
+    GConfValue *ret;
+    GList *handlers;
+    gint index;
+    GnomeDAWebItem *item;
+    const gchar *command;
+    GnomeDACapplet *capplet;
 
-    g_return_if_fail (gconf_entry_get_key (entry) != NULL);
+    g_object_get (G_OBJECT (peditor), "data", &capplet, NULL);
 
-    if (!(value = gconf_entry_get_value (entry)))
-	return;
+    index = gconf_value_get_int (value);
+    handlers = capplet->web_browsers;
 
-    if (strcmp (entry->key, DEFAULT_APPS_KEY_TERMINAL_EXEC) == 0) {
-	terminal_update_combo_box (capplet, gconf_value_get_string (value));
+    item = g_list_nth_data (handlers, index);
+
+    ret = gconf_value_new (GCONF_VALUE_STRING);
+    if (!item)
+    {
+        /* if item was not found, this is probably the "Custom" item */
+
+        /* XXX: returning "" as the value here is not ideal, but required to
+         * prevent the combo box from jumping back to the previous value if the
+         * user has selected Custom */
+        gconf_value_set_string (ret, "");
+        return ret;
     }
-    /* TODO: Remove when GConfPropertyEditor will be used */
-    else if (strcmp (entry->key, DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG) == 0) {
-	gtk_entry_set_text (GTK_ENTRY (capplet->terminal_exec_flag_entry),
-			    gconf_value_get_string (value));
+    else
+    {
+        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton)) && item->netscape_remote == TRUE)
+            command = item->win_command;
+        else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton)) && item->netscape_remote == TRUE)
+            command = item->tab_command;
+        else
+            command = item->generic.command;
+
+        gconf_value_set_string (ret, command);
+        return ret;
     }
 }
 
-
-static void
-visual_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
+static GConfValue*
+combo_conv_to_widget (GConfPropertyEditor *peditor, const GConfValue *value)
 {
-    GConfValue *value;
+    GConfValue *ret;
+    GList *entry, *handlers;
+    const gchar *command;
+    gint index;
 
-    g_return_if_fail (gconf_entry_get_key (entry) != NULL);
+    g_object_get (G_OBJECT (peditor), "data", &handlers, NULL);
 
-    if (!(value = gconf_entry_get_value (entry)))
-	return;
+    command = gconf_value_get_string (value);
 
-    if (strcmp (entry->key, DEFAULT_APPS_KEY_VISUAL_EXEC) == 0) {
-	visual_update_combo_box (capplet, gconf_value_get_string (value));
+    if (handlers)
+    {
+        entry = g_list_find_custom (handlers, command, (GCompareFunc) generic_item_comp);
+        if (entry)
+            index = g_list_position (handlers, entry);
+        else
+            index = g_list_length (handlers) + 1;
     }
-    /* TODO: Remove when GConfPropertyEditor will be used */
-    else if (strcmp (entry->key, DEFAULT_APPS_KEY_VISUAL_STARTUP) == 0) {
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->visual_startup_checkbutton),
-				      gconf_value_get_bool (value));
+    else
+    {
+        /* if the item has no handlers lsit then select the Custom item */
+        index = 1;
     }
+
+    ret = gconf_value_new (GCONF_VALUE_INT);
+    gconf_value_set_int (ret, index);
+    return ret;
 }
 
-static void
-mobility_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
+static GConfValue*
+combo_conv_from_widget (GConfPropertyEditor *peditor, const GConfValue *value)
 {
-    GConfValue *value;
+    GConfValue *ret;
+    GList *handlers;
+    gint index;
+    GnomeDAItem *item;
 
-    g_return_if_fail (gconf_entry_get_key (entry) != NULL);
+    g_object_get (G_OBJECT (peditor), "data", &handlers, NULL);
+    index = gconf_value_get_int (value);
 
-    if (!(value = gconf_entry_get_value (entry)))
-	return;
+    item = g_list_nth_data (handlers, index);
+    ret = gconf_value_new (GCONF_VALUE_STRING);
 
-    if (strcmp (entry->key, DEFAULT_APPS_KEY_MOBILITY_EXEC) == 0) {
-	mobility_update_combo_box (capplet, gconf_value_get_string (value));
+    if (!item)
+    {
+        /* if item was not found, this is probably the "Custom" item */
+
+        /* XXX: returning "" as the value here is not ideal, but required to
+         * prevent the combo box from jumping back to the previous value if the
+         * user has selected Custom */
+        gconf_value_set_string (ret, "");
+        return NULL;
     }
-    /* TODO: Remove when GConfPropertyEditor will be used */
-    else if (strcmp (entry->key, DEFAULT_APPS_KEY_MOBILITY_STARTUP) == 0) {
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->mobility_startup_checkbutton),
-				      gconf_value_get_bool (value));
+    else
+    {
+        gconf_value_set_string (ret, item->command);
+        return ret;
     }
 }
 
@@ -1084,7 +634,7 @@ fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list)
 static void
 show_dialog (GnomeDACapplet *capplet, const gchar *start_page)
 {
-    GConfValue *value;
+    GObject *obj;
 
     if (g_file_test (GNOMECC_GLADE_DIR "/gnome-default-applications-properties.glade", G_FILE_TEST_EXISTS) != FALSE) {
 	capplet->xml = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-default-applications-properties.glade", NULL, NULL);
@@ -1155,104 +705,6 @@ show_dialog (GnomeDACapplet *capplet, const gchar *start_page)
     fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats);
     fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats);
 
-    /* update ui to gconf content */
-    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, NULL);
-    if (value)
-    {
-	web_browser_update_combo_box (capplet, gconf_value_get_string (value));
-	web_browser_update_radio_buttons (capplet, gconf_value_get_string (value));
-	gconf_value_free (value);
-    }
-
-    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, NULL);
-    if (value)
-    {
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->web_browser_terminal_checkbutton),
-				      gconf_value_get_bool (value));
-	gconf_value_free (value);
-    }
-
-    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_MAILER_EXEC, NULL);
-    if (value)
-    {
-	mail_reader_update_combo_box (capplet, gconf_value_get_string (value));
-	gconf_value_free (value);
-    }
-
-    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_MAILER_NEEDS_TERM, NULL);
-    if (value)
-    {
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->mail_reader_terminal_checkbutton),
-				      gconf_value_get_bool (value));
-	gconf_value_free (value);
-    }
-
-    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_EXEC, NULL);
-    if (value)
-    {
-	terminal_update_combo_box (capplet, gconf_value_get_string (value));
-	gconf_value_free (value);
-    }
-
-    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG, NULL);
-    if (value)
-    {
-	gtk_entry_set_text (GTK_ENTRY (capplet->terminal_exec_flag_entry),
-			    gconf_value_get_string (value));
-	gconf_value_free (value);
-    }
-
-    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_MEDIA_EXEC, NULL);
-    if (value)
-    {
-	media_player_update_combo_box (capplet, gconf_value_get_string (value));
-	gconf_value_free (value);
-    }
-
-    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM, NULL);
-    if (value)
-    {
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->media_player_terminal_checkbutton),
-				      gconf_value_get_bool (value));
-	gconf_value_free (value);
-    }
-
-    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_VISUAL_EXEC, NULL);
-
-    if (value)
-    {
-        visual_update_combo_box (capplet, gconf_value_get_string (value));
-	gconf_value_free (value);
-    }
-
-    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_VISUAL_STARTUP, NULL);
-
-    if (value)
-    {
-        gtk_toggle_button_set_active (
-            GTK_TOGGLE_BUTTON (capplet->visual_startup_checkbutton),
-            gconf_value_get_bool (value));
-	gconf_value_free (value);
-    }
-
-    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_MOBILITY_EXEC, NULL);
-
-    if (value)
-    {
-        mobility_update_combo_box (capplet, gconf_value_get_string (value));
-	gconf_value_free (value);
-    }
-
-    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_MOBILITY_STARTUP, NULL);
-
-    if (value)
-    {
-        gtk_toggle_button_set_active (
-            GTK_TOGGLE_BUTTON (capplet->mobility_startup_checkbutton),
-            gconf_value_get_bool (value));
-	gconf_value_free (value);
-    }
-
     g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet);
     g_signal_connect (capplet->mail_combo_box, "changed", G_CALLBACK (mail_combo_changed_cb), capplet);
     g_signal_connect (capplet->term_combo_box, "changed", G_CALLBACK (terminal_combo_changed_cb), capplet);
@@ -1260,31 +712,130 @@ show_dialog (GnomeDACapplet *capplet, const gchar *start_page)
     g_signal_connect (capplet->visual_combo_box, "changed", G_CALLBACK (visual_combo_changed_cb), capplet);
     g_signal_connect (capplet->mobility_combo_box, "changed", G_CALLBACK (mobility_combo_changed_cb), capplet);
 
-    /* TODO: Remove when GConfPropertyEditor will be used */
-    g_signal_connect (capplet->web_browser_terminal_checkbutton, "toggled",
-		      G_CALLBACK (terminal_checkbutton_toggled_cb), capplet);
-    g_signal_connect (capplet->mail_reader_terminal_checkbutton, "toggled",
-		      G_CALLBACK (terminal_checkbutton_toggled_cb), capplet);
-    g_signal_connect (capplet->media_player_terminal_checkbutton, "toggled",
-		      G_CALLBACK (terminal_checkbutton_toggled_cb), capplet);
-    g_signal_connect (capplet->visual_startup_checkbutton, "toggled",
-                    G_CALLBACK (a11y_checkbutton_toggled_cb), capplet);
-    g_signal_connect (capplet->mobility_startup_checkbutton, "toggled",
-                    G_CALLBACK (a11y_checkbutton_toggled_cb), capplet);
-
-    /* TODO: Remove when GConfPropertyEditor will be used */
-    g_signal_connect (capplet->web_browser_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
-    g_signal_connect (capplet->mail_reader_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
-    g_signal_connect (capplet->terminal_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
-    g_signal_connect (capplet->terminal_exec_flag_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
-    g_signal_connect (capplet->media_player_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
-    g_signal_connect (capplet->visual_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
-    g_signal_connect (capplet->mobility_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
 
     g_signal_connect (capplet->default_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet);
     g_signal_connect (capplet->new_win_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet);
     g_signal_connect (capplet->new_tab_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet);
 
+    /* Setup GConfPropertyEditors */
+
+    /* Web Browser */
+    gconf_peditor_new_combo_box (NULL,
+        DEFAULT_APPS_KEY_HTTP_EXEC,
+        capplet->web_combo_box,
+        "conv-from-widget-cb", web_combo_conv_from_widget,
+        "conv-to-widget-cb", web_combo_conv_to_widget,
+        "data", capplet,
+        NULL);
+
+    obj = gconf_peditor_new_string (NULL,
+        DEFAULT_APPS_KEY_HTTP_EXEC,
+        capplet->web_browser_command_entry,
+        NULL);
+    g_signal_connect (obj, "value-changed", G_CALLBACK (web_gconf_changed_cb), capplet);
+
+    obj = gconf_peditor_new_boolean (NULL,
+        DEFAULT_APPS_KEY_HTTP_NEEDS_TERM,
+        capplet->web_browser_terminal_checkbutton,
+        NULL);
+    g_signal_connect (obj, "value-changed", G_CALLBACK (web_gconf_changed_cb), capplet);
+
+    /* Mailer */
+    gconf_peditor_new_combo_box (NULL,
+        DEFAULT_APPS_KEY_MAILER_EXEC,
+        capplet->mail_combo_box,
+        "conv-from-widget-cb", combo_conv_from_widget,
+        "conv-to-widget-cb", combo_conv_to_widget,
+        "data", capplet->mail_readers,
+        NULL);
+
+    gconf_peditor_new_string (NULL,
+        DEFAULT_APPS_KEY_MAILER_EXEC,
+        capplet->mail_reader_command_entry,
+        NULL);
+
+    gconf_peditor_new_boolean (NULL,
+        DEFAULT_APPS_KEY_MAILER_NEEDS_TERM,
+        capplet->mail_reader_terminal_checkbutton,
+        NULL);
+
+    /* Media player */
+    gconf_peditor_new_combo_box (NULL,
+        DEFAULT_APPS_KEY_MEDIA_EXEC,
+        capplet->media_combo_box,
+        "conv-from-widget-cb", combo_conv_from_widget,
+        "conv-to-widget-cb", combo_conv_to_widget,
+        "data", capplet->media_players,
+        NULL);
+
+    gconf_peditor_new_string (NULL,
+        DEFAULT_APPS_KEY_MEDIA_EXEC,
+        capplet->media_player_command_entry,
+        NULL);
+
+    gconf_peditor_new_boolean (NULL,
+        DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM,
+        capplet->media_player_terminal_checkbutton,
+        NULL);
+
+    /* Terminal */
+    gconf_peditor_new_combo_box (NULL,
+        DEFAULT_APPS_KEY_TERMINAL_EXEC,
+        capplet->term_combo_box,
+        "conv-from-widget-cb", combo_conv_from_widget,
+        "conv-to-widget-cb", combo_conv_to_widget,
+        "data", capplet->terminals,
+        NULL);
+
+    gconf_peditor_new_string (NULL,
+        DEFAULT_APPS_KEY_TERMINAL_EXEC,
+        capplet->terminal_command_entry,
+        NULL);
+    gconf_peditor_new_string (NULL,
+        DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG,
+        capplet->terminal_exec_flag_entry,
+        NULL);
+
+
+    /* Visual */
+    gconf_peditor_new_combo_box (NULL,
+        DEFAULT_APPS_KEY_VISUAL_EXEC,
+        capplet->visual_combo_box,
+        "conv-from-widget-cb", combo_conv_from_widget,
+        "conv-to-widget-cb", combo_conv_to_widget,
+        "data", capplet->visual_ats,
+        NULL);
+
+    gconf_peditor_new_string (NULL,
+        DEFAULT_APPS_KEY_VISUAL_EXEC,
+        capplet->visual_command_entry,
+        NULL);
+
+    gconf_peditor_new_boolean (NULL,
+        DEFAULT_APPS_KEY_VISUAL_STARTUP,
+        capplet->visual_startup_checkbutton,
+        NULL);
+
+
+    /* Mobility */
+    gconf_peditor_new_combo_box (NULL,
+        DEFAULT_APPS_KEY_MOBILITY_EXEC,
+        capplet->mobility_combo_box,
+        "conv-from-widget-cb", combo_conv_from_widget,
+        "conv-to-widget-cb", combo_conv_to_widget,
+        "data", capplet->mobility_ats,
+        NULL);
+
+    gconf_peditor_new_string (NULL,
+        DEFAULT_APPS_KEY_MOBILITY_EXEC,
+        capplet->mobility_command_entry,
+        NULL);
+
+    gconf_peditor_new_boolean (NULL,
+        DEFAULT_APPS_KEY_MOBILITY_STARTUP,
+        capplet->mobility_startup_checkbutton,
+        NULL);
+
     gtk_window_set_icon_name (GTK_WINDOW (capplet->window),
 			      "gnome-settings-default-applications");
 
@@ -1348,32 +899,6 @@ main (int argc, char **argv)
 
     capplet = g_new0 (GnomeDACapplet, 1);
     capplet->gconf = gconf_client_get_default ();
-
-    gconf_client_add_dir (capplet->gconf, "/desktop/gnome/applications/browser", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-    gconf_client_add_dir (capplet->gconf, "/desktop/gnome/applications/terminal", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-    gconf_client_add_dir (capplet->gconf, "/desktop/gnome/applications/media", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-    gconf_client_add_dir (capplet->gconf, "/desktop/gnome/url-handlers", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-    gconf_client_add_dir (capplet->gconf, "/desktop/gnome/accessibility/at", GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
-
-    gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_HTTP_PATH,
-			     (GConfClientNotifyFunc) web_gconf_changed_cb,
-			     capplet, NULL, NULL);
-    gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_MAILER_PATH,
-			     (GConfClientNotifyFunc) mail_gconf_changed_cb,
-			     capplet, NULL, NULL);
-    gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_PATH,
-			     (GConfClientNotifyFunc) term_gconf_changed_cb,
-			     capplet, NULL, NULL);
-    gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_MEDIA_PATH,
-			     (GConfClientNotifyFunc) media_gconf_changed_cb,
-			     capplet, NULL, NULL);
-    gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_VISUAL_PATH,
-			     (GConfClientNotifyFunc) visual_gconf_changed_cb,
-			     capplet, NULL, NULL);
-    gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_MOBILITY_PATH,
-			     (GConfClientNotifyFunc) mobility_gconf_changed_cb,
-			     capplet, NULL, NULL);
-
     gnome_da_xml_load_list (capplet);
 
     show_dialog (capplet, start_page);
diff --git a/capplets/default-applications/icons/16x16/gnome-settings-default-applications.png b/capplets/default-applications/icons/16x16/gnome-settings-default-applications.png
new file mode 100644
index 000000000..41a765aab
--- /dev/null
+++ b/capplets/default-applications/icons/16x16/gnome-settings-default-applications.png
diff --git a/capplets/default-applications/icons/22x22/gnome-settings-default-applications.png b/capplets/default-applications/icons/22x22/gnome-settings-default-applications.png
new file mode 100644
index 000000000..83b6826c9
--- /dev/null
+++ b/capplets/default-applications/icons/22x22/gnome-settings-default-applications.png
diff --git a/capplets/default-applications/icons/24x24/gnome-settings-default-applications.png b/capplets/default-applications/icons/24x24/gnome-settings-default-applications.png
new file mode 100644
index 000000000..630ea040c
--- /dev/null
+++ b/capplets/default-applications/icons/24x24/gnome-settings-default-applications.png
diff --git a/capplets/default-applications/icons/32x32/gnome-settings-default-applications.png b/capplets/default-applications/icons/32x32/gnome-settings-default-applications.png
new file mode 100644
index 000000000..23718f781
--- /dev/null
+++ b/capplets/default-applications/icons/32x32/gnome-settings-default-applications.png
diff --git a/capplets/default-applications/icons/48x48/gnome-settings-default-applications.png b/capplets/default-applications/icons/48x48/gnome-settings-default-applications.png
new file mode 100644
index 000000000..ac25569d1
--- /dev/null
+++ b/capplets/default-applications/icons/48x48/gnome-settings-default-applications.png
diff --git a/capplets/default-applications/icons/svg/preferred-applications.svg b/capplets/default-applications/icons/svg/preferred-applications.svg
new file mode 100644
index 000000000..68cb55310
--- /dev/null
+++ b/capplets/default-applications/icons/svg/preferred-applications.svg
@@ -0,0 +1,12680 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90.000000"
+   inkscape:export-xdpi="90.000000"
+   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
+   width="400"
+   height="100"
+   id="svg11300"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/jimmac/gfx/novell/openoffice-art/icons/Industrial/svg"
+   sodipodi:docname="preferred-applications.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline;enable-background:new">
+  <sodipodi:namedview
+     stroke="#ef2929"
+     fill="#f57900"
+     id="base"
+     pagecolor="#474747"
+     bordercolor="#666666"
+     borderopacity="0.25490196"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="122.25356"
+     inkscape:cy="42.180306"
+     inkscape:current-layer="layer3"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1156"
+     inkscape:window-height="1044"
+     inkscape:window-x="271"
+     inkscape:window-y="39"
+     width="400px"
+     height="300px"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     guidecolor="#0000ff"
+     guideopacity="0.09411765"
+     inkscape:snap-intersection-line-segments="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     gridtolerance="5">
+    <inkscape:grid
+       spacingy="1px"
+       spacingx="1px"
+       id="grid5883"
+       type="xygrid"
+       empcolor="#0000ff"
+       empopacity="0.07843137"
+       enabled="true"
+       visible="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective1699" />
+    <linearGradient
+       id="linearGradient7624">
+      <stop
+         id="stop7626"
+         offset="0"
+         style="stop-color:#cc0000;stop-opacity:1;" />
+      <stop
+         id="stop7628"
+         offset="1"
+         style="stop-color:#60645a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7618">
+      <stop
+         id="stop7620"
+         offset="0"
+         style="stop-color:#cc0000;stop-opacity:1;" />
+      <stop
+         id="stop7622"
+         offset="1"
+         style="stop-color:#6a6f63;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7612">
+      <stop
+         id="stop7614"
+         offset="0"
+         style="stop-color:#cc0000;stop-opacity:1;" />
+      <stop
+         id="stop7616"
+         offset="1"
+         style="stop-color:#65685e;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective1690" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective1697" />
+    <linearGradient
+       id="linearGradient14058"
+       inkscape:collect="always">
+      <stop
+         id="stop14060"
+         offset="0"
+         style="stop-color:#d5d5d5;stop-opacity:1" />
+      <stop
+         id="stop14062"
+         offset="1"
+         style="stop-color:#5a5a5a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient13207">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop13209" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop13211" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient13174">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop13176" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop13178" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13137">
+      <stop
+         style="stop-color:#cc0000;stop-opacity:1;"
+         offset="0"
+         id="stop13139" />
+      <stop
+         style="stop-color:#6e7367;stop-opacity:1"
+         offset="1"
+         id="stop13141" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13075">
+      <stop
+         style="stop-color:#cdcdcd;stop-opacity:1;"
+         offset="0"
+         id="stop13077" />
+      <stop
+         id="stop13085"
+         offset="0.75000036"
+         style="stop-color:#7c8772;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ccccc4;stop-opacity:1;"
+         offset="1"
+         id="stop13079" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective161" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective160" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective18060" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient11176">
+      <stop
+         style="stop-color:#ff5757;stop-opacity:1"
+         offset="0"
+         id="stop11178" />
+      <stop
+         style="stop-color:#9e0000;stop-opacity:1"
+         offset="1"
+         id="stop11180" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient11133">
+      <stop
+         style="stop-color:#c2c3c0;stop-opacity:1"
+         offset="0"
+         id="stop11135" />
+      <stop
+         style="stop-color:#595b56;stop-opacity:1"
+         offset="1"
+         id="stop11137" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10550">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop10552" />
+      <stop
+         id="stop10558"
+         offset="0.2084758"
+         style="stop-color:#c5c5c5;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop10554" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10182">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1;"
+         offset="0"
+         id="stop10184" />
+      <stop
+         style="stop-color:#ecfbdd;stop-opacity:1"
+         offset="1"
+         id="stop10186" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10086">
+      <stop
+         id="stop10088"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.068627454;" />
+      <stop
+         id="stop10090"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.49456522" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6053">
+      <stop
+         id="stop6055"
+         offset="0"
+         style="stop-color:#c0cdf9;stop-opacity:1" />
+      <stop
+         id="stop6057"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5785">
+      <stop
+         id="stop5787"
+         offset="0"
+         style="stop-color:#c0cdf9;stop-opacity:1" />
+      <stop
+         id="stop5789"
+         offset="1"
+         style="stop-color:#07092d;stop-opacity:0.28804347" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5785"
+       id="linearGradient9175"
+       gradientUnits="userSpaceOnUse"
+       x1="82.118591"
+       y1="20"
+       x2="60"
+       y2="40" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6053"
+       id="linearGradient6063"
+       gradientUnits="userSpaceOnUse"
+       x1="82.118591"
+       y1="20"
+       x2="60"
+       y2="40" />
+    <linearGradient
+       id="linearGradient2795">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.068627454;"
+         offset="0.0000000"
+         id="stop2797" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2799" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2803">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2805" />
+      <stop
+         id="stop10010"
+         offset="0.49486449"
+         style="stop-color:#dbdbdb;stop-opacity:1;" />
+      <stop
+         style="stop-color:#9f9f9f;stop-opacity:1"
+         offset="1.0000000"
+         id="stop2807" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2094">
+      <stop
+         id="stop2096"
+         offset="0.0000000"
+         style="stop-color:#d6e3f0;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2098"
+         offset="1.0000000"
+         style="stop-color:#95b1cf;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12512">
+      <stop
+         id="stop12513"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop12517"
+         offset="0.50000000"
+         style="stop-color:#fff520;stop-opacity:0.89108908;" />
+      <stop
+         id="stop12514"
+         offset="1.0000000"
+         style="stop-color:#fff300;stop-opacity:0.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         id="stop5050"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop5056" />
+      <stop
+         id="stop5052"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective9851"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="-50 : 600 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective10176"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="-50 : 600 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10182"
+       id="linearGradient10188"
+       x1="169.84375"
+       y1="30.15625"
+       x2="100"
+       y2="169.84375"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10182"
+       id="linearGradient10196"
+       gradientUnits="userSpaceOnUse"
+       x1="169.84375"
+       y1="30.15625"
+       x2="100"
+       y2="169.84375" />
+    <inkscape:perspective
+       id="perspective10977"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="-50 : 600 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10550"
+       id="linearGradient11172"
+       gradientUnits="userSpaceOnUse"
+       x1="79.726288"
+       y1="82.829826"
+       x2="79.726288"
+       y2="45.348064" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11133"
+       id="linearGradient11174"
+       gradientUnits="userSpaceOnUse"
+       x1="77.351288"
+       y1="54.996952"
+       x2="77.351288"
+       y2="83.204826" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11176"
+       id="linearGradient11208"
+       gradientUnits="userSpaceOnUse"
+       x1="82.731491"
+       y1="72.665169"
+       x2="82.731491"
+       y2="54.973362" />
+    <inkscape:perspective
+       id="perspective18069"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="-50 : 600 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5567">
+      <stop
+         id="stop5569"
+         offset="0"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop5571"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5442"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="-50 : 600 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12199"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12197"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12195"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12191"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12189"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12185"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12183"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12179"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12175"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12173"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12169"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12165"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12163"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12159"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12157"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12153"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12151"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12147"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12145"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12141"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12139"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12135"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12133"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12129"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12127"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12123"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12121"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12117"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12115"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12113"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12109"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12107"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12103"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12101"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12097"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12093"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12091"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12087"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12083"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12081"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12077"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12075"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12071"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12069"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12065"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12063"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12059"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12057"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12053"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12051"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12047"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12045"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12041"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12039"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12035"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12033"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12031"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12027"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12025"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12021"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12019"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12015"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12011"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12009"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12005"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12001"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11999"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11995"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11993"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11989"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11987"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11983"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11981"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11977"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11975"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11971"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11969"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11965"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11963"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11959"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11957"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11675"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11673"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11671"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11669"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11667"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11665"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11663"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11661"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11659"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11657"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11655"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11653"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11651"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11649"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11647"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11645"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11643"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11641"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11639"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11637"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11635"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11633"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11631"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11629"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11627"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11625"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11623"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11621"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11619"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11617"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11615"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11613"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11611"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11609"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11607"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11605"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11603"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11601"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11599"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11597"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11595"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="110.51429"
+       fy="115.11371"
+       fx="126.13385"
+       cy="115.11371"
+       cx="126.13385"
+       gradientTransform="matrix(1.0543192,-9.3566035e-3,9.3679552e-3,1.0524618,-6.5889037,-3.4365327)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11155"
+       xlink:href="#linearGradient5887"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11153"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11151"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11149"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11145"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11143"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11139"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11137"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11133"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11129"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11127"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11123"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11119"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11117"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11113"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11111"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11107"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11105"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11101"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11099"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11095"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11093"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11089"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11087"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11083"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11081"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11077"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11075"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11071"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11069"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11067"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11063"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11061"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11057"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11055"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11051"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11047"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11045"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11041"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11037"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11035"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11031"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11029"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11025"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11023"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11019"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11017"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11013"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11011"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11007"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11005"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11001"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10999"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10995"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10993"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10989"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10987"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10985"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10981"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10979"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10975"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10973"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10969"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10965"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10963"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10959"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10955"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10953"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10949"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10947"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10943"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10941"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10937"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10935"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10931"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10929"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10925"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10923"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10919"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10917"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10913"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10911"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9356"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9354"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9350"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9348"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9344"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9342"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9338"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9334"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9332"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9328"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9324"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9322"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9318"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9316"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9312"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9310"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9306"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9304"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9300"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9298"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9294"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9292"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9288"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9286"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9282"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.277534"
+       fy="17.963018"
+       fx="23.604723"
+       cy="17.963018"
+       cx="23.604723"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9280"
+       xlink:href="#linearGradient6694"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9276"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9274"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9270"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9268"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9264"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9262"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9258"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9254"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9252"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9248"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9244"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9242"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9238"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9236"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9232"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9230"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9226"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9224"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9220"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9218"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9214"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9212"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9208"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9206"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9202"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9200"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective8941" />
+    <linearGradient
+       id="linearGradient6141">
+      <stop
+         style="stop-color:#132b50;stop-opacity:0;"
+         offset="0"
+         id="stop6143" />
+      <stop
+         id="stop6149"
+         offset="0.90476191"
+         style="stop-color:#132b50;stop-opacity:0;" />
+      <stop
+         style="stop-color:#132b50;stop-opacity:1;"
+         offset="1"
+         id="stop6145" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6776">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="0"
+         id="stop6778" />
+      <stop
+         id="stop6780"
+         offset="0.90476191"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop6782" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6762">
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="0"
+         id="stop6764" />
+      <stop
+         id="stop6766"
+         offset="0.80952382"
+         style="stop-color:#000000;stop-opacity:0;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop6768" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6752">
+      <stop
+         id="stop6754"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="0.5714286"
+         id="stop6756" />
+      <stop
+         id="stop6758"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6868">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop6870" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop6872" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6694">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6696" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6698" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6598">
+      <stop
+         id="stop6606"
+         offset="0"
+         style="stop-color:#386ab5;stop-opacity:1;" />
+      <stop
+         style="stop-color:#436699;stop-opacity:1;"
+         offset="0.75"
+         id="stop6608" />
+      <stop
+         style="stop-color:#2a3e5c;stop-opacity:1;"
+         offset="1"
+         id="stop6602" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3962">
+      <stop
+         style="stop-color:#d3e9ff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop3964" />
+      <stop
+         style="stop-color:#f3f9ff;stop-opacity:1"
+         offset="0.15517241"
+         id="stop4134" />
+      <stop
+         style="stop-color:#376497;stop-opacity:1"
+         offset="0.63108921"
+         id="stop4346" />
+      <stop
+         id="stop6610"
+         offset="0.81554461"
+         style="stop-color:#273e5d;stop-opacity:1" />
+      <stop
+         style="stop-color:#526ea5;stop-opacity:1;"
+         offset="1"
+         id="stop3966" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6604"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6694"
+       id="radialGradient6700"
+       cx="23.604723"
+       cy="17.963018"
+       fx="23.604723"
+       fy="17.963018"
+       r="19.277534"
+       gradientTransform="matrix(1.0187736,0,0,0.9597,-0.2184701,2.4283776)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient6874"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6752"
+       id="radialGradient6953"
+       cx="123"
+       cy="119.43689"
+       fx="123"
+       fy="119.43689"
+       r="108"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9537037,0,0,0.9537037,5.6944444,5.0925926)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6049"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6051"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6055"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6057"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6061"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6063"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6067"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6073"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6075"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6079"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6081"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6085"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6091"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6093"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6099"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6103"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6107"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6109"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6113"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6117"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6119"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6123"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6598"
+       id="radialGradient6125"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1191082,0,0,1.0425685,-1.6692131,0.6964856)"
+       cx="23.72484"
+       cy="19.374041"
+       fx="23.72484"
+       fy="19.374041"
+       r="19.18985" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective7425" />
+    <linearGradient
+       id="linearGradient7449">
+      <stop
+         style="stop-color:#abaeb4;stop-opacity:1;"
+         offset="0"
+         id="stop7451" />
+      <stop
+         style="stop-color:#babfc4;stop-opacity:1"
+         offset="1"
+         id="stop7453" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5412"
+       id="linearGradient7455"
+       x1="24"
+       y1="7.125"
+       x2="30.25"
+       y2="31.75"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.3971832,2,1.6665491)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5420"
+       id="linearGradient7457"
+       x1="24.75"
+       y1="26.932989"
+       x2="24.75"
+       y2="8.2395487"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3945186,0,0,0.374603,1.5315518,1.4298105)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5456"
+       id="linearGradient7463"
+       x1="66.8125"
+       y1="3.28125"
+       x2="66.8125"
+       y2="4.15625"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.727273,0,0,0.6400001,-37.090913,7.9999948e-2)" />
+    <linearGradient
+       y2="46.694988"
+       x2="26.355263"
+       y1="34.850952"
+       x1="26.091883"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7224"
+       xlink:href="#linearGradient5504"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective6991" />
+    <linearGradient
+       id="linearGradient7030">
+      <stop
+         style="stop-color:#abaeb4;stop-opacity:1;"
+         offset="0"
+         id="stop7032" />
+      <stop
+         style="stop-color:#babfc4;stop-opacity:1"
+         offset="1"
+         id="stop7034" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5412"
+       id="linearGradient7036"
+       x1="24"
+       y1="7.125"
+       x2="30.25"
+       y2="31.75"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6365011,0,0,0.611841,0.8353154,0.4054337)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5420"
+       id="linearGradient7038"
+       x1="24.75"
+       y1="26.932989"
+       x2="24.75"
+       y2="8.2395487"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6365011,0,0,0.5710435,0.8353154,0.3524889)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5456"
+       id="linearGradient7044"
+       x1="66.8125"
+       y1="3.28125"
+       x2="66.8125"
+       y2="4.15625"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7272728,0,0,0.6400002,-32.090911,8.0000093e-2)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5504"
+       id="linearGradient7050"
+       gradientUnits="userSpaceOnUse"
+       x1="26.091883"
+       y1="34.850952"
+       x2="26.355263"
+       y2="46.694988" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7052">
+      <rect
+         ry="1.2420602"
+         rx="1.2447108"
+         y="32.740601"
+         x="2.403806"
+         height="10.259402"
+         width="44.192387"
+         id="rect7054"
+         style="opacity:1;color:#000000;fill:url(#linearGradient5613);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5504"
+       id="linearGradient7056"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2626397,0,0,0.7328144,-6.4346717,11.48898)"
+       x1="26.091883"
+       y1="34.850952"
+       x2="26.355263"
+       y2="46.694988" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5617"
+       id="linearGradient7058"
+       x1="24.660349"
+       y1="30.941048"
+       x2="24.660349"
+       y2="48.972271"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5735"
+       id="linearGradient7064"
+       x1="17.799442"
+       y1="2.0108604"
+       x2="24"
+       y2="30.48914"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6365011,0,0,0.6362749,0.8353154,-0.1046238)" />
+    <radialGradient
+       r="81.292717"
+       fy="123.17536"
+       fx="110.74259"
+       cy="123.17536"
+       cx="110.74259"
+       gradientTransform="matrix(8.5252831e-2,-0.1151514,-0.1028372,-7.6135911e-2,79.820049,75.863913)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6753"
+       xlink:href="#XMLID_27_"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective6282" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective384" />
+    <linearGradient
+       id="linearGradient7290">
+      <stop
+         id="stop7292"
+         offset="0"
+         style="stop-color:#dddddd;stop-opacity:1;" />
+      <stop
+         id="stop7294"
+         offset="1"
+         style="stop-color:#a7a7a7;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7150">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="0"
+         id="stop7152" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop7154" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7136">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop7138" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop7140" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6064">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6308" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6068" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4029">
+      <stop
+         style="stop-color:#818584;stop-opacity:1;"
+         offset="0"
+         id="stop4031" />
+      <stop
+         id="stop4033"
+         offset="0.5"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         style="stop-color:#818584;stop-opacity:1;"
+         offset="1"
+         id="stop4035" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3722">
+      <stop
+         style="stop-color:#ececec;stop-opacity:1;"
+         offset="0"
+         id="stop3724" />
+      <stop
+         style="stop-color:#404040;stop-opacity:1;"
+         offset="1"
+         id="stop3726" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3611">
+      <stop
+         id="stop3613"
+         offset="0"
+         style="stop-color:#818584;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.5"
+         id="stop3615" />
+      <stop
+         id="stop3617"
+         offset="1"
+         style="stop-color:#818584;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3483">
+      <stop
+         id="stop3485"
+         offset="0"
+         style="stop-color:#ba0000;stop-opacity:1;" />
+      <stop
+         id="stop3487"
+         offset="1"
+         style="stop-color:#ba0000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3176">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3178" />
+      <stop
+         style="stop-color:#afb0b0;stop-opacity:0;"
+         offset="1"
+         id="stop3180" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3166">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3168" />
+      <stop
+         id="stop3518"
+         offset="0.5990991"
+         style="stop-color:#ffffff;stop-opacity:0.82206404;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3170" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3149">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3151" />
+      <stop
+         id="stop3157"
+         offset="0.34797296"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="0.65930116"
+         id="stop4061" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3153" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3954">
+      <stop
+         style="stop-color:#b3b3b3;stop-opacity:1;"
+         offset="0"
+         id="stop3956" />
+      <stop
+         id="stop3962"
+         offset="0.52879584"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#c5c5c5;stop-opacity:1;"
+         offset="1"
+         id="stop3958" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3065">
+      <stop
+         id="stop3067"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3073" />
+      <stop
+         id="stop3069"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3088">
+      <stop
+         id="stop3090"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.49803922;"
+         offset="0.73626375"
+         id="stop3098" />
+      <stop
+         id="stop3092"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7150"
+       id="radialGradient7164"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7001186,0,0,2.7816652,48.721132,1.3717999)"
+       cx="162.46797"
+       cy="-0.23275588"
+       fx="162.46797"
+       fy="-0.23275588"
+       r="25.9375" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask7160">
+      <path
+         id="path7162"
+         d="M 137.37423,-51.650649 C 136.90963,-51.650649 136.53048,-51.183286 136.53048,-50.619399 L 136.53048,-0.18189907 C 141.47984,0.40821793 146.5415,0.72435094 151.68673,0.72435094 C 164.60291,0.72435094 176.96094,-1.191205 188.40548,-4.713149 L 188.40548,-50.619399 C 188.40548,-51.183286 188.02634,-51.650649 187.56173,-51.650649 L 137.37423,-51.650649 z"
+         style="opacity:1;fill:url(#radialGradient7164);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.08779998;stroke-opacity:1" />
+    </mask>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3722"
+       id="linearGradient7464"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7018405,0,0,0.7018405,-31.780515,17.907276)"
+       x1="88.188385"
+       y1="74.379738"
+       x2="47.238132"
+       y2="118.57565" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3176"
+       id="radialGradient5527"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4526982,0,0,0.5009139,-273.4665,-184.05718)"
+       cx="648.65515"
+       cy="639.22247"
+       fx="648.65515"
+       fy="639.22247"
+       r="93.508705" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7136"
+       id="linearGradient5542"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(102.53048,-57.275649)"
+       x1="70.316795"
+       y1="58"
+       x2="72.281242"
+       y2="15.908398" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="0.60519463"
+       x2="69"
+       y1="35.035378"
+       x1="69"
+       id="linearGradient4056"
+       xlink:href="#linearGradient4050"
+       inkscape:collect="always" />
+    <clipPath
+       id="clipPath4024"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         ry="0"
+         width="112"
+         height="88"
+         id="rect4026"
+         x="8"
+         y="7.9999967"
+         style="fill:#e20071;fill-opacity:1" />
+    </clipPath>
+    <linearGradient
+       y2="-113.61256"
+       x2="314.05814"
+       y1="11.862287"
+       x1="314.05814"
+       gradientTransform="matrix(1.214876,0,0,-1.2057416,-356.23137,-16.727269)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3002"
+       xlink:href="#linearGradient5645"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5645">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop5647" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop5649" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4854">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4857" />
+      <stop
+         id="stop4010"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop4859" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4838">
+      <stop
+         id="stop4840"
+         offset="0"
+         style="stop-color:#9a9a9a;stop-opacity:1;" />
+      <stop
+         style="stop-color:#d0d0d0;stop-opacity:1;"
+         offset="0.26439792"
+         id="stop4846" />
+      <stop
+         style="stop-color:#e4e4e4;stop-opacity:1;"
+         offset="0.52879584"
+         id="stop4842" />
+      <stop
+         id="stop4848"
+         offset="0.76439792"
+         style="stop-color:#e2e2e2;stop-opacity:1;" />
+      <stop
+         id="stop4844"
+         offset="1"
+         style="stop-color:#acacac;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4804"
+       gradientUnits="userSpaceOnUse"
+       x1="49.875"
+       y1="165.22659"
+       x2="196.125"
+       y2="165.22659">
+      <stop
+         offset="0"
+         style="stop-color:#6b6b6b;stop-opacity:1;"
+         id="stop4806" />
+      <stop
+         offset="0.1716"
+         style="stop-color:#d6d9df;stop-opacity:1;"
+         id="stop4808" />
+      <stop
+         offset="0.30770001"
+         style="stop-color:#737373;stop-opacity:1;"
+         id="stop4810" />
+      <stop
+         offset="0.5"
+         style="stop-color:#e1e4e7;stop-opacity:1;"
+         id="stop4812" />
+      <stop
+         offset="0.74559999"
+         style="stop-color:#818181;stop-opacity:1;"
+         id="stop4814" />
+      <stop
+         offset="0.77539998"
+         style="stop-color:#868d93;stop-opacity:1;"
+         id="stop4816" />
+      <stop
+         offset="0.83310002"
+         style="stop-color:#9b9da3;stop-opacity:1;"
+         id="stop4818" />
+      <stop
+         offset="0.89039999"
+         style="stop-color:#8e9198;stop-opacity:1;"
+         id="stop4820" />
+      <stop
+         offset="0.9465"
+         style="stop-color:#8f949a;stop-opacity:1;"
+         id="stop4822" />
+      <stop
+         offset="1"
+         style="stop-color:#adb0b5;stop-opacity:1;"
+         id="stop4824" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3258">
+      <stop
+         style="stop-color:#ececec;stop-opacity:1;"
+         offset="0"
+         id="stop3260" />
+      <stop
+         style="stop-color:#404040;stop-opacity:1;"
+         offset="1"
+         id="stop3262" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3250">
+      <stop
+         id="stop3252"
+         offset="0"
+         style="stop-color:#818584;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.5"
+         id="stop3254" />
+      <stop
+         id="stop3256"
+         offset="1"
+         style="stop-color:#818584;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3242">
+      <stop
+         style="stop-color:#b3b3b3;stop-opacity:1;"
+         offset="0"
+         id="stop3244" />
+      <stop
+         id="stop3246"
+         offset="0.52879584"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#909090;stop-opacity:1;"
+         offset="1"
+         id="stop3248" />
+    </linearGradient>
+    <linearGradient
+       y2="69"
+       x2="220"
+       y1="69"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_18_">
+      <stop
+         id="stop3354"
+         style="stop-color:#3383E6"
+         offset="0" />
+      <stop
+         id="stop3364"
+         style="stop-color:#6ECAF7"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6160">
+      <stop
+         id="stop6162"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop6164"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3623">
+      <stop
+         id="stop3625"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1;" />
+      <stop
+         id="stop3627"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4050">
+      <stop
+         id="stop4052"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop4054"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3722"
+       id="linearGradient2792"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7018405,0,0,0.7018405,-31.780515,17.907276)"
+       x1="88.188385"
+       y1="74.379738"
+       x2="47.238132"
+       y2="118.57565" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7136"
+       id="linearGradient2806"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(102.53048,-57.275649)"
+       x1="70.316795"
+       y1="58"
+       x2="72.281242"
+       y2="15.908398" />
+    <linearGradient
+       gradientTransform="translate(0,2)"
+       gradientUnits="userSpaceOnUse"
+       y2="78.850853"
+       x2="67.629204"
+       y1="-2.1941743"
+       x1="67.629204"
+       id="linearGradient3092"
+       xlink:href="#XMLID_25_"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="155.16769"
+       x2="193.5"
+       y1="6.7293491"
+       x1="193.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2263"
+       xlink:href="#linearGradient3215"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="155.16769"
+       x2="193.5"
+       y1="6.7293491"
+       x1="193.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2255"
+       xlink:href="#linearGradient3215"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(1.0727282,0,0,-0.7852748,-88.140453,159.47421)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#XMLID_27_"
+       id="radialGradient2370"
+       fy="123.17536"
+       fx="110.74259"
+       r="81.292717"
+       cy="123.17536"
+       cx="110.74259" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3215"
+       id="linearGradient2368"
+       y2="155.16769"
+       x2="193.5"
+       y1="6.7293491"
+       x1="193.5" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3215"
+       id="linearGradient2366"
+       y2="155.16769"
+       x2="193.5"
+       y1="6.7293491"
+       x1="193.5" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3215"
+       id="linearGradient2364"
+       y2="155.16769"
+       x2="193.5"
+       y1="6.7293491"
+       x1="193.5" />
+    <radialGradient
+       gradientTransform="matrix(0.9459,0,0,1,1051.1319,-330.17143)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#XMLID_25_"
+       id="radialGradient2362"
+       r="81.971497"
+       cy="0.75440001"
+       cx="66.136703" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#XMLID_23_"
+       id="linearGradient2360"
+       y2="102.0937"
+       x2="115.9771"
+       y1="72.341148"
+       x1="108.00493" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#XMLID_23_"
+       id="linearGradient2358"
+       y2="102.0937"
+       x2="115.9771"
+       y1="72.341148"
+       x1="108.00493" />
+    <radialGradient
+       gradientTransform="translate(1047.3429,-330.17143)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#XMLID_21_"
+       id="radialGradient2356"
+       r="141"
+       cy="145.3999"
+       cx="69.600098" />
+    <radialGradient
+       gradientTransform="translate(1047.3429,-330.17143)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#XMLID_20_"
+       id="radialGradient2354"
+       r="85"
+       cy="68.399902"
+       cx="69.600098" />
+    <linearGradient
+       gradientTransform="matrix(-1,-4.371139e-8,4.371139e-8,-1,1186.5436,-193.37143)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#XMLID_18_"
+       id="linearGradient2352"
+       y2="68.399902"
+       x2="129.6001"
+       y1="68.399902"
+       x1="9.5995998" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3215"
+       id="linearGradient2330"
+       y2="155.16769"
+       x2="193.5"
+       y1="6.7293491"
+       x1="193.5" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3215"
+       id="linearGradient2328"
+       y2="155.16769"
+       x2="193.5"
+       y1="6.7293491"
+       x1="193.5" />
+    <filter
+       id="filter4466">
+      <feGaussianBlur
+         id="feGaussianBlur4468"
+         stdDeviation="2.32"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       gradientTransform="matrix(-1,-4.371139e-8,4.371139e-8,-1,1186.5436,-193.37143)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3056"
+       y2="68.399902"
+       x2="129.6001"
+       y1="68.399902"
+       x1="9.5995998">
+      <stop
+         id="stop13"
+         offset="0"
+         style="stop-color:#003685;stop-opacity:1" />
+      <stop
+         id="stop15"
+         offset="0.0105"
+         style="stop-color:#083c8f;stop-opacity:1" />
+      <stop
+         id="stop17"
+         offset="0.0533"
+         style="stop-color:#2451b1;stop-opacity:1" />
+      <stop
+         id="stop19"
+         offset="0.099"
+         style="stop-color:#3b63cd;stop-opacity:1" />
+      <stop
+         id="stop21"
+         offset="0.1477"
+         style="stop-color:#4d71e3;stop-opacity:1" />
+      <stop
+         id="stop23"
+         offset="0.20100001"
+         style="stop-color:#597bf3;stop-opacity:1" />
+      <stop
+         id="stop25"
+         offset="0.2622"
+         style="stop-color:#6180fc;stop-opacity:1" />
+      <stop
+         id="stop27"
+         offset="0.34909999"
+         style="stop-color:#6382ff;stop-opacity:1" />
+      <stop
+         id="stop31"
+         offset="0.58579999"
+         style="stop-color:#6382ff;stop-opacity:1" />
+      <stop
+         id="stop33"
+         offset="1"
+         style="stop-color:#003685;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="translate(1047.3429,-330.17143)"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_20_"
+       r="85"
+       cy="68.399902"
+       cx="69.600098">
+      <stop
+         id="stop47"
+         offset="0.5"
+         style="stop-color:#6193ff;stop-opacity:1" />
+      <stop
+         id="stop49"
+         offset="0.78109998"
+         style="stop-color:#003685;stop-opacity:1" />
+      <stop
+         id="stop51"
+         offset="1"
+         style="stop-color:#709dff;stop-opacity:1" />
+    </radialGradient>
+    <radialGradient
+       gradientTransform="translate(1047.3429,-330.17143)"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_21_"
+       r="141"
+       cy="145.3999"
+       cx="69.600098">
+      <stop
+         id="stop58"
+         offset="0.3373"
+         style="stop-color:#2c72c7;stop-opacity:0" />
+      <stop
+         id="stop60"
+         offset="0.57990003"
+         style="stop-color:#2c72c7;stop-opacity:1" />
+      <stop
+         id="stop62"
+         offset="1"
+         style="stop-color:#2c72c7;stop-opacity:0" />
+    </radialGradient>
+    <filter
+       id="AI_Sfocatura_4">
+      <feGaussianBlur
+         id="feGaussianBlur6"
+         stdDeviation="4" />
+    </filter>
+    <clipPath
+       id="clipPath4458">
+      <use
+         xlink:href="#XMLID_10_"
+         height="1"
+         width="1"
+         y="0"
+         x="0"
+         id="use4460" />
+    </clipPath>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#XMLID_23_"
+       id="linearGradient4454"
+       y2="102.0937"
+       x2="115.9771"
+       y1="72.341148"
+       x1="108.00493" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_23_"
+       y2="120.3999"
+       x2="115.9771"
+       y1="72.399902"
+       x1="115.9771">
+      <stop
+         id="stop79"
+         offset="0"
+         style="stop-color:#00316e;stop-opacity:0" />
+      <stop
+         id="stop81"
+         offset="1"
+         style="stop-color:#00316e;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       id="filter4442"
+       height="1.1148686"
+       y="-0.057434313"
+       width="1.5844299"
+       x="-0.29221493">
+      <feGaussianBlur
+         id="feGaussianBlur4444"
+         stdDeviation="2.4087233"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#XMLID_23_"
+       id="linearGradient4456"
+       y2="102.0937"
+       x2="115.9771"
+       y1="72.341148"
+       x1="108.00493" />
+    <filter
+       id="filter4446"
+       height="1.1148686"
+       y="-0.057434313"
+       width="1.5844299"
+       x="-0.29221493">
+      <feGaussianBlur
+         id="feGaussianBlur4448"
+         stdDeviation="2.4087233"
+         inkscape:collect="always" />
+    </filter>
+    <radialGradient
+       gradientTransform="matrix(0.9459,0,0,1,1051.1319,-330.17143)"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_25_"
+       r="81.971497"
+       cy="0.75440001"
+       cx="66.136703">
+      <stop
+         id="stop95"
+         offset="0.1302"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop97"
+         offset="0.5"
+         style="stop-color:#ffffff;stop-opacity:0.16862746;" />
+    </radialGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3215"
+       id="linearGradient3213"
+       y2="155.16769"
+       x2="193.5"
+       y1="6.7293491"
+       x1="193.5" />
+    <linearGradient
+       gradientTransform="matrix(-1,-4.371139e-8,4.371139e-8,-1,139.2007,136.8)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3215"
+       y2="68.399902"
+       x2="129.6001"
+       y1="68.399902"
+       x1="9.5995998">
+      <stop
+         id="stop3221"
+         offset="0"
+         style="stop-color:#2451b1;stop-opacity:1" />
+      <stop
+         id="stop3227"
+         offset="0.5"
+         style="stop-color:#c5d1fb;stop-opacity:0" />
+      <stop
+         id="stop3233"
+         offset="1"
+         style="stop-color:#7ab4ff;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(1.0727282,0,0,-0.7852748,-88.140453,159.47421)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#XMLID_27_"
+       id="radialGradient5096"
+       fy="123.17536"
+       fx="110.74259"
+       r="81.292717"
+       cy="123.17536"
+       cx="110.74259" />
+    <radialGradient
+       gradientTransform="matrix(0.9397,0,0,0.9397,4.2153,4.1331)"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_27_"
+       r="66.164497"
+       cy="58.0625"
+       cx="76.764198">
+      <stop
+         id="stop107"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop109"
+         offset="0.32780001"
+         style="stop-color:#fdfdfc;stop-opacity:1" />
+      <stop
+         id="stop111"
+         offset="0.6773591"
+         style="stop-color:#f4f5f4;stop-opacity:1" />
+      <stop
+         id="stop113"
+         offset="1"
+         style="stop-color:#cacfd0;stop-opacity:1;" />
+    </radialGradient>
+    <inkscape:perspective
+       id="perspective3018"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="-50 : 600 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6064"
+       id="linearGradient3143"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(321,-165.5)"
+       x1="89.39682"
+       y1="69.079369"
+       x2="67.047623"
+       y2="71.111115" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_21_"
+       id="radialGradient3156"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(315.4,39.099995)"
+       cx="69.600098"
+       cy="145.3999"
+       r="141" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_20_"
+       id="radialGradient3159"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9824561,0,0,0.9824561,316.62105,40.299995)"
+       cx="69.600098"
+       cy="68.399902"
+       r="85" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_18_"
+       id="linearGradient3162"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,-4.371139e-8,4.371139e-8,-1,454.6007,175.89999)"
+       x1="9.5995998"
+       y1="68.399902"
+       x2="129.6001"
+       y2="68.399902" />
+    <defs
+       id="defs68">
+      <path
+         id="XMLID_10_"
+         d="M 69.626,12.145 L 69.574,12.145 C 46.847,11.853 23.102,16.222 22.865,16.267 C 20.441,16.718 17.919,19.241 17.468,21.664 C 17.424,21.901 13.054,45.647 13.346,68.374 C 13.054,91.151 17.424,114.897 17.468,115.135 C 17.919,117.558 20.442,120.08 22.866,120.533 C 23.103,120.577 46.848,124.946 69.575,124.654 C 92.354,124.946 116.099,120.577 116.336,120.533 C 118.759,120.081 121.282,117.557 121.734,115.134 C 121.778,114.898 126.147,91.153 125.855,68.425 C 126.147,45.648 121.778,21.902 121.734,21.664 C 121.281,19.241 118.758,16.718 116.336,16.267 C 116.098,16.222 92.352,11.853 69.626,12.145 z" />
+    </defs>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_23_"
+       id="linearGradient3177"
+       gradientUnits="userSpaceOnUse"
+       x1="108.00493"
+       y1="72.341148"
+       x2="115.9771"
+       y2="102.0937" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_23_"
+       id="linearGradient3181"
+       gradientUnits="userSpaceOnUse"
+       x1="108.00493"
+       y1="72.341148"
+       x2="115.9771"
+       y2="102.0937"
+       gradientTransform="translate(315.40001,39.099995)" />
+    <linearGradient
+       y2="46.694988"
+       x2="26.355263"
+       y1="34.850952"
+       x1="26.091883"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7333"
+       xlink:href="#linearGradient5504"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective5691" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5735">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop5737" />
+      <stop
+         style="stop-color:#080d19;stop-opacity:1"
+         offset="1"
+         id="stop5739" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5617">
+      <stop
+         style="stop-color:#2e5d9c;stop-opacity:1;"
+         offset="0"
+         id="stop5619" />
+      <stop
+         style="stop-color:#2e5d9c;stop-opacity:0;"
+         offset="1"
+         id="stop5621" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5456">
+      <stop
+         style="stop-color:#7d7c7d;stop-opacity:1"
+         offset="0"
+         id="stop5458" />
+      <stop
+         style="stop-color:#8f8f8f;stop-opacity:1"
+         offset="1"
+         id="stop5460" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5420">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop5422" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="1"
+         id="stop5424" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5412">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5414" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5416" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5715">
+      <stop
+         style="stop-color:#abaeb4;stop-opacity:1;"
+         offset="0"
+         id="stop5717" />
+      <stop
+         style="stop-color:#babfc4;stop-opacity:1"
+         offset="1"
+         id="stop5719" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5504"
+       id="linearGradient5730"
+       gradientUnits="userSpaceOnUse"
+       x1="26.091883"
+       y1="34.850952"
+       x2="26.355263"
+       y2="46.694988" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5732">
+      <rect
+         ry="1.2420602"
+         rx="1.2447108"
+         y="32.740601"
+         x="2.403806"
+         height="10.259402"
+         width="44.192387"
+         id="rect5734"
+         style="opacity:1;color:#000000;fill:url(#linearGradient5613);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5504"
+       id="linearGradient5736"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2626397,0,0,0.7328144,-6.4346717,11.48898)"
+       x1="26.091883"
+       y1="34.850952"
+       x2="26.355263"
+       y2="46.694988" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective5376" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5504">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop7306" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop5508" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5129">
+      <stop
+         style="stop-color:#abaeb4;stop-opacity:1;"
+         offset="0"
+         id="stop5131" />
+      <stop
+         style="stop-color:#babfc4;stop-opacity:1"
+         offset="1"
+         id="stop5133" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5504"
+       id="linearGradient5598"
+       gradientUnits="userSpaceOnUse"
+       x1="26.091883"
+       y1="34.850952"
+       x2="26.355263"
+       y2="46.694988" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5609">
+      <rect
+         ry="1.2420602"
+         rx="1.2447108"
+         y="32.740601"
+         x="2.403806"
+         height="10.259402"
+         width="44.192387"
+         id="rect5611"
+         style="opacity:1;color:#000000;fill:url(#linearGradient5613);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5504"
+       id="linearGradient5613"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2626397,0,0,0.7328144,-6.4346717,11.48898)"
+       x1="26.091883"
+       y1="34.850952"
+       x2="26.355263"
+       y2="46.694988" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective6059" />
+    <linearGradient
+       id="linearGradient6062">
+      <stop
+         id="stop6064"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop6066"
+         offset="1"
+         style="stop-color:#545f62;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6095">
+      <stop
+         id="stop6097"
+         offset="0"
+         style="stop-color:#729fcf;stop-opacity:1;" />
+      <stop
+         id="stop6099"
+         offset="1"
+         style="stop-color:#326194;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5233"
+       id="radialGradient6102"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7741996,0,0,0.4496991,-2.5938863,-21.089376)"
+       cx="24.006104"
+       cy="32.997028"
+       fx="24.006104"
+       fy="32.997028"
+       r="19.00016" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5225"
+       id="radialGradient6104"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.24763,0,32.1168)"
+       cx="23.9375"
+       cy="42.6875"
+       fx="23.9375"
+       fy="42.6875"
+       r="23.75956" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3746"
+       id="linearGradient6106"
+       x1="1"
+       y1="41"
+       x2="57"
+       y2="41"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.6694657,0,0,0.5055005,32.353347,7.2744773)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3773"
+       id="linearGradient6108"
+       x1="41.030415"
+       y1="31.742641"
+       x2="44.018246"
+       y2="38.463863"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6694658,0,0,0.6532314,0.2189897,0.8669223)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3781"
+       id="linearGradient6110"
+       x1="6"
+       y1="32"
+       x2="2.4217334"
+       y2="40"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6694658,0,0,0.6532314,0.2189897,0.8669223)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3817"
+       id="linearGradient6112"
+       x1="49.23904"
+       y1="25.185259"
+       x2="-2.4866421"
+       y2="-0.96008933"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6756758,0,0,0.6538462,-0.2162163,0.8653854)" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective5197" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective5050" />
+    <linearGradient
+       id="linearGradient3817">
+      <stop
+         id="stop3819"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop3821"
+         offset="1"
+         style="stop-color:#545f62;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3781">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3783" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3785" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3773">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3775" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3777" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3746">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop3748" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop3750" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3494">
+      <stop
+         id="stop3496"
+         offset="0"
+         style="stop-color:#bebebe;stop-opacity:1;" />
+      <stop
+         style="stop-color:#5b5b5b;stop-opacity:1;"
+         offset="0.5"
+         id="stop3500" />
+      <stop
+         id="stop3498"
+         offset="1"
+         style="stop-color:#bebebe;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5225"
+       inkscape:collect="always">
+      <stop
+         id="stop5227"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop5229"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5233">
+      <stop
+         id="stop5235"
+         offset="0"
+         style="stop-color:#729fcf;stop-opacity:1;" />
+      <stop
+         id="stop5237"
+         offset="1"
+         style="stop-color:#326194;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="54.973362"
+       x2="82.731491"
+       y1="72.665169"
+       x1="82.731491"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7257"
+       xlink:href="#linearGradient11176"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="83.204826"
+       x2="77.351288"
+       y1="54.996952"
+       x1="77.351288"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7255"
+       xlink:href="#linearGradient11133"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="45.348064"
+       x2="79.726288"
+       y1="82.829826"
+       x1="79.726288"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7253"
+       xlink:href="#linearGradient10550"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective7251" />
+    <linearGradient
+       y2="169.84375"
+       x2="100"
+       y1="30.15625"
+       x1="169.84375"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7249"
+       xlink:href="#linearGradient10182"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="169.84375"
+       x2="100"
+       y1="30.15625"
+       x1="169.84375"
+       id="linearGradient7247"
+       xlink:href="#linearGradient10182"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective7245" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-50 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       id="perspective7243" />
+    <linearGradient
+       id="linearGradient7235">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop7237" />
+      <stop
+         id="stop7239"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop7241" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7227">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop7229" />
+      <stop
+         style="stop-color:#fff520;stop-opacity:0.89108908;"
+         offset="0.50000000"
+         id="stop7231" />
+      <stop
+         style="stop-color:#fff300;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop7233" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7221">
+      <stop
+         style="stop-color:#d6e3f0;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop7223" />
+      <stop
+         style="stop-color:#95b1cf;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop7225" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7213">
+      <stop
+         id="stop7215"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#dbdbdb;stop-opacity:1;"
+         offset="0.49486449"
+         id="stop7217" />
+      <stop
+         id="stop7219"
+         offset="1.0000000"
+         style="stop-color:#9f9f9f;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7207">
+      <stop
+         id="stop7209"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.068627454;" />
+      <stop
+         id="stop7211"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       y2="40"
+       x2="60"
+       y1="20"
+       x1="82.118591"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7205"
+       xlink:href="#linearGradient6053"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="60"
+       y1="20"
+       x1="82.118591"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7203"
+       xlink:href="#linearGradient5785"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient7197"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#c0cdf9;stop-opacity:1"
+         offset="0"
+         id="stop7199" />
+      <stop
+         style="stop-color:#07092d;stop-opacity:0.28804347"
+         offset="1"
+         id="stop7201" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7191"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#c0cdf9;stop-opacity:1"
+         offset="0"
+         id="stop7193" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop7195" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7185">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.068627454;"
+         offset="0.0000000"
+         id="stop7187" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.49456522"
+         offset="1.0000000"
+         id="stop7189" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective123"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="-50 : 600 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient6244">
+      <stop
+         id="stop6246"
+         offset="0"
+         style="stop-color:#70726e;stop-opacity:1;" />
+      <stop
+         id="stop6248"
+         offset="1"
+         style="stop-color:#3f413e;stop-opacity:1;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective238"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="-50 : 600 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective235"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="-50 : 600 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7882"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7806"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7804"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7812"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7810"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7818"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7816"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7824"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7822"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7830"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7828"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7836"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7834"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7842"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7840"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7848"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7846"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7858"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7852"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7856"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7868"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7862"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7866"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7874"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7872"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7880"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="22.999987"
+       fx="24.88145"
+       cy="22.999987"
+       cx="24.88145"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7878"
+       xlink:href="#linearGradient6868"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7964"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5911">
+      <stop
+         style="stop-color:#f6f6f5;stop-opacity:1;"
+         offset="0"
+         id="stop5913" />
+      <stop
+         id="stop5921"
+         offset="0.38095239"
+         style="stop-color:#ecece9;stop-opacity:1;" />
+      <stop
+         id="stop5919"
+         offset="0.76190478"
+         style="stop-color:#c5c5be;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop5915" />
+    </linearGradient>
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7888"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7886"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient6070">
+      <stop
+         id="stop6072"
+         offset="0"
+         style="stop-color:#f6f6f5;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ecece9;stop-opacity:1;"
+         offset="0.49916622"
+         id="stop6074" />
+      <stop
+         style="stop-color:#9a9a8d;stop-opacity:1"
+         offset="0.76190478"
+         id="stop6076" />
+      <stop
+         id="stop6078"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7894"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7892"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7900"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7898"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7906"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7904"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7912"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7910"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7918"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7916"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient6082">
+      <stop
+         id="stop6084"
+         offset="0"
+         style="stop-color:#f6f6f5;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ecece9;stop-opacity:1;"
+         offset="0.53798574"
+         id="stop6086" />
+      <stop
+         style="stop-color:#97978a;stop-opacity:1"
+         offset="0.85428226"
+         id="stop6088" />
+      <stop
+         id="stop6090"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7924"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7922"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7930"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7928"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7940"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7934"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7938"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7950"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7944"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7948"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7956"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7954"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7962"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.18985"
+       fy="14.213541"
+       fx="24.137535"
+       cy="14.213541"
+       cx="24.137535"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7960"
+       xlink:href="#linearGradient5911"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8046"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6012">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6014" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop6016" />
+    </linearGradient>
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7970"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7968"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7966"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7976"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7974"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7972"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7982"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7980"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7978"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7988"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7986"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7984"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7994"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7992"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7990"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8000"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7998"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7996"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8006"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8004"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8002"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8012"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8010"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8008"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8022"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8016"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8014"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8020"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8018"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8032"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8026"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8024"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8030"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8028"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8038"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8036"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8034"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8044"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8042"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.452903"
+       fy="31.935415"
+       fx="22.251312"
+       cy="31.935415"
+       cx="22.251312"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8040"
+       xlink:href="#linearGradient6012"
+       inkscape:collect="always" />
+    <radialGradient
+       r="110.51429"
+       fy="115.11371"
+       fx="126.13385"
+       cy="115.11371"
+       cx="126.13385"
+       gradientTransform="matrix(1.0714238,-9.5271972e-3,9.5199345e-3,1.0716506,-8.7638618,-6.7904041)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8048"
+       xlink:href="#linearGradient5887"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5887">
+      <stop
+         id="stop5891"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="0.92668045"
+         id="stop5901" />
+      <stop
+         id="stop5889"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective6992"
+       inkscape:persp3d-origin="300 : 400 : 1"
+       inkscape:vp_z="700 : 600 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="-50 : 600 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9047"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9049"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9053"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9055"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9061"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9065"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9067"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9071"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9073"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9077"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9079"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9083"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9085"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9089"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9091"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9095"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9099"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9101"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9105"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9109"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9111"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9115"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9117"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9121"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9123"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9125"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9129"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9131"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9135"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9137"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9141"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9143"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9147"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9149"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9153"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9155"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9159"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9161"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9165"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9167"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9171"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9173"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9177"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9181"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9183"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9187"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9191"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9193"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9197"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9199"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9203"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9207"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9667"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9669"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9673"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9675"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9679"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9681"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9685"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9687"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9691"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9693"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9697"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9699"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9703"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9705"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9709"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9711"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9725"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9729"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9731"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9735"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9737"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9741"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9743"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9745"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9749"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9751"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9755"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9757"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9761"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9763"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9767"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9769"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9773"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9775"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9779"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9781"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9785"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9787"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9791"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9793"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9797"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9801"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9803"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9807"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9811"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9813"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9817"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9819"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9823"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9825"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9827"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9843"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9845"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9849"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9851"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9855"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9857"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9861"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9863"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9867"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9869"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9875"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9879"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9881"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9885"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9887"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9891"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9895"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9897"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9901"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9905"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9907"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9911"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9913"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9917"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9919"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient9921"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9925"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9927"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9931"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9933"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9937"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9943"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9945"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9949"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9951"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9955"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9957"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9961"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9963"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9967"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9969"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9973"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9977"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9979"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9983"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9987"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9989"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9993"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9995"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient9999"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10001"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10007"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10009"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10013"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10015"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10019"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10021"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10025"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10033"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10037"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10039"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10043"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10045"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10049"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10051"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10055"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10061"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10065"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10071"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10075"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10077"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10081"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10083"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10085"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10273"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10275"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10279"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10281"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10285"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10287"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10291"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10293"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10297"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10299"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10303"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10305"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10309"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10311"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10315"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10317"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10321"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10325"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10327"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10331"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10335"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10341"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10343"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10347"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10349"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10351"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10355"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10357"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10361"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10363"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10367"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10369"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10373"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10375"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10379"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10381"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10385"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10387"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10391"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10393"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10397"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10399"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10403"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10407"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10409"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10413"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10417"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10419"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10423"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10425"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10429"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10431"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10433"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10437"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10439"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10443"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10445"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10449"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10451"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10455"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10457"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10461"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10463"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10467"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10469"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10473"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10475"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10479"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10481"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10485"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10489"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10491"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10495"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10499"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10501"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10505"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10507"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10511"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10513"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6012"
+       id="radialGradient10515"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.793205,-2.7049214e-2,7.3970344e-3,0.4906728,-17.886079,12.316899)"
+       cx="22.251312"
+       cy="31.935415"
+       fx="22.251312"
+       fy="31.935415"
+       r="19.452903" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10708"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10710"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10714"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10716"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10720"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10722"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10726"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10728"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10732"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10734"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10738"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10740"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10744"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10746"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10750"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10752"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10756"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10760"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10762"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10766"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10770"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10772"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10776"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10778"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10782"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10784"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient10786"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10790"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10792"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10796"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10798"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10802"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10804"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10808"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10810"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10814"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10816"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10820"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10822"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10826"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10828"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10832"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10838"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10842"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10844"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10848"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10852"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10854"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10858"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10860"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10864"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10866"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient10868"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11676"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11682"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11684"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11688"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11690"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11694"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11696"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11700"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11702"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11706"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11708"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11712"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11714"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11718"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11720"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11724"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11728"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11730"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11734"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11738"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11740"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11744"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11746"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11750"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11752"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11754"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11758"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11760"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11764"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11766"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11770"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11772"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11776"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11778"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11782"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11784"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11788"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11790"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11794"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11796"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11800"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11802"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11806"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11810"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11812"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11816"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11820"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11822"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11826"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11828"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11832"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient11836"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11936"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11938"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11942"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11944"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11948"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11950"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11954"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11956"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11960"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11962"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11966"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11968"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11972"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11974"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11978"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11980"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11984"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11988"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11990"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11994"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient11998"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient12000"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient12004"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient12006"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient12010"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient12012"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6868"
+       id="radialGradient12014"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9316064,0,1.5730518)"
+       cx="24.88145"
+       cy="22.999987"
+       fx="24.88145"
+       fy="22.999987"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12018"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12020"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12026"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12030"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12032"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12036"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12038"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12042"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12044"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12048"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12050"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12054"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12056"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12062"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12066"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12070"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12072"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12076"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12080"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12082"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12086"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12092"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12094"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12096"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12100"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12102"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12106"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12108"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12114"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12120"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12124"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12130"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12132"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12136"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12138"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12142"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12148"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12152"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12154"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12158"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12162"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12164"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12168"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12170"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12174"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12176"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient12178"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14320"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14324"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14326"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14328"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14330"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14332"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14334"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14336"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14338"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14340"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14342"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14344"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14354"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14356"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14358"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14360"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14362"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14364"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14366"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14368"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5911"
+       id="radialGradient14372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7004739,0,0,1.5841724,-16.907714,-7.7022218)"
+       cx="24.137535"
+       cy="14.213541"
+       fx="24.137535"
+       fy="14.213541"
+       r="19.18985" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14058"
+       id="radialGradient14662"
+       gradientUnits="userSpaceOnUse"
+       cx="133.91667"
+       cy="49.0625"
+       fx="133.91667"
+       fy="49.0625"
+       r="2.6666667" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13174"
+       id="radialGradient14666"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1730027,-0.742932,0.444609,0.7019856,-107.62783,110.62328)"
+       cx="131.60938"
+       cy="57.356792"
+       fx="131.60938"
+       fy="57.356792"
+       r="4.046875" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13174"
+       id="radialGradient14668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.4218516,2.4218513,-1.4493615,-1.4493615,476.12764,-191.55682)"
+       cx="130.41443"
+       cy="57.180382"
+       fx="130.41443"
+       fy="57.180382"
+       r="4.046875" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13207"
+       id="radialGradient14670"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(7.1085984,-0.8898331,0.1829124,1.4612324,-887.84602,105.65331)"
+       cx="135.34987"
+       cy="36.609375"
+       fx="135.34987"
+       fy="36.609375"
+       r="12.875" />
+    <inkscape:perspective
+       id="perspective6851"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       y2="58.910736"
+       x2="25.821404"
+       y1="31.785736"
+       x1="25.625187"
+       gradientTransform="matrix(1.0338314,0,0,1.0338314,-4.3469388,-11.233809)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5471"
+       xlink:href="#linearGradient4746"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="58.910736"
+       x2="25.821404"
+       y1="31.785736"
+       x1="25.625187"
+       gradientTransform="translate(-0.375,0.25)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5465"
+       xlink:href="#linearGradient4746"
+       inkscape:collect="always" />
+    <clipPath
+       id="clipPath5461"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="opacity:0.35714285;fill:none;fill-rule:nonzero;stroke:url(#linearGradient5465);stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+         d="M 23.910794,41.946345 L 5.5001859,23.535737 L 23.910794,5.125128 L 42.321402,23.535737 L 23.910794,41.946345 L 23.910794,41.946345 z"
+         id="path5463" />
+    </clipPath>
+    <linearGradient
+       gradientTransform="translate(-0.375,0.25)"
+       y2="58.910736"
+       x2="25.821404"
+       y1="31.785736"
+       x1="25.625187"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5459"
+       xlink:href="#linearGradient4746"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="58.910736"
+       x2="25.821404"
+       y1="31.785736"
+       x1="25.625187"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6930"
+       xlink:href="#linearGradient4746"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective5423" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2790">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop2792" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2780">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2782" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2784" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6621">
+      <stop
+         style="stop-color:#f5a108;stop-opacity:0.0000000;"
+         offset="0.0000000"
+         id="stop6622" />
+      <stop
+         style="stop-color:#fefdc3;stop-opacity:0.74251497;"
+         offset="1.0000000"
+         id="stop6623" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6621"
+       id="linearGradient7881"
+       x1="22.819513"
+       y1="28.829224"
+       x2="12.849945"
+       y2="12.239423"
+       gradientTransform="matrix(1.059395,0,0,0.544945,1.249822,2.738696)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6621"
+       id="linearGradient1697"
+       x1="11.464835"
+       y1="20.415981"
+       x2="6.3578372"
+       y2="6.1003184"
+       gradientTransform="matrix(1.996051,0,0,1.070808,0.902744,-1.06494)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6621"
+       id="linearGradient121"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.174132,0,0,1.166342,-1.102204,-2.607882)"
+       x1="18.711395"
+       y1="34.807064"
+       x2="11.413211"
+       y2="31.452499" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2780"
+       id="linearGradient2786"
+       x1="22.686586"
+       y1="16.672918"
+       x2="42.437912"
+       y2="52.172916"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2790"
+       id="radialGradient2796"
+       cx="24.375"
+       cy="37.75"
+       fx="24.375"
+       fy="37.75"
+       r="17.375"
+       gradientTransform="matrix(1,0,0,0.352518,0,24.44245)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="58.910736"
+       x2="25.821404"
+       y1="31.785736"
+       x1="25.625187"
+       id="linearGradient4752"
+       xlink:href="#linearGradient4746"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2300"
+       id="radialGradient2308"
+       gradientTransform="matrix(1.399258,-2.234445e-7,8.196178e-8,0.513264,4.365074,4.839285)"
+       cx="14.287618"
+       cy="68.872971"
+       fx="14.287618"
+       fy="72.568001"
+       r="11.689870"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientTransform="matrix(0.200685,0,0,0.200685,-0.585758,-1.050787)"
+       y2="248.6311"
+       x2="153.0005"
+       y1="15.4238"
+       x1="99.7773"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient53551"
+       xlink:href="#aigrd1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="248.6311"
+       x2="153.0005"
+       y1="15.4238"
+       x1="99.7773"
+       gradientUnits="userSpaceOnUse"
+       id="aigrd1">
+      <stop
+         id="stop53300"
+         style="stop-color:#184375"
+         offset="0" />
+      <stop
+         id="stop53302"
+         style="stop-color:#C8BDDC"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2300">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.32673267;"
+         offset="0.0000000"
+         id="stop2302" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2304" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4746"
+       inkscape:collect="always">
+      <stop
+         id="stop4748"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4750"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5294"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2300"
+       id="radialGradient6971"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.399258,-2.234445e-7,8.196178e-8,0.513264,4.365074,4.839285)"
+       cx="14.287618"
+       cy="68.872971"
+       fx="14.287618"
+       fy="72.568001"
+       r="11.689870" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#aigrd1"
+       id="linearGradient6973"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1992331,0,0,0.1992331,-0.2617712,-0.7306711)"
+       x1="99.7773"
+       y1="15.4238"
+       x2="153.0005"
+       y2="248.6311" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4746"
+       id="linearGradient6975"
+       gradientUnits="userSpaceOnUse"
+       x1="25.625187"
+       y1="31.785736"
+       x2="25.821404"
+       y2="58.910736"
+       gradientTransform="matrix(0.9507257,0,0,0.9507257,1.4429438,1.3936668)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2300"
+       id="radialGradient6979"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.399258,-2.234445e-7,8.196178e-8,0.513264,4.365074,4.839285)"
+       cx="14.287618"
+       cy="68.872971"
+       fx="14.287618"
+       fy="72.568001"
+       r="11.689870" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2300"
+       id="radialGradient6989"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.399258,-2.234445e-7,8.196178e-8,0.513264,4.365074,4.839285)"
+       cx="14.287618"
+       cy="68.872971"
+       fx="14.287618"
+       fy="72.568001"
+       r="11.689870" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2300"
+       id="radialGradient7009"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.399258,-2.234445e-7,8.196178e-8,0.513264,4.365074,4.839285)"
+       cx="14.287618"
+       cy="68.872971"
+       fx="14.287618"
+       fy="72.568001"
+       r="11.689870" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2300"
+       id="radialGradient7011"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.399258,-2.234445e-7,8.196178e-8,0.513264,4.365074,4.839285)"
+       cx="14.287618"
+       cy="68.872971"
+       fx="14.287618"
+       fy="72.568001"
+       r="11.689870" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#aigrd1"
+       id="linearGradient7013"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1992331,0,0,0.1992331,-0.2617712,-0.7306711)"
+       x1="99.7773"
+       y1="15.4238"
+       x2="153.0005"
+       y2="248.6311" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4746"
+       id="linearGradient7015"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9190342,0,0,0.9190342,2.2125946,2.1316245)"
+       x1="25.625187"
+       y1="31.785736"
+       x2="25.821404"
+       y2="58.910736" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2300"
+       id="radialGradient7035"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.399258,-2.234445e-7,8.196178e-8,0.513264,4.365074,4.839285)"
+       cx="14.287618"
+       cy="68.872971"
+       fx="14.287618"
+       fy="72.568001"
+       r="11.689870" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2300"
+       id="radialGradient7037"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.399258,-2.234445e-7,8.196178e-8,0.513264,4.365074,4.839285)"
+       cx="14.287618"
+       cy="68.872971"
+       fx="14.287618"
+       fy="72.568001"
+       r="11.689870" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#aigrd1"
+       id="linearGradient7039"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1992331,0,0,0.1992331,-0.2617712,-0.7306711)"
+       x1="99.7773"
+       y1="15.4238"
+       x2="153.0005"
+       y2="248.6311" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4746"
+       id="linearGradient7041"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8945111,0,0,0.8945111,2.808158,2.7026633)"
+       x1="25.625187"
+       y1="31.785736"
+       x2="25.821404"
+       y2="58.910736" />
+  </defs>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+        <dc:title>Folder</dc:title>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>dir</rdf:li>
+            <rdf:li>folder</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:date />
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier />
+        <dc:relation />
+        <dc:language />
+        <dc:coverage />
+        <dc:description />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="display:none"
+     inkscape:label="plate"
+     id="layer3"
+     inkscape:groupmode="layer">
+    <rect
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6284"
+       width="48"
+       height="48"
+       x="110"
+       y="30"
+       inkscape:label="48x48" />
+    <rect
+       inkscape:label="32x32"
+       y="30.00367"
+       x="173.9375"
+       height="32"
+       width="32"
+       id="rect6592"
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6749"
+       width="22"
+       height="22"
+       x="220"
+       y="31.105408"
+       inkscape:label="22x22" />
+    <rect
+       inkscape:label="16x16"
+       y="32"
+       x="258.0275"
+       height="16"
+       width="16"
+       id="rect6833"
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       inkscape:label="24x24"
+       y="30"
+       x="218.95709"
+       height="24"
+       width="24"
+       id="rect5028"
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="artwork"
+     id="layer1">
+    <g
+       style="display:inline;enable-background:new"
+       id="g6937"
+       transform="translate(109.28572,29.124871)">
+      <g
+         id="layer2"
+         inkscape:label="shadow">
+        <path
+           sodipodi:type="arc"
+           style="fill:url(#radialGradient2308);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50000042;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="path1538"
+           sodipodi:cx="24.357143"
+           sodipodi:cy="38.714287"
+           sodipodi:rx="19.928572"
+           sodipodi:ry="9.837245"
+           d="M 44.285715,38.714287 A 19.928572,9.837245 0 1 1 4.4285717,38.714287 A 19.928572,9.837245 0 1 1 44.285715,38.714287 z"
+           transform="matrix(1.18638,0,0,1.18638,-4.539687,-7.794678)" />
+        <path
+           transform="matrix(0.5215055,0,0,0.6093191,11.654758,16.295824)"
+           d="M 44.285715,38.714287 A 19.928572,9.837245 0 1 1 4.4285717,38.714287 A 19.928572,9.837245 0 1 1 44.285715,38.714287 z"
+           sodipodi:ry="9.837245"
+           sodipodi:rx="19.928572"
+           sodipodi:cy="38.714287"
+           sodipodi:cx="24.357143"
+           id="path6977"
+           style="fill:url(#radialGradient6979);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50000042;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           sodipodi:type="arc" />
+      </g>
+      <g
+         inkscape:label="Layer 1"
+         id="g6941">
+        <path
+           id="path53304"
+           d="M 24.285801,43.196358 L 4.3751874,23.285744 L 24.285801,3.3751291 L 44.196415,23.285744 L 24.285801,43.196358 L 24.285801,43.196358 z"
+           style="fill:url(#linearGradient53551);fill-rule:nonzero;stroke:#3f4561;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
+        <path
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           style="opacity:0.35714285;fill:none;fill-rule:nonzero;stroke:url(#linearGradient4752);stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+           d="M 24.285794,41.696345 L 5.8751859,23.285737 L 24.285794,4.875128 L 42.696402,23.285737 L 24.285794,41.696345 L 24.285794,41.696345 z"
+           id="path4736" />
+        <path
+           transform="matrix(1.0338314,0,0,1.0338314,-0.9592521,-0.242267)"
+           clip-path="url(#clipPath5461)"
+           style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="M 27.851538,25.32377 C 30.875364,17.176984 39.482498,21.065372 39.438215,25.709354 C 39.397733,29.954761 30.660777,32.98794 28.15367,40.414248 C 25.391803,33.014369 16.642767,31.769407 16.68705,26.732373 C 16.731333,21.51828 24.619609,17.230078 27.851538,25.32377 z"
+           id="path920"
+           sodipodi:nodetypes="czczc" />
+        <path
+           sodipodi:nodetypes="czczc"
+           id="path5467"
+           d="M 19.464439,14.026623 C 20.729872,10.617296 24.33185,12.244537 24.313318,14.187985 C 24.296377,15.964635 20.64007,17.233982 19.590878,20.341798 C 18.435071,17.245042 14.773709,16.724041 14.792241,14.616106 C 14.810773,12.434073 18.111917,10.639515 19.464439,14.026623 z"
+           style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           clip-path="none" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.634441,0,0,0.634441,174.54683,29.1759)"
+       id="g6955"
+       style="display:inline;enable-background:new">
+      <path
+         transform="matrix(0.5649431,0,0,0.6600709,9.8086473,14.755484)"
+         d="M 44.285715,38.714287 A 19.928572,9.837245 0 1 1 4.4285717,38.714287 A 19.928572,9.837245 0 1 1 44.285715,38.714287 z"
+         sodipodi:ry="9.837245"
+         sodipodi:rx="19.928572"
+         sodipodi:cy="38.714287"
+         sodipodi:cx="24.357143"
+         id="path6987"
+         style="fill:url(#radialGradient6989);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50000042;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         sodipodi:type="arc" />
+      <g
+         inkscape:label="shadow"
+         id="g6957">
+        <path
+           transform="matrix(1.18638,0,0,1.18638,-4.539687,-7.794678)"
+           d="M 44.285715,38.714287 A 19.928572,9.837245 0 1 1 4.4285717,38.714287 A 19.928572,9.837245 0 1 1 44.285715,38.714287 z"
+           sodipodi:ry="9.837245"
+           sodipodi:rx="19.928572"
+           sodipodi:cy="38.714287"
+           sodipodi:cx="24.357143"
+           id="path6959"
+           style="fill:url(#radialGradient6971);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50000042;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           sodipodi:type="arc" />
+      </g>
+      <g
+         id="g6961"
+         inkscape:label="Layer 1">
+        <path
+           style="fill:url(#linearGradient6973);fill-rule:nonzero;stroke:#3f4561;stroke-width:1.57619071;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+           d="M 24.42985,43.196359 L 4.6632832,23.429792 L 24.42985,3.6632249 L 44.196416,23.429792 L 24.42985,43.196359 L 24.42985,43.196359 z"
+           id="path6963" />
+        <path
+           id="path6965"
+           d="M 24.532072,41.035453 L 7.0286341,23.532016 L 24.532072,6.0285764 L 42.03551,23.532016 L 24.532072,41.035453 L 24.532072,41.035453 z"
+           style="opacity:0.35714285;fill:none;fill-rule:nonzero;stroke:url(#linearGradient6975);stroke-width:1.57619047;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true" />
+        <path
+           sodipodi:nodetypes="czczc"
+           id="path6967"
+           d="M 27.851538,25.32377 C 30.875364,17.176984 39.482498,21.065372 39.438215,25.709354 C 39.397733,29.954761 30.660777,32.98794 28.15367,40.414248 C 25.391803,33.014369 16.642767,31.769407 16.68705,26.732373 C 16.731333,21.51828 24.619609,17.230078 27.851538,25.32377 z"
+           style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           clip-path="url(#clipPath5461)"
+           transform="matrix(0.9963507,0,0,0.9963507,-0.2483097,1.225037)" />
+        <path
+           clip-path="none"
+           style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="M 22.336246,14.147819 C 23.496485,11.021906 26.799034,12.513876 26.782042,14.295767 C 26.76651,15.924725 23.414148,17.088553 22.452175,19.938019 C 21.392449,17.098693 18.035453,16.621003 18.052444,14.688298 C 18.069436,12.687656 21.096158,11.042278 22.336246,14.147819 z"
+           id="path6969"
+           sodipodi:nodetypes="czczc" />
+      </g>
+    </g>
+    <g
+       style="display:inline;enable-background:new"
+       id="g6991"
+       transform="matrix(0.5066454,0,0,0.5066454,218.63811,28.605829)">
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#radialGradient7009);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50000042;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:new"
+         id="path6993"
+         sodipodi:cx="24.357143"
+         sodipodi:cy="38.714287"
+         sodipodi:rx="19.928572"
+         sodipodi:ry="9.837245"
+         d="M 44.285715,38.714287 A 19.928572,9.837245 0 1 1 4.4285717,38.714287 A 19.928572,9.837245 0 1 1 44.285715,38.714287 z"
+         transform="matrix(0.5649431,0,0,0.6600709,9.8086473,14.755484)" />
+      <g
+         id="g6995"
+         inkscape:label="shadow">
+        <path
+           sodipodi:type="arc"
+           style="fill:url(#radialGradient7011);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50000042;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="path6997"
+           sodipodi:cx="24.357143"
+           sodipodi:cy="38.714287"
+           sodipodi:rx="19.928572"
+           sodipodi:ry="9.837245"
+           d="M 44.285715,38.714287 A 19.928572,9.837245 0 1 1 4.4285717,38.714287 A 19.928572,9.837245 0 1 1 44.285715,38.714287 z"
+           transform="matrix(1.18638,0,0,1.18638,-4.539687,-7.794678)" />
+      </g>
+      <g
+         inkscape:label="Layer 1"
+         id="g6999">
+        <path
+           id="path7001"
+           d="M 24.42985,43.196359 L 4.6632832,23.429792 L 24.42985,3.6632249 L 44.196416,23.429792 L 24.42985,43.196359 L 24.42985,43.196359 z"
+           style="fill:url(#linearGradient7013);fill-rule:nonzero;stroke:#3f4561;stroke-width:1.97376716;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" />
+        <path
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           style="opacity:0.35714285;fill:none;fill-rule:nonzero;stroke:url(#linearGradient7015);stroke-width:1.97376704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+           d="M 24.532074,40.451998 L 7.6120924,23.532018 L 24.532074,6.6120346 L 41.452056,23.532018 L 24.532074,40.451998 L 24.532074,40.451998 z"
+           id="path7003" />
+        <path
+           transform="matrix(0.9586418,0,0,0.9586418,0.4987047,2.7490125)"
+           clip-path="url(#clipPath5461)"
+           style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="M 27.851538,25.32377 C 30.875364,17.176984 39.482498,21.065372 39.438215,25.709354 C 39.397733,29.954761 30.660777,32.98794 28.15367,40.414248 C 25.391803,33.014369 16.642767,31.769407 16.68705,26.732373 C 16.731333,21.51828 24.619609,17.230078 27.851538,25.32377 z"
+           id="path7005"
+           sodipodi:nodetypes="czczc" />
+        <path
+           sodipodi:nodetypes="czczc"
+           id="path7007"
+           d="M 22.336246,14.147819 C 23.496485,11.021906 26.799034,12.513876 26.782042,14.295767 C 26.76651,15.924725 23.414148,17.088553 22.452175,19.938019 C 21.392449,17.098693 18.035453,16.621003 18.052444,14.688298 C 18.069436,12.687656 21.096158,11.042278 22.336246,14.147819 z"
+           style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           clip-path="none" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.5066454,0,0,0.5066454,255.38811,28.605829)"
+       id="g7017"
+       style="display:inline;enable-background:new">
+      <g
+         inkscape:label="shadow"
+         id="g7021" />
+      <g
+         id="g7025"
+         inkscape:label="Layer 1"
+         transform="matrix(0.7608441,0,0,0.7608441,2.4123668,4.6630244)">
+        <path
+           style="fill:url(#linearGradient7039);fill-rule:nonzero;stroke:#3f4561;stroke-width:2.59418082;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+           d="M 24.42985,43.196359 L 4.6632832,23.429792 L 24.42985,3.6632249 L 44.196416,23.429792 L 24.42985,43.196359 L 24.42985,43.196359 z"
+           id="path7027" />
+        <path
+           id="path7029"
+           d="M 24.532076,40.000516 L 8.0635785,23.53202 L 24.532076,7.0635205 L 41.000574,23.53202 L 24.532076,40.000516 L 24.532076,40.000516 z"
+           style="opacity:0.35714285;fill:none;fill-rule:nonzero;stroke:url(#linearGradient7041);stroke-width:2.59418058;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true" />
+        <path
+           sodipodi:nodetypes="czczc"
+           id="path7031"
+           d="M 27.851538,25.32377 C 30.875364,17.176984 39.482498,21.065372 39.438215,25.709354 C 39.397733,29.954761 30.660777,32.98794 28.15367,40.414248 C 25.391803,33.014369 16.642767,31.769407 16.68705,26.732373 C 16.731333,21.51828 24.619609,17.230078 27.851538,25.32377 z"
+           style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           clip-path="url(#clipPath5461)"
+           transform="matrix(1.22928,0,0,1.2676326,-8.5572183,-7.667158)" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/capplets/display/ChangeLog b/capplets/display/ChangeLog
index dba22fa9c..8e3237ae3 100644
--- a/capplets/display/ChangeLog
+++ b/capplets/display/ChangeLog
@@ -29,6 +29,8 @@ Wed May 14 18:16:10 2008  S�ren Sandmann  <sandmann@redhat.com>
 
 	* *: Check in new RandR 1.2 enabled capplet
 
+==================== 2.23.2 ====================
+
 2008-02-19  Jens Granseuer  <jensgr@gmx.net>
 
 	* main.c: (create_dialog), (save_to_gconf): escape strange hostnames
diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog
index e2d28ee3d..66d7e4696 100644
--- a/capplets/keybindings/ChangeLog
+++ b/capplets/keybindings/ChangeLog
@@ -1,3 +1,30 @@
+2008-06-01  Jens Granseuer  <jensgr@gmx.net>
+
+	* gnome-keybinding-properties.c: (create_dialog), (accel_set_func),
+	(description_set_func), (keybinding_key_changed),
+	(keybinding_description_changed), (clear_old_model),
+	(append_keys_to_tree), (parse_start_tag),
+	(append_keys_to_tree_from_file), (append_keys_to_tree_from_gconf),
+	(cb_check_for_uniqueness), (accel_edited_callback),
+	(accel_cleared_callback), (description_edited_callback),
+	(real_start_editing_cb), (start_editing_cb), (setup_dialog):
+	make editing the shortcut action work for custom bindings
+
+2008-05-31  Jens Granseuer  <jensgr@gmx.net>
+
+	* gnome-keybinding-properties.c: (append_keys_to_tree),
+	(parse_start_tag), (append_keys_to_tree_from_file),
+	(append_keys_to_tree_from_gconf), (reload_key_entries): add
+	initial support for editing custom shortcuts (bug #114796).
+	Adding/deleting shortcuts is not yet possible
+
+2008-05-29  William Jon McCann  <jmccann@redhat.com>
+
+	* eggcellrendererkeys.c (egg_cell_renderer_keys_class_init):
+	Don't use deprecated GTK+ symbol.
+
+==================== 2.23.2 ====================
+
 2008-04-01  Jens Granseuer  <jensgr@gmx.net>
 
 	* gnome-keybinding-properties.c: (get_real_model), (clear_old_model),
diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c
index 959f52be7..ff1a0b964 100644
--- a/capplets/keybindings/gnome-keybinding-properties.c
+++ b/capplets/keybindings/gnome-keybinding-properties.c
@@ -16,6 +16,7 @@
 #include "eggcellrendererkeys.h"
 #include "activate-settings-daemon.h"
 
+#define GCONF_BINDING_DIR "/desktop/gnome/keybindings"
 #define MAX_ELEMENTS_BEFORE_SCROLLING 10
 
 typedef struct {
@@ -40,6 +41,7 @@ typedef struct
   char *name;
   int value;
   char *key;
+  char *description_name;
   Comparison comparison;
 } KeyListEntry;
 
@@ -58,8 +60,11 @@ typedef struct
   EggVirtualModifierType mask;
   gboolean editable;
   GtkTreeModel *model;
-  guint gconf_cnxn;
   char *description;
+  char *desc_gconf_key;
+  gboolean desc_editable;
+  guint gconf_cnxn;
+  guint gconf_cnxn_desc;
 } KeyEntry;
 
 static gboolean block_accels = FALSE;
@@ -67,13 +72,8 @@ static gboolean block_accels = FALSE;
 static GladeXML *
 create_dialog (void)
 {
-  GladeXML *dialog;
-
-  dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-keybinding-properties.glade", "gnome-keybinding-dialog", NULL);
-  if (!dialog)
-    dialog = glade_xml_new ("gnome-keybinding-properties.glade", "gnome-keybinding-dialog", NULL);
-
-  return dialog;
+  return glade_xml_new (GNOMECC_GLADE_DIR "/gnome-keybinding-properties.glade",
+                        "gnome-keybinding-dialog", NULL);
 }
 
 static char*
@@ -128,11 +128,11 @@ accel_set_func (GtkTreeViewColumn *tree_column,
                       -1);
 
   if (key_entry == NULL)
-    g_object_set (G_OBJECT (cell),
+    g_object_set (cell,
 		  "visible", FALSE,
 		  NULL);
   else if (! key_entry->editable)
-    g_object_set (G_OBJECT (cell),
+    g_object_set (cell,
 		  "visible", TRUE,
 		  "editable", FALSE,
 		  "accel_key", key_entry->keyval,
@@ -141,7 +141,7 @@ accel_set_func (GtkTreeViewColumn *tree_column,
 		  "style", PANGO_STYLE_ITALIC,
 		  NULL);
   else
-    g_object_set (G_OBJECT (cell),
+    g_object_set (cell,
 		  "visible", TRUE,
 		  "editable", TRUE,
 		  "accel_key", key_entry->keyval,
@@ -151,6 +151,27 @@ accel_set_func (GtkTreeViewColumn *tree_column,
 		  NULL);
 }
 
+static void
+description_set_func (GtkTreeViewColumn *tree_column,
+                      GtkCellRenderer   *cell,
+                      GtkTreeModel      *model,
+                      GtkTreeIter       *iter,
+                      gpointer           data)
+{
+  KeyEntry *key_entry;
+
+  gtk_tree_model_get (model, iter,
+                      KEYENTRY_COLUMN, &key_entry,
+                      -1);
+
+  if (key_entry != NULL)
+    g_object_set (cell,
+		  "editable", key_entry->desc_editable,
+		  "text", key_entry->description != NULL ?
+			  key_entry->description : _("<Unknown Action>"),
+		  NULL);
+}
+
 static gboolean
 keybinding_key_changed_foreach (GtkTreeModel *model,
 				GtkTreePath  *path,
@@ -182,8 +203,8 @@ keybinding_key_changed (GConfClient *client,
   KeyEntry *key_entry;
   const gchar *key_value;
 
-  key_entry = (KeyEntry *)user_data;
-  key_value = gconf_value_get_string (entry->value);
+  key_entry = (KeyEntry *) user_data;
+  key_value = entry->value ? gconf_value_get_string (entry->value) : NULL;
 
   binding_from_string (key_value, &key_entry->keyval, &key_entry->keycode, &key_entry->mask);
   key_entry->editable = gconf_entry_get_is_writable (entry);
@@ -192,6 +213,26 @@ keybinding_key_changed (GConfClient *client,
   gtk_tree_model_foreach (key_entry->model, keybinding_key_changed_foreach, key_entry);
 }
 
+static void
+keybinding_description_changed (GConfClient *client,
+				guint        cnxn_id,
+				GConfEntry  *entry,
+				gpointer     user_data)
+{
+  KeyEntry *key_entry;
+  const gchar *key_value;
+
+  key_entry = (KeyEntry *) user_data;
+  key_value = entry->value ? gconf_value_get_string (entry->value) : NULL;
+
+  g_free (key_entry->description);
+  key_entry->description = key_value ? g_strdup (key_value) : NULL;
+  key_entry->desc_editable = gconf_entry_get_is_writable (entry);
+
+  /* update the model */
+  gtk_tree_model_foreach (key_entry->model, keybinding_key_changed_foreach, key_entry);
+}
+
 static int
 keyentry_sort_func (GtkTreeModel *model,
                     GtkTreeIter  *a,
@@ -297,9 +338,13 @@ clear_old_model (GladeXML *dialog)
 
           if (key_entry != NULL)
             {
+              gconf_client_remove_dir (client, key_entry->gconf_key, NULL);
               gconf_client_notify_remove (client, key_entry->gconf_cnxn);
+              if (key_entry->gconf_cnxn_desc != 0)
+                gconf_client_notify_remove (client, key_entry->gconf_cnxn_desc);
               g_free (key_entry->gconf_key);
               g_free (key_entry->description);
+              g_free (key_entry->desc_gconf_key);
               g_free (key_entry);
             }
         }
@@ -428,11 +473,10 @@ append_keys_to_tree (GladeXML           *dialog,
   for (j = 0; keys_list[j].name != NULL; j++)
     {
       GConfEntry *entry;
-      GConfSchema *schema = NULL;
       KeyEntry *key_entry;
-      GError *error = NULL;
       const gchar *key_string;
       gchar *key_value;
+      gchar *description;
 
       if (!should_show_key (&keys_list[j]))
 	continue;
@@ -443,59 +487,71 @@ append_keys_to_tree (GladeXML           *dialog,
                                       key_string,
 				      NULL,
 				      TRUE,
-				      &error);
-      if (error || entry == NULL)
+				      NULL);
+      if (entry == NULL)
 	{
 	  /* We don't actually want to popup a dialog - just skip this one */
-	  if (error)
-	    g_error_free (error);
 	  continue;
 	}
 
-      if (gconf_entry_get_schema_name (entry))
-	schema = gconf_client_get_schema (client, gconf_entry_get_schema_name (entry), &error);
-
-      if (error || schema == NULL)
-	{
-	  /* We don't actually want to popup a dialog - just skip this one */
-	  if (error)
-	    g_error_free (error);
-	  continue;
-	}
+      if (keys_list[j].description_name != NULL)
+        {
+          description = gconf_client_get_string (client, keys_list[j].description_name, NULL);
+        }
+      else
+        {
+          description = NULL;
 
-      key_value = gconf_client_get_string (client, key_string, &error);
+          if (gconf_entry_get_schema_name (entry))
+            {
+              GConfSchema *schema;
+
+              schema = gconf_client_get_schema (client,
+                                                gconf_entry_get_schema_name (entry),
+                                                NULL);
+              if (schema != NULL)
+                {
+                  description = g_strdup (gconf_schema_get_short_desc (schema));
+                  gconf_schema_free (schema);
+                }
+            }
+        }
 
       key_entry = g_new0 (KeyEntry, 1);
       key_entry->gconf_key = g_strdup (key_string);
       key_entry->editable = gconf_entry_get_is_writable (entry);
       key_entry->model = model;
+      key_entry->description = description;
+      if (keys_list[j].description_name != NULL)
+        {
+          key_entry->desc_gconf_key =  g_strdup (keys_list[j].description_name);
+          key_entry->desc_editable = gconf_client_key_is_writable (client, key_entry->desc_gconf_key, NULL);
+          key_entry->gconf_cnxn_desc = gconf_client_notify_add (client,
+								key_entry->desc_gconf_key,
+								(GConfClientNotifyFunc) &keybinding_description_changed,
+								key_entry, NULL, NULL);
+        }
+
       gconf_client_add_dir (client, key_string, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
       key_entry->gconf_cnxn = gconf_client_notify_add (client,
 						       key_string,
 						       (GConfClientNotifyFunc) &keybinding_key_changed,
 						       key_entry, NULL, NULL);
+
+      key_value = gconf_client_get_string (client, key_string, NULL);
       binding_from_string (key_value, &key_entry->keyval, &key_entry->keycode, &key_entry->mask);
       g_free (key_value);
-      key_entry->description = g_strdup (gconf_schema_get_short_desc (schema));
 
+      gconf_entry_free (entry);
       ensure_scrollbar (dialog, i);
 
-      i++;
+      ++i;
       gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent_iter);
-      if (gconf_schema_get_short_desc (schema))
-	gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
-			    DESCRIPTION_COLUMN,
-                            key_entry->description,
-			    KEYENTRY_COLUMN, key_entry,
-			    -1);
-      else
-	gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
-			    DESCRIPTION_COLUMN, _("<Unknown Action>"),
-			    KEYENTRY_COLUMN, key_entry,
-			    -1);
+      /* we use the DESCRIPTION_COLUMN only for the section headers */
+      gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
+			  KEYENTRY_COLUMN, key_entry,
+			  -1);
       gtk_tree_view_expand_all (GTK_TREE_VIEW (WID ("shortcut_treeview")));
-      gconf_entry_free (entry);
-      gconf_schema_free (schema);
     }
 
   g_object_unref (client);
@@ -613,6 +669,7 @@ parse_start_tag (GMarkupParseContext *ctx,
     return;
 
   key.name = g_strdup (name);
+  key.description_name = NULL;
   key.value = value;
   if (gconf_key)
     key.key = g_strdup (gconf_key);
@@ -679,6 +736,7 @@ append_keys_to_tree_from_file (GladeXML   *dialog,
 
   /* Empty KeyListEntry to end the array */
   key.name = NULL;
+  key.description_name = NULL;
   key.key = NULL;
   key.value = 0;
   key.comparison = COMPARISON_NONE;
@@ -703,6 +761,58 @@ append_keys_to_tree_from_file (GladeXML   *dialog,
 }
 
 static void
+append_keys_to_tree_from_gconf (GladeXML *dialog, const gchar *gconf_path)
+{
+  GConfClient *client;
+  GSList *custom_list, *l;
+  GArray *entries;
+  KeyListEntry key;
+
+  /* load custom shortcuts from GConf */
+  entries = g_array_new (FALSE, TRUE, sizeof (KeyListEntry));
+
+  key.key = NULL;
+  key.value = 0;
+  key.comparison = COMPARISON_NONE;
+
+  client = gconf_client_get_default ();
+  custom_list = gconf_client_all_dirs (client, gconf_path, NULL);
+
+  for (l = custom_list; l != NULL; l = l->next)
+    {
+      key.name = g_strconcat (l->data, "/binding", NULL);
+      key.description_name = g_strconcat (l->data, "/action", NULL);
+      g_array_append_val (entries, key);
+
+      g_free (l->data);
+    }
+
+  g_slist_free (custom_list);
+  g_object_unref (client);
+
+  if (entries->len > 0)
+    {
+      KeyListEntry *keys;
+      int i;
+
+      /* Empty KeyListEntry to end the array */
+      key.name = NULL;
+      key.description_name = NULL;
+      g_array_append_val (entries, key);
+
+      keys = (KeyListEntry *) entries->data;
+      append_keys_to_tree (dialog, _("Custom Shortcuts"), keys);
+      for (i = 0; i < entries->len; ++i)
+        {
+          g_free (keys[i].name);
+          g_free (keys[i].description_name);
+        }
+    }
+
+  g_array_free (entries, TRUE);
+}
+
+static void
 reload_key_entries (gpointer wm_name, GladeXML *dialog)
 {
   GDir *dir;
@@ -736,6 +846,8 @@ reload_key_entries (gpointer wm_name, GladeXML *dialog)
 	g_free (path);
     }
   g_list_free (list);
+
+  append_keys_to_tree_from_gconf (dialog, GCONF_BINDING_DIR);
 }
 
 static void
@@ -775,6 +887,8 @@ cb_check_for_uniqueness (GtkTreeModel *model,
   new_key->editable = FALSE;
   new_key->gconf_key = element->gconf_key;
   new_key->description = element->description;
+  new_key->desc_gconf_key = element->desc_gconf_key;
+  new_key->desc_editable = element->desc_editable;
   return TRUE;
 }
 
@@ -883,7 +997,7 @@ accel_edited_callback (GtkCellRendererText   *cell,
 				  GTK_MESSAGE_WARNING,
 				  GTK_BUTTONS_CANCEL,
 				  _("The shortcut \"%s\" cannot be used because it will become impossible to type using this key.\n"
-				  "Please try with a key such as Control, Alt or Shift at the same time.\n"),
+				  "Please try with a key such as Control, Alt or Shift at the same time."),
 				  name);
 
 	g_free (name);
@@ -911,7 +1025,7 @@ accel_edited_callback (GtkCellRendererText   *cell,
                                 GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
                                 GTK_MESSAGE_WARNING,
                                 GTK_BUTTONS_CANCEL,
-                                _("The shortcut \"%s\" is already used for:\n \"%s\"\n"),
+                                _("The shortcut \"%s\" is already used for:\n \"%s\""),
                                 name,
                                 tmp_key.description ?
                                 tmp_key.description : tmp_key.gconf_key);
@@ -927,13 +1041,13 @@ accel_edited_callback (GtkCellRendererText   *cell,
 
   str = binding_name (keyval, keycode, mask, FALSE);
 
-  client = gconf_client_get_default();
+  client = gconf_client_get_default ();
   gconf_client_set_string (client,
                            key_entry->gconf_key,
                            str,
                            &err);
   g_free (str);
-  g_object_unref (G_OBJECT (client));
+  g_object_unref (client);
 
   if (err != NULL)
     {
@@ -943,7 +1057,7 @@ accel_edited_callback (GtkCellRendererText   *cell,
 				       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
 				       GTK_MESSAGE_WARNING,
 				       GTK_BUTTONS_OK,
-				       _("Error setting new accelerator in configuration database: %s\n"),
+				       _("Error setting new accelerator in configuration database: %s"),
 				       err->message);
       gtk_dialog_run (GTK_DIALOG (dialog));
 
@@ -985,7 +1099,7 @@ accel_cleared_callback (GtkCellRendererText *cell,
 			   key_entry->gconf_key,
 			   "disabled",
 			   &err);
-  g_object_unref (G_OBJECT (client));
+  g_object_unref (client);
 
   if (err != NULL)
     {
@@ -995,7 +1109,7 @@ accel_cleared_callback (GtkCellRendererText *cell,
 				       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
 				       GTK_MESSAGE_WARNING,
 				       GTK_BUTTONS_OK,
-				       _("Error unsetting accelerator in configuration database: %s\n"),
+				       _("Error unsetting accelerator in configuration database: %s"),
 				       err->message);
       gtk_dialog_run (GTK_DIALOG (dialog));
 
@@ -1005,11 +1119,44 @@ accel_cleared_callback (GtkCellRendererText *cell,
     }
 }
 
+static void
+description_edited_callback (GtkCellRendererText *renderer,
+                             gchar               *path_string,
+                             gchar               *new_text,
+                             gpointer             user_data)
+{
+  GConfClient *client;
+  GtkTreeView *view = GTK_TREE_VIEW (user_data);
+  GtkTreeModel *model;
+  GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
+  GtkTreeIter iter;
+  KeyEntry *key_entry;
+
+  model = gtk_tree_view_get_model (view);
+  gtk_tree_model_get_iter (model, &iter, path);
+  gtk_tree_path_free (path);
+
+  gtk_tree_model_get (model, &iter,
+		      KEYENTRY_COLUMN, &key_entry,
+		      -1);
+
+  /* sanity check */
+  if (key_entry == NULL || key_entry->desc_gconf_key == NULL)
+    return;
+
+  client = gconf_client_get_default ();
+  if (!gconf_client_set_string (client, key_entry->desc_gconf_key, new_text, NULL))
+    key_entry->desc_editable = FALSE;
+
+  g_object_unref (client);
+}
+
 
 typedef struct
 {
   GtkTreeView *tree_view;
   GtkTreePath *path;
+  GtkTreeViewColumn *column;
 } IdleData;
 
 static gboolean
@@ -1018,9 +1165,8 @@ real_start_editing_cb (IdleData *idle_data)
   gtk_widget_grab_focus (GTK_WIDGET (idle_data->tree_view));
   gtk_tree_view_set_cursor (idle_data->tree_view,
 			    idle_data->path,
-			    gtk_tree_view_get_column (idle_data->tree_view, 1),
+			    idle_data->column,
 			    TRUE);
-
   gtk_tree_path_free (idle_data->path);
   g_free (idle_data);
   return FALSE;
@@ -1047,6 +1193,7 @@ start_editing_cb (GtkTreeView    *tree_view,
 		  gpointer        user_data)
 {
   GtkTreePath *path;
+  GtkTreeViewColumn *column;
 
   if (event->window != gtk_tree_view_get_bin_window (tree_view))
     return FALSE;
@@ -1054,10 +1201,13 @@ start_editing_cb (GtkTreeView    *tree_view,
   if (gtk_tree_view_get_path_at_pos (tree_view,
 				     (gint) event->x,
 				     (gint) event->y,
-				     &path, NULL,
+				     &path, &column,
 				     NULL, NULL))
     {
       IdleData *idle_data;
+      GtkTreeModel *model;
+      GtkTreeIter iter;
+      KeyEntry *key;
 
       if (gtk_tree_path_get_depth (path) == 1)
 	{
@@ -1065,10 +1215,20 @@ start_editing_cb (GtkTreeView    *tree_view,
 	  return FALSE;
 	}
 
+      model = gtk_tree_view_get_model (tree_view);
+      gtk_tree_model_get_iter (model, &iter, path);
+      gtk_tree_model_get (model, &iter,
+                          KEYENTRY_COLUMN, &key,
+                         -1);
+
       idle_data = g_new (IdleData, 1);
       idle_data->tree_view = tree_view;
       idle_data->path = path;
-      g_signal_stop_emission_by_name (G_OBJECT (tree_view), "button_press_event");
+      /* if only the accel can be edited on the selected row
+       * always select the accel column */
+      idle_data->column = key->desc_editable ? column :
+                          gtk_tree_view_get_column (tree_view, 1);
+      g_signal_stop_emission_by_name (tree_view, "button_press_event");
       g_idle_add ((GSourceFunc) real_start_editing_cb, idle_data);
       block_accels = TRUE;
     }
@@ -1115,49 +1275,52 @@ setup_dialog (GladeXML *dialog)
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   GtkWidget *widget;
+  GtkTreeView *treeview = GTK_TREE_VIEW (WID ("shortcut_treeview"));
   gchar *wm_name;
 
   client = gconf_client_get_default ();
 
-  g_signal_connect (GTK_TREE_VIEW (WID ("shortcut_treeview")),
-		    "button_press_event",
+  g_signal_connect (treeview, "button_press_event",
 		    G_CALLBACK (start_editing_cb), NULL);
-  g_signal_connect (GTK_TREE_VIEW (WID ("shortcut_treeview")),
-		    "row-activated",
+  g_signal_connect (treeview, "row-activated",
 		    G_CALLBACK (start_editing_kb_cb), NULL);
 
+  renderer = gtk_cell_renderer_text_new ();
+
+  g_signal_connect (renderer, "edited",
+                    G_CALLBACK (description_edited_callback),
+                    treeview);
+
   column = gtk_tree_view_column_new_with_attributes (_("Action"),
-						     gtk_cell_renderer_text_new (),
+						     renderer,
 						     "text", DESCRIPTION_COLUMN,
 						     NULL);
+  gtk_tree_view_column_set_cell_data_func (column, renderer, description_set_func, NULL, NULL);
   gtk_tree_view_column_set_resizable (column, FALSE);
 
-  gtk_tree_view_append_column (GTK_TREE_VIEW (WID ("shortcut_treeview")), column);
+  gtk_tree_view_append_column (treeview, column);
   gtk_tree_view_column_set_sort_column_id (column, DESCRIPTION_COLUMN);
 
   renderer = (GtkCellRenderer *) g_object_new (EGG_TYPE_CELL_RENDERER_KEYS,
-					       "editable", TRUE,
 					       "accel_mode", EGG_CELL_RENDERER_KEYS_MODE_X,
 					       NULL);
 
-  g_signal_connect (G_OBJECT (renderer),
-		    "accel_edited",
+  g_signal_connect (renderer, "accel_edited",
                     G_CALLBACK (accel_edited_callback),
-                    WID ("shortcut_treeview"));
+                    treeview);
 
-  g_signal_connect (G_OBJECT (renderer),
-		    "accel_cleared",
+  g_signal_connect (renderer, "accel_cleared",
                     G_CALLBACK (accel_cleared_callback),
-                    WID ("shortcut_treeview"));
+                    treeview);
 
   column = gtk_tree_view_column_new_with_attributes (_("Shortcut"), renderer, NULL);
   gtk_tree_view_column_set_cell_data_func (column, renderer, accel_set_func, NULL, NULL);
   gtk_tree_view_column_set_resizable (column, FALSE);
 
-  gtk_tree_view_append_column (GTK_TREE_VIEW (WID ("shortcut_treeview")), column);
+  gtk_tree_view_append_column (treeview, column);
   gtk_tree_view_column_set_sort_column_id (column, KEYENTRY_COLUMN);
 
-  gconf_client_add_dir (client, "/apps/gnome_keybinding_properties", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+  gconf_client_add_dir (client, GCONF_BINDING_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
   gconf_client_add_dir (client, "/apps/metacity/general", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
   gconf_client_notify_add (client,
 			   "/apps/metacity/general/num_workspaces",
@@ -1174,8 +1337,8 @@ setup_dialog (GladeXML *dialog)
   capplet_set_icon (widget, "gnome-settings-keybindings");
   gtk_widget_show (widget);
 
-  g_signal_connect (G_OBJECT (widget), "key_press_event", G_CALLBACK (maybe_block_accels), NULL);
-  g_signal_connect (G_OBJECT (widget), "response", G_CALLBACK (cb_dialog_response), dialog);
+  g_signal_connect (widget, "key_press_event", G_CALLBACK (maybe_block_accels), NULL);
+  g_signal_connect (widget, "response", G_CALLBACK (cb_dialog_response), dialog);
 }
 
 int
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index 0e326f592..12b21034b 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,5 @@
+==================== 2.23.2 ====================
+
 2008-04-28  Sergey Udaltsov <svu@gnome.org>
 
 	* gnome-keyboard-properties-iso.c: removed unneeded file
diff --git a/capplets/localization/ChangeLog b/capplets/localization/ChangeLog
index aaa608321..56d353f3b 100644
--- a/capplets/localization/ChangeLog
+++ b/capplets/localization/ChangeLog
@@ -1,3 +1,5 @@
+==================== 2.23.2 ====================
+
 2007-11-11  Jens Granseuer  <jensgr@gmx.net>
 
 	* localization.desktop.in.in: use standard preferences-desktop-locale
diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index 4ae721193..237ad6371 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,5 @@
+==================== 2.23.2 ====================
+
 2008-04-11  Gerd Kohlberger  <gerdk@svn.gnome.org>
 
 	* gnome-mouse-properties.c: (create_dialog): Remove unused custom widget.
diff --git a/capplets/network/ChangeLog b/capplets/network/ChangeLog
index 4c400d07c..5061bd268 100644
--- a/capplets/network/ChangeLog
+++ b/capplets/network/ChangeLog
@@ -1,3 +1,11 @@
+==================== 2.23.2 ====================
+
+2008-05-16  Jens Granseuer  <jensgr@gmx.net>
+
+	* gnome-network-preferences.c: (get_hostname_from_uri),
+	(extract_proxy_host), (main): drop gnome-vfs dependency (part of bug
+	#524401)
+
 2008-04-06  Denis Washington  <denisw@svn.gnome.org>
 
 	* gnome-network-preferences.glade: rename "Advanced Configuration" tab
diff --git a/capplets/network/gnome-network-preferences.c b/capplets/network/gnome-network-preferences.c
index 9176476e0..56e49e1c5 100644
--- a/capplets/network/gnome-network-preferences.c
+++ b/capplets/network/gnome-network-preferences.c
@@ -24,10 +24,10 @@
 #  include <config.h>
 #endif
 
+#include <string.h>
 #include <libgnome/libgnome.h>
 #include <gconf/gconf-client.h>
 #include <glade/glade.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
 
 #include "capplet-util.h"
 #include "gconf-property-editor.h"
@@ -336,27 +336,58 @@ cb_use_same_proxy_checkbutton_clicked (GtkWidget *checkbutton,
 	g_object_unref (client);
 }
 
+static gchar *
+get_hostname_from_uri (const gchar *uri)
+{
+	const gchar *start, *end;
+	gchar *host;
+
+	if (uri == NULL)
+		return NULL;
+
+	/* skip the scheme part */
+	start = strchr (uri, ':');
+	if (start == NULL)
+		return NULL;
+
+	/* forward until after the last '/' */
+	do {
+		++start;
+	} while (*start == '/');
+
+	if (*start == '\0')
+	  return NULL;
+
+	/* maybe we have a port? */
+	end = strchr (start, ':');
+	if (end == NULL)
+		end = strchr (start, '/');
+
+	if (end != NULL)
+		host = g_strndup (start, end - start);
+	else
+		host = g_strdup (start);
+
+	return host;
+}
+
 static GConfValue *
 extract_proxy_host (GConfPropertyEditor *peditor, const GConfValue *orig)
 {
-	char const  *entered_text = gconf_value_get_string (orig);
-	GConfValue  *res = NULL;
+	char const *entered_text = gconf_value_get_string (orig);
+	GConfValue *res = NULL;
 
 	if (entered_text != NULL) {
-		GnomeVFSURI *uri = gnome_vfs_uri_new (entered_text);
-		if (uri != NULL) {
-			char const  *host	  = gnome_vfs_uri_get_host_name (uri);
-			if (host != NULL) {
-				res = gconf_value_new (GCONF_VALUE_STRING);
-				gconf_value_set_string (res, host);
-			}
-			gnome_vfs_uri_unref (uri);
+		gchar *host = get_hostname_from_uri (entered_text);
+
+		if (host != NULL) {
+			res = gconf_value_new (GCONF_VALUE_STRING);
+			gconf_value_set_string (res, host);
+			g_free (host);
 		}
 	}
 
-	if (res != NULL)
-		return res;
-	return gconf_value_copy (orig);
+	return (res != NULL) ? res : gconf_value_copy (orig);
 }
 
 static void
@@ -538,8 +569,6 @@ main (int argc, char **argv)
 				      argc, argv, GNOME_PARAM_NONE);
 
 	client = gconf_client_get_default ();
-	gconf_client_add_dir (client, "/system/gnome-vfs",
-			      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 	gconf_client_add_dir (client, "/system/http_proxy",
 			      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 	gconf_client_add_dir (client, "/system/proxy",
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index 02514f0bc..ee55b6787 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,5 @@
+==================== 2.23.2 ====================
+
 2008-04-25  Jens Granseuer  <jensgr@gmx.net>
 
 	Patch by: Tim-Phillip Müller <t.i.m@zen.co.uk>
diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog
index 8def3919c..dee48f08c 100644
--- a/capplets/windows/ChangeLog
+++ b/capplets/windows/ChangeLog
@@ -1,3 +1,5 @@
+==================== 2.23.2 ====================
+
 2007-12-06  Jens Granseuer  <jensgr@gmx.net>
 
 	* gnome-window-properties.c: (reload_mouse_modifiers): add a comment
diff --git a/configure.in b/configure.in
index 05febf9eb..d554c07b5 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT([gnome-control-center], [2.23.1],
+AC_INIT([gnome-control-center], [2.23.4],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center])
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -94,9 +94,7 @@ COMMON_MODULES="gtk+-2.0 >= 2.11.6 dnl
  gconf-2.0 dnl
  libgnomeui-2.0 >= 2.2.0 dnl
  libglade-2.0 >= 2.0.0 dnl
- libbonobo-2.0 dnl
- libbonoboui-2.0 dnl
- gnome-desktop-2.0 >= 2.21.4"
+ gnome-desktop-2.0 >= 2.23.4"
 PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0)
 PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
 PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0)
@@ -107,7 +105,6 @@ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
 PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
 PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1)
 PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
-PKG_CHECK_MODULES(LIBBACKGROUND, glib-2.0 gobject-2.0 gdk-2.0 gconf-2.0)
 PKG_CHECK_MODULES(LIBSOUNDS, gio-2.0 libgnome-2.0 libgnomeui-2.0)
 PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
 
@@ -191,7 +188,7 @@ AC_SUBST(LIBGNOMEKBDUI_CFLAGS)
 AC_SUBST(LIBGNOMEKBDUI_LIBS)
 
 dnl ==============================================
-dnl themus and fontilus dependencies
+dnl fontilus dependencies
 dnl ==============================================
 
 AC_ARG_ENABLE(vfs-methods,
@@ -201,23 +198,6 @@ AC_ARG_ENABLE(vfs-methods,
 
 if test x$enable_vfs_methods = xyes; then
 
-  PKG_CHECK_MODULES(THEME_METHOD,
-  [gnome-vfs-module-2.0 >= 2.2.0 dnl
-   gnome-vfs-2.0 >= 2.2.0])
-  PKG_CHECK_MODULES(THEMUS_THUMBNAILER,
-  [gdk-2.0 >= 2.2.0 dnl
-   libgnomeui-2.0 >= 2.2.0 dnl
-   libmetacity-private dnl
-   gnome-vfs-2.0 >= 2.2.0])
-  PKG_CHECK_MODULES(THEMUS_COMPONENT,
-  [glib-2.0 >= 2.8.0 dnl
-   gtk+-2.0 >= 2.4.0 dnl
-   libnautilus-extension >= nautilus_minver])
-  PKG_CHECK_MODULES(THEMUS_APPLIER,
-  [gtk+-2.0 >= 2.4.0 dnl
-   libglade-2.0 >= 2.0 dnl
-   gnome-vfs-2.0 >= 2.2.0 dnl
-   libgnome-2.0 >= 2.2.0])
   PKG_CHECK_MODULES(FONT_METHOD,
   [gnome-vfs-module-2.0 >= gnomevfs_minver dnl
    fontconfig >= fontconfig_minver])
@@ -242,9 +222,7 @@ if test x$enable_vfs_methods = xyes; then
   FONT_THUMBNAILER_CFLAGS="$FONT_THUMBNAILER_CFLAGS `$FREETYPE_CONFIG --cflags`"
   FONT_THUMBNAILER_LIBS="$FONT_THUMBNAILER_LIBS `$FREETYPE_CONFIG --libs`"
 
-  THEMUS=themus
   FONTILUS=fontilus
-  AC_SUBST(THEMUS)
   AC_SUBST(FONTILUS)
 
   # Determine the install dir for the nautilus extensions.
@@ -254,8 +232,6 @@ if test x$enable_vfs_methods = xyes; then
   # update LIBS for $export_dynamic
   export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
   if test -n "$export_dynamic"; then
-    THEME_METHOD_LIBS=`echo $THEME_METHOD_LIBS | sed -e "s/$export_dynamic//"`
-    THEMUS_COMPONENT_LIBS=`echo $THEMUS_COMPONENT_LIBS | sed -e "s/$export_dynamic//"`
     FONT_VIEW_LIBS=`echo $FONT_VIEW_LIBS | sed -e "s/$export_dynamic//"`
     FONT_CONTEXT_MENU_LIBS=`echo $FONT_CONTEXT_MENU_LIBS | sed -e "s/$export_dynamic//"`
     FONT_THUMBNAILER_LIBS=`echo $FONT_THUMBNAILER_LIBS | sed -e "s/$export_dynamic//"`
@@ -450,7 +426,6 @@ capplets/sound/gnome-settings-sound.desktop.in
 capplets/windows/Makefile
 capplets/windows/window-properties.desktop.in
 help/Makefile
-libbackground/Makefile
 libslab/Makefile
 libslab/libslab.pc
 libsounds/Makefile
@@ -463,8 +438,6 @@ typing-break/Makefile
 vfs-methods/Makefile
 vfs-methods/fontilus/Makefile
 vfs-methods/fontilus/gnome-font-viewer.desktop.in
-vfs-methods/themus/Makefile
-vfs-methods/themus/themus-theme-applier.desktop.in
 ])
 
 dnl due to a bug in intltool we need to expand something from the root last control-center.spec
diff --git a/help/ChangeLog b/help/ChangeLog
index 9f02baf59..338877583 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,5 @@
+==================== 2.23.2 ====================
+
 2008-03-05  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es/es.po: Updated Spanish translation
diff --git a/libwindow-settings/ChangeLog b/libwindow-settings/ChangeLog
index e967a18d3..ac65ebeab 100644
--- a/libwindow-settings/ChangeLog
+++ b/libwindow-settings/ChangeLog
@@ -1,3 +1,5 @@
+==================== 2.23.2 ====================
+
 2008-03-27  Cosimo Cecchi  <cosimoc@gnome.org>
 
 	* metacity-window-manager.c: (metacity_change_settings),
diff --git a/po/ChangeLog b/po/ChangeLog
index 875345f1d..09414ea7b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,62 @@
+2008-06-16  Rodrigo Moya <rodrigo@gnome-db.org>
+
+	* POTFILES.in:
+	* POTFILES.skip: skip themus files
+
+2008-06-11  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Khaled Hosny.
+
+2008-06-11  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2008-06-11  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Updated Thai translation.
+
+2008-06-08  Funda Wang  <fundawang@gmail.com>
+
+	* zh_CN.po: Updated zh_CN translation.
+
+2008-06-07  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-06-07  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-06-03  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.
+
+2008-06-02   Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po: Updated Vietnamese translation.
+
+2008-06-01   Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po: Updated Vietnamese translation.
+
+2008-06-01  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.
+
+2008-05-25   Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po: Updated Vietnamese translation.
+
+2008-05-19  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Anas Husseini.
+
+==================== 2.23.2 ====================
+
+2008-05-17  Vincent Untz  <vuntz@gnome.org>
+
+	* POTFILES.in: updated
+
 2008-05-14  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* nb.po: Updated Norwegian bokmål translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dcf59b114..f31c7e025 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -67,7 +67,6 @@ capplets/sound/sound-properties.glade
 capplets/windows/gnome-window-properties.c
 capplets/windows/gnome-window-properties.glade
 capplets/windows/window-properties.desktop.in.in
-libbackground/preferences.c
 libslab/application-tile.c
 libslab/app-shell.c
 libslab/bookmark-agent.c
@@ -91,11 +90,3 @@ vfs-methods/fontilus/fontilus.schemas.in
 vfs-methods/fontilus/font-view.c
 vfs-methods/fontilus/gnome-font-viewer.desktop.in.in
 vfs-methods/fontilus/thumbnailer.c
-vfs-methods/themus/apply-font.glade
-vfs-methods/themus/theme-method.c
-vfs-methods/themus/theme-method.directory.in
-vfs-methods/themus/themus-properties-main.c
-vfs-methods/themus/themus-properties-view.c
-vfs-methods/themus/themus.schemas.in
-vfs-methods/themus/themus-theme-applier.c
-vfs-methods/themus/themus-theme-applier.desktop.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e38e4c331..104384ed1 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -23,3 +23,11 @@ capplets/localization/localization.glade
 schemas/apps_gnome_settings_daemon_default_editor.schemas.in
 schemas/apps_gnome_settings_daemon_keybindings.schemas.in
 schemas/apps_gnome_settings_daemon_screensaver.schemas.in
+vfs-methods/themus/apply-font.glade
+vfs-methods/themus/theme-method.c
+vfs-methods/themus/theme-method.directory.in
+vfs-methods/themus/themus-properties-main.c
+vfs-methods/themus/themus-properties-view.c
+vfs-methods/themus/themus.schemas.in
+vfs-methods/themus/themus-theme-applier.c
+vfs-methods/themus/themus-theme-applier.desktop.in.in
diff --git a/po/ar.po b/po/ar.po
index a5f72353c..62668ab79 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,5 +1,4 @@
-# translation of gnome-control-center.HEAD.ar.po to
-# translation of gnome-control-center.po to
+# translation of gnome-control-center.HEAD.po to Arabic
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER
 #
@@ -8,22 +7,22 @@
 # Arafat Medini <lumina@silverpen.de>, 2003.
 # Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>, 2004.
 # Djihed Afifi <djihed@gmail.com>, 2006.
-# Khaled Hosny <khaledhosny@eglug.org>, 2006, 2007.
+# Khaled Hosny <khaledhosny@eglug.org>, 2006, 2007, 2008.
 # Anas Husseini <linux.anas@gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-control-center.HEAD.ar\n"
+"Project-Id-Version: gnome-control-center.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-11 22:00+0000\n"
-"PO-Revision-Date: 2007-10-24 20:47+0100\n"
-"Last-Translator: Anas Husseini <linux.anas@gmail.com>\n"
+"POT-Creation-Date: 2008-06-11 22:27+0100\n"
+"PO-Revision-Date: 2008-05-24 15:35+0300\n"
+"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && "
-"n<=10 ? 2 : 3\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: ../capplets/about-me/eel-alert-dialog.c:114
 msgid "Image/label border"
@@ -51,47 +50,47 @@ msgstr "الأزرار المعروضة في حوار التّنبيه"
 
 #: ../capplets/about-me/eel-alert-dialog.c:198
 msgid "Show more _details"
-msgstr "اظهر _تفاصيل أكثر"
+msgstr "أظهر _تفاصيل أكثر"
 
-#: ../capplets/about-me/gnome-about-me.c:665
+#: ../capplets/about-me/gnome-about-me.c:739
 msgid "Select Image"
 msgstr "اختر صورة"
 
-#: ../capplets/about-me/gnome-about-me.c:667
+#: ../capplets/about-me/gnome-about-me.c:741
 msgid "No Image"
 msgstr "لا صورة"
 
-#: ../capplets/about-me/gnome-about-me.c:695
-#: ../capplets/appearance/appearance-desktop.c:1141
+#: ../capplets/about-me/gnome-about-me.c:769
+#: ../capplets/appearance/appearance-desktop.c:661
 msgid "Images"
 msgstr "صور"
 
-#: ../capplets/about-me/gnome-about-me.c:699
-#: ../capplets/appearance/theme-installer.c:700
+#: ../capplets/about-me/gnome-about-me.c:773
+#: ../capplets/appearance/theme-installer.c:717
 msgid "All Files"
 msgstr "كل الملفّات"
 
-#: ../capplets/about-me/gnome-about-me.c:836
+#: ../capplets/about-me/gnome-about-me.c:911
 msgid ""
 "There was an error while trying to get the addressbook information\n"
 "Evolution Data Server can't handle the protocol"
 msgstr ""
-"كان هناك خطأ أثناء محاولة جلب معلومات دفتر العناوين \n"
-"لا يستطيع خادم معلومات إيفوليوشن التعامل مع هذا البروتوكول"
+"حدث خطأ أثناء محاولة جلب معلومات دفتر العناوين \n"
+"لا يستطيع خادوم معلومات إيفوليوشن التعامل مع هذا البروتوكول"
 
-#: ../capplets/about-me/gnome-about-me.c:857
+#: ../capplets/about-me/gnome-about-me.c:932
 msgid "Unable to open address book"
-msgstr "لايمكن فتح دفتر العناوين"
+msgstr "تعذّر فتح دفتر العناوين"
 
-#: ../capplets/about-me/gnome-about-me.c:871
+#: ../capplets/about-me/gnome-about-me.c:946
 msgid "Unknown login ID, the user database might be corrupted"
 msgstr "هويّة ولوج غير معروفة، ربّما تلِفت قاعدة بيانات المستخمين"
 
-#: ../capplets/about-me/gnome-about-me.c:901
-#: ../capplets/about-me/gnome-about-me.c:903
+#: ../capplets/about-me/gnome-about-me.c:976
+#: ../capplets/about-me/gnome-about-me.c:978
 #, c-format
 msgid "About %s"
-msgstr "حوْل %s"
+msgstr "عنْ %s"
 
 #: ../capplets/about-me/gnome-about-me.desktop.in.in.h:1
 #: ../capplets/about-me/gnome-about-me.glade.h:12
@@ -144,7 +143,7 @@ msgstr "ال_عنوان:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:11
 msgid "A_ssistant:"
-msgstr "المُسَاعَد:"
+msgstr "المُ_سَاعَد:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:13
 msgid "Address"
@@ -172,7 +171,7 @@ msgstr "_غيِّر كلمة السر"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:19
 msgid "Change password"
-msgstr "غِّير كلمة السر"
+msgstr "غيّر كلمة السر"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:20
 msgid "Ci_ty:"
@@ -184,7 +183,7 @@ msgstr "الب_لد:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:22
 msgid "Contact"
-msgstr "الإتصال"
+msgstr "الاتصال"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:23
 msgid "Cou_ntry:"
@@ -196,7 +195,7 @@ msgstr "كلمة السر ال_حالية:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:25
 msgid "Full Name"
-msgstr "الإسم الكامل"
+msgstr "الاسم بالكامل"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:26
 msgid "Hom_e:"
@@ -212,18 +211,18 @@ msgstr "M_SN:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:29
 msgid "P.O. _box:"
-msgstr "صندوق ال_بريد:"
+msgstr "_صندوق البريد:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:30
 msgid "P._O. box:"
-msgstr "_صندوق البريد:"
+msgstr "ص_ندوق البريد:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:31
 msgid "Personal Info"
-msgstr "معلومات شخصية"
+msgstr "المعلومات الشخصية"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:32
-#: ../capplets/about-me/gnome-about-me-password.c:934
+#: ../capplets/about-me/gnome-about-me-password.c:938
 msgid ""
 "Please type your password again in the <b>Retype new password</b> field."
 msgstr "من فضلك اكتب كلمة سرِّك مرّة أخرى في حقل <b>أعِد كتابة كلمة السر</b>."
@@ -243,8 +242,8 @@ msgid ""
 "After you have authenticated, enter your new password, retype it for "
 "verification and click <b>Change password</b>."
 msgstr ""
-"لتغيير كلمة السر، ادخل كلمة السر في المجال السفلي ثم اتقر <b>وثِّقْ</b>.\n"
-"بعد التوثيق، ادخل كلمة السر الجديدة، اعد كتابتها للتّحقّق و انقر <b>غيِّر كلمة "
+"لتغيير كلمة السر، أدخل كلمة السر في الخانة بأسفل ثم انقر <b>استوثِق</b>.\n"
+"بعد الاستيثاق، أدخل كلمة السر الجديدة، أعد كتابتها للتّحقّق و انقر <b>غيّر كلمة "
 "السر</b>."
 
 #: ../capplets/about-me/gnome-about-me.glade.h:37
@@ -265,7 +264,7 @@ msgstr "_فاكس العمل:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:41
 msgid "Zip/_Postal code:"
-msgstr "الرمز البريدي:"
+msgstr "الر_مز البريدي:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:42
 msgid "_Address:"
@@ -273,11 +272,11 @@ msgstr "ال_عنوان:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:43
 msgid "_Authenticate"
-msgstr "_وثِّق"
+msgstr "ا_ستوثق"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:44
 msgid "_Department:"
-msgstr "_المَصْلَحَة:"
+msgstr "ال_مَصْلَحَة:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:45
 msgid "_Groupwise:"
@@ -285,7 +284,7 @@ msgstr "_Groupwise:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:46
 msgid "_Home page:"
-msgstr "الصفحة الرئيسيّة:"
+msgstr "ال_صفحة الرئيسيّة:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:47
 msgid "_Home:"
@@ -301,7 +300,7 @@ msgstr "الم_دير:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:50
 msgid "_Mobile:"
-msgstr "ال_جوّال:"
+msgstr "الم_حمول:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:51
 msgid "_New password:"
@@ -321,7 +320,7 @@ msgstr "ال_ولاية/المحافظة:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:55
 msgid "_Title:"
-msgstr "ال_عنوان:"
+msgstr "ال_مُسمّى:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:56
 msgid "_Work:"
@@ -333,7 +332,7 @@ msgstr "_ياهو:"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:58
 msgid "_Zip/Postal code:"
-msgstr "الرمز البريدي:"
+msgstr "الر_مز البريدي:"
 
 #: ../capplets/about-me/gnome-about-me-password.c:162
 msgid "Child exited unexpectedly"
@@ -342,16 +341,16 @@ msgstr "خرج التطبيق بشكلٍ غير متوقّع"
 #: ../capplets/about-me/gnome-about-me-password.c:297
 #, c-format
 msgid "Could not shutdown backend_stdin IO channel: %s"
-msgstr "لم يمكن إيقاف قناة الإدخال backend_stdin: %s"
+msgstr "تعذّر إيقاف قناة الدخل/الخرج backend_stdin: %s"
 
 #: ../capplets/about-me/gnome-about-me-password.c:310
 #, c-format
 msgid "Could not shutdown backend_stdout IO channel: %s"
-msgstr "لم يمكن إيقاف قناة الإدخال backend_stdout: %s"
+msgstr "تعذّر إيقاف قناة الدخل/الخرج backend_stdout: %s"
 
 #: ../capplets/about-me/gnome-about-me-password.c:409
 msgid "Authenticated!"
-msgstr "موثّق!"
+msgstr "مستوثق"
 
 #. This is a re-auth, and it failed.
 #. * The password must have been changed in the meantime!
@@ -364,7 +363,7 @@ msgstr "موثّق!"
 msgid ""
 "Your password has been changed since you initially authenticated! Please re-"
 "authenticate."
-msgstr "غُيِّرَت كلمة السر بعد التّوثيق الأخير! رجاء أعِد التّوثيق."
+msgstr "تغيِّرت كلمة السر بعد الاستيثاق الأخير، رجاء أعِد الاستيثاق."
 
 #: ../capplets/about-me/gnome-about-me-password.c:477
 msgid "That password was incorrect."
@@ -402,33 +401,33 @@ msgid "The old and new passwords are the same."
 msgstr "كلمتا السر القديمة و الجديدة متطابقتان."
 
 #. translators: Unable to launch <program>: <error message>
-#: ../capplets/about-me/gnome-about-me-password.c:818
+#: ../capplets/about-me/gnome-about-me-password.c:820
 #, c-format
 msgid "Unable to launch %s: %s"
-msgstr "لايمكن تشغيل %s: %s"
+msgstr "تعذّر تشغيل %s: %s"
 
-#: ../capplets/about-me/gnome-about-me-password.c:821
+#: ../capplets/about-me/gnome-about-me-password.c:824
 msgid "Unable to launch backend"
-msgstr "لا يمكن تشغيل النهاية الخلفية"
+msgstr "تعذّر تشغيل النهاية الخلفية"
 
-#: ../capplets/about-me/gnome-about-me-password.c:822
+#: ../capplets/about-me/gnome-about-me-password.c:825
 msgid "A system error has occurred"
 msgstr "حصل خطأ في النظام"
 
 #. Update status message
-#: ../capplets/about-me/gnome-about-me-password.c:842
+#: ../capplets/about-me/gnome-about-me-password.c:845
 msgid "Checking password..."
-msgstr "التحقق من كلمة السر..."
+msgstr "يتحقق من كلمة السر..."
 
-#: ../capplets/about-me/gnome-about-me-password.c:928
+#: ../capplets/about-me/gnome-about-me-password.c:932
 msgid "Click <b>Change password</b> to change your password."
 msgstr "انقر <b>غيّر كلمة السر</b> لتغيّر كلمة سرّك."
 
-#: ../capplets/about-me/gnome-about-me-password.c:931
+#: ../capplets/about-me/gnome-about-me-password.c:935
 msgid "Please type your password in the <b>New password</b> field."
-msgstr "من فضلك اكتب كلمة سرِّك في حقل <b>كلمة سر جديدة</b>."
+msgstr "من فضلك اكتب كلمة سرِّك في حقل <b>كلمة سر الجديدة</b>."
 
-#: ../capplets/about-me/gnome-about-me-password.c:937
+#: ../capplets/about-me/gnome-about-me-password.c:941
 msgid "The two passwords are not equal."
 msgstr "كلمتا السر غير متطابقتين."
 
@@ -442,19 +441,18 @@ msgstr "<b>التفضيلات</b>"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:3
 msgid "Accessible Lo_gin"
-msgstr "الولو_ج المتاح"
+msgstr "الولو_ج المُعان"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:4
 msgid "Assistive Technologies Preferences"
-msgstr "تفضيلات التكنولوجيا المعاونة"
+msgstr "تفضيلات التقنية المعِينة"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:5
 msgid ""
 "Changes to enable assistive technologies will not take effect until your "
 "next log in."
 msgstr ""
-"التغييرات لتفعيل التقنيات المساعدة لن تأخذ مجراها حتى تسجل دخولك في المرة "
-"القادمة."
+"تغييرات تفعيل التقنيات المُعِينة لن تأخذ مجراها حتى تلج في المرة القادمة."
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:6
 msgid "Close and _Log Out"
@@ -462,47 +460,55 @@ msgstr "أغلق و ا_خرج"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:7
 msgid "Jump to Preferred Applications dialog"
-msgstr "اقفز إلى مربع حوار التطبيقات المفضلة"
+msgstr "انتقل إلى مربع حوار التطبيقات المفضلة"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:8
 msgid "Jump to the Accessible Login dialog"
-msgstr "اقفز إلى مربع حوار الولوج المتاح"
+msgstr "انتقل إلى مربع حوار الولوج المُعان"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:9
 msgid "Jump to the Keyboard Accessibility dialog"
-msgstr "اقفز إلى مربع حوار إتاحة لوحة المفاتيح"
+msgstr "انتقل إلى مربع حوار إتاحة لوحة المفاتيح"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:10
-msgid "_Enable assistive technologies"
-msgstr "_فعِّل التكنولوجيات المساعدة"
+msgid "Jump to the Mouse Accessibility dialog"
+msgstr "انتقل إلى مربع حوار إتاحة الفأرة"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:11
+msgid "_Enable assistive technologies"
+msgstr "_فعِّل التقنيات المساعدة"
+
+#: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:12
 msgid "_Keyboard Accessibility"
 msgstr "إتاحة لوحة المفاتي_ح"
 
-#: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:12
+#: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:13
+msgid "_Mouse Accessibility"
+msgstr "إتاحة ال_فأرة"
+
+#: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:14
 msgid "_Preferred Applications"
 msgstr "التطبيقات المف_ضّلة"
 
 #: ../capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technologies"
-msgstr "التكنولوجيا المعاونة"
+msgstr "التقنيات المُعِينة"
 
 #: ../capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
-msgstr "فعِّل دعم التكنولوجيات المعينة عند الولوج"
+msgstr "فعِّل دعم التقنيات المُعِينة عند الولوج"
 
-#: ../capplets/appearance/appearance-desktop.c:1109
+#: ../capplets/appearance/appearance-desktop.c:629
 msgid "Add Wallpaper"
 msgstr "أضِف خلفية للشاشة"
 
-#: ../capplets/appearance/appearance-desktop.c:1145
+#: ../capplets/appearance/appearance-desktop.c:665
 msgid "All files"
 msgstr "كل الملفّات"
 
 #: ../capplets/appearance/appearance-font.c:494
 msgid "Font may be too large"
-msgstr "قد يكون الخط كبيراً جدا"
+msgstr "قد يكون الخط كبيرًا جدا"
 
 #: ../capplets/appearance/appearance-font.c:498
 #, c-format
@@ -515,17 +521,23 @@ msgid_plural ""
 "effectively use the computer. It is recommended that you select a size "
 "smaller than %d."
 msgstr[0] ""
-"الخط المنتقى حجمه نقطة واحدة و قد يعرقل فعاليّة استخدام الحاسوب. من المستحسن "
-"أن تختار حجماً أقلّ من %d."
+"الخط المختار حجمه أقل من نقطة (%Id) و قد يُصعّب استخدام الحاسوب. من المستحسن "
+"أن تختار حجمًا أقلّ من %Id."
 msgstr[1] ""
-"الخط المنتقى حجمه نقطتان و قد يعرقل فعالية استخدام الحاسوب. من المستحسن أن "
-"تختار حجماً أقلّ من %d."
+"الخط المختار حجمه نقطة واحدة (%Id) و قد يُصعّب استخدام الحاسوب. من المستحسن أن "
+"تختار حجمًا أقلّ من %Id."
 msgstr[2] ""
-"الخط المنتقى حجمه %d نقاط و قد يعرقل فعالية استخدام الحاسوب. من المستحسن أن "
-"تختار حجماً أقلّ من %d."
+"الخط المختار حجمه نقطتان (%Id) و قد يصعّب استخدام الحاسوب. من المستحسن أن "
+"تختار حجمًا أقلّ من %Id."
 msgstr[3] ""
-"الخط المنتقى حجمه %d نقطة و قد يعرقل فعالية استخدام الحاسوب. من المستحسن أن "
-"تختار حجماً أقلّ من %d."
+"الخط المختار حجمه %Id نقاط و قد يصعّب استخدام الحاسوب. من المستحسن أن تختار "
+"حجمًا أقلّ من %Id."
+msgstr[4] ""
+"الخط المختار حجمه %Id نقطة و قد يُصعّب استخدام الحاسوب. من المستحسن أن تختار "
+"حجمًا أقلّ من %Id."
+msgstr[5] ""
+"الخط المختار حجمه %Id نقطة و قد يُصعّب استخدام الحاسوب. من المستحسن أن تختار "
+"حجمًا أقلّ من %Id."
 
 #: ../capplets/appearance/appearance-font.c:511
 #, c-format
@@ -538,17 +550,23 @@ msgid_plural ""
 "effectively use the computer. It is recommended that you select a smaller "
 "sized font."
 msgstr[0] ""
-"الخط المنتقى حجمه نقطة واحدة و قد يعرقل فعالية استخدام الحاسوب. من المستحسن "
-"أن تختار خطّاً بحجمٍ أصغر."
+"الخط المختار حجمه أقل من نقطة و قد يُصعّب استخدام الحاسوب. من المستحسن أن "
+"تختار خطًّا بحجمٍ أصغر."
 msgstr[1] ""
-"الخط المنتقى حجمه نقطتان و قد يعرقل فعالية استخدام الحاسوب. من المستحسن أن "
-"تختار خطّاً بحجمٍ أصغر."
+"الخط المختار حجمه نقطة واحدة و قد يُصعّب استخدام الحاسوب. من المستحسن أن تختار "
+"خطًّا بحجمٍ أصغر."
 msgstr[2] ""
-"الخط المنتقى حجمه %d نقاط و قد يعرقل فعالية استخدام الحاسوب. من المستحسن أن "
-"تختار خطّاً بحجمٍ أصغر."
+"الخط المختار حجمه نقطتان و قد يُصعّب استخدام الحاسوب. من المستحسن أن تختار خطًّا "
+"بحجمٍ أصغر."
 msgstr[3] ""
-"الخط المنتقى حجمه %d نقطة و قد يعرقل فعالية استخدام الحاسوب. من المستحسن أن "
-"تختار خطّاً بحجمٍ أصغر."
+"الخط المختار حجمه %Id نقاط و قد يُصعّب استخدام الحاسوب. من المستحسن أن تختار "
+"خطًّا بحجمٍ أصغر."
+msgstr[4] ""
+"الخط المختار حجمه %Id نقطة و قد يُصعّب استخدام الحاسوب. من المستحسن أن تختار "
+"خطًّا بحجمٍ أصغر."
+msgstr[5] ""
+"الخط المختار حجمه %Id نقطة و قد يُصعّب استخدام الحاسوب. من المستحسن أن تختار "
+"خطًّا بحجمٍ أصغر."
 
 #: ../capplets/appearance/appearance-font.c:533
 msgid "Use previous font"
@@ -556,58 +574,101 @@ msgstr "استخدم الخط السابق"
 
 #: ../capplets/appearance/appearance-font.c:535
 msgid "Use selected font"
-msgstr "استخدم الخط المُنتقى"
+msgstr "استخدم الخط المُختار"
 
-#: ../capplets/appearance/appearance-main.c:108
+#: ../capplets/appearance/appearance-main.c:107
 msgid "Specify the filename of a theme to install"
-msgstr "حدد اسم ملف السِمة لتثبيتها"
+msgstr "حدد اسم ملف سِمة لتثبيتها"
 
-#: ../capplets/appearance/appearance-main.c:109
+#: ../capplets/appearance/appearance-main.c:108
 msgid "filename"
 msgstr "اسم الملف"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/appearance/appearance-main.c:116
+#: ../capplets/appearance/appearance-main.c:115
 msgid "Specify the name of the page to show (theme|background|fonts|interface)"
-msgstr "حدّد اسم الصفحة التي تريد إظهارها (سمة|خلفية|خطوط|واجهة)"
+msgstr "حدّد اسم الصفحة التي تريد إظهارها (theme|background|fonts|interface)"
 
-#: ../capplets/appearance/appearance-main.c:117
+#: ../capplets/appearance/appearance-main.c:116
+#: ../capplets/default-applications/gnome-da-capplet.c:880
+#: ../capplets/mouse/gnome-mouse-properties.c:444
 msgid "page"
 msgstr "صفحة"
 
-#: ../capplets/appearance/appearance-main.c:124
+#: ../capplets/appearance/appearance-main.c:123
 msgid "[WALLPAPER...]"
 msgstr "[خلفية...]"
 
-#: ../capplets/appearance/appearance-style.c:156
+#: ../capplets/appearance/appearance-style.c:159
 #: ../capplets/common/gnome-theme-info.c:439
-#: ../capplets/common/gnome-theme-info.c:638
+#: ../capplets/common/gnome-theme-info.c:628
 msgid "Default Pointer"
-msgstr "المؤشر الإفتراضي"
+msgstr "المؤشر المبدئي"
+
+#: ../capplets/appearance/appearance-style.c:221
+#: ../capplets/appearance/appearance-themes.c:685
+msgid "Install"
+msgstr "ثبِّت"
 
-#: ../capplets/appearance/appearance-themes.c:534
+#: ../capplets/appearance/appearance-style.c:241
+#: ../capplets/common/gnome-theme-info.c:1634
+#, c-format
+msgid ""
+"This theme will not look as intended because the required GTK+ theme engine "
+"'%s' is not installed."
+msgstr "لن تظهر هذه السمة كما يفترض لأن محرك سمات جتك+ المطلوب '%s' ليس مُثبّتا."
+
+#: ../capplets/appearance/appearance-themes.c:673
 msgid "Apply Background"
 msgstr "استخدم ال_خلفيّة"
 
-#: ../capplets/appearance/appearance-themes.c:538
+#: ../capplets/appearance/appearance-themes.c:677
 msgid "Apply Font"
 msgstr "استخدم الخ_ط"
 
-#: ../capplets/appearance/appearance-themes.c:563
+#: ../capplets/appearance/appearance-themes.c:681
+msgid "Revert Font"
+msgstr "استرجِع الخط"
+
+#: ../capplets/appearance/appearance-themes.c:711
+msgid ""
+"The current theme suggests a background and a font. Also, the last applied "
+"font suggestion can be reverted."
+msgstr ""
+"السمة الحالية تقترح خلفية وخطًا. ويمكن أيضا التراجع عن آخر خط مقترح تم تفعيله."
+
+#: ../capplets/appearance/appearance-themes.c:713
+msgid ""
+"The current theme suggests a background. Also, the last applied font "
+"suggestion can be reverted."
+msgstr ""
+"السمة الحالية تقترح خلفية. ويمكن أيضا التراجع عن آخر خط مقترح تم تفعيله."
+
+#: ../capplets/appearance/appearance-themes.c:715
 msgid "The current theme suggests a background and a font."
-msgstr "السمة الحالية تقترح خلفية وخطاً."
+msgstr "السمة الحالية تقترح خلفية وخطًا."
 
-#: ../capplets/appearance/appearance-themes.c:568
+#: ../capplets/appearance/appearance-themes.c:717
+msgid ""
+"The current theme suggests a font. Also, the last applied font suggestion "
+"can be reverted."
+msgstr "السمة الحالية تقترح خطًا. ويمكن أيضا التراجع عن آخر خط مقترح تم تفعيله."
+
+#: ../capplets/appearance/appearance-themes.c:719
 msgid "The current theme suggests a background."
 msgstr "السمة الحالية تقترح خلفية."
 
-#: ../capplets/appearance/appearance-themes.c:573
+#: ../capplets/appearance/appearance-themes.c:721
+msgid "The last applied font suggestion can be reverted."
+msgstr "يمكن التراجع عن آخر خط مقترح تم تفعيله."
+
+#: ../capplets/appearance/appearance-themes.c:723
 msgid "The current theme suggests a font."
-msgstr "السمة الحالية تقترح خطاً."
+msgstr "السمة الحالية تقترح خطًا."
 
-#: ../capplets/appearance/appearance-themes.c:857
-#: ../capplets/default-applications/gnome-da-capplet.c:1080
-#: ../capplets/sound/sound-properties-capplet.c:327
+#: ../capplets/appearance/appearance-themes.c:1046
+#: ../capplets/default-applications/gnome-da-capplet.c:630
+#: ../capplets/sound/sound-properties-capplet.c:328
 msgid "Custom"
 msgstr "مخصص"
 
@@ -630,15 +691,15 @@ msgstr "<b>معاينة</b>"
 
 #: ../capplets/appearance/data/appearance.glade.h:6
 msgid "<b>Rendering</b>"
-msgstr "<b>تصيير</b>"
+msgstr "<b>التصيير</b>"
 
 #: ../capplets/appearance/data/appearance.glade.h:7
 msgid "<b>Smoothing</b>"
-msgstr "<b>تنعيم</b>"
+msgstr "<b>التنعيم</b>"
 
 #: ../capplets/appearance/data/appearance.glade.h:8
 msgid "<b>Subpixel Order</b>"
-msgstr "<b>ترتيب النقاط التحت بكسلية</b>"
+msgstr "<b>الترتيب التحت بكسلي</b>"
 
 #: ../capplets/appearance/data/appearance.glade.h:9
 msgid "<b>_Wallpaper</b>"
@@ -650,7 +711,7 @@ msgstr "تفضيلات المظهر"
 
 #: ../capplets/appearance/data/appearance.glade.h:11
 msgid "Background"
-msgstr "خلفية"
+msgstr "الخلفية"
 
 #: ../capplets/appearance/data/appearance.glade.h:12
 msgid "Best _shapes"
@@ -658,7 +719,7 @@ msgstr "أفضل أ_شكال"
 
 #: ../capplets/appearance/data/appearance.glade.h:13
 msgid "Best co_ntrast"
-msgstr "أفضل ت_باين"
+msgstr "أفضل _تباين"
 
 #: ../capplets/appearance/data/appearance.glade.h:14
 msgid "C_ustomize..."
@@ -669,120 +730,106 @@ msgid "C_ut"
 msgstr "_قص"
 
 #: ../capplets/appearance/data/appearance.glade.h:16
-msgid ""
-"Centered\n"
-"Fill screen\n"
-"Scaled\n"
-"Zoom\n"
-"Tiled"
-msgstr ""
-"وسطي\n"
-"ملء الشاشة\n"
-"ممدود\n"
-"مُكبّر\n"
-"مُبلـّط"
-
-#: ../capplets/appearance/data/appearance.glade.h:21
 msgid "Changing your cursor theme takes effect the next time you log in."
-msgstr "تغيير سمة مؤشرك سيأخذ مجراه عند ولوجك القادم."
+msgstr "تغيير سمة مؤشرك سيطبّق عند ولوجك القادم."
 
-#: ../capplets/appearance/data/appearance.glade.h:22
+#: ../capplets/appearance/data/appearance.glade.h:17
 msgid "Colors"
-msgstr "ألوان"
+msgstr "الألوان"
 
-#: ../capplets/appearance/data/appearance.glade.h:23
+#: ../capplets/appearance/data/appearance.glade.h:18
 msgid "Controls"
-msgstr "متحكّمات"
+msgstr "المتحكّمات"
 
-#: ../capplets/appearance/data/appearance.glade.h:24
+#: ../capplets/appearance/data/appearance.glade.h:19
 msgid "Customize Theme"
-msgstr "خصّص سمة"
+msgstr "خصّص السمة"
 
-#: ../capplets/appearance/data/appearance.glade.h:25
+#: ../capplets/appearance/data/appearance.glade.h:20
 msgid "D_etails..."
-msgstr "_تفاصيل..."
+msgstr "ال_تفاصيل..."
 
-#: ../capplets/appearance/data/appearance.glade.h:26
+#: ../capplets/appearance/data/appearance.glade.h:21
 msgid "Des_ktop font:"
 msgstr "خط ال_مكتب:"
 
-#: ../capplets/appearance/data/appearance.glade.h:27
+#: ../capplets/appearance/data/appearance.glade.h:22
 msgid "Edit"
 msgstr "حرّر"
 
-#: ../capplets/appearance/data/appearance.glade.h:28
+#: ../capplets/appearance/data/appearance.glade.h:23
 msgid "Font Rendering Details"
-msgstr "تفاصيل ترجمة الخط"
+msgstr "تفاصيل تصيير الخط"
 
-#: ../capplets/appearance/data/appearance.glade.h:29
+#: ../capplets/appearance/data/appearance.glade.h:24
 msgid "Fonts"
 msgstr "الخطوط"
 
-#: ../capplets/appearance/data/appearance.glade.h:30
+#: ../capplets/appearance/data/appearance.glade.h:25
 msgid "Gra_yscale"
 msgstr "تد_رج رمادي"
 
-#: ../capplets/appearance/data/appearance.glade.h:31
+#: ../capplets/appearance/data/appearance.glade.h:26
 msgid "Icons"
-msgstr "أيقونات"
+msgstr "الأيقونات"
 
-#: ../capplets/appearance/data/appearance.glade.h:32
+#: ../capplets/appearance/data/appearance.glade.h:27
 msgid "Interface"
-msgstr "واجهة"
+msgstr "الواجهة"
 
-#: ../capplets/appearance/data/appearance.glade.h:33
+#: ../capplets/appearance/data/appearance.glade.h:28
 msgid "Large"
-msgstr "عريض"
+msgstr "كبير"
 
-#: ../capplets/appearance/data/appearance.glade.h:34
+#: ../capplets/appearance/data/appearance.glade.h:29
 msgid "N_one"
 msgstr "_لا شيء"
 
-#: ../capplets/appearance/data/appearance.glade.h:35
+#: ../capplets/appearance/data/appearance.glade.h:30
 msgid "New File"
 msgstr "ملف جديد"
 
-#: ../capplets/appearance/data/appearance.glade.h:36
+#: ../capplets/appearance/data/appearance.glade.h:31
 msgid "Open File"
-msgstr "افتح ملف"
+msgstr "افتح ملفا"
 
-#: ../capplets/appearance/data/appearance.glade.h:37
+#: ../capplets/appearance/data/appearance.glade.h:32
 msgid "Open a dialog to specify the color"
-msgstr "افتح حوار لتحديد اللون"
+msgstr "افتح حوارا لتحديد اللون"
 
-#: ../capplets/appearance/data/appearance.glade.h:38
+#: ../capplets/appearance/data/appearance.glade.h:33
 msgid "Pointer"
-msgstr "مؤشر"
+msgstr "المؤشر"
 
-#: ../capplets/appearance/data/appearance.glade.h:39
+#: ../capplets/appearance/data/appearance.glade.h:34
 msgid "R_esolution:"
 msgstr "الا_ستبانة:"
 
-#: ../capplets/appearance/data/appearance.glade.h:40
+#: ../capplets/appearance/data/appearance.glade.h:35
 msgid "Save File"
-msgstr "احفظ ملف"
+msgstr "احفظ الملف"
 
-#: ../capplets/appearance/data/appearance.glade.h:41
+#: ../capplets/appearance/data/appearance.glade.h:36
 msgid "Save Theme As..."
-msgstr "ا_حفظ السِمة كـ..."
+msgstr "ا_حفظ السِمة باسم..."
 
-#: ../capplets/appearance/data/appearance.glade.h:42
+#: ../capplets/appearance/data/appearance.glade.h:37
 msgid "Save _As..."
-msgstr "احفظ _كـ..."
+msgstr "احفظ با_سم..."
 
-#: ../capplets/appearance/data/appearance.glade.h:43
+#: ../capplets/appearance/data/appearance.glade.h:38
 msgid "Save _background image"
 msgstr "احفظ صورة ال_خلفية"
 
-#: ../capplets/appearance/data/appearance.glade.h:44
+#: ../capplets/appearance/data/appearance.glade.h:39
 msgid "Show _icons in menus"
-msgstr "اظهر ال_أيقونات في القوائم"
+msgstr "أظهر ال_أيقونات في القوائم"
 
-#: ../capplets/appearance/data/appearance.glade.h:45
+#: ../capplets/appearance/data/appearance.glade.h:40
 msgid "Small"
 msgstr "صغير"
 
-#: ../capplets/appearance/data/appearance.glade.h:46
+#: ../capplets/appearance/data/appearance.glade.h:41
 msgid ""
 "Solid color\n"
 "Horizontal gradient\n"
@@ -792,42 +839,56 @@ msgstr ""
 "تدرج أفقي\n"
 "تدرج عمودي"
 
-#: ../capplets/appearance/data/appearance.glade.h:49
+#: ../capplets/appearance/data/appearance.glade.h:44
 msgid "Sub_pixel (LCDs)"
 msgstr "تحت _بكسلي (LCD)"
 
-#: ../capplets/appearance/data/appearance.glade.h:50
+#: ../capplets/appearance/data/appearance.glade.h:45
 msgid "Sub_pixel smoothing (LCDs)"
 msgstr "تنعيم تحت _بكسلي (LCD)"
 
-#: ../capplets/appearance/data/appearance.glade.h:51
+#: ../capplets/appearance/data/appearance.glade.h:46
 msgid "Text"
 msgstr "نص"
 
-#: ../capplets/appearance/data/appearance.glade.h:52
+#: ../capplets/appearance/data/appearance.glade.h:47
 msgid ""
 "Text below items\n"
 "Text beside items\n"
 "Icons only\n"
 "Text only"
 msgstr ""
-"النص أسفل العناصر\n"
-"النص بجانب العناصر\n"
+"نص أسفل العناصر\n"
+"نص بجانب العناصر\n"
 "أيقونات فقط\n"
 "نص فقط"
 
-#: ../capplets/appearance/data/appearance.glade.h:56
+#: ../capplets/appearance/data/appearance.glade.h:51
 msgid "The current controls theme does not support color schemes."
-msgstr "لا تدعم سِمة المتحكّمات الحالية مخططات الألوان"
+msgstr "لا تدعم سِمة المتحكّمات الحالية مخططات الألوان."
 
-#: ../capplets/appearance/data/appearance.glade.h:57
+#: ../capplets/appearance/data/appearance.glade.h:52
 #: ../vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
-msgstr "سِمة"
+msgstr "السِمة"
+
+#: ../capplets/appearance/data/appearance.glade.h:53
+msgid ""
+"Tiled\n"
+"Zoom\n"
+"Centered\n"
+"Scaled\n"
+"Fill screen"
+msgstr ""
+"مبلّط\n"
+"تقريب\n"
+"موسّط\n"
+"مُقيّس\n"
+"ملء الشاشة"
 
 #: ../capplets/appearance/data/appearance.glade.h:58
 msgid "Toolbar _button labels:"
-msgstr "عناوين أ_زرار شريط الأدوات"
+msgstr "عناوين أ_زرار شريط الأدوات:"
 
 #. vertical hinting, pixel order blue, green, red
 #: ../capplets/appearance/data/appearance.glade.h:60
@@ -839,7 +900,7 @@ msgid "Window Border"
 msgstr "حدود النافذة"
 
 #: ../capplets/appearance/data/appearance.glade.h:62
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:47
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:50
 msgid "_Add..."
 msgstr "أ_ضف..."
 
@@ -898,7 +959,7 @@ msgstr "أ_حادي اللون"
 
 #: ../capplets/appearance/data/appearance.glade.h:77
 msgid "_Name:"
-msgstr "الإ_سم:"
+msgstr "الا_سم:"
 
 #: ../capplets/appearance/data/appearance.glade.h:78
 msgid "_New"
@@ -931,7 +992,7 @@ msgstr "_RGB"
 
 #: ../capplets/appearance/data/appearance.glade.h:86
 msgid "_Reset to Defaults"
-msgstr "أعد التعيين للافترا_ضيات"
+msgstr "أعد الضبط لل_مبدئيات"
 
 #: ../capplets/appearance/data/appearance.glade.h:87
 msgid "_Save"
@@ -939,7 +1000,7 @@ msgstr "ا_حفظ"
 
 #: ../capplets/appearance/data/appearance.glade.h:88
 msgid "_Selected items:"
-msgstr "العناصر الم_نتقاة:"
+msgstr "العناصر الم_حددة:"
 
 #: ../capplets/appearance/data/appearance.glade.h:89
 msgid "_Size:"
@@ -972,7 +1033,7 @@ msgstr "ال_نوافذ:"
 
 #: ../capplets/appearance/data/appearance.glade.h:97
 msgid "dots per inch"
-msgstr "نقاط بكل بوصة"
+msgstr "نقطة في البوصة"
 
 #: ../capplets/appearance/data/gnome-appearance-properties.desktop.in.in.h:1
 msgid "Appearance"
@@ -988,17 +1049,17 @@ msgstr "ثبِّت حزم السِمات لأجزاء سطح المكتب الم
 
 #: ../capplets/appearance/data/gnome-theme-installer.desktop.in.in.h:2
 msgid "Theme Installer"
-msgstr "مُثبِّت السِمة"
+msgstr "مُثبِّت السِمات"
 
 #: ../capplets/appearance/data/gnome-theme-package.xml.in.h:1
 msgid "Gnome Theme Package"
 msgstr "حزمة سِمات جنوم"
 
-#: ../capplets/appearance/gnome-wp-info.c:45
+#: ../capplets/appearance/gnome-wp-info.c:50
 msgid "No Wallpaper"
 msgstr "لا صور على المكتب"
 
-#: ../capplets/appearance/gnome-wp-item.c:200
+#: ../capplets/appearance/gnome-wp-item.c:209
 msgid "Slide Show"
 msgstr "عرض شرائح"
 
@@ -1006,98 +1067,98 @@ msgstr "عرض شرائح"
 #. * mime type, x pixel(s) by y pixel(s)
 #. * Folder: /path/to/file
 #.
-#: ../capplets/appearance/gnome-wp-item.c:208
+#: ../capplets/appearance/gnome-wp-item.c:217
 #, c-format
 msgid ""
 "<b>%s</b>\n"
 "%s, %d %s by %d %s\n"
 "Folder: %s"
 msgstr ""
-"<b>%s</b>\n"
-"%s, %d %s by %d %s\n"
+"<b>‏%s</b>\n"
+"‏%s، %Id %s × %Id %s\n"
 "المجلد: %s"
 
-#: ../capplets/appearance/gnome-wp-item.c:214
-#: ../capplets/appearance/gnome-wp-item.c:216
+#: ../capplets/appearance/gnome-wp-item.c:223
+#: ../capplets/appearance/gnome-wp-item.c:225
 msgid "pixel"
 msgid_plural "pixels"
 msgstr[0] "بكسل"
 msgstr[1] "بكسل"
-msgstr[2] "بكسلات"
-msgstr[3] "بكسلاً"
+msgstr[2] "بكسل"
+msgstr[3] "بكسلات"
+msgstr[4] "بكسلًا"
+msgstr[5] "بكسل"
 
 #: ../capplets/appearance/theme-installer.c:171
 #: ../capplets/appearance/theme-installer.c:221
 msgid "Cannot install theme"
-msgstr "لا يمكن تثبيت السِمة"
+msgstr "تعذّر تثبيت السِمة"
 
 #: ../capplets/appearance/theme-installer.c:173
 #, c-format
 msgid "The %s utility is not installed."
-msgstr ""
-"أداة %s غير مثبتة."
+msgstr "الأداة %s غير مثبتة."
 
 #: ../capplets/appearance/theme-installer.c:223
 msgid "There was a problem while extracting the theme."
-msgstr ""
-"حدثت مشكلة أثناء استخلاص السِمة"
+msgstr "حدثت مشكلة أثناء استخراج السِمة."
 
 #: ../capplets/appearance/theme-installer.c:246
 msgid "There was an error installing the selected file"
-msgstr "حدث خطأ عند تثبيت الملف المنتقى"
+msgstr "حدث خطأ عند تثبيت الملف المختار"
 
 #: ../capplets/appearance/theme-installer.c:247
 #, c-format
 msgid "\"%s\" does not appear to be a valid theme."
-msgstr "يبدو أن \"%s\" لا يمثل سِمة صالحة."
+msgstr "لا يبدو أن \"%s\" يمثل سِمة صالحة."
 
 #: ../capplets/appearance/theme-installer.c:248
 #, c-format
 msgid ""
 "\"%s\" does not appear to be a valid theme. It may be a theme engine which "
 "you need to compile."
-msgstr "لا يبدو أن \"%s\" ملف سمة صحيح. محرك سمات يجب تصريفه."
+msgstr "لا يبدو أن \"%s\" ملف سمة صحيح. ربما يكون محرك سمات يجب تصريفه."
 
 #: ../capplets/appearance/theme-installer.c:287
 #, c-format
 msgid "GNOME Theme %s correctly installed"
 msgstr "سِمة جنوم %s مثبتة بشكل صحيح"
 
-#: ../capplets/appearance/theme-installer.c:347
+#: ../capplets/appearance/theme-installer.c:354
 #, c-format
 msgid "Installation for theme \"%s\" failed."
 msgstr "فشل تثبيت السِمة \"%s\"."
 
-#: ../capplets/appearance/theme-installer.c:379
+#: ../capplets/appearance/theme-installer.c:392
 #, c-format
 msgid "The theme \"%s\" has been installed."
 msgstr "ثُبِّتت السِّمة \"%s\"."
 
-#: ../capplets/appearance/theme-installer.c:385
+#: ../capplets/appearance/theme-installer.c:398
 msgid "Would you like to apply it now, or keep your current theme?"
 msgstr "أترغب بتفعيلها الآن أم الإبقاء على السِّمة الحالية؟"
 
-#: ../capplets/appearance/theme-installer.c:387
+#: ../capplets/appearance/theme-installer.c:400
 msgid "Keep Current Theme"
 msgstr "أبقِ السِمة الحالية"
 
-#: ../capplets/appearance/theme-installer.c:389
+#: ../capplets/appearance/theme-installer.c:402
 msgid "Apply New Theme"
 msgstr "طبّق السِمة الجديدة"
 
-#: ../capplets/appearance/theme-installer.c:491
+#: ../capplets/appearance/theme-installer.c:505
 msgid "Failed to create temporary directory"
 msgstr "فشل إنشاء دليل مؤقت"
 
-#: ../capplets/appearance/theme-installer.c:551
+#: ../capplets/appearance/theme-installer.c:568
 msgid "New themes have been successfully installed."
 msgstr "أضيفت السِمات الجديدة بنجاح."
 
-#: ../capplets/appearance/theme-installer.c:579
+#: ../capplets/appearance/theme-installer.c:595
 msgid "No theme file location specified to install"
 msgstr "لم يحدّد موقع ملف السِمة لتثبيتها"
 
-#: ../capplets/appearance/theme-installer.c:599
+#: ../capplets/appearance/theme-installer.c:615
 #, c-format
 msgid ""
 "Insufficient permissions to install the theme in:\n"
@@ -1106,41 +1167,47 @@ msgstr ""
 "تّصريحات غير كافية لتثبيت السِمة في:\n"
 "%s"
 
-#: ../capplets/appearance/theme-installer.c:621
+#: ../capplets/appearance/theme-installer.c:637
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
 "selected as the source location"
 msgstr ""
-"%s هو المسار الذي ستثبّت فيه ملفات السِمة، لذا لا يمكن إنتقاءه كموقع المصدر"
+"‏%s هو المسار الذي ستثبّت فيه ملفات السِمة، لذا لا يمكن اختياره كموقع المصدر"
 
-#: ../capplets/appearance/theme-installer.c:689
+#: ../capplets/appearance/theme-installer.c:706
 msgid "Select Theme"
 msgstr "اختر سمة"
 
-#: ../capplets/appearance/theme-installer.c:693
+#: ../capplets/appearance/theme-installer.c:710
 msgid "Theme Packages"
-msgstr "حزمات السمة"
+msgstr "حزم السمة"
 
 #: ../capplets/appearance/theme-save.c:91
+#, c-format
 msgid "Theme name must be present"
 msgstr "يجب أن يكون اسم السِمة موجودا"
 
-#: ../capplets/appearance/theme-save.c:161
+#: ../capplets/appearance/theme-save.c:154
 msgid "The theme already exists. Would you like to replace it?"
-msgstr "هذه السِمة موجودة أصلاً. أتريد استبدالها؟"
+msgstr "هذه السِمة موجودة أصلًا. أتريد استبدالها؟"
 
-#: ../capplets/appearance/theme-save.c:162
+#: ../capplets/appearance/theme-save.c:155
+#: ../capplets/common/file-transfer-dialog.c:450
 msgid "_Overwrite"
-msgstr "ك_تابة فوقية"
+msgstr "ا_ستبدلها"
 
-#: ../capplets/appearance/theme-util.c:69
+#: ../capplets/appearance/theme-util.c:134
 msgid "Would you like to delete this theme?"
 msgstr "أتريد حذف هذه السِمة؟"
 
-#: ../capplets/appearance/theme-util.c:121
+#: ../capplets/appearance/theme-util.c:179
 msgid "Theme cannot be deleted"
-msgstr "لا يمكن حذف السِمة"
+msgstr "تعذّر حذف السِمة"
+
+#: ../capplets/appearance/theme-util.c:304
+msgid "Could not install theme engine"
+msgstr "تعذّر تثبيت محرّك السِمات"
 
 #: ../capplets/common/activate-settings-daemon.c:16
 msgid ""
@@ -1150,167 +1217,166 @@ msgid ""
 "settings manager may already be active and conflicting with the GNOME "
 "settings manager."
 msgstr ""
-"لا يمكن تشغيل مدير الاعدادات 'gnome-settings-daemon'.\n"
-"لن يكون لبعض التفضيلات تأثير دون عمل مدير اعدادات جنوم، . قد يشير ذلك إلى "
-"وجود مشكلة مع بونوبو أو أن مدير اعدادات مغاير (تابع لكيدي مثلا) نشط مسبّقا، و "
-"متضارب مع مدير اعدادات جنوم."
+"تعذّر تشغيل مدير الإعدادات 'gnome-settings-daemon'.\n"
+"لن يكون لبعض التفضيلات تأثير دون عمل مدير إعدادات جنوم، قد يشير ذلك إلى وجود "
+"مشكلة مع بونوبو أو أن مدير إعدادات مغاير (تابع لكدي مثلا) نشط مسبّقا، و "
+"متضارب مع مدير إعدادات جنوم."
 
 #: ../capplets/common/capplet-stock-icons.c:67
 #, c-format
 msgid "Unable to load stock icon '%s'\n"
-msgstr "لا يمكن تحميل مخزون الأيقونات '%s'\n"
-
-#: ../capplets/common/capplet-util.c:240 ../capplets/common/capplet-util.c:242
-msgid "Just apply settings and quit"
-msgstr "فقط طبِّق الإعدادات ثم انهي"
-
-#: ../capplets/common/capplet-util.c:244
-#: ../capplets/keyboard/gnome-keyboard-properties.c:249
-#: ../capplets/sound/sound-properties-capplet.c:1030
-msgid "Retrieve and store legacy settings"
-msgstr "إسترجع و خزن الإعدادات التقليديّة"
+msgstr "تعذّر تحميل الأيقونة '%s'\n"
 
-#: ../capplets/common/capplet-util.c:344
+#: ../capplets/common/capplet-util.c:80
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "حدث خطأ عند عرض المساعدة: %s"
 
-#: ../capplets/common/file-transfer-dialog.c:94
+#: ../capplets/common/file-transfer-dialog.c:98
 #, c-format
 msgid "Copying file: %u of %u"
-msgstr "يجري نسخ الملف:  '%u من %u"
+msgstr "يجري نسخ الملف: %Iu من %Iu"
 
-#: ../capplets/common/file-transfer-dialog.c:154
+#: ../capplets/common/file-transfer-dialog.c:145
 #, c-format
 msgid "Copying '%s'"
 msgstr "يجري نسخ '%s'"
 
 #: ../capplets/common/file-transfer-dialog.c:185
-#: ../capplets/common/file-transfer-dialog.c:309
+#: ../capplets/common/file-transfer-dialog.c:312
 msgid "Copying files"
 msgstr "يجري نسخ الملفات"
 
-#: ../capplets/common/file-transfer-dialog.c:221
+#: ../capplets/common/file-transfer-dialog.c:224
 msgid "Parent Window"
 msgstr "النافذة الأب"
 
-#: ../capplets/common/file-transfer-dialog.c:222
+#: ../capplets/common/file-transfer-dialog.c:225
 msgid "Parent window of the dialog"
 msgstr "النافذة الأب للحوار"
 
-#: ../capplets/common/file-transfer-dialog.c:228
+#: ../capplets/common/file-transfer-dialog.c:231
 msgid "From URI"
-msgstr "من العنوان"
+msgstr "من المسار"
 
-#: ../capplets/common/file-transfer-dialog.c:229
+#: ../capplets/common/file-transfer-dialog.c:232
 msgid "URI currently transferring from"
-msgstr "االعنوان الذي ينقل منه حاليّا"
+msgstr "المسار الذي ينقل منه حاليّا"
 
-#: ../capplets/common/file-transfer-dialog.c:236
+#: ../capplets/common/file-transfer-dialog.c:239
 msgid "To URI"
-msgstr "إلى العنوان"
+msgstr "إلى المسار"
 
-#: ../capplets/common/file-transfer-dialog.c:237
+#: ../capplets/common/file-transfer-dialog.c:240
 msgid "URI currently transferring to"
-msgstr "العنوان الذي ينقل إليه حاليّا"
+msgstr "المسار الذي ينقل إليه حاليّا"
 
-#: ../capplets/common/file-transfer-dialog.c:244
+#: ../capplets/common/file-transfer-dialog.c:247
 msgid "Fraction completed"
 msgstr "الجزء المكتمل"
 
-#: ../capplets/common/file-transfer-dialog.c:245
+#: ../capplets/common/file-transfer-dialog.c:248
 msgid "Fraction of transfer currently completed"
 msgstr "جزء الإرسال المكتمل حاليا"
 
-#: ../capplets/common/file-transfer-dialog.c:252
+#: ../capplets/common/file-transfer-dialog.c:255
 msgid "Current URI index"
-msgstr "فهرس العناوين الحالي"
+msgstr "فهرس المسارات الحالي"
 
-#: ../capplets/common/file-transfer-dialog.c:253
+#: ../capplets/common/file-transfer-dialog.c:256
 msgid "Current URI index - starts from 1"
-msgstr "فهرس العناوين الحالي - يبدأ من 1"
+msgstr "فهرس المسارات الحالي - يبدأ من 1"
 
-#: ../capplets/common/file-transfer-dialog.c:260
+#: ../capplets/common/file-transfer-dialog.c:263
 msgid "Total URIs"
-msgstr "عدد العناوين الإجمالي"
+msgstr "عدد المسارات الإجمالي"
 
-#: ../capplets/common/file-transfer-dialog.c:261
+#: ../capplets/common/file-transfer-dialog.c:264
 msgid "Total number of URIs"
-msgstr "عدد العناوين الاجمالي"
+msgstr "عدد المسارات الإجمالي"
 
-#: ../capplets/common/file-transfer-dialog.c:422
-msgid "Connecting..."
-msgstr "يجري الإتّصال..."
+#: ../capplets/common/file-transfer-dialog.c:444
+#, c-format
+msgid "File '%s' already exists. Do you want to overwrite it?"
+msgstr "السِمة '%s' موجودة أصلًا. أتريد استبدالها؟"
+
+#: ../capplets/common/file-transfer-dialog.c:447
+msgid "_Skip"
+msgstr "_تخطى"
 
-#: ../capplets/common/gconf-property-editor.c:170
+#: ../capplets/common/file-transfer-dialog.c:448
+msgid "Overwrite _All"
+msgstr "استبدل ال_كل"
+
+#: ../capplets/common/gconf-property-editor.c:133
 msgid "Key"
 msgstr "المفتاح"
 
-#: ../capplets/common/gconf-property-editor.c:171
+#: ../capplets/common/gconf-property-editor.c:134
 msgid "GConf key to which this property editor is attached"
-msgstr "مفتاح GConf الذي يتبع محرّر الخاصية هذا."
+msgstr "مفتاح GConf الذي يتبعه محرّر الخاصية هذا."
 
-#: ../capplets/common/gconf-property-editor.c:177
+#: ../capplets/common/gconf-property-editor.c:140
 msgid "Callback"
 msgstr "اتصال معاكس"
 
-#: ../capplets/common/gconf-property-editor.c:178
+#: ../capplets/common/gconf-property-editor.c:141
 msgid "Issue this callback when the value associated with key gets changed"
 msgstr "فعّل هذا الاتصال المعاكس إثر تغيير قيمة بالمفتاح"
 
-#: ../capplets/common/gconf-property-editor.c:183
+#: ../capplets/common/gconf-property-editor.c:146
 msgid "Change set"
 msgstr "مجموعة التغييرات"
 
-#: ../capplets/common/gconf-property-editor.c:184
+#: ../capplets/common/gconf-property-editor.c:147
 msgid ""
 "GConf change set containing data to be forwarded to the gconf client on apply"
 msgstr ""
 "مجموعة تغييرات GConf المحتوية على بيانات سترسل إلى عميل gconf عند التطبيق"
 
-#: ../capplets/common/gconf-property-editor.c:189
+#: ../capplets/common/gconf-property-editor.c:152
 msgid "Conversion to widget callback"
-msgstr "تحويل إلى نداء معاكس للقطعة"
+msgstr "تحويل إلى نداء معاكس للودجة"
 
-#: ../capplets/common/gconf-property-editor.c:190
+#: ../capplets/common/gconf-property-editor.c:153
 msgid ""
 "Callback to be issued when data are to be converted from GConf to the widget"
-msgstr "الاتصال المعاكس الذي يتم تفعيله لتحويل البيانات من GConf للقطعة"
+msgstr "الاتصال المعاكس الذي يتم تفعيله لتحويل البيانات من GConf للودجة"
 
-#: ../capplets/common/gconf-property-editor.c:195
+#: ../capplets/common/gconf-property-editor.c:158
 msgid "Conversion from widget callback"
-msgstr "تحويل من النداء المعاكس للقطعة"
+msgstr "تحويل من النداء المعاكس للودجة"
 
-#: ../capplets/common/gconf-property-editor.c:196
+#: ../capplets/common/gconf-property-editor.c:159
 msgid ""
 "Callback to be issued when data are to be converted to GConf from the widget"
-msgstr "الاتصال المعاكس الذي يتم تفعيله لتحويل البيانات من القطعة إلى GConf"
+msgstr "الاتصال المعاكس الذي يتم تفعيله لتحويل البيانات من الودجة إلى GConf"
 
-#: ../capplets/common/gconf-property-editor.c:201
+#: ../capplets/common/gconf-property-editor.c:164
 msgid "UI Control"
 msgstr "كائن واجهة المستخدم"
 
-#: ../capplets/common/gconf-property-editor.c:202
+#: ../capplets/common/gconf-property-editor.c:165
 msgid "Object that controls the property (normally a widget)"
-msgstr "الكائن الذي يتحكم في الخاصية (عادة قطعة)"
+msgstr "الكائن الذي يتحكم في الخاصية (عادة ودجة)"
 
-#: ../capplets/common/gconf-property-editor.c:217
+#: ../capplets/common/gconf-property-editor.c:180
 msgid "Property editor object data"
 msgstr "بيانات كائن محرّر الخاصيات"
 
-#: ../capplets/common/gconf-property-editor.c:218
+#: ../capplets/common/gconf-property-editor.c:181
 msgid "Custom data required by the specific property editor"
 msgstr "البيانات المعرفة المطلوبة من محرّر الخاصية المحدّد"
 
-#: ../capplets/common/gconf-property-editor.c:224
+#: ../capplets/common/gconf-property-editor.c:187
 msgid "Property editor data freeing callback"
 msgstr "الاتصال المعاكس المفرغ لمحرر الخاصيات من بياناته"
 
-#: ../capplets/common/gconf-property-editor.c:225
+#: ../capplets/common/gconf-property-editor.c:188
 msgid "Callback to be issued when property editor object data is to be freed"
 msgstr "الاتصال المعاكس الذي يتم تفعيله عند تحرير بيانات جسم محرّر الخاصيات"
 
-#: ../capplets/common/gconf-property-editor.c:1468
+#: ../capplets/common/gconf-property-editor.c:1429
 #, c-format
 msgid ""
 "Couldn't find the file '%s'.\n"
@@ -1318,11 +1384,11 @@ msgid ""
 "Please make sure it exists and try again, or choose a different background "
 "picture."
 msgstr ""
-"لم يمكن ايجاد الملف '%s'.\n"
+"تعذّر إيجاد الملف '%s'.\n"
 "\n"
 "رجاء تأكد من وجوده وأعد المحاولة مرّة اخرى، أو اختر صورةَ خلفية مغايرة."
 
-#: ../capplets/common/gconf-property-editor.c:1476
+#: ../capplets/common/gconf-property-editor.c:1437
 #, c-format
 msgid ""
 "I don't know how to open the file '%s'.\n"
@@ -1335,42 +1401,66 @@ msgstr ""
 "\n"
 "رجاء اختر صورة أخرى."
 
-#: ../capplets/common/gconf-property-editor.c:1595
+#: ../capplets/common/gconf-property-editor.c:1556
 msgid "Please select an image."
 msgstr "رجاء اختر صورة."
 
-#: ../capplets/common/gconf-property-editor.c:1600
+#: ../capplets/common/gconf-property-editor.c:1561
 msgid "_Select"
-msgstr "انت_قي"
+msgstr "ا_ختر"
 
-#: ../capplets/common/gnome-theme-info.c:639
+#: ../capplets/common/gnome-theme-info.c:629
 msgid "Default Pointer - Current"
-msgstr "المؤشر الإفتراضي - الحالي"
+msgstr "المؤشر المبدئي - الحالي"
 
-#: ../capplets/common/gnome-theme-info.c:643
+#: ../capplets/common/gnome-theme-info.c:633
 msgid "White Pointer"
 msgstr "مؤشر أبيض"
 
-#: ../capplets/common/gnome-theme-info.c:644
+#: ../capplets/common/gnome-theme-info.c:634
 msgid "White Pointer - Current"
 msgstr "مؤشر أبيض - الحالي"
 
-#: ../capplets/common/gnome-theme-info.c:648
+#: ../capplets/common/gnome-theme-info.c:638
 msgid "Large Pointer"
 msgstr "مؤشر كبير"
 
-#: ../capplets/common/gnome-theme-info.c:649
+#: ../capplets/common/gnome-theme-info.c:639
 msgid "Large Pointer - Current"
 msgstr "مؤشر كبير - الحالي"
 
-#: ../capplets/common/gnome-theme-info.c:653
+#: ../capplets/common/gnome-theme-info.c:643
 msgid "Large White Pointer - Current"
 msgstr "مؤشر أبيض كبير - الحالي"
 
-#: ../capplets/common/gnome-theme-info.c:654
+#: ../capplets/common/gnome-theme-info.c:644
 msgid "Large White Pointer"
 msgstr "مؤشر أبيض كبير"
 
+#: ../capplets/common/gnome-theme-info.c:1610
+#, c-format
+msgid ""
+"This theme will not look as intended because the required GTK+ theme '%s' is "
+"not installed."
+msgstr "لن تظهر هذه السمة كما يفترض لأن سمة جتك+ المطلوبة '%s' ليست مُثبّتة."
+
+#: ../capplets/common/gnome-theme-info.c:1618
+#, c-format
+msgid ""
+"This theme will not look as intended because the required window manager "
+"theme '%s' is not installed."
+msgstr ""
+"لن تظهر هذه السمة كما يفترض لأن محرك سمة مدير النوافذ المطلوبة '%s' ليست "
+"مُثبّتة."
+
+#: ../capplets/common/gnome-theme-info.c:1625
+#, c-format
+msgid ""
+"This theme will not look as intended because the required icon theme '%s' is "
+"not installed."
+msgstr ""
+"لن تظهر هذه السمة كما يفترض لأن سمة الأيقونات المطلوبة '%s' ليست مُثبّتة."
+
 #: ../capplets/default-applications/default-applications.desktop.in.in.h:1
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Preferred Applications"
@@ -1378,40 +1468,36 @@ msgstr "التطبيقات المفضّلة"
 
 #: ../capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
-msgstr "اختر تطبيقاتك الإفتراضية"
+msgstr "اختر تطبيقاتك المبدئية"
 
 #: ../capplets/default-applications/gnome-at-session.desktop.in.in.h:1
 msgid "Start the preferred visual assistive technology"
-msgstr "ابدأ تكنولوجيا المعاونة المرئية المفضلة"
+msgstr "ابدأ تقنية الإعانة المرئية المفضلة"
 
 #: ../capplets/default-applications/gnome-at-session.desktop.in.in.h:2
 msgid "Visual Assistance"
-msgstr "المعاونة المرئية"
-
-#: ../capplets/default-applications/gnome-da-capplet.c:80
-#: ../capplets/default-applications/gnome-da-capplet.c:112
-#: ../capplets/default-applications/gnome-da-capplet.c:133
-#: ../capplets/default-applications/gnome-da-capplet.c:177
-#: ../capplets/default-applications/gnome-da-capplet.c:222
-#: ../capplets/default-applications/gnome-da-capplet.c:279
-#: ../capplets/default-applications/gnome-da-capplet.c:330
-#: ../capplets/default-applications/gnome-da-capplet.c:381
-#: ../capplets/default-applications/gnome-da-capplet.c:434
-#: ../capplets/default-applications/gnome-da-capplet.c:484
-#: ../capplets/default-applications/gnome-da-capplet.c:877
-#: ../capplets/default-applications/gnome-da-capplet.c:899
+msgstr "الإعانة المرئية"
+
+#: ../capplets/default-applications/gnome-da-capplet.c:94
+#: ../capplets/default-applications/gnome-da-capplet.c:345
+#: ../capplets/default-applications/gnome-da-capplet.c:366
 #, c-format
 msgid "Error saving configuration: %s"
 msgstr "خطأ أثناء حفظ الإعدادات: %s."
 
-#: ../capplets/default-applications/gnome-da-capplet.c:1100
+#: ../capplets/default-applications/gnome-da-capplet.c:650
 msgid "Could not load the main interface"
-msgstr "لم يمكن تحميل الواجهة الرئيسيّة"
+msgstr "تعذّر تحميل الواجهة الرئيسيّة"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:1102
+#: ../capplets/default-applications/gnome-da-capplet.c:652
 msgid "Please make sure that the applet is properly installed"
 msgstr "رجاء تأكّد من أن البريمج مثبت بدقة"
 
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplets/default-applications/gnome-da-capplet.c:879
+msgid "Specify the name of the page to show (internet|multimedia|system|a11y)"
+msgstr "حدّد اسم الصفحة التي تريد إظهارها (internet|multimedia|system|a11y)"
+
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:1
 msgid "<b>Image Viewer</b>"
 msgstr "<b>عارض الصّور</b>"
@@ -1438,7 +1524,7 @@ msgstr "<b>محاكي الطرفية</b>"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "<b>Text Editor</b>"
-msgstr "<b>محرّر نصوص</b>"
+msgstr "<b>محرّر النصوص</b>"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:8
 msgid "<b>Video Player</b>"
@@ -1453,7 +1539,7 @@ msgid "<b>Web Browser</b>"
 msgstr "<b>متصفّح وِب</b>"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:11
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:13
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:12
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:28
 msgid "Accessibility"
 msgstr "الإتاحة"
@@ -1469,7 +1555,7 @@ msgstr "ال_أمر:"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:15
 msgid "Co_mmand:"
-msgstr "أ_مر:"
+msgstr "الأ_مر:"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:16
 msgid "E_xecute flag:"
@@ -1489,23 +1575,23 @@ msgstr "افتح الرابط في _لسان جديد"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:20
 msgid "Open link in new _window"
-msgstr "افتح الرابط في نافذة _جديدة"
+msgstr "افتح الرابط في _نافذة جديدة"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid "Open link with web browser _default"
-msgstr "افتح الرابط بمتصفح الوِب الإ_فتراضي"
+msgstr "افتح الرابط بمتصفح الوِب ال_مبدئي"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Run at st_art"
-msgstr "تشغي_ل عند البدء"
+msgstr "شغّ_ل عند البدء"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:24
 msgid "Run in t_erminal"
-msgstr "شغِّل في _طرفية"
+msgstr "شغّل في _طرفية"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "System"
-msgstr "نظام"
+msgstr "النظام"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "_Run at start"
@@ -1521,7 +1607,7 @@ msgstr "مشغل موسيقى بانشي"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:3
 msgid "Claws Mail"
-msgstr "بريد كلـُوْز"
+msgstr "بريد كلُوْز"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:4
 msgid "Dasher"
@@ -1529,7 +1615,7 @@ msgstr "داشر"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:5
 msgid "Debian Sensible Browser"
-msgstr "متصفّح وِب دبيان الحساس"
+msgstr "متصفّح دبيان الحساس"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:6
 msgid "Debian Terminal Emulator"
@@ -1545,19 +1631,19 @@ msgstr "Encompass"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:9
 msgid "Epiphany Web Browser"
-msgstr "متصفّح الويب إيبِفَني"
+msgstr "متصفّح الوب إبِفَني"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:10
 msgid "Evolution Mail Reader"
-msgstr "قارئ البريد ايفوليوشن"
+msgstr "قارئ البريد إيفوليوشن"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:11
 msgid "Firebird"
-msgstr "الطائر الناري"
+msgstr "فايربرد"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:12
 msgid "Firefox"
-msgstr "الثعلب الناري"
+msgstr "فايرفوكس"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:13
 msgid "GNOME Magnifier without Screen Reader"
@@ -1585,19 +1671,19 @@ msgstr "جنوبرنيكوس مع المكبّر"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:19
 msgid "Iceape"
-msgstr "قرد الثلج"
+msgstr "أيس آب"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:20
 msgid "Iceape Mail"
-msgstr "بريد قرد الثلج"
+msgstr "بريد أيس آب"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:21
 msgid "Icedove"
-msgstr "يمامة الثلج"
+msgstr "أيس دوڤ"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:22
 msgid "Iceweasel"
-msgstr "Iceweasel"
+msgstr "أيس وِصل"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:23
 msgid "KDE Magnifier without Screen Reader"
@@ -1609,7 +1695,7 @@ msgstr "بريد كي"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:25
 msgid "Konqueror"
-msgstr "كونكيرور"
+msgstr "كنكرر"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:26
 msgid "Konsole"
@@ -1617,11 +1703,11 @@ msgstr "كونسول"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:27
 msgid "Linux Screen Reader"
-msgstr "قارئ شاشة لينوكس"
+msgstr "قارئ شاشة لينكس"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:28
 msgid "Linux Screen Reader with Magnifier"
-msgstr "قارئ شاشة لينوكس مع المكبّر"
+msgstr "قارئ شاشة لينكس مع المكبّر"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:29
 msgid "Midori"
@@ -1641,11 +1727,11 @@ msgstr "بريد موزيلا"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:33
 msgid "Mozilla Thunderbird"
-msgstr "طائر برق موزيلا"
+msgstr "ثندربرد موزيلا"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:34
 msgid "Muine Music Player"
-msgstr "مشغل موسيقى موين"
+msgstr "مشغل الموسيقى موين"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:35
 msgid "Mutt"
@@ -1657,7 +1743,7 @@ msgstr "NXterm"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:37
 msgid "Netscape Communicator"
-msgstr "مُحاور نتسكيب"
+msgstr "نتسكيب كميونيكتر"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:38
 msgid "Opera"
@@ -1677,15 +1763,15 @@ msgstr "RXVT"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:42
 msgid "Rhythmbox Music Player"
-msgstr "مشغل موسيقى صندوق الإيقاع"
+msgstr "مشغل الموسيقى أنغام"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:43
 msgid "SeaMonkey"
-msgstr "قرد البحر"
+msgstr "سي منكي"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:44
 msgid "SeaMonkey Mail"
-msgstr "بريد قرد البحر"
+msgstr "بريد سي منكي"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:45
 msgid "Standard XTerminal"
@@ -1705,11 +1791,11 @@ msgstr "Terminator"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:49
 msgid "Thunderbird"
-msgstr "طائر البرق"
+msgstr "ثندربرد"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:50
 msgid "Totem Movie Player"
-msgstr "مشغل أفلام توتيم"
+msgstr "مشغل الأفلام طوطم"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:51
 msgid "aterm"
@@ -1742,7 +1828,7 @@ msgstr "يمين"
 #: ../capplets/display/main.c:374
 #, c-format
 msgid "%d Hz"
-msgstr "%d هرتز"
+msgstr "%Id هرتز"
 
 #: ../capplets/display/main.c:514
 msgid "_Resolution:"
@@ -1758,27 +1844,27 @@ msgstr "ال_دوران:"
 
 #: ../capplets/display/main.c:569
 msgid "Default Settings"
-msgstr "الإعدادات الافتراضية"
+msgstr "الإعدادات المبدئية"
 
 #: ../capplets/display/main.c:571
 #, c-format
 msgid "Screen %d Settings\n"
-msgstr "اعدادات %d للشاشة\n"
+msgstr "إعدادات الشاشة %Id\n"
 
-#: ../capplets/display/main.c:592
+#: ../capplets/display/main.c:593
 msgid "Screen Resolution Preferences"
-msgstr "تفضيلات إستبانة الشاشة"
+msgstr "تفضيلات استبانة الشاشة"
 
-#: ../capplets/display/main.c:627
+#: ../capplets/display/main.c:628
 #, c-format
 msgid "_Make default for this computer (%s) only"
-msgstr "ا_جعله الإفتراضي لهذا الحاسوب (%s) فقط"
+msgstr "ا_جعله المبدئي لهذا الحاسوب (%s) فقط"
 
-#: ../capplets/display/main.c:644
+#: ../capplets/display/main.c:648
 msgid "Options"
 msgstr "الخيارات"
 
-#: ../capplets/display/main.c:664
+#: ../capplets/display/main.c:668
 #, c-format
 msgid ""
 "Testing the new settings. If you don't respond in %d second the previous "
@@ -1787,77 +1873,83 @@ msgid_plural ""
 "Testing the new settings. If you don't respond in %d seconds the previous "
 "settings will be restored."
 msgstr[0] ""
+"يجري اختبار التّعيينات الجديدة. ستسترجع التّعيينات السابقة اذا لم تستجب حالا."
+msgstr[1] ""
 "يجري اختبار التّعيينات الجديدة. ستسترجع التّعيينات السابقة اذا لم تستجب خلال "
 "ثانيةٍ واحدة."
-msgstr[1] ""
+msgstr[2] ""
 "يجري اختبار التّعيينات الجديدة. ستسترجع التّعيينات السابقة اذا لم تستجب خلال "
 "ثانيتين."
-msgstr[2] ""
-"يجري اختبار التّعيينات الجديدة. ستسترجع التّعيينات السابقة اذا لم تستجب خلال %"
-"d ثوانٍ."
 msgstr[3] ""
 "يجري اختبار التّعيينات الجديدة. ستسترجع التّعيينات السابقة اذا لم تستجب خلال %"
-"d ثانية."
+"Id ثوانٍ."
+msgstr[4] ""
+"يجري اختبار التّعيينات الجديدة. ستسترجع التّعيينات السابقة اذا لم تستجب خلال %"
+"Id ثانية."
+msgstr[5] ""
+"يجري اختبار التّعيينات الجديدة. ستسترجع التّعيينات السابقة اذا لم تستجب خلال %"
+"Id ثانية."
 
-#: ../capplets/display/main.c:704
+#: ../capplets/display/main.c:708
 msgid "Keep Resolution"
-msgstr "ابقِ الإستبانة"
+msgstr "أبقِ الاستبانة"
 
-#: ../capplets/display/main.c:708
+#: ../capplets/display/main.c:712
 msgid "Do you want to keep this resolution?"
-msgstr "أتريد الحفاظ على هذه الاستبانة؟"
+msgstr "أتريد إبقاء هذه الاستبانة؟"
 
-#: ../capplets/display/main.c:734
+#: ../capplets/display/main.c:738
 msgid "Use _Previous Resolution"
 msgstr "استخدم الاستبانة السا_بقة"
 
-#: ../capplets/display/main.c:735
+#: ../capplets/display/main.c:739
 msgid "_Keep Resolution"
 msgstr "أ_بقِ الاستبانة"
 
-#: ../capplets/display/main.c:883
+#: ../capplets/display/main.c:888
 msgid ""
 "The X server does not support the XRandR extension.  Runtime resolution "
 "changes to the display size are not available."
 msgstr ""
-"خادم X لا يدعم إمتداد XRandR. لا تتوفّر إمكانيّة إحداث تغييرات في الإستبانة "
-"لحجم العرض أثناء زمن التّشغيل."
+"خادوم س لا يدعم امتداد XRandR. لا تتوفّر إمكانيّة إحداث تغييرات في استبانة "
+"العرض أثناء زمن التّشغيل."
 
-#: ../capplets/display/main.c:890
+#: ../capplets/display/main.c:895
 msgid ""
 "The version of the XRandR extension is incompatible with this program. "
 "Runtime changes to the display size are not available."
 msgstr ""
-"إصدارة إمتداد XRandR غير متوافقة مع هذا البرنامج. إمكانيّة تغيير إستبانة حجم "
-"الشاشة  في وقت العمل غير متوفّرة."
+"إصدارة امتداد XRandR غير متوافقة مع هذا البرنامج. لا تتوفّر إمكانيّة إحداث "
+"تغييرات في استبانة العرض أثناء زمن التّشغيل."
 
 #: ../capplets/keybindings/00-multimedia-key.xml.in.h:1
 #: ../capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
-msgstr "صوت"
+msgstr "الصوت"
 
 #: ../capplets/keybindings/01-desktop-key.xml.in.h:1
+#: ../libslab/bookmark-agent.c:1158
 msgid "Desktop"
 msgstr "سطح المكتب"
 
 #: ../capplets/keybindings/eggcellrendererkeys.c:21
 msgid "New accelerator..."
-msgstr "مسرّع جديد..."
+msgstr "اختصار جديد..."
 
 #: ../capplets/keybindings/eggcellrendererkeys.c:163
 #: ../capplets/keybindings/eggcellrendererkeys.c:164
 msgid "Accelerator key"
-msgstr "مفتاح مسرِّع"
+msgstr "مفتاح اختصار"
 
 #: ../capplets/keybindings/eggcellrendererkeys.c:173
 #: ../capplets/keybindings/eggcellrendererkeys.c:174
 msgid "Accelerator modifiers"
-msgstr "مُغيِّرات مفاتيح الإختصار"
+msgstr "مُغيِّرات مفاتيح الاختصار"
 
 #: ../capplets/keybindings/eggcellrendererkeys.c:182
 #: ../capplets/keybindings/eggcellrendererkeys.c:183
 msgid "Accelerator keycode"
-msgstr "رمز مفتاح الإختصار"
+msgstr "رمز مفتاح الاختصار"
 
 #: ../capplets/keybindings/eggcellrendererkeys.c:193
 msgid "Accel Mode"
@@ -1868,51 +1960,56 @@ msgid "The type of accelerator."
 msgstr "نوع مفتاح الاختصار."
 
 #: ../capplets/keybindings/eggcellrendererkeys.c:242
-#: ../capplets/keybindings/gnome-keybinding-properties.c:112
+#: ../capplets/keybindings/gnome-keybinding-properties.c:90
 #: ../typing-break/drwright.c:483
 msgid "Disabled"
 msgstr "معطّل"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:523
+#: ../capplets/keybindings/gnome-keybinding-properties.c:171
 msgid "<Unknown Action>"
 msgstr "<إجراء مجهول>"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:915
-#, c-format
+#: ../capplets/keybindings/gnome-keybinding-properties.c:804
+#, fuzzy
+msgid "Custom Shortcuts"
+msgstr "الاختصار"
+
+#: ../capplets/keybindings/gnome-keybinding-properties.c:999
+#, fuzzy, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
 "using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time.\n"
+"Please try with a key such as Control, Alt or Shift at the same time."
 msgstr ""
-"الإختصار \"%s\" لا يمكن استعماله لإن الكتابة بهذا المفتاح ستصبح مستحيلة. \n"
+"الاختصار \"%s\" لا يمكن استعماله لأن الكتابة بهذا المفتاح ستصبح مستحيلة. \n"
 "الرجاء المحاولة مجدّدا بمفتاح Control، Alt أو Shift في نفس الوقت.\n"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:944
-#, c-format
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1028
+#, fuzzy, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
-" \"%s\"\n"
+" \"%s\""
 msgstr ""
-"الإختصار \"%s\" مستخدم لـ:\n"
+"الاختصار \"%s\" مستخدم في:\n"
 " \"%s\"\n"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:976
-#, c-format
-msgid "Error setting new accelerator in configuration database: %s\n"
-msgstr "حدث خطأ أثناء ضبط مفتاح تعجيل جديد في قاعدة بيانات الإعدادات: %s\n"
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1060
+#, fuzzy, c-format
+msgid "Error setting new accelerator in configuration database: %s"
+msgstr "حدث خطأ أثناء ضبط مفتاح اختصار جديد في قاعدة بيانات الإعدادات: %s\n"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1026
-#, c-format
-msgid "Error unsetting accelerator in configuration database: %s\n"
-msgstr "خطأ عند إلغاء ضبط مفتاح الإختصار في قاعدة بيانات الإعدادات: %s\n"
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1112
+#, fuzzy, c-format
+msgid "Error unsetting accelerator in configuration database: %s"
+msgstr "خطأ عند إلغاء ضبط مفتاح الاختصار في قاعدة بيانات الإعدادات: %s\n"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1141
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1294
 msgid "Action"
-msgstr "اجراء"
+msgstr "الإجراء"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1165
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1316
 msgid "Shortcut"
-msgstr "اختصار"
+msgstr "الاختصار"
 
 #.
 #. * vim: sw=2 ts=8 cindent noai bs=2
@@ -1927,31 +2024,36 @@ msgid ""
 "To edit a shortcut key, click on the corresponding row and type a new "
 "accelerator, or press backspace to clear."
 msgstr ""
-"لتحرير مفتاح اختصار انقر السّطر المقابل و أدخل مسرّعاً جديداً أو اضغط مفتاح "
+"لتحرير مفتاح اختصار انقر السّطر المقابل و أدخل مسرّعًا جديدًا أو اضغط مفتاح "
 "التّراجع للإخلاء."
 
 #: ../capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "اربط مفاتيح اختصار بأوامر"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:241
-#: ../capplets/keyboard/gnome-keyboard-properties.c:246
-#: ../capplets/sound/sound-properties-capplet.c:1026
-#: ../capplets/sound/sound-properties-capplet.c:1028
+#: ../capplets/keyboard/gnome-keyboard-properties.c:248
+#: ../capplets/keyboard/gnome-keyboard-properties.c:253
+#: ../capplets/sound/sound-properties-capplet.c:1155
+#: ../capplets/sound/sound-properties-capplet.c:1157
 msgid ""
 "Just apply settings and quit (compatibility only; now handled by daemon)"
 msgstr ""
-"فقط طبّق الاعدادات واخرج (للتوافق فقط؛ يتم التعامل معها عن طريق جنّي حاليا)"
+"فقط طبّق الإعدادات واخرج (للتوافق فقط؛ يتم التعامل معها عن طريق جنّي حاليا)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:253
+#: ../capplets/keyboard/gnome-keyboard-properties.c:256
+#: ../capplets/sound/sound-properties-capplet.c:1159
+msgid "Retrieve and store legacy settings"
+msgstr "استرجع و خزن الإعدادات التقليديّة"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.c:260
 msgid "Start the page with the typing break settings showing"
 msgstr "ابدأ الصفحة بإعدادات استراحة الكتابة مرئية"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:258
+#: ../capplets/keyboard/gnome-keyboard-properties.c:265
 msgid "Start the page with the accessibility settings showing"
 msgstr "ابدأ الصفحة بإعدادات تسهيل الاستخدام مرئية"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:267
+#: ../capplets/keyboard/gnome-keyboard-properties.c:274
 msgid "- GNOME Keyboard Preferences"
 msgstr "- تفضيلات لوحة مفاتيح جنوم"
 
@@ -1979,42 +2081,42 @@ msgstr "<b>إبطاء المفاتيح</b>"
 msgid "<b>Sticky Keys</b>"
 msgstr "<b>المفاتيح الملتصقة</b>"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:7
-msgid "<b>_Lock screen to enforce typing break</b>"
-msgstr "<b>ا_قفل الشاشة لفرض استراحة عن الكتابة</b>"
-
 #. fast acceleration
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:8
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:7
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:13
 msgid "<small><i>Fast</i></small>"
 msgstr "<small><i>سريع</i></small>"
 
 #. long delay
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:9
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:8
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:19
 msgid "<small><i>Long</i></small>"
 msgstr "<small><i>طويل</i></small>"
 
 #. short delay
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:10
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:9
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:23
 msgid "<small><i>Short</i></small>"
 msgstr "<small><i>قصير</i></small>"
 
 #. slow acceleration
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:11
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:10
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:25
 msgid "<small><i>Slow</i></small>"
-msgstr "<small><i>بطيئ</i></small>"
+msgstr "<small><i>بطيء</i></small>"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:12
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:11
 msgid "A_cceleration:"
 msgstr "ال_تسارع:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:14
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:13
 msgid "All_ow postponing of breaks"
 msgstr "ا_سمح بتأجيل الاستراحات"
 
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:14
+msgid "Audio _Feedback..."
+msgstr "المردود ال_صوتي..."
+
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:15
 msgid "Beep when _accessibility features are turned on or off"
 msgstr "صافرة عند تشغيل أو تعطيل _ميزات تسهيل الاستخدام من لوحة المفاتيح"
@@ -2037,184 +2139,196 @@ msgstr "صافرة إذا _رُفض مفتاح"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:20
 msgid "Beep when key is _accepted"
-msgstr "صافرة إذا قـُبل المفتاح"
+msgstr "صافرة إذا قُبل المفتاح"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:21
 msgid "Beep when key is _rejected"
 msgstr "صافرة إ_ذا رُفض المفتاح"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:22
-msgid "Check if breaks are allowed to be postponed"
-msgstr "تثبت من انه يمكن تأجيل الإستراحات"
+msgid "By _country"
+msgstr "بالب_لد"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:23
+msgid "By _language"
+msgstr "بالل_غة"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:24
+msgid "Check if breaks are allowed to be postponed"
+msgstr "تثبت من أنه يمكن تأجيل الاستراحات"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:25
 msgid "Choose a Keyboard Model"
 msgstr "اختر طراز لوحة المفاتيح"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:24
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:26
 msgid "Choose a Layout"
-msgstr "اختر تخطيطاً"
+msgstr "اختر تخطيطًا"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:25
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:27
 msgid "Cursor _blinks in text fields"
 msgstr "_ومضات المؤشر في حقول النصوص"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:26
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:28
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:31
 msgid "Cursor blinks speed"
 msgstr "سرعة ومضات المؤشر"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:27
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:29
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:32
 msgid "D_elay:"
 msgstr "ال_تأخير:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:28
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:30
 msgid "Disa_ble sticky keys if two keys are pressed together"
-msgstr "ع_طِّل المفاتيح الملتصقة إذا ضـُغط مفتاحان في آن واحد"
+msgstr "ع_طِّل المفاتيح الملتصقة إذا ضُغط مفتاحان في آن واحد"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:29
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:31
 msgid "Duration of the break when typing is disallowed"
-msgstr "مدة الإستراحة عند منع الكتابة"
+msgstr "مدة الاستراحة عند منع الكتابة"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:30
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:32
 msgid "Duration of work before forcing a break"
-msgstr "مدة العمل قبل فرض إستراحة"
+msgstr "مدة العمل قبل فرض استراحة"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:31
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:33
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:36
 msgid "General"
 msgstr "عام"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:32
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:34
 msgid "Key presses _repeat when key is held down"
 msgstr "_تكرار نقر المفتاح عند الضغط عليه"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:33
-msgid "Keyboard Accessibility Notifications"
-msgstr "تنبيهات تسهيل استخدام لوحة المفاتيح"
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:35
+msgid "Keyboard Accessibility Audio Feedback"
+msgstr "المردود الصوتي لإتاحة لوحة المفاتيح"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:34
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:36
 msgid "Keyboard Layout Options"
 msgstr "خيارات تخطيط لوحة المفاتيح"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:35
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:37
 msgid "Keyboard Preferences"
 msgstr "تفضيلات لوحة المفاتيح"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:36
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:38
 msgid "Keyboard _model:"
 msgstr "_طراز لوحة المفاتيح:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:37
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:39
 msgid "Layout _Options..."
 msgstr "خيارات التخط_يط..."
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:38
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:40
 msgid "Layouts"
 msgstr "التخطيطات"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:39
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:41
 msgid ""
 "Lock screen after a certain duration to help prevent repetitive keyboard use "
 "injuries"
 msgstr ""
-"أقفل الشاشة بعد مدّة معيّنة للحماية من إستخدامات ممنوعة و متكرّرة للوحة المفاتيح"
+"أقفل الشاشة بعد مدّة معيّنة للحماية من إصابات الاستخدام المتكرر للوحة المفاتيح"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:40
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:42
 msgid "Mouse Keys"
 msgstr "مفاتيح الفأرة"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:41
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:43
 msgid "Preview:"
 msgstr "معاينة:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:42
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:44
 msgid "Repeat keys speed"
 msgstr "سرعة المفاتيح المعادة"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:43
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:45
 msgid "Reset to De_faults"
-msgstr "أعد التعيين للافترا_ضيات"
+msgstr "ا_ستعد المبدئيات"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:44
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:46
 msgid "S_peed:"
 msgstr "ال_سرعة:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:45
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:47
 msgid "Separate _layout for each window"
 msgstr "_تخطيط مستقل لكل نافذة"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:46
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:48
 msgid "Typing Break"
 msgstr "استراحة عن الكتابة"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:48
-msgid "_Allow to control the pointer using the keyboard"
-msgstr "اسمح بال_تحكم بالمؤشر باستخدام لوحة المفاتيح"
-
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:49
-msgid "_Allow to turn accessibility features on and off from the keyboard"
-msgstr "اسمح بت_شغيل وإطفاء ميزات تسهيل الاستخدام من لوحة المفاتيح"
+msgid "_Accessibility features can be toggled with keyboard shortcuts"
+msgstr "يمكن ت_شغيل وإطفاء ميزات تسهيل الاستخدام من لوحة المفاتيح"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:50
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:51
 msgid "_Break interval lasts:"
 msgstr "مدة الا_ستراحة:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:51
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:52
+msgid "_Country:"
+msgstr "الب_لد:"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:53
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:43
 msgid "_Delay:"
 msgstr "ال_تأخير:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:52
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:54
 msgid "_Ignore fast duplicate keypresses"
 msgstr "_تجاهل الضغطات المكررة السريعة للمفاتيح"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:53
-msgid "_Layouts:"
-msgstr "الت_خطيطات:"
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:55
+msgid "_Language:"
+msgstr "الل_غة:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:54
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:56
+msgid "_Lock screen to enforce typing break"
+msgstr "أ_قفل الشاشة لفرض استراحة عن الكتابة"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:57
 msgid "_Models:"
 msgstr "ال_طرُز:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:55
-msgid "_Notifications..."
-msgstr "الت_نبيهات..."
-
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:56
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:58
 msgid "_Only accept long keypresses"
 msgstr "_لا تقبل إلا المفاتيح المضغوطة لمدة"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:57
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:59
+msgid "_Pointer can be controlled using the keypad"
+msgstr "يمكن ال_تحكم في المؤشر باستخدام لوحة المفاتيح"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:60
 msgid "_Selected layouts:"
-msgstr "التخطيطات الم_نتقاة:"
+msgstr "التخطيطات الم_ختارة:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:58
-msgid "_Simulate simultanous keypresses"
-msgstr "_محاكاة ضغطات المفاتيح المتزامنة"
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:61
+msgid "_Simulate simultaneous keypresses"
+msgstr "_حاكى ضغطات المفاتيح المتزامنة"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:59
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:62
 msgid "_Speed:"
 msgstr "ال_سرعة:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:60
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:63
 msgid "_Type to test settings:"
-msgstr "ا_كتب لاختبار الاعدادات:"
+msgstr "ا_كتب لاختبار الإعدادات:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:61
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:64
 msgid "_Variants:"
-msgstr "المت_غيرات:"
+msgstr "ال_تنويعات:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:62
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:65
 msgid "_Vendors:"
-msgstr "البا_عة:"
+msgstr "ال_مُنتِج:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:63
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:66
 msgid "_Work interval lasts:"
 msgstr "مدة ال_عمل:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:64
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:67
 msgid "minutes"
 msgstr "دقائق"
 
@@ -2222,19 +2336,18 @@ msgstr "دقائق"
 msgid "Unknown"
 msgstr "مجهول"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-xkbltadd.c:211
-#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:307
-#: ../capplets/keyboard/gnome-keyboard-properties-xkbot.c:211
-msgid "Default"
-msgstr "الافتراضي"
-
-#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:301
+#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:305
 msgid "Layout"
 msgstr "التصميم"
 
+#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:311
+#: ../capplets/keyboard/gnome-keyboard-properties-xkbot.c:211
+msgid "Default"
+msgstr "المبدئي"
+
 #: ../capplets/keyboard/gnome-keyboard-properties-xkbmc.c:169
 msgid "Vendors"
-msgstr "الباعة"
+msgstr "المُنتِج"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-xkbmc.c:235
 msgid "Models"
@@ -2252,13 +2365,13 @@ msgstr "اضبط خصائص لوحة مفاتيحك"
 #. Don't include the prefix "gesture|" in the translation.
 #: ../capplets/mouse/gnome-mouse-accessibility.c:89
 msgid "gesture|Move left"
-msgstr "تحرّك يساراً"
+msgstr "تحرّك يسارًا"
 
 #. Translators: this is the gesture to trigger/choose the click type.
 #. Don't include the prefix "gesture|" in the translation.
 #: ../capplets/mouse/gnome-mouse-accessibility.c:94
 msgid "gesture|Move right"
-msgstr "تحرّك يميناً"
+msgstr "تحرّك يمينًا"
 
 #. Translators: this is the gesture to trigger/choose the click type.
 #. Don't include the prefix "gesture|" in the translation.
@@ -2278,18 +2391,27 @@ msgstr "تحرّك إلى أسفل"
 msgid "gesture|Disabled"
 msgstr "معطّل"
 
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplets/mouse/gnome-mouse-properties.c:443
+msgid "Specify the name of the page to show (general|accessibility)"
+msgstr "حدّد اسم الصفحة التي تريد إظهارها (general|accessibility)"
+
+#: ../capplets/mouse/gnome-mouse-properties.c:452
+msgid "- GNOME Mouse Preferences"
+msgstr "- تفضيلات فأرة جنوم"
+
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:1
 msgid "<b>Double-Click Timeout</b>"
 msgstr "<b>مهلة النقر المزدوج</b>"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:2
 msgid "<b>Drag and Drop</b>"
-msgstr "<b>السحب والإسقاط</b>"
+msgstr "<b>السحب والإفلات</b>"
 
 #. Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:4
 msgid "<b>Dwell Click</b>"
-msgstr "<b>نقر المَسكن</b>"
+msgstr "<b>النقر السلبي</b>"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:5
 msgid "<b>Locate Pointer</b>"
@@ -2311,16 +2433,14 @@ msgstr "<b>محاكاة النقر الثانوي</b>"
 msgid ""
 "<i>To test your double-click settings, try to double-click on the light bulb."
 "</i>"
-msgstr ""
-"<i>لاختبار إعدادات النقر المزدوج، جرّب نقراً مزدوجاً على المصباح.</i>"
+msgstr "<i>لاختبار إعدادات النقر المزدوج، جرّب نقرًا مزدوجًا على المصباح.</i>"
 
 #. Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:11
 msgid ""
 "<i>You can also use the Dwell Click panel applet to choose the click type.</"
 "i>"
-msgstr ""
-"<i>يمكنك أيضاً استخدام بريمج لوحة نقر المسكن لاختيار نوع النقر.</i>"
+msgstr "<i>يمكنك أيضًا استخدام بريمج النقر السلبي لاختيار نوع النقر.</i>"
 
 #. high sensitivity
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:15
@@ -2330,7 +2450,7 @@ msgstr "<small><i>عالٍ</i></small>"
 #. large threshold
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:17
 msgid "<small><i>Large</i></small>"
-msgstr "<small><i>عريض</i></small>"
+msgstr "<small><i>كبير</i></small>"
 
 #. low sensitivity
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:21
@@ -2344,7 +2464,7 @@ msgstr "<small><i>صغير</i></small>"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:29
 msgid "Choose type of click _beforehand"
-msgstr "اختر نوع النقر م_سبقاً"
+msgstr "اختر نوع النقر م_سبقًا"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:30
 msgid "Choose type of click with mo_use gestures"
@@ -2413,7 +2533,7 @@ msgstr "ا_لمهلة:"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:51
 msgid "_Trigger secondary click by holding down the primary button"
-msgstr "يسبب النقر الث_انوي عن طريق الاستمرار بضغط الزر الأولي"
+msgstr "يسبب النقر ال_ثانوي عن طريق الاستمرار بضغط الزر الأولي"
 
 #: ../capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
@@ -2425,11 +2545,11 @@ msgstr "اضبط تفضيلات فأرتك"
 
 #: ../capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
-msgstr "وكيل الشبكة"
+msgstr "وسيط الشبكة"
 
 #: ../capplets/network/gnome-network-preferences.desktop.in.in.h:2
 msgid "Set your network proxy preferences"
-msgstr "اضبط خيارات وكيل شبكتك"
+msgstr "اضبط خيارات وسيط شبكتك"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:1
 msgid "<b>Di_rect internet connection</b>"
@@ -2437,39 +2557,39 @@ msgstr "<b>ات_صال مباشر بالإنترنت</b>"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:2
 msgid "<b>Ignore Host List</b>"
-msgstr "<b>اهمل قائمة الخوادم</b>"
+msgstr "<b>أهمل قائمة المستضيفين</b>"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:3
 msgid "<b>_Automatic proxy configuration</b>"
-msgstr "<b>إعداد آ_لي للوكيل</b>"
+msgstr "<b>إعداد آ_لي للوسيط</b>"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:4
 msgid "<b>_Manual proxy configuration</b>"
-msgstr "<b>إعداد _يدوي للوكيل</b>"
+msgstr "<b>إعداد _يدوي للوسيط</b>"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:5
 msgid "<b>_Use authentication</b>"
-msgstr "<b>است_خدم التوثّق</b>"
+msgstr "<b>است_خدم الاستيثاق</b>"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:6
-msgid "Advanced Configuration"
-msgstr "التفضيلات المتقدمة"
+msgid "Autoconfiguration _URL:"
+msgstr "_مسار الإعداد الآلي:"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:7
-msgid "Autoconfiguration _URL:"
-msgstr "_مسار الإعداد آلي:"
+msgid "HTTP Proxy Details"
+msgstr "تفاصيل وسيط HTTP"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:8
-msgid "HTTP Proxy Details"
-msgstr "تفاصيل وكيل HTTP"
+msgid "H_TTP proxy:"
+msgstr "و_سيط HTTP:"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:9
-msgid "H_TTP proxy:"
-msgstr "و_كيل HTTP:"
+msgid "Ignored Hosts"
+msgstr "المستضيفين المهمَلين"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:10
 msgid "Network Proxy Preferences"
-msgstr "تفضيلات وكيل الشبكة"
+msgstr "تفضيلات وسيط الشبكة"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:11
 msgid "Port:"
@@ -2477,11 +2597,11 @@ msgstr "المنفذ:"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:12
 msgid "Proxy Configuration"
-msgstr "إعداد الوكيل"
+msgstr "إعداد الوسيط"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:13
 msgid "S_ocks host:"
-msgstr "مضيف S_ocks:"
+msgstr "مستضيف S_ocks:"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:14
 msgid "U_sername:"
@@ -2489,11 +2609,11 @@ msgstr "ا_سم المستخدم:"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:15
 msgid "_Details"
-msgstr "_تفاصيل"
+msgstr "ال_تفاصيل"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:16
 msgid "_FTP proxy:"
-msgstr "_وكيل FTP:"
+msgstr "_وسيط FTP:"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:17
 msgid "_Password:"
@@ -2501,11 +2621,11 @@ msgstr "_كلمة السر:"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:18
 msgid "_Secure HTTP proxy:"
-msgstr "وكيل HTTP _آمن:"
+msgstr "وسيط HTTP _آمن:"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:19
 msgid "_Use the same proxy for all protocols"
-msgstr "ا_ستخدم نفس الوكيل لكل البرتوكولات"
+msgstr "ا_ستخدم نفس الوسيط لكل البرتوكولات"
 
 #: ../capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
@@ -2514,55 +2634,55 @@ msgstr "فعِّل الصوت واربطه بالأحداث"
 #: ../capplets/sound/mixer-support.c:79
 #, c-format
 msgid "Unknown Volume Control %d"
-msgstr "تحكم شدّة مجهول %d"
+msgstr "تحكم شدّة مجهول %Id"
 
 #: ../capplets/sound/pipeline-tests.c:84
 #, c-format
 msgid "Failed to construct test pipeline for '%s'"
 msgstr "فشل تركيب خط أنابيب اختبار '%s'"
 
-#: ../capplets/sound/sound-properties-capplet.c:325
-#: ../capplets/sound/sound-properties-capplet.c:378
+#: ../capplets/sound/sound-properties-capplet.c:326
+#: ../capplets/sound/sound-properties-capplet.c:447
 msgid "Not connected"
 msgstr "غير متّصل"
 
-#: ../capplets/sound/sound-properties-capplet.c:661
+#: ../capplets/sound/sound-properties-capplet.c:785
 msgid "Autodetect"
-msgstr "تعرف آالي"
+msgstr "تعرف آليا"
 
-#: ../capplets/sound/sound-properties-capplet.c:666
-#: ../capplets/sound/sound-properties-capplet.c:667
+#: ../capplets/sound/sound-properties-capplet.c:790
+#: ../capplets/sound/sound-properties-capplet.c:791
 msgid "ALSA - Advanced Linux Sound Architecture"
-msgstr "ALSA - معماريّة لينكس المتقدّمة للصوت"
+msgstr "‏ALSA - معماريّة لينكس المتقدّمة للصوت"
 
-#: ../capplets/sound/sound-properties-capplet.c:668
+#: ../capplets/sound/sound-properties-capplet.c:792
 msgid "Artsd - ART Sound Daemon"
-msgstr "Artsd - خادم صوت ART"
+msgstr "‏Artsd - جني صوت ART"
 
-#: ../capplets/sound/sound-properties-capplet.c:669
-#: ../capplets/sound/sound-properties-capplet.c:670
+#: ../capplets/sound/sound-properties-capplet.c:793
+#: ../capplets/sound/sound-properties-capplet.c:794
 msgid "ESD - Enlightened Sound Daemon"
-msgstr "ESD - خادم صوت انلايتنمنت"
+msgstr "‏ESD - جني صوت إنلايتنمنت"
 
-#: ../capplets/sound/sound-properties-capplet.c:671
-#: ../capplets/sound/sound-properties-capplet.c:672
+#: ../capplets/sound/sound-properties-capplet.c:797
+#: ../capplets/sound/sound-properties-capplet.c:800
 msgid "OSS - Open Sound System"
-msgstr "OSS - نظام الصوت المفتوح"
+msgstr "‏OSS - نظام الصوت المفتوح"
 
-#: ../capplets/sound/sound-properties-capplet.c:673
-#: ../capplets/sound/sound-properties-capplet.c:674
+#: ../capplets/sound/sound-properties-capplet.c:802
+#: ../capplets/sound/sound-properties-capplet.c:803
 msgid "PulseAudio Sound Server"
-msgstr "خادم صوت PulseAudio"
+msgstr "خادوم صوت PulseAudio"
 
-#: ../capplets/sound/sound-properties-capplet.c:675
+#: ../capplets/sound/sound-properties-capplet.c:804
 msgid "Test Sound"
-msgstr "اختبر الأصوات"
+msgstr "اختبر الصوت"
 
-#: ../capplets/sound/sound-properties-capplet.c:676
+#: ../capplets/sound/sound-properties-capplet.c:805
 msgid "Silence"
 msgstr "صمت"
 
-#: ../capplets/sound/sound-properties-capplet.c:1043
+#: ../capplets/sound/sound-properties-capplet.c:1172
 msgid "- GNOME Sound Preferences"
 msgstr "- تفضيلات صوت جنوم"
 
@@ -2572,7 +2692,7 @@ msgstr "<b>اجتماع صوتي</b>"
 
 #: ../capplets/sound/sound-properties.glade.h:2
 msgid "<b>Default Mixer Tracks</b>"
-msgstr "<b>مقطوعات المازِج الإفتراضية</b>"
+msgstr "<b>مقطوعات المازِج المبدئية</b>"
 
 #: ../capplets/sound/sound-properties.glade.h:3
 msgid "<b>Music and Movies</b>"
@@ -2584,7 +2704,7 @@ msgstr "<b>الأحداث الصوتيّة</b>"
 
 #: ../capplets/sound/sound-properties.glade.h:5
 msgid "<span weight=\"bold\" size=\"x-large\">Testing...</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">اختبار...</span>"
+msgstr "<span weight=\"bold\" size=\"x-large\">يختبر...</span>"
 
 #: ../capplets/sound/sound-properties.glade.h:6
 msgid "Click OK to finish."
@@ -2592,11 +2712,11 @@ msgstr "انقر موافق للإنهاء."
 
 #: ../capplets/sound/sound-properties.glade.h:7
 msgid "Devices"
-msgstr "أجهزة"
+msgstr "الأجهزة"
 
 #: ../capplets/sound/sound-properties.glade.h:8
-msgid "E_nable software sound mixing (ESD)"
-msgstr "فعِّل تخليط الصوت البرمجي (ESD)"
+msgid "E_nable software sound mixing"
+msgstr "_فعِّل مزج الصوت البرمجي"
 
 #: ../capplets/sound/sound-properties.glade.h:9
 msgid "Flash _entire screen"
@@ -2615,8 +2735,8 @@ msgid ""
 "Select the device and tracks to control with the keyboard. Use the Shift and "
 "Control keys to select multiple tracks if required."
 msgstr ""
-"انتقِ الجهاز والمسارات التي تريد التحكم فيها باستخدام لوحة المفاتيح. استخدم "
-"مفاتيح  Shift و Control لتنقي أكثر من مسار إذا دعت الحاجة لذلك."
+"اختر الجهاز والمقطوعات التي تريد التحكم فيها باستخدام لوحة المفاتيح. استخدم "
+"مفاتيح  Shift و Control لتختار أكثر من مسار إذا دعت الحاجة لذلك."
 
 #: ../capplets/sound/sound-properties.glade.h:13
 msgid "So_und playback:"
@@ -2668,7 +2788,7 @@ msgstr "صافرة نظام _مرئيّة"
 
 #: ../capplets/windows/gnome-window-properties.c:344
 msgid "Cannot start the preferences application for your window manager"
-msgstr "لا يمكن تشغيل تطبيق تفضيلات مدير نوافذك"
+msgstr "تعذّر تشغيل تطبيق تفضيلات مدير نوافذك"
 
 #. translators: this is the Control key
 #: ../capplets/windows/gnome-window-properties.c:602
@@ -2685,7 +2805,7 @@ msgstr "H_yper"
 
 #: ../capplets/windows/gnome-window-properties.c:620
 msgid "S_uper (or \"Windows logo\")"
-msgstr "S_uper (أو \"شعار ويندوز\")"
+msgstr "‏S_uper (أو \"شعار ويندوز\")"
 
 #: ../capplets/windows/gnome-window-properties.c:627
 msgid "_Meta"
@@ -2701,11 +2821,11 @@ msgstr "<b>إجراء شريط العنوان</b>"
 
 #: ../capplets/windows/gnome-window-properties.glade.h:3
 msgid "<b>Window Selection</b>"
-msgstr "<b>انتقاء النّافذة</b>"
+msgstr "<b>تحديد النّافذة</b>"
 
 #: ../capplets/windows/gnome-window-properties.glade.h:4
 msgid "To move a window, press-and-hold this key then grab the window:"
-msgstr "لنقل نافذة، انقر و اضغط هذا المفتاح ثم امسك النافذة:"
+msgstr "لنقل نافذة، انقر و اضغط هذا المفتاح ثم أمسك النافذة:"
 
 #: ../capplets/windows/gnome-window-properties.glade.h:5
 msgid "Window Preferences"
@@ -2725,7 +2845,7 @@ msgstr "ا_رفع النافذة المختارة بعد فاصل زمني"
 
 #: ../capplets/windows/gnome-window-properties.glade.h:9
 msgid "_Select windows when the mouse moves over them"
-msgstr "ا_نتقي النوافذ عند تنقل الفأرة فوقها"
+msgstr "_حدد النوافذ عند تنقل الفأرة فوقها"
 
 #: ../capplets/windows/gnome-window-properties.glade.h:10
 msgid "seconds"
@@ -2740,38 +2860,38 @@ msgid "Windows"
 msgstr "النوافذ"
 
 #. make start action
-#: ../libslab/application-tile.c:369
+#: ../libslab/application-tile.c:372
 #, c-format
 msgid "<b>Start %s</b>"
 msgstr "<b>ابدأ %s</b>"
 
-#: ../libslab/application-tile.c:388
+#: ../libslab/application-tile.c:391 ../libslab/bookmark-agent.c:1059
 msgid "Help"
 msgstr "مساعدة"
 
-#: ../libslab/application-tile.c:435
+#: ../libslab/application-tile.c:438
 msgid "Upgrade"
 msgstr "رقّي"
 
-#: ../libslab/application-tile.c:450
+#: ../libslab/application-tile.c:453
 msgid "Uninstall"
-msgstr "الغ التثبيت"
+msgstr "أزِل"
 
-#: ../libslab/application-tile.c:777 ../libslab/document-tile.c:737
+#: ../libslab/application-tile.c:780 ../libslab/document-tile.c:760
 msgid "Remove from Favorites"
 msgstr "احذف من المفضّلة"
 
-#: ../libslab/application-tile.c:779 ../libslab/document-tile.c:739
+#: ../libslab/application-tile.c:782 ../libslab/document-tile.c:762
 msgid "Add to Favorites"
 msgstr "أضِف للمفضّلة"
 
-#: ../libslab/application-tile.c:864
+#: ../libslab/application-tile.c:867
 msgid "Remove from Startup Programs"
-msgstr "احذف من برامج بدأ التشغيل"
+msgstr "احذف من برامج بدء التشغيل"
 
-#: ../libslab/application-tile.c:866
+#: ../libslab/application-tile.c:869
 msgid "Add to Startup Programs"
-msgstr "اضِف لبرامج بدأ التشغيل"
+msgstr "أضِف لبرامج بدء التشغيل"
 
 #: ../libslab/app-shell.c:750
 #, c-format
@@ -2788,104 +2908,121 @@ msgstr ""
 msgid "Other"
 msgstr "أخرى"
 
-#: ../libslab/bookmark-agent.c:1060
+#: ../libslab/bookmark-agent.c:1061
+msgid "Lock Screen"
+msgstr "أقفل الشاشة"
+
+#: ../libslab/bookmark-agent.c:1063 ../libsounds/sound-view.c:45
+msgid "Logout"
+msgstr "اخرج"
+
+#: ../libslab/bookmark-agent.c:1065
+msgid "Shutdown"
+msgstr "أطفئ"
+
+#: ../libslab/bookmark-agent.c:1090
 msgid "New Spreadsheet"
 msgstr "ورقة حساب جديدة"
 
-#: ../libslab/bookmark-agent.c:1064
+#: ../libslab/bookmark-agent.c:1095
 msgid "New Document"
 msgstr "مستند جديد"
 
-#: ../libslab/bookmark-agent.c:1114
+#: ../libslab/bookmark-agent.c:1147
 msgid "Home"
-msgstr "ال_موطن:"
+msgstr "ال_منزل:"
 
-#: ../libslab/bookmark-agent.c:1130
+#: ../libslab/bookmark-agent.c:1152
+msgid "Documents"
+msgstr "مستندات"
+
+#: ../libslab/bookmark-agent.c:1165
 msgid "File System"
 msgstr "نظام الملفات"
 
-#: ../libslab/bookmark-agent.c:1134
+#: ../libslab/bookmark-agent.c:1169
 msgid "Network Servers"
-msgstr "خادمات الشبكة"
+msgstr "خواديم الشبكة"
 
-#: ../libslab/bookmark-agent.c:1163
+#: ../libslab/bookmark-agent.c:1198
 msgid "Search"
 msgstr "ابحث"
 
 #. make open with default action
 #: ../libslab/directory-tile.c:170
+#, c-format
 msgid "<b>Open</b>"
 msgstr "<b>افتح</b>"
 
 #. make rename action
-#: ../libslab/directory-tile.c:189 ../libslab/document-tile.c:228
+#: ../libslab/directory-tile.c:189 ../libslab/document-tile.c:242
 msgid "Rename..."
-msgstr "أعِد تسمية..."
+msgstr "غيّر الاسم..."
 
 #: ../libslab/directory-tile.c:203 ../libslab/directory-tile.c:212
-#: ../libslab/document-tile.c:242 ../libslab/document-tile.c:251
+#: ../libslab/document-tile.c:256 ../libslab/document-tile.c:265
 msgid "Send To..."
-msgstr "ارسل إلى..."
+msgstr "أرسل إلى..."
 
 #. make move to trash action
-#: ../libslab/directory-tile.c:227 ../libslab/document-tile.c:277
+#: ../libslab/directory-tile.c:227 ../libslab/document-tile.c:291
 msgid "Move to Trash"
 msgstr "انقل للمهملات"
 
 #: ../libslab/directory-tile.c:237 ../libslab/directory-tile.c:450
-#: ../libslab/document-tile.c:287 ../libslab/document-tile.c:850
+#: ../libslab/document-tile.c:301 ../libslab/document-tile.c:873
 msgid "Delete"
 msgstr "احذف"
 
-#: ../libslab/directory-tile.c:575 ../libslab/document-tile.c:1022
+#: ../libslab/directory-tile.c:575 ../libslab/document-tile.c:1045
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
-msgstr "هل أنت متأكد أنك تريد حذف \"%s\" نهائياً؟"
+msgstr "أمتأكد أنك تريد حذف \"%s\" نهائيًا؟"
 
-#: ../libslab/directory-tile.c:580 ../libslab/document-tile.c:1026
+#: ../libslab/directory-tile.c:580 ../libslab/document-tile.c:1049
 msgid "If you delete an item, it is permanently lost."
-msgstr "إذا حذفت عنصراً، فسيُفقد إلى الأبد."
+msgstr "إذا حذفت عنصرًا، فسيُفقد إلى الأبد."
 
-#: ../libslab/document-tile.c:189
+#: ../libslab/document-tile.c:203
 #, c-format
 msgid "<b>Open with \"%s\"</b>"
-msgstr "<b>افتح بـ \"%s\"</b>"
+msgstr "<b>افتح باستخدام \"%s\"</b>"
 
-#: ../libslab/document-tile.c:201
+#: ../libslab/document-tile.c:215
 msgid "Open with Default Application"
-msgstr "افتح بالتطبيق الإفتراضي"
+msgstr "افتح بالتطبيق المبدئي"
 
-#: ../libslab/document-tile.c:212
+#: ../libslab/document-tile.c:226
 msgid "Open in File Manager"
 msgstr "افتح في مدير الملفّات"
 
-#: ../libslab/document-tile.c:633
+#: ../libslab/document-tile.c:656
 msgid "?"
 msgstr "؟"
 
-#: ../libslab/document-tile.c:640
+#: ../libslab/document-tile.c:663
 msgid "%l:%M %p"
-msgstr "%l:%M %p"
+msgstr "%Ol:%OM %p"
 
-#: ../libslab/document-tile.c:648
+#: ../libslab/document-tile.c:671
 msgid "Today %l:%M %p"
-msgstr "اليوم %l:%M %p"
+msgstr "اليوم %Ol:%OM %p"
 
-#: ../libslab/document-tile.c:658
+#: ../libslab/document-tile.c:681
 msgid "Yesterday %l:%M %p"
-msgstr "البارحة %l:%M %p"
+msgstr "بالأمس %Ol:%OM %p"
 
-#: ../libslab/document-tile.c:670
+#: ../libslab/document-tile.c:693
 msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+msgstr "%A %Ol:%OM %p"
 
-#: ../libslab/document-tile.c:678
+#: ../libslab/document-tile.c:701
 msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%b %Od %Ol:%OM %"
 
-#: ../libslab/document-tile.c:680
+#: ../libslab/document-tile.c:703
 msgid "%b %d %Y"
-msgstr "%b %d %Y"
+msgstr "%b %Od %Y"
 
 #: ../libslab/libslab-bookmarkfile.c:700 ../libslab/libslab-bookmarkfile.c:777
 #: ../libslab/libslab-bookmarkfile.c:856 ../libslab/libslab-bookmarkfile.c:903
@@ -2916,13 +3053,14 @@ msgid "Unexpected tag '%s' inside '%s'"
 msgstr "الوسم '%s' غير متوقع داخل '%s'"
 
 #: ../libslab/libslab-bookmarkfile.c:1929
+#, c-format
 msgid "No valid bookmark file found in data dirs"
-msgstr "لا يوجد ملف علامات مرجعية صالح في مجلدات البيانات"
+msgstr "لا يوجد ملف علامات صالح في مجلدات البيانات"
 
 #: ../libslab/libslab-bookmarkfile.c:2130
 #, c-format
 msgid "A bookmark for URI '%s' already exists"
-msgstr "هناك علامة مرجعية للعنوان '%s' موجودة مسبقاً"
+msgstr "هناك علامة للمسار '%s' موجودة مسبقًا"
 
 #: ../libslab/libslab-bookmarkfile.c:2176
 #: ../libslab/libslab-bookmarkfile.c:2333
@@ -2943,32 +3081,32 @@ msgstr "هناك علامة مرجعية للعنوان '%s' موجودة مسب
 #: ../libslab/libslab-bookmarkfile.c:3790
 #, c-format
 msgid "No bookmark found for URI '%s'"
-msgstr "لا علامات مرجعية موجودة للعنوان '%s'"
+msgstr "لا علامات موجودة للمسار '%s'"
 
 #: ../libslab/libslab-bookmarkfile.c:2508
 #, c-format
 msgid "No MIME type defined in the bookmark for URI '%s'"
-msgstr "لا نوع MIME معرّف في العلامة المرجعية للعنوان '%s'"
+msgstr "لا نوع MIME معرّف في علامة المسار '%s'"
 
 #: ../libslab/libslab-bookmarkfile.c:2593
 #, c-format
 msgid "No private flag has been defined in bookmark for URI '%s'"
-msgstr "لا أعلام خاصة قد عُرّفت لعلامة الموقع المرجعية '%s'"
+msgstr "لا أعلام خاصة قد عُرّفت لعلامة المسار '%s'"
 
 #: ../libslab/libslab-bookmarkfile.c:2972
 #, c-format
 msgid "No groups set in bookmark for URI '%s'"
-msgstr "لا مجموعات معينة في علامة الموقع المرجعية '%s'"
+msgstr "لا مجموعات معينة في علامة المسار '%s'"
 
 #: ../libslab/libslab-bookmarkfile.c:3373
 #: ../libslab/libslab-bookmarkfile.c:3518
 #, c-format
 msgid "No application with name '%s' registered a bookmark for '%s'"
-msgstr "لا تطبيق له الاسم '%s' مسجل كعلامة مرجعية لـ '%s'"
+msgstr "لا تطبيق له الاسم '%s' مسجل كعلامة لـ '%s'"
 
 #: ../libslab/search-bar.c:255
 msgid "Find Now"
-msgstr "اعثر الآن"
+msgstr "ابحث الآن"
 
 #: ../libslab/system-tile.c:128
 #, c-format
@@ -2976,67 +3114,64 @@ msgid "<b>Open %s</b>"
 msgstr "<b>افتح %s</b>"
 
 #: ../libslab/system-tile.c:141
+#, c-format
 msgid "Remove from System Items"
 msgstr "احذف من عناصر النظام"
 
-#: ../libsounds/sound-view.c:43
+#: ../libsounds/sound-view.c:44
 msgid "Login"
 msgstr "ادخل"
 
-#: ../libsounds/sound-view.c:44
-msgid "Logout"
-msgstr "اخرج"
-
-#: ../libsounds/sound-view.c:45
+#: ../libsounds/sound-view.c:46
 msgid "Boing"
 msgstr "بوينج"
 
-#: ../libsounds/sound-view.c:46
+#: ../libsounds/sound-view.c:47
 msgid "Siren"
 msgstr "صافرة إنذار"
 
-#: ../libsounds/sound-view.c:47
+#: ../libsounds/sound-view.c:48
 msgid "Clink"
 msgstr "صلصلة"
 
-#: ../libsounds/sound-view.c:48
+#: ../libsounds/sound-view.c:49
 msgid "Beep"
 msgstr "صافِرة"
 
-#: ../libsounds/sound-view.c:49
+#: ../libsounds/sound-view.c:50
 msgid "No sound"
 msgstr "لا صوت"
 
-#: ../libsounds/sound-view.c:131
+#: ../libsounds/sound-view.c:132
 msgid "Sound not set for this event."
 msgstr "الصوت لهذا الحدث غير معين."
 
-#: ../libsounds/sound-view.c:140
+#: ../libsounds/sound-view.c:141
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package for a set of default sounds."
 msgstr ""
 "ملف الصوت لهذا الحدث غير موجود.\n"
-"قد يتوجب عليك تثبيت حزمة gnome-audio للحصول على مجموعة من الأصوات الإفتراضية."
+"قد يتوجب عليك تثبيت حزمة gnome-audio للحصول على مجموعة من الأصوات المبدئية."
 
-#: ../libsounds/sound-view.c:151
+#: ../libsounds/sound-view.c:152
 msgid "The sound file for this event does not exist."
 msgstr "ملف الصوت لهذا الحدث غير موجود."
 
-#: ../libsounds/sound-view.c:182
+#: ../libsounds/sound-view.c:183
 msgid "Select Sound File"
-msgstr "انتق ملف صوت"
+msgstr "اختر ملف صوت"
 
-#: ../libsounds/sound-view.c:209
+#: ../libsounds/sound-view.c:210
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "الملف %s ليس ملف wav سليم"
 
-#: ../libsounds/sound-view.c:270
+#: ../libsounds/sound-view.c:271
 msgid "Select sound file..."
-msgstr "انتقِ ملف صوت..."
+msgstr "اخترِ ملف صوت..."
 
-#: ../libsounds/sound-view.c:372
+#: ../libsounds/sound-view.c:373
 msgid "System Sounds"
 msgstr "أصوات النظام"
 
@@ -3045,19 +3180,27 @@ msgstr "أصوات النظام"
 msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr "لم يسجل مدير النوافذ \"%s\" أيّة أداة إعداد\n"
 
-#: ../libwindow-settings/metacity-window-manager.c:390
+#: ../libwindow-settings/metacity-window-manager.c:402
 msgid "Maximize"
 msgstr "كبِّر"
 
-#: ../libwindow-settings/metacity-window-manager.c:391
+#: ../libwindow-settings/metacity-window-manager.c:403
+msgid "Maximize Vertically"
+msgstr "كبّر رأسيا"
+
+#: ../libwindow-settings/metacity-window-manager.c:404
+msgid "Maximize Horizontally"
+msgstr "كبّر أفقيا"
+
+#: ../libwindow-settings/metacity-window-manager.c:405
 msgid "Minimize"
-msgstr "صغـّر"
+msgstr "صغّر"
 
-#: ../libwindow-settings/metacity-window-manager.c:392
+#: ../libwindow-settings/metacity-window-manager.c:406
 msgid "Roll up"
 msgstr "لُف للأعلى"
 
-#: ../libwindow-settings/metacity-window-manager.c:393
+#: ../libwindow-settings/metacity-window-manager.c:407
 msgid "None"
 msgstr "لا شيء"
 
@@ -3097,11 +3240,11 @@ msgstr "اخرج من الصدفة عند أداء إجراء مساعدة"
 
 #: ../shell/control-center.schemas.in.h:4
 msgid "Exit shell on start action performed"
-msgstr "اخرج من الصدفة عند أداء إجراء بدأ"
+msgstr "اخرج من الصدفة عند أداء إجراء بدء"
 
 #: ../shell/control-center.schemas.in.h:5
 msgid "Exit shell on upgrade or uninstall action performed"
-msgstr "اخرج من الصدفة عند أداء إجراء تحديث أو إزالة تثبيت"
+msgstr "اخرج من الصدفة عند أداء إجراء ترقية أو إزالة"
 
 #: ../shell/control-center.schemas.in.h:6
 msgid "Indicates whether to close the shell when a help action is performed."
@@ -3133,8 +3276,8 @@ msgid ""
 "separator then the filename of an associated .desktop file to launch for "
 "that task."
 msgstr ""
-"أسماء المهام التي ستعرض في مركز التحكم مفصولة بفاصل \";"
-"\" ثم اسم ملف .desktop المرتبط لإطلاق هذه المهمّة."
+"أسماء المهام التي ستعرض في مركز التحكم مفصولة بفاصل \";\" ثم اسم ملف ."
+"desktop المرتبط لإطلاق هذه المهمّة."
 
 #. Translators: The format of this string is the task name to be displayed (translate that part) followed by a ";" separator then the filename (DONT translate the file name) of a .desktop file to launch. Multiple entries are separated by a ","
 #: ../shell/control-center.schemas.in.h:13
@@ -3148,7 +3291,7 @@ msgstr ""
 #: ../shell/control-center.schemas.in.h:14
 msgid ""
 "if true, the control-center will close when a \"Common Task\" is activated."
-msgstr "إذا كان صحيحاً، سيغلق سطح المكتب عند تنشيط \"مهمة شائعة\""
+msgstr "إذا كان صحيحًا، سيغلق سطح المكتب عند تنشيط \"مهمة شائعة\""
 
 #: ../shell/gnomecc.desktop.in.in.h:2
 msgid "The GNOME configuration tool"
@@ -3156,11 +3299,11 @@ msgstr "أداة إعداد جنوم"
 
 #: ../typing-break/drw-break-window.c:188
 msgid "_Postpone Break"
-msgstr "أخـّر الاستراح_ة"
+msgstr "أخّر الاستراح_ة"
 
 #: ../typing-break/drw-break-window.c:244
 msgid "Take a break!"
-msgstr "استرِح!"
+msgstr "استرِح"
 
 #. { N_("/_Enabled"),      NULL, GIF_CB (popup_enabled_cb),     POPUP_ITEM_ENABLED, "<ToggleItem>", NULL },
 #. translators: keep the initial "/"
@@ -3170,7 +3313,7 @@ msgstr "/الت_فضيلات"
 
 #: ../typing-break/drwright.c:130
 msgid "/_About"
-msgstr "/_حوْل"
+msgstr "/_عنْ"
 
 #: ../typing-break/drwright.c:132
 msgid "/_Take a Break"
@@ -3180,21 +3323,24 @@ msgstr "/ا_سترِح"
 #, c-format
 msgid "%d minute until the next break"
 msgid_plural "%d minutes until the next break"
-msgstr[0] "دقيقة واحدة حتّى التّوقّف التّالي"
-msgstr[1] "دقيقتان حتّى التّوقّف التّالي"
-msgstr[2] "%d دقائق حتّى التّوقّف التّالي"
-msgstr[3] "%d دقيقة حتّى التّوقّف التّالي"
+msgstr[0] "أقل من دقيقة حتّى الاستراحة التالية"
+msgstr[1] "دقيقة واحدة حتّى الاستراحة التالية"
+msgstr[2] "دقيقتان حتّى الاستراحة التالية"
+msgstr[3] "%Id دقائق حتّى الاستراحة التالية"
+msgstr[4] "%Id دقيقة حتّى الاستراحة التالية"
+msgstr[5] "%Id دقيقة حتّى الاستراحة التالية"
 
 #: ../typing-break/drwright.c:505
+#, c-format
 msgid "Less than one minute until the next break"
-msgstr "أقل من دقيقة حتى الإستراحة القادمة"
+msgstr "أقل من دقيقة حتى الاستراحة التالية"
 
 #: ../typing-break/drwright.c:592
 #, c-format
 msgid ""
 "Unable to bring up the typing break properties dialog with the following "
 "error: %s"
-msgstr "لا يمكن إحضار حوار خصائص إستراحة الكتابة بسبب الخطأ التالي: %s"
+msgstr "تعذّر إحضار حوار خصائص استراحة الكتابة بسبب الخطأ التالي: %s"
 
 #: ../typing-break/drwright.c:611
 msgid "Written by Richard Hult <richard@imendio.com>"
@@ -3202,11 +3348,11 @@ msgstr "كتبَهُ ريتشارد هولت <richard@imendio.com>"
 
 #: ../typing-break/drwright.c:612
 msgid "Eye candy added by Anders Carlsson"
-msgstr "اضيفت الجماليّات من قبل أندرس كارلسن"
+msgstr "أضاف الجماليّات أندرس كارلسن"
 
 #: ../typing-break/drwright.c:621
 msgid "A computer break reminder."
-msgstr "مذكّر الإستراحة عن الحاسوب."
+msgstr "مذكّر الاستراحة عن الحاسوب."
 
 #: ../typing-break/drwright.c:623
 msgid "translator-credits"
@@ -3222,7 +3368,7 @@ msgstr ""
 
 #: ../typing-break/main.c:61
 msgid "Enable debugging code"
-msgstr "فعلّ شيفرة التنقيح"
+msgstr "فعلّ كود التنقيح"
 
 #: ../typing-break/main.c:63
 msgid "Don't check whether the notification area exists"
@@ -3241,81 +3387,81 @@ msgid ""
 msgstr ""
 "يستخدم مراقب الكتابة مساحة التبليغ لعرض المعلومات. يبدو أنك لا تملك مساحة "
 "تبليغ على شريطك. يمكنك إضافتها بنقر يمينيّ على شريطك و اختيار 'أضِف للشريط' ثم "
-"انتقاء 'مساحة التبليغ' ثم النقر على أضِف."
+"اختيار 'مساحة التبليغ' ثم النقر على أضِف."
 
 #: ../vfs-methods/fontilus/fontilus-context-menu.c:132
 msgid "Set as Application Font"
-msgstr "اضبط كخط التطبيقات"
+msgstr "اجعله خط التطبيقات"
 
 #: ../vfs-methods/fontilus/fontilus-context-menu.c:133
 msgid "Sets the default application font"
-msgstr "يحدد خط التطبيقات الإفتراضي"
+msgstr "يحدد خط التطبيقات المبدئي"
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
-msgstr "إذا ضبط لصحيح، فستنشأ مستعرضات عن خطوط OpenType."
+msgstr "إذا ضبط لصحيح، فستنشأ مصغرات لخطوط OpenType."
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:2
 msgid "If set to true, then PCF fonts will be thumbnailed."
-msgstr "إذا ضبط لصحيح، فستنشأ مستعرضات عن خطوط PCF."
+msgstr "إذا ضبط لصحيح، فستنشأ مصغرات لخطوط PCF."
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:3
 msgid "If set to true, then TrueType fonts will be thumbnailed."
-msgstr "إذا ضبط لصحيح، فستنشأ مستعرضات عن خطوط TrueType."
+msgstr "إذا ضبط لصحيح، فستنشأ مصغرات لخطوط TrueType."
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:4
 msgid "If set to true, then Type1 fonts will be thumbnailed."
-msgstr "إذا ضبط لصحيح، فستنشأ مستعرضات عن خطوط Type1."
+msgstr "إذا ضبط لصحيح، فستنشأ مصغرات لخطوط Type1."
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:5
 msgid ""
 "Set this key to the command used to create thumbnails for OpenType fonts."
-msgstr "اضبط هذا المفتاح للأمر المجعول لإنشاء المستعرضات لخطوط OpenType."
+msgstr "اضبط هذا المفتاح للأمر المجعول لإنشاء مصغرات خطوط OpenType."
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:6
 msgid "Set this key to the command used to create thumbnails for PCF fonts."
-msgstr "اضبط هذا المفتاح للأمر المجعول لإنشاء المستعرضات لخطوط PCF."
+msgstr "اضبط هذا المفتاح للأمر المجعول لإنشاء مصغرات خطوط PCF."
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:7
 msgid ""
 "Set this key to the command used to create thumbnails for TrueType fonts."
-msgstr "اضبط هذا المفتاح للأمر المجعول لإنشاء المستعرضات لخطوط TrueType."
+msgstr "اضبط هذا المفتاح للأمر المجعول لإنشاء مصغرات خطوط TrueType."
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:8
 msgid "Set this key to the command used to create thumbnails for Type1 fonts."
-msgstr "اضبط هذا المفتاح للأمر المجعول لإنشاء المستعرضات لخطوط Type1."
+msgstr "اضبط هذا المفتاح للأمر المجعول لإنشاء مصغرات خطوط Type1."
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:9
 msgid "Thumbnail command for OpenType fonts"
-msgstr "أمر إنشاء المستعرضات لخطوط OpenType"
+msgstr "أمر إنشاء مصغرات خطوط OpenType"
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:10
 msgid "Thumbnail command for PCF fonts"
-msgstr "أمر إنشاء المستعرضات لخطوط PCF"
+msgstr "أمر إنشاء مصغرات خطوط PCF"
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:11
 msgid "Thumbnail command for TrueType fonts"
-msgstr "أمر إنشاء المستعرضات لخطوط TrueType"
+msgstr "أمر إنشاء مصغرات خطوط TrueType"
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:12
 msgid "Thumbnail command for Type1 fonts"
-msgstr "أمر إنشاء المستعرضات لخطوط Type1"
+msgstr "أمر إنشاء مصغرات خطوط Type1"
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:13
 msgid "Whether to thumbnail OpenType fonts"
-msgstr "فيما إذا ستنشأ مستعرضات لخطوط OpenType"
+msgstr "فيما إذا ستنشأ مصغرات لخطوط OpenType"
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:14
 msgid "Whether to thumbnail PCF fonts"
-msgstr "فيما إذا ستنشأ مستعرضات لخطوط PCF"
+msgstr "فيما إذا ستنشأ مصغرات لخطوط PCF"
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:15
 msgid "Whether to thumbnail TrueType fonts"
-msgstr "فيما إذا ستنشأ مستعرضات لخطوط TrueType"
+msgstr "فيما إذا ستنشأ مصغرات لخطوط TrueType"
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:16
 msgid "Whether to thumbnail Type1 fonts"
-msgstr "فيما إذا ستنشأ مستعرضات لخطوط Type1"
+msgstr "فيما إذا ستنشأ مصغرات لخطوط Type1"
 
 #: ../vfs-methods/fontilus/font-view.c:115
 msgid "The quick brown fox jumps over the lazy dog. 0123456789"
@@ -3345,11 +3491,11 @@ msgstr "الإصدارة:"
 #: ../vfs-methods/fontilus/font-view.c:343
 #: ../vfs-methods/fontilus/font-view.c:354
 msgid "Copyright:"
-msgstr "حقوق النسخ:"
+msgstr "حقوق النشر:"
 
 #: ../vfs-methods/fontilus/font-view.c:347
 msgid "Description:"
-msgstr "ال_وصف:"
+msgstr "الوصف:"
 
 #: ../vfs-methods/fontilus/font-view.c:408
 #, c-format
@@ -3362,11 +3508,11 @@ msgstr "عارض الخطوط"
 
 #: ../vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
 msgid "Preview fonts"
-msgstr "اعرض خطوط"
+msgstr "عاين الخطوط"
 
 #: ../vfs-methods/fontilus/thumbnailer.c:242
 msgid "Text to thumbnail (default: Aa)"
-msgstr "نص الى مظهر (افتراضي Aa)"
+msgstr "النص الذي سيوضع في المصغرة (المبدئي: Aa)"
 
 #: ../vfs-methods/fontilus/thumbnailer.c:242
 msgid "TEXT"
@@ -3374,7 +3520,7 @@ msgstr "نص"
 
 #: ../vfs-methods/fontilus/thumbnailer.c:244
 msgid "Font size (default: 64)"
-msgstr "حجم النص (افتراضي: 64)"
+msgstr "حجم النص (المبدئي: 64)"
 
 #: ../vfs-methods/fontilus/thumbnailer.c:244
 msgid "SIZE"
@@ -3411,54 +3557,54 @@ msgstr "اس_تخدم الخط"
 msgid "Themes"
 msgstr "السِمات"
 
-#: ../vfs-methods/themus/themus-properties-view.c:127
+#: ../vfs-methods/themus/themus-properties-view.c:128
 msgid "Description"
 msgstr "الوصف"
 
-#: ../vfs-methods/themus/themus-properties-view.c:134
+#: ../vfs-methods/themus/themus-properties-view.c:135
 msgid "Control theme"
 msgstr "سِمة التحكّم"
 
-#: ../vfs-methods/themus/themus-properties-view.c:140
+#: ../vfs-methods/themus/themus-properties-view.c:141
 msgid "Window border theme"
 msgstr "سِمة حدود النافذة"
 
-#: ../vfs-methods/themus/themus-properties-view.c:146
+#: ../vfs-methods/themus/themus-properties-view.c:147
 msgid "Icon theme"
 msgstr "سِمة الأيقونات"
 
 #: ../vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
-msgstr "إذا ضبط لصحيح فستنشأ مستعرضات عن الخطوط المثبّتة."
+msgstr "إذا ضبط لصحيح فستنشأ مصغرات عن الخطوط المثبّتة."
 
 #: ../vfs-methods/themus/themus.schemas.in.h:2
 msgid "If set to true, then themes will be thumbnailed."
-msgstr "إذا ضبط لصحيح فستنشأ مستعرضات عن السِمات."
+msgstr "إذا ضبط لصحيح فستنشأ مصغرات عن السِمات."
 
 #: ../vfs-methods/themus/themus.schemas.in.h:3
 msgid ""
 "Set this key to the command used to create thumbnails for installed themes."
-msgstr "اضبط هذ المفتاح للأمر المستخدم لإنشاء مستعرضات عن السِمات المثبّتة."
+msgstr "اضبط هذ المفتاح للأمر المستخدم لإنشاء مصغرات عن السِمات المثبّتة."
 
 #: ../vfs-methods/themus/themus.schemas.in.h:4
 msgid "Set this key to the command used to create thumbnails for themes."
-msgstr "اضبط هذ المفتاح للأمر المستخدم لإنشاء مستعرضات عن السِمات."
+msgstr "اضبط هذ المفتاح للأمر المستخدم لإنشاء مصغرات عن السِمات."
 
 #: ../vfs-methods/themus/themus.schemas.in.h:5
 msgid "Thumbnail command for installed themes"
-msgstr "أمر إنشاء مستعرضات للسِمات المثبّتة"
+msgstr "أمر إنشاء مصغرات للسِمات المثبّتة"
 
 #: ../vfs-methods/themus/themus.schemas.in.h:6
 msgid "Thumbnail command for themes"
-msgstr "أمر إنشاء مستعرضات السِمات"
+msgstr "أمر إنشاء مصغرات السِمات"
 
 #: ../vfs-methods/themus/themus.schemas.in.h:7
 msgid "Whether to thumbnail installed themes"
-msgstr "فيما إذا يقع إنشاء مستعرضات للسِمات المثبّتة"
+msgstr "فيما إذا يقع إنشاء مصغرات للسِمات المثبّتة"
 
 #: ../vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
-msgstr "فيما إذا يقع إنشاء مستعرضات للسِمات"
+msgstr "فيما إذا يقع إنشاء مصغرات للسِمات"
 
 #. translators: you may want to include non-western chars here
 #: ../vfs-methods/themus/themus-theme-applier.c:58
@@ -3475,886 +3621,7 @@ msgstr "استخدم السِمة"
 
 #: ../vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
 msgid "Sets the default theme"
-msgstr "يحدد السِمة الإفتراضية"
-
-#~ msgid "Go _to Fonts Folder"
-#~ msgstr "اذهب إلى _مجلد الخطوط"
-
-#~ msgid "Autostart the preferred AT"
-#~ msgstr "تشغيل تلقائي لـ AT المفضل"
-
-#~ msgid "Visual"
-#~ msgstr "المرئي"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid "      "
-#~ msgstr "......"
-
-#~ msgid "There was an error launching the mouse preferences dialog: %s"
-#~ msgstr "حصل خطأ اثناء تشغيل حوار تفضيلات الفأرة: %s"
-
-#~ msgid "Unable to import AccessX settings from file '%s'"
-#~ msgstr "لا يمكن استيراد اعدادات AccessX من الملف '%s'"
-
-#~ msgid "Import Feature Settings File"
-#~ msgstr "استورد ملف اعدادات الميزة"
-
-#~ msgid "_Import"
-#~ msgstr "إ_ستورد"
-
-#~ msgid "Keyboard Accessibility"
-#~ msgstr "إتاحة لوحة المفاتيح"
-
-#~ msgid "Set your keyboard accessibility preferences"
-#~ msgstr "اضبط خيارات الإتاحة للوحة مفاتيحك"
-
-#~ msgid ""
-#~ "This system does not seem to have the XKB extension.  The keyboard "
-#~ "accessibility features will not operate without it."
-#~ msgstr ""
-#~ "يبدو أن هذا النظام لا يملك امتداد XKB.لن تعمل ميزات إتاحة لوحة المفاتيح "
-#~ "بدونه."
-
-#~ msgid "<b>Enable Bo_unce Keys</b>"
-#~ msgstr "<b>فعِّل المفاتيح ال_مرتدّة</b>"
-
-#~ msgid "<b>Enable Slo_w Keys</b>"
-#~ msgstr "<b>فعِّل إ_بطاء المفاتيح</b>"
-
-#~ msgid "<b>Enable _Mouse Keys</b>"
-#~ msgstr "<b>فعِّل مفاتيح ال_فأرة</b>"
-
-#~ msgid "<b>Enable _Repeat Keys</b>"
-#~ msgstr "<b>فعِّل إ_عادة نقر المفاتيح</b>"
-
-#~ msgid "<b>Enable _Sticky Keys</b>"
-#~ msgstr "<b>فعِّل المفاتيح اللا_صقة</b>"
-
-#~ msgid "<b>Features</b>"
-#~ msgstr "<b>الميزات</b>"
-
-#~ msgid "<b>Toggle Keys</b>"
-#~ msgstr "<b>مفاتيح التبديل</b>"
-
-#~ msgid "Basic"
-#~ msgstr "أوَّلي"
-
-#~ msgid "Beep if key is re_jected"
-#~ msgstr "صافرة إذا _رفض المفتاح"
-
-#~ msgid "Beep when _features turned on or off from keyboard"
-#~ msgstr "صافرة عند تشغيل أو تعطيل ال_ميزات من لوحة المفاتيح"
-
-#~ msgid "Beep when _modifier is pressed"
-#~ msgstr "صافرة عند نقر المغيّرات"
-
-#~ msgid "Beep when an LED is turned on and two beeps when one is turned off."
-#~ msgstr "صافرة عند تشغيل LED واحدة و صافرتان عند تعطيل إحداهما."
-
-#~ msgid "Beep when key is:"
-#~ msgstr "صافرة اذا كان المفتاح:"
-
-#~ msgid "Del_ay:"
-#~ msgstr "ال_تأخير:"
-
-#~ msgid "Delay between keypress and pointer mo_vement:"
-#~ msgstr "التأخير بين ضغط الزر و _حركة المؤشر:"
-
-#~ msgid "Disa_ble if two keys pressed together"
-#~ msgstr "ع_طِّل إذا نقر الزران في آن واحد"
-
-#~ msgid "E_nable Toggle Keys"
-#~ msgstr "فعِّل مفاتيح الت_بديل"
-
-#~ msgid "Filters"
-#~ msgstr "مرشِّحات"
-
-#~ msgid "I_gnore duplicate keypresses within:"
-#~ msgstr "_تجاهل النقرات المضاعفة للمفاتيح خلال:"
-
-#~ msgid ""
-#~ "Ignore all subsequent presses of the SAME key if they happen within a "
-#~ "user selectable period of time."
-#~ msgstr ""
-#~ "تجاهل كل تلاحقات النقر على نفس المفتاح إذا حدثت خلال وقت اختير من طرف "
-#~ "المستخدم."
-
-#~ msgid "Keyboard Accessibility Preferences (AccessX)"
-#~ msgstr "تفضيلات إتاحة لوحة المفاتيح (AccessX)"
-
-#~ msgid "Ma_ximum pointer speed:"
-#~ msgstr "سرعة المؤشر ال_قصوى:"
-
-#~ msgid "Mouse _Preferences..."
-#~ msgstr "تفضيلات ال_فأرة..."
-
-#~ msgid ""
-#~ "Only accept keys after they have been pressed and held for a user "
-#~ "adjustable amount of time."
-#~ msgstr ""
-#~ "لا تقبل إلا المفاتيح المضغوطة و المبقى عليها مضغوطة خلال الفترة المحددة "
-#~ "من المستخدم."
-
-#~ msgid ""
-#~ "Perform multiple simultaneous key press operations by pressing modifier "
-#~ "keys in sequence."
-#~ msgstr ""
-#~ "أدِّي عمليّات نقرِ مفاتيحٍ متزامنة عند نقر المفاتيح المغيّرة بترتيب متعاقب."
-
-#~ msgid "Time to acce_lerate to maximum speed:"
-#~ msgstr "وقت الت_سارع للسرعة القصوى:"
-
-#~ msgid "Turn the numeric keypad into a mouse control pad."
-#~ msgstr "حوِّل لوحة الأرقام إلى لوحة تحكّم للفأرة."
-
-#~ msgid "_Disable if unused for:"
-#~ msgstr "_عطِّل اذا لم يستخدم لمدة:"
-
-#~ msgid "_Enable keyboard accessibility features"
-#~ msgstr "_فعِّل ميزات إتاحة لوحة المفاتيح"
-
-#~ msgid "_Import Feature Settings..."
-#~ msgstr "_استورد اعدادات الميزة..."
-
-#~ msgid "_Only accept keys held for:"
-#~ msgstr "_لا تقبل إلا المفاتيح المضغوطة لمدة:"
-
-#~ msgid "_accepted"
-#~ msgstr "م_قبول"
-
-#~ msgid "_pressed"
-#~ msgstr "م_ضغوط"
-
-#~ msgid "_rejected"
-#~ msgstr "مر_فوض"
-
-#~ msgid "characters/second"
-#~ msgstr "محارف/ثانية"
-
-#~ msgid "milliseconds"
-#~ msgstr "ملي ثانية"
-
-#~ msgid "pixels/second"
-#~ msgstr "بكسل/ثانية"
-
-#, fuzzy
-#~ msgid "Set your language and location preferences"
-#~ msgstr "اضبط تفضيلات فأرتك"
-
-#, fuzzy
-#~ msgid ""
-#~ "<i>Region and language changes take effect the next time you log in.</i>"
-#~ msgstr "تغيير سمة مؤشرك سيأخذ مجراه عند ولوجك القادم."
-
-#, fuzzy
-#~ msgid "Localization Preferences"
-#~ msgstr "تفضيلات الخط"
-
-#, fuzzy
-#~ msgid "Region:"
-#~ msgstr "الإصدارة:"
-
-#, fuzzy
-#~ msgid "Selected languages:"
-#~ msgstr "التصاميم الم_نتقاة:"
-
-#, fuzzy
-#~ msgid "(None)"
-#~ msgstr "لا شيء"
-
-#~ msgid "%d millisecond"
-#~ msgid_plural "%d milliseconds"
-#~ msgstr[0] "%d ملي ثانية"
-#~ msgstr[1] "%d ملي ثانية"
-#~ msgstr[2] "%d ملي ثانية"
-#~ msgstr[3] "%d ملي ثانية"
-
-#~ msgid "Volume"
-#~ msgstr "شدة الصوت"
-
-#~ msgid "Slow Keys Alert"
-#~ msgstr "تنبيه المفاتيح البطيئة"
-
-#~ 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."
-#~ msgstr ""
-#~ "لقد ضغطت مفتاح Shift لثمان ثوان. إنّ هذا إختصار ميزة المفاتيح البطيئة "
-#~ "المؤثّر على طريقة عمل لوحة مفاتيحك."
-
-#~ msgid "Do you want to activate Slow Keys?"
-#~ msgstr "أتريد تفعيل المفاتيح البطيئة؟"
-
-#~ msgid "Do you want to deactivate Slow Keys?"
-#~ msgstr "أتريد تعطيل المفاتيح البطيئة؟"
-
-#~ msgid "_Activate"
-#~ msgstr "_نَشِّط"
-
-#~ msgid "_Deactivate"
-#~ msgstr "_عَطِّل"
-
-#~ msgid "Do_n't activate"
-#~ msgstr "_لا تنشط"
-
-#~ msgid "Do_n't deactivate"
-#~ msgstr "_لا تعطل"
-
-#~ msgid "Sticky Keys Alert"
-#~ msgstr "تنبيه المفاتيح اللاصقة"
-
-#~ 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."
-#~ msgstr ""
-#~ "لقد نقرت مفتاح Shift خمس مرات متتالية. هذا اختصار ميزة المفاتيح اللاصقة "
-#~ "المؤثّر على طريقة عمل لوحة مفاتيحك."
-
-#~ 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 "
-#~ "keyboard works."
-#~ msgstr ""
-#~ "لقد ضغطت على مفتاحان في آن واحد أو نقرت مفتاح Shift خمس مرّات متتالية. "
-#~ "يعطّل هذا ميزة المفاتيح اللاصقة المؤثّر على طريقة عمل لوحة مفاتيحك."
-
-#~ msgid "Do you want to activate Sticky Keys?"
-#~ msgstr "أتريد تفعيل المفاتيح اللاصقة؟"
-
-#~ msgid "Do you want to deactivate Sticky Keys?"
-#~ msgstr "أتريد تعطيل المفاتيح اللاصقة؟"
-
-#~ msgid ""
-#~ "Cannot create the directory \"%s\".\n"
-#~ "This is needed to allow changing the mouse pointer theme."
-#~ msgstr ""
-#~ "لم يمكن إنشاء الدليل \"%s\".\n"
-#~ "هذا مطلوب حتى يمكن تغيير سِمة مؤشر الفأرة."
-
-#~ msgid ""
-#~ "Cannot create the directory \"%s\".\n"
-#~ "This is needed to allow changing cursors."
-#~ msgstr ""
-#~ "لم يمكن إنشاء الدليل \"%s\".\n"
-#~ "هذا مطلوب حتى يمكن تغيير المؤشرات."
-
-#~ msgid "Key Binding (%s) has its action defined multiple times\n"
-#~ msgstr "اجراء ارتباط المفتاح (%s) معرّف أكثر من مرّة\n"
-
-#~ msgid "Key Binding (%s) has its binding defined multiple times\n"
-#~ msgstr "ارتباط المفتاح (%s) معرّف أكثر من\n"
-
-#~ msgid "Key Binding (%s) is incomplete\n"
-#~ msgstr "ارتباط المفتاح (%s) غير مكتمل\n"
-
-#~ msgid "Key Binding (%s) is invalid\n"
-#~ msgstr "ارتباط المفتاح (%s) غير صالح\n"
-
-#~ msgid "It seems that another application already has access to key '%u'."
-#~ msgstr "يبدو أن تطبيقا آخر يستعمل المفتاح '%u'."
-
-#~ msgid "Key Binding (%s) is already in use\n"
-#~ msgstr "ارتباط المفتاح (%s) مستعمَل بالفعل\n"
-
-#~ msgid ""
-#~ "Error while trying to run (%s)\n"
-#~ "which is linked to the key (%s)"
-#~ msgstr ""
-#~ "خطأ عند محاولة تشغيل(%s)\n"
-#~ "المربوط بالمفتاح (%s)"
-
-#~ msgid ""
-#~ "Error activating XKB configuration.\n"
-#~ "It can happen under various circumstances:\n"
-#~ "- a bug in libxklavier library\n"
-#~ "- a bug in X server (xkbcomp, xmodmap utilities)\n"
-#~ "- X server with incompatible libxkbfile implementation\n"
-#~ "\n"
-#~ "X server version data:\n"
-#~ "%s\n"
-#~ "%d\n"
-#~ "%s\n"
-#~ "If you report this situation as a bug, please include:\n"
-#~ "- The result of <b>%s</b>\n"
-#~ "- The result of <b>%s</b>"
-#~ msgstr ""
-#~ "خطأ أثناء تفعيل إعدادات XKB.\n"
-#~ "يمكن أن يحصل هذا لأسباب عدة:\n"
-#~ "- خطأ في libxklavier\n"
-#~ "- خطأ داخلي في خادم X\n"
-#~ "- خادم X لا يتوافق مع تطبيق libxkbfile\n"
-#~ "\n"
-#~ "بيانات إصدارة خادم X:\n"
-#~ "%s\n"
-#~ "%d\n"
-#~ "%s\n"
-#~ "إذا كنت ستبلغ عن هذه الحالة كخلل ضمّن:\n"
-#~ "- نتيجة <b>%s</b>\n"
-#~ "- نتيجة <b>%s</b>"
-
-#~ msgid ""
-#~ "You are using XFree 4.3.0.\n"
-#~ "There are known problems with complex XKB configurations.\n"
-#~ "Try using a simpler configuration or taking a fresher version of XFree "
-#~ "software."
-#~ msgstr ""
-#~ "أنت تستخدم XFree 4.3.0.\n"
-#~ "هناك مشاكل معروفة مع إعدادات XKB المعقّدة .\n"
-#~ "حاول إستعمال إعادادات أبسط أو أخذ إصدارة حديثة من برمجيّات XFree."
-
-#, fuzzy
-#~ msgid "Could not enable mouse accessibility features"
-#~ msgstr "_فعِّل ميزات إتاحة لوحة المفاتيح"
-
-#~ msgid ""
-#~ "Could not get default terminal. Verify that your default terminal command "
-#~ "is set and points to a valid application."
-#~ msgstr ""
-#~ "تعذر إحضار الطرفية الافتراضية. تحقق من أن أمر الطرفية الافتراضية لديك مُعدّ "
-#~ "ويشير إلى تطبيق صالح."
-
-#~ msgid ""
-#~ "Couldn't execute command: %s\n"
-#~ "Verify that this is a valid command."
-#~ msgstr ""
-#~ "لم يمكن تنفيذ الأمر: %s\n"
-#~ "تأكّد من أن هذا الأمر صالح."
-
-#~ msgid ""
-#~ "Couldn't put the machine to sleep.\n"
-#~ "Verify that the machine is correctly configured."
-#~ msgstr ""
-#~ "لم يمكن تنويم الحاسوب.\n"
-#~ "تأكّد من أنّ الحاسوب معدّ بسلامة."
-
-#~ msgid ""
-#~ "There was an error starting up the screensaver:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Screensaver functionality will not work in this session."
-#~ msgstr ""
-#~ "حصل خطأ عند تشغيل حافظة الشاشة:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "لن تعمل حافظة الشاشة في هذه الجلسة."
-
-#~ msgid "_Do not show this message again"
-#~ msgstr "لا _تظهر هذه الرسالة مرة أخرى"
-
-#~ msgid "Couldn't load sound file %s as sample %s"
-#~ msgstr "لم يمكن تحميل ملف الصوت %s كعيِّنة %s"
-
-#~ msgid "Cannot determine user's home directory"
-#~ msgstr "لا يمكن تحديد الدليل المنزلي للمستخدم"
-
-#~ msgid "GConf key %s set to type %s but its expected type was %s\n"
-#~ msgstr "مفتاح GConf وهو %s مضبوط لنوع %s بينما النوع المتوقع كان %s\n"
-
-#~ msgid "A_vailable files:"
-#~ msgstr "الملفّات المو_جودة:"
-
-#~ msgid "Do _not show this warning again."
-#~ msgstr "لا تظهر هذا التحذير مجدداً."
-
-#~ msgid "Load modmap files"
-#~ msgstr "حمِّل ملفات modmap"
-
-#~ msgid "Would you like to load the modmap file(s)?"
-#~ msgstr "أتريد تحميل ملفات modmap ؟"
-
-#~ msgid "_Load"
-#~ msgstr "_حمِّل"
-
-#~ msgid "_Loaded files:"
-#~ msgstr "المل_فّات المحملة:"
-
-#~ msgid "Error creating signal pipe."
-#~ msgstr "خطأ أثناء إنشاء أنبوب الإشارة."
-
-#~ msgid "Edited %m/%d/%Y"
-#~ msgstr "حُرِّر في %d/%m/%Y"
-
-#~ msgid ""
-#~ "If true, the mime handlers for text/plain and text/* will be kept in sync"
-#~ msgstr ""
-#~ "إذا ضبط لصحيح، فسيبقى على معالجات mime لـ text/plain و text/* في تزامن"
-
-#~ msgid "Sync text/plain and text/* handlers"
-#~ msgstr "زامِن معالجا text/plain و text/*"
-
-#~ msgid "E-mail"
-#~ msgstr "البريد الإلكتروني"
-
-#~ msgid "E-mail's shortcut."
-#~ msgstr "اختصار البريد الإلكتروني."
-
-#~ msgid "Eject"
-#~ msgstr "اطرد"
-
-#~ msgid "Eject's shortcut."
-#~ msgstr "اختصار الطرد."
-
-#~ msgid "Home folder"
-#~ msgstr "مجلّد المنزل"
-
-#~ msgid "Home folder's shortcut."
-#~ msgstr "اختصار مجلّد المنزل."
-
-#~ msgid "Launch calculator"
-#~ msgstr "شغل الحاسبة"
-
-#~ msgid "Launch calculator's shortcut"
-#~ msgstr "مختصر إطلاق شغل الحاسبة"
-
-#~ msgid "Launch help browser"
-#~ msgstr "أطلق متصفّح المساعدة"
-
-#~ msgid "Launch help browser's shortcut."
-#~ msgstr "اختصار إطلاق متصفّح المساعدة."
-
-#~ msgid "Launch web browser"
-#~ msgstr "أطلق متصفّح الوِب"
-
-#~ msgid "Launch web browser's shortcut."
-#~ msgstr "اختصار إطلاق متصفّح الوِب."
-
-#~ msgid "Lock screen"
-#~ msgstr "أقفل الشاشة"
-
-#~ msgid "Lock screen's shortcut."
-#~ msgstr "اختصار قفل الشاشة."
-
-#~ msgid "Log out"
-#~ msgstr "اخرج"
-
-#~ msgid "Log out's shortcut."
-#~ msgstr "اختصار الخروج."
-
-#~ msgid "Media player"
-#~ msgstr "مشغل الوسائط"
-
-#~ msgid "Media player key's shortcut."
-#~ msgstr "اختصار مفتاح مشغل الوسائط."
-
-#~ msgid "Next track key's shortcut."
-#~ msgstr "اختصار مفتاح المقطوعة التالية."
-
-#~ msgid "Pause"
-#~ msgstr "ايقاف مؤقّت"
-
-#~ msgid "Pause key's shortcut."
-#~ msgstr "اختصار مفتاح الإيقاف المؤقّت."
-
-#~ msgid "Play (or play/pause)"
-#~ msgstr "عزف (أو عزف/تمهّل)"
-
-#~ msgid "Play (or play/pause) key's shortcut."
-#~ msgstr "اختصار مفتاح العزف (أو العزف/التمهّل)."
-
-#~ msgid "Previous track key's shortcut."
-#~ msgstr "اختصار مفتاح المقطوعة السابقة."
-
-#~ msgid "Search's shortcut."
-#~ msgstr "اختصار البحث."
-
-#~ msgid "Skip to next track"
-#~ msgstr "تخطّي إلى المقطوعة التّالية"
-
-#~ msgid "Skip to previous track"
-#~ msgstr "تخطّي إلى المقطوعة السّابقة"
-
-#~ msgid "Sleep"
-#~ msgstr "نوم"
-
-#~ msgid "Sleep's shortcut."
-#~ msgstr "اختصار النوم."
-
-#~ msgid "Stop playback key"
-#~ msgstr "مفتاح إيقاف العزف"
-
-#~ msgid "Stop playback key's shortcut."
-#~ msgstr "اختصار مفتاح إيقاف العزف."
-
-#~ msgid "Volume down"
-#~ msgstr "اخفض شدّة الصوت"
-
-#~ msgid "Volume down's shortcut."
-#~ msgstr "اختصار خفض شدّة الصوت."
-
-#~ msgid "Volume mute"
-#~ msgstr "أسكِت الصوت"
-
-#~ msgid "Volume mute's shortcut."
-#~ msgstr "اختصار إسكات الصوت"
-
-#~ msgid "Volume step"
-#~ msgstr "تدريج شدّة الصوت"
-
-#~ msgid "Volume step as percentage of volume."
-#~ msgstr "تدريج شدّة الصوت كنسبة مئوية من الصوت."
-
-#~ msgid "Volume up"
-#~ msgstr "ارفع شدّة الصوت"
-
-#~ msgid "Volume up's shortcut."
-#~ msgstr "اختصار رفع شدة الصوت."
-
-#~ msgid "Display a dialog when there are errors running the screensaver"
-#~ msgstr "اعرض حوار عند وجود أخطاء في تشغيل حافظة الشاشة"
-
-#~ msgid "Run screensaver at login"
-#~ msgstr "شغِّل حافظة الشاشة عند الولوج"
-
-#~ msgid "Show Startup Errors"
-#~ msgstr "اظهر أخطاء التشغيل"
-
-#~ msgid "Start screensaver"
-#~ msgstr "ابدأ حافظة الشاشة"
-
-#, fuzzy
-#~ msgid "gtk-close"
-#~ msgstr "gtk-delete"
-
-#, fuzzy
-#~ msgid "gtk-help"
-#~ msgstr "gtk-delete"
-
-#~ msgid "<i>Fast</i>"
-#~ msgstr "<i>سريع</i>"
-
-#~ msgid "<i>High</i>"
-#~ msgstr "<i>مرتفع</i>"
-
-#~ msgid "<i>Large</i>"
-#~ msgstr "<i>عريض</i>"
-
-#~ msgid "<i>Low</i>"
-#~ msgstr "<i>منخفض</i>"
-
-#~ msgid "<i>Slow</i>"
-#~ msgstr "<i>بطيئ</i>"
-
-#~ msgid "<i>Small</i>"
-#~ msgstr "<i>صغير</i>"
-
-#~ msgid "Buttons"
-#~ msgstr "الأزرار"
-
-#~ msgid "Motion"
-#~ msgstr "الحركة"
-
-#~ msgid "Type"
-#~ msgstr "النوع"
-
-#~ 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_PREVIEW للمعاينة"
-
-#~ msgid "Preview Width"
-#~ msgstr "عرض المعاينة"
-
-#~ msgid "Width if applier is a preview: Defaults to 64."
-#~ msgstr "العرض اذا كان المطبق معاينة: الإفتراضي 64."
-
-#~ msgid "Preview Height"
-#~ msgstr "ارتفاع المعاينة"
-
-#~ msgid "Height if applier is a preview: Defaults to 48."
-#~ msgstr "الإرتفاع اذا كان المطبق معاينة: الافتراضي 48."
-
-#~ msgid "Screen"
-#~ msgstr "الشاشة"
-
-#~ msgid "Screen on which BGApplier is to draw"
-#~ msgstr "الشاشة التي سيُرسم عليها BGApplier"
-
-#~ msgid "There was an error launching the keyboard tool: %s"
-#~ msgstr "حصل خطأ اثناء تشغيل أداة لوحة المفاتيح: %s"
-
-#~ msgid "_Accessibility"
-#~ msgstr "الإ_تاحة"
-
-#~ msgid "_Accessibility..."
-#~ msgstr "الإ_تاحة..."
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "Simple OnScreen Keyboard"
-#~ msgstr "لوحة المفاتيح البسيطة على الشاشة"
-
-#~ msgid "Evolution Mail Reader 1.4"
-#~ msgstr "قارئ البريد ايفوليوشن 1.4"
-
-#~ msgid "Evolution Mail Reader 1.5"
-#~ msgstr "قارئ البريد ايفوليوشن 1.5"
-
-#~ msgid "Evolution Mail Reader 1.6"
-#~ msgstr "قارئ البريد ايفوليوشن 1.6"
-
-#~ msgid "Evolution Mail Reader 2.0"
-#~ msgstr "قارئ البريد ايفوليوشن 2.0"
-
-#~ msgid "Evolution Mail Reader 2.2"
-#~ msgstr "قارئ البريد ايفوليوشن 2.2"
-
-#~ msgid "Evolution Mail Reader 2.4"
-#~ msgstr "قارئ البريد ايفوليوشن 2.4"
-
-#~ msgid "Links Text Browser"
-#~ msgstr "متصفح Links النصي"
-
-#~ msgid "Lynx Text Browser"
-#~ msgstr "متصفح Lynx النصي"
-
-#~ msgid "W3M Text Browser"
-#~ msgstr "متصفح W3M النصي"
-
-#~ msgid "_Keep resolution"
-#~ msgstr "ا_بقِ الإستبانة"
-
-#~ msgid "Choose..."
-#~ msgstr "اختر..."
-
-#~ msgid "Microsoft Natural Keyboard"
-#~ msgstr "لوحة مفاتيح مايكروسوفت الطّبيعيّة"
-
-#~ msgid "The theme is an engine. You need to compile it."
-#~ msgstr "السِمة عبارة عن محرّك، تحتاج لتصريفها."
-
-#~ msgid "The file format is invalid"
-#~ msgstr "تنسيق الملف غير صحيح."
-
-#~ msgid "This theme is not in a supported format."
-#~ msgstr "هذا السِمة ليست بتنسيق مدعوم."
-
-#~ msgid "The file format is invalid."
-#~ msgstr "تنسيق الملف غير صحيح."
-
-#~ msgid "Do _not show this warning again"
-#~ msgstr "لا _تظهر هذا التحذير مجدداً."
-
-#~ msgid ""
-#~ "<b>The X system keyboard settings differ from your current GNOME keyboard "
-#~ "settings.</b>\n"
-#~ "\n"
-#~ "Expected was %s, but the the following settings were found: %s.\n"
-#~ "\n"
-#~ "Which set would you like to use?"
-#~ msgstr ""
-#~ "<b> تختلف اعدادات لوحة مفاتيح نظام X عن اعدادات لوحة مفاتيح جنوم الحاليّة. "
-#~ "</b> \n"
-#~ "\n"
-#~ " المُتَوَقَّع كان %s، لكن عُثِر على الإعدادت التالية: %s.\n"
-#~ "\n"
-#~ "أي الإعدادات تريد استعماله؟"
-
-#~ msgid "Use X settings"
-#~ msgstr "استخدم إعدادات X"
-
-#~ msgid "Keep GNOME settings"
-#~ msgstr "أبقِ إعدادات جنوم"
-
-#~ msgid "<b>Applications</b>"
-#~ msgstr "<b>تطبيقات</b>"
-
-#~ msgid "<b>Support</b>"
-#~ msgstr "<b>دعم</b>"
-
-#~ msgid "Start these assistive technologies every time you log in:"
-#~ msgstr "ابدأ التكنولوجيات المعينة هذه كل مرة تلِجُ فيها:"
-
-#~ msgid ""
-#~ "No Assistive Technology is available on your system.  The 'gok' package "
-#~ "must be installed in order to get on-screen keyboard support, and the "
-#~ "'orca' package must be installed for screenreading and magnifying "
-#~ "capabilities."
-#~ msgstr ""
-#~ "لا تكنولوجيا معينة متوفّرة على نظامك. يجب أن تكون حزمة 'gok' مثبّتة على حتّى "
-#~ "تتحصّل على دعم لوحة مفاتيح الشاشة كما يجب أن تكون حزمة جنوبارنِكِسْ' مثبّتة "
-#~ "كذلك لقدرات قراءة الشاشة و تكبيرها."
-
-#~ msgid ""
-#~ "Not all available assistive technologies are installed on your system.  "
-#~ "The 'gok' package must be installed in order to get on-screen keyboard "
-#~ "support."
-#~ msgstr ""
-#~ "لم تثبّت على نظامك جميع التكنولوجيّات المعينة المتوفّرة. يجب تثبيت حزمة "
-#~ "'gok' للحصول على دعم لوحة مفاتيح الشاشة."
-
-#~ msgid ""
-#~ "Not all available assistive technologies are installed on your system.  "
-#~ "The 'orca' package must be installed for screenreading and magnifying "
-#~ "capabilities."
-#~ msgstr ""
-#~ "لم تثبّت على نظامك جميع التكنولوجيّات المعينة المتوفّرة. يجب تثبيت حزمة "
-#~ "'orca'."
-
-#~ msgid "Change your Desktop Background settings"
-#~ msgstr "غيِّر اعدادات خلفيّة سطح مكتبك"
-
-#~ msgid "Desktop Background"
-#~ msgstr "خلفية سطح المكتب"
-
-#~ msgid "Desktop Background Preferences"
-#~ msgstr "تفضيلات خلفية سطح المكتب"
-
-#~ msgid "_Add Wallpaper"
-#~ msgstr "أضِف _صورة للمكتب"
-
-#~ msgid "_Finish"
-#~ msgstr "ا_نهي"
-
-#~ msgid "_Remove"
-#~ msgstr "ا_حذف"
-
-#~ msgid "Centered"
-#~ msgstr "موسّط"
-
-#~ msgid "Fill Screen"
-#~ msgstr "املأ الشاشة"
-
-#~ msgid "Scaled"
-#~ msgstr "محجّم"
-
-#~ msgid "Zoom"
-#~ msgstr "تكبير"
-
-#~ msgid "Tiled"
-#~ msgstr "مرصّف"
-
-#~ msgid "Solid Color"
-#~ msgstr "لون صلب"
-
-#~ msgid "Horizontal Gradient"
-#~ msgstr "تدرّج أفقي"
-
-#~ msgid "Vertical Gradient"
-#~ msgstr "تدرّج عمودي"
-
-#~ msgid "- Desktop Background Preferences"
-#~ msgstr "- تفضيلات خلفية سطح المكتب"
-
-#~ msgid "background size|%s, %d %s x %d %s"
-#~ msgstr "%s، %d %s x %d %s"
-
-#~ msgid "Select fonts for the desktop"
-#~ msgstr "اختر خطوط لسطح المكتب"
-
-#~ msgid "Unknown Pointer"
-#~ msgstr "مؤشر مجهول"
-
-#~ msgid "The default pointer that ships with X"
-#~ msgstr "المؤشر الافتراضي المشحون مع إكس"
-
-#~ msgid "The default pointer inverted"
-#~ msgstr "المؤشر الإفتراضي مقلوبا"
-
-#~ msgid "Large version of normal pointer"
-#~ msgstr "نسخة كبيرة للمؤشر العادي"
-
-#~ msgid "Large version of white pointer"
-#~ msgstr "نسخة كبيرة من المؤشر الأبيض"
-
-#~ msgid "Pointer Theme"
-#~ msgstr "سِمة المؤشر"
-
-#~ msgid "Highlight the _pointer when you press Ctrl"
-#~ msgstr "أبرز ال_مؤشر عند ضغطك لـ Ctrl"
-
-#~ msgid "Medium"
-#~ msgstr "متوسط"
-
-#~ msgid "Pointer Size:"
-#~ msgstr "مقاس المؤشر:"
-
-#~ msgid "Theme deleted succesfully. Please select another theme."
-#~ msgstr "حُذِفت السِمة بنجاح. رجاء اختر سِمة أخرى."
-
-#~ msgid ""
-#~ "No themes could be found on your system.  This probably means that your "
-#~ "\"Theme Preferences\" dialog was improperly installed, or you haven't "
-#~ "installed the \"gnome-themes\" package."
-#~ msgstr ""
-#~ "لم يُعثر سِمات بِنظامك. قد يعني ذلك أن حوار \"تفضيلات السِمة\" ثُبِّت بشكل "
-#~ "خاطيء، أو أنّك لم تُثبيت حزمة \"سِمات جنوم\" (gnome-themes)."
-
-#~ msgid "The theme file location specified to install is invalid"
-#~ msgstr "موقع ملف السِمة المحدّد لتثبيتها غير صحيح."
-
-#~ msgid "You can save this theme by pressing the Save Theme button."
-#~ msgstr "يمكنك حفظ السِمة بنقر زر احفظ السِمة."
-
-#~ msgid ""
-#~ "The default theme schemas could not be found on your system.  This means "
-#~ "that you probably don't have metacity installed, or that your gconf is "
-#~ "configured incorrectly."
-#~ msgstr ""
-#~ "لم يمكن إيجاد مخطّطات السِمة الإفتراضيّة غلى نظامك. يعني هذا أن ميتاسِتي قد "
-#~ "لا يكون مثبّتا عندك، أو أن gconf غير معدّ بسلامة."
-
-#~ msgid "Select themes for various parts of the desktop"
-#~ msgstr "اختر سِمات لأجزاء سطح المكتب المختلفة"
-
-#~ msgid "<b>You do not have permission to change theme settings</b>"
-#~ msgstr "<b>لا تملك التراخيص اللازمة لتغيير إعدادت السِمة</b>"
-
-#~ msgid "Theme Details"
-#~ msgstr "تفاصيل السِمة"
-
-#~ msgid "This theme does not suggest any particular font or background."
-#~ msgstr "لا تقترح هذه السِمة خطا أو خلفية محددة."
-
-#~ msgid "This theme suggests a font and a background:"
-#~ msgstr "تقترح هذه السِمة خطا و خلفية:"
-
-#~ msgid "_Install Theme..."
-#~ msgstr "_ثبِّت سِمة..."
-
-#~ msgid "_Revert"
-#~ msgstr "ا_سترجِع"
-
-#~ msgid "_Save Theme..."
-#~ msgstr "ا_حفظ السِمة..."
-
-#~ msgid "theme selection tree"
-#~ msgstr "شجرة إنتقاء السِمات"
-
-#~ msgid "Customize the appearance of toolbars and menubars in applications"
-#~ msgstr "خصِّص مظهر أشرطة الأدوات و أشرطة القوائم في التطبيقات"
-
-#~ msgid "<b>Behavior and Appearance</b>"
-#~ msgstr "<b>السلوك و المظهر</b>"
-
-#~ msgid "Icons only"
-#~ msgstr "أيقونات فقط"
-
-#~ msgid "Menu and Toolbar Preferences"
-#~ msgstr "تفضيلات أشرطة الأدوات و أشرطة القوائم"
-
-#~ msgid "Text below icons"
-#~ msgstr "نص تحت الأيقونة"
-
-#~ msgid "Text beside icons"
-#~ msgstr "نص بجانب الأيقونة"
-
-#~ msgid "Text only"
-#~ msgstr "نص فقط"
-
-#~ msgid "_Detachable toolbars"
-#~ msgstr "أشرطة أدوات قابلة لل_فصل"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "Window Management"
-#~ msgstr "إدارة النوافذ"
+msgstr "يحدد السِمة المبدئية"
 
-#~ msgid "A_vailable layouts:"
-#~ msgstr "التصاميم ال_متوفّرة:"
+#~ msgid "Just apply settings and quit"
+#~ msgstr "طبِّق الإعدادات ثم اخرج"
diff --git a/po/es.po b/po/es.po
index 28ad959ca..d60286585 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,12 +15,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-07 20:19+0000\n"
-"PO-Revision-Date: 2008-05-09 08:08+0200\n"
+"POT-Creation-Date: 2008-06-01 16:58+0000\n"
+"PO-Revision-Date: 2008-06-07 14:37+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type:  text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
@@ -64,12 +64,12 @@ msgid "No Image"
 msgstr "Sin imagen"
 
 #: ../capplets/about-me/gnome-about-me.c:769
-#: ../capplets/appearance/appearance-desktop.c:1069
+#: ../capplets/appearance/appearance-desktop.c:1080
 msgid "Images"
 msgstr "Imágenes"
 
 #: ../capplets/about-me/gnome-about-me.c:773
-#: ../capplets/appearance/theme-installer.c:695
+#: ../capplets/appearance/theme-installer.c:717
 msgid "All Files"
 msgstr "Todos los archivos"
 
@@ -88,7 +88,8 @@ msgstr "Imposible abrir la libreta de direcciones"
 
 #: ../capplets/about-me/gnome-about-me.c:946
 msgid "Unknown login ID, the user database might be corrupted"
-msgstr "ID de inicio desconocido, la base de datos de usuarios quizá esté corrupta"
+msgstr ""
+"ID de inicio desconocido, la base de datos de usuarios quizá esté corrupta"
 
 #: ../capplets/about-me/gnome-about-me.c:976
 #: ../capplets/about-me/gnome-about-me.c:978
@@ -227,7 +228,8 @@ msgstr "Datos personales"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:32
 #: ../capplets/about-me/gnome-about-me-password.c:938
-msgid "Please type your password again in the <b>Retype new password</b> field."
+msgid ""
+"Please type your password again in the <b>Retype new password</b> field."
 msgstr ""
 "Por favor, teclee la contraseña de nuevo en el campo <b>Teclee la contraseña "
 "nueva otra vez</b>."
@@ -509,11 +511,11 @@ msgstr ""
 "Active el soporte para las tecnologías de asistencia de GNOME durante el "
 "inicio"
 
-#: ../capplets/appearance/appearance-desktop.c:1037
+#: ../capplets/appearance/appearance-desktop.c:1048
 msgid "Add Wallpaper"
 msgstr "Añadir tapiz"
 
-#: ../capplets/appearance/appearance-desktop.c:1073
+#: ../capplets/appearance/appearance-desktop.c:1084
 msgid "All files"
 msgstr "Todos los archivos"
 
@@ -563,37 +565,52 @@ msgstr "Usar la tipografía anterior"
 msgid "Use selected font"
 msgstr "Usar la tipografía seleccionada"
 
-#: ../capplets/appearance/appearance-main.c:108
+#: ../capplets/appearance/appearance-main.c:107
 msgid "Specify the filename of a theme to install"
 msgstr "Especifique el nombre de archivo del tema a instalar"
 
-#: ../capplets/appearance/appearance-main.c:109
+#: ../capplets/appearance/appearance-main.c:108
 msgid "filename"
 msgstr "nombre de archivo"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/appearance/appearance-main.c:116
+#: ../capplets/appearance/appearance-main.c:115
 msgid "Specify the name of the page to show (theme|background|fonts|interface)"
 msgstr ""
 "Especifique el nombre de la página para mostrar (theme|background|fonts|"
 "interface)"
 
-#: ../capplets/appearance/appearance-main.c:117
-#: ../capplets/default-applications/gnome-da-capplet.c:1329
+#: ../capplets/appearance/appearance-main.c:116
+#: ../capplets/default-applications/gnome-da-capplet.c:880
 #: ../capplets/mouse/gnome-mouse-properties.c:444
 msgid "page"
 msgstr "página"
 
-#: ../capplets/appearance/appearance-main.c:124
+#: ../capplets/appearance/appearance-main.c:123
 msgid "[WALLPAPER...]"
 msgstr "[Tapiz…]"
 
-#: ../capplets/appearance/appearance-style.c:156
-#: ../capplets/common/gnome-theme-info.c:442
-#: ../capplets/common/gnome-theme-info.c:631
+#: ../capplets/appearance/appearance-style.c:159
+#: ../capplets/common/gnome-theme-info.c:439
+#: ../capplets/common/gnome-theme-info.c:628
 msgid "Default Pointer"
 msgstr "Puntero predeterminado"
 
+#: ../capplets/appearance/appearance-style.c:221
+#: ../capplets/appearance/appearance-themes.c:685
+msgid "Install"
+msgstr "Instalar"
+
+#: ../capplets/appearance/appearance-style.c:241
+#: ../capplets/common/gnome-theme-info.c:1634
+#, c-format
+msgid ""
+"This theme will not look as intended because the required GTK+ theme engine "
+"'%s' is not installed."
+msgstr ""
+"Este tema no se mostrará como se pretende porque el motor de temas GTK+ "
+"necesario «%s» no está instalado."
+
 #: ../capplets/appearance/appearance-themes.c:673
 msgid "Apply Background"
 msgstr "Aplicar tapiz"
@@ -606,10 +623,6 @@ msgstr "Aplicar tipografía"
 msgid "Revert Font"
 msgstr "Revertir la tipografía"
 
-#: ../capplets/appearance/appearance-themes.c:685
-msgid "Install"
-msgstr "Instalar"
-
 #: ../capplets/appearance/appearance-themes.c:711
 msgid ""
 "The current theme suggests a background and a font. Also, the last applied "
@@ -651,7 +664,7 @@ msgid "The current theme suggests a font."
 msgstr "El tema actual sugiere una tipografía."
 
 #: ../capplets/appearance/appearance-themes.c:1046
-#: ../capplets/default-applications/gnome-da-capplet.c:1080
+#: ../capplets/default-applications/gnome-da-capplet.c:630
 #: ../capplets/sound/sound-properties-capplet.c:328
 msgid "Custom"
 msgstr "Personalizar"
@@ -1041,7 +1054,7 @@ msgstr "Instalador de temas"
 msgid "Gnome Theme Package"
 msgstr "Paquete de tema GNOME"
 
-#: ../capplets/appearance/gnome-wp-info.c:49
+#: ../capplets/appearance/gnome-wp-info.c:50
 msgid "No Wallpaper"
 msgstr "Sin tapiz"
 
@@ -1071,30 +1084,30 @@ msgid_plural "pixels"
 msgstr[0] "píxel"
 msgstr[1] "píxeles"
 
-#: ../capplets/appearance/theme-installer.c:166
-#: ../capplets/appearance/theme-installer.c:216
+#: ../capplets/appearance/theme-installer.c:171
+#: ../capplets/appearance/theme-installer.c:221
 msgid "Cannot install theme"
 msgstr "No se puede instalar el tema"
 
-#: ../capplets/appearance/theme-installer.c:168
+#: ../capplets/appearance/theme-installer.c:173
 #, c-format
 msgid "The %s utility is not installed."
 msgstr "La utilidad %s no está instalada."
 
-#: ../capplets/appearance/theme-installer.c:218
+#: ../capplets/appearance/theme-installer.c:223
 msgid "There was a problem while extracting the theme."
 msgstr "Hubo un problema al extraer el tema."
 
-#: ../capplets/appearance/theme-installer.c:241
+#: ../capplets/appearance/theme-installer.c:246
 msgid "There was an error installing the selected file"
 msgstr "Hubo un error al instalar el archivo seleccionado"
 
-#: ../capplets/appearance/theme-installer.c:242
+#: ../capplets/appearance/theme-installer.c:247
 #, c-format
 msgid "\"%s\" does not appear to be a valid theme."
 msgstr "«%s» no parece ser un tema válido."
 
-#: ../capplets/appearance/theme-installer.c:243
+#: ../capplets/appearance/theme-installer.c:248
 #, c-format
 msgid ""
 "\"%s\" does not appear to be a valid theme. It may be a theme engine which "
@@ -1103,46 +1116,47 @@ msgstr ""
 "«%s» no parece ser un tema válido. Puede ser un motor de temas que debe "
 "compilar."
 
-#: ../capplets/appearance/theme-installer.c:282
+#: ../capplets/appearance/theme-installer.c:287
 #, c-format
 msgid "GNOME Theme %s correctly installed"
 msgstr "El tema de GNOME %s se instaló correctamente"
 
-#: ../capplets/appearance/theme-installer.c:342
+#: ../capplets/appearance/theme-installer.c:354
 #, c-format
 msgid "Installation for theme \"%s\" failed."
 msgstr "La instalación del tema «%s» falló."
 
-#: ../capplets/appearance/theme-installer.c:374
+#: ../capplets/appearance/theme-installer.c:392
 #, c-format
 msgid "The theme \"%s\" has been installed."
 msgstr "Se ha instalado el tema «%s»."
 
-#: ../capplets/appearance/theme-installer.c:380
+#: ../capplets/appearance/theme-installer.c:398
 msgid "Would you like to apply it now, or keep your current theme?"
 msgstr "¿Desea aplicarlo ahora, o mantener su tema actual?"
 
-#: ../capplets/appearance/theme-installer.c:382
+#: ../capplets/appearance/theme-installer.c:400
 msgid "Keep Current Theme"
 msgstr "Mantener el tema actual"
 
-#: ../capplets/appearance/theme-installer.c:384
+#: ../capplets/appearance/theme-installer.c:402
 msgid "Apply New Theme"
 msgstr "Aplicar el nuevo tema"
 
-#: ../capplets/appearance/theme-installer.c:486
+#: ../capplets/appearance/theme-installer.c:505
 msgid "Failed to create temporary directory"
 msgstr "Falló al crear la carpeta temporal"
 
-#: ../capplets/appearance/theme-installer.c:546
+#: ../capplets/appearance/theme-installer.c:568
 msgid "New themes have been successfully installed."
 msgstr "Los nuevos temas se han instalado con éxito."
 
-#: ../capplets/appearance/theme-installer.c:573
+#: ../capplets/appearance/theme-installer.c:595
 msgid "No theme file location specified to install"
-msgstr "No se ha especificado ninguna ubicación del archivo del tema para instalar"
+msgstr ""
+"No se ha especificado ninguna ubicación del archivo del tema para instalar"
 
-#: ../capplets/appearance/theme-installer.c:593
+#: ../capplets/appearance/theme-installer.c:615
 #, c-format
 msgid ""
 "Insufficient permissions to install the theme in:\n"
@@ -1151,7 +1165,7 @@ msgstr ""
 "Permisos insuficientes para instalar el tema en:\n"
 "%s"
 
-#: ../capplets/appearance/theme-installer.c:615
+#: ../capplets/appearance/theme-installer.c:637
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -1160,11 +1174,11 @@ msgstr ""
 "%s es la ruta donde se van a instalar los archivos del tema. Esto no puede "
 "seleccionarse como ubicación de origen"
 
-#: ../capplets/appearance/theme-installer.c:684
+#: ../capplets/appearance/theme-installer.c:706
 msgid "Select Theme"
 msgstr "Seleccione un tema"
 
-#: ../capplets/appearance/theme-installer.c:688
+#: ../capplets/appearance/theme-installer.c:710
 msgid "Theme Packages"
 msgstr "Paquete de tema"
 
@@ -1182,15 +1196,15 @@ msgstr "El tema ya existe. ¿Quiere reemplazarlo?"
 msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
-#: ../capplets/appearance/theme-util.c:131
+#: ../capplets/appearance/theme-util.c:134
 msgid "Would you like to delete this theme?"
 msgstr "¿Quiere eliminar este tema?"
 
-#: ../capplets/appearance/theme-util.c:176
+#: ../capplets/appearance/theme-util.c:179
 msgid "Theme cannot be deleted"
 msgstr "No se puede borrar el tema"
 
-#: ../capplets/appearance/theme-util.c:301
+#: ../capplets/appearance/theme-util.c:304
 msgid "Could not install theme engine"
 msgstr "No se pudo instalar el motor del tema"
 
@@ -1214,17 +1228,7 @@ msgstr ""
 msgid "Unable to load stock icon '%s'\n"
 msgstr "No se puede cargar el icono de fábrica «%s»\n"
 
-#: ../capplets/common/capplet-util.c:240 ../capplets/common/capplet-util.c:242
-msgid "Just apply settings and quit"
-msgstr "Aplicar los cambios y salir"
-
-#: ../capplets/common/capplet-util.c:244
-#: ../capplets/keyboard/gnome-keyboard-properties.c:256
-#: ../capplets/sound/sound-properties-capplet.c:1159
-msgid "Retrieve and store legacy settings"
-msgstr "Obtener y almacenar configuración heredada"
-
-#: ../capplets/common/capplet-util.c:344
+#: ../capplets/common/capplet-util.c:80
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "Hubo un error al mostrar la ayuda: %s"
@@ -1305,79 +1309,84 @@ msgstr "_Saltar"
 msgid "Overwrite _All"
 msgstr "Sobreescribir _todo"
 
-#: ../capplets/common/gconf-property-editor.c:170
+#: ../capplets/common/gconf-property-editor.c:133
 msgid "Key"
 msgstr "Clave"
 
-#: ../capplets/common/gconf-property-editor.c:171
+#: ../capplets/common/gconf-property-editor.c:134
 msgid "GConf key to which this property editor is attached"
 msgstr "Clave de gconf a la que está asociado este editor de propiedades"
 
-#: ../capplets/common/gconf-property-editor.c:177
+#: ../capplets/common/gconf-property-editor.c:140
 msgid "Callback"
 msgstr "Retorno de llamada"
 
-#: ../capplets/common/gconf-property-editor.c:178
+#: ../capplets/common/gconf-property-editor.c:141
 msgid "Issue this callback when the value associated with key gets changed"
-msgstr "Emitir este retorno de llamada cuando cambie el valor asociado con la clave"
+msgstr ""
+"Emitir este retorno de llamada cuando cambie el valor asociado con la clave"
 
-#: ../capplets/common/gconf-property-editor.c:183
+#: ../capplets/common/gconf-property-editor.c:146
 msgid "Change set"
 msgstr "Conjunto de cambios"
 
-#: ../capplets/common/gconf-property-editor.c:184
-msgid "GConf change set containing data to be forwarded to the gconf client on apply"
+#: ../capplets/common/gconf-property-editor.c:147
+msgid ""
+"GConf change set containing data to be forwarded to the gconf client on apply"
 msgstr ""
 "Conjunto de cambios de gconf que contiene datos que deben remitirse al "
 "cliente de gconf cuando se apliquen"
 
-#: ../capplets/common/gconf-property-editor.c:189
+#: ../capplets/common/gconf-property-editor.c:152
 msgid "Conversion to widget callback"
 msgstr "Conversión a retorno de llamada del widget"
 
-#: ../capplets/common/gconf-property-editor.c:190
-msgid "Callback to be issued when data are to be converted from GConf to the widget"
+#: ../capplets/common/gconf-property-editor.c:153
+msgid ""
+"Callback to be issued when data are to be converted from GConf to the widget"
 msgstr ""
 "Retorno de llamada que se debe emitir cuando se vayan a convertir datos de "
 "gconf al widget"
 
-#: ../capplets/common/gconf-property-editor.c:195
+#: ../capplets/common/gconf-property-editor.c:158
 msgid "Conversion from widget callback"
 msgstr "Conversión desde el retorno de llamada del widget"
 
-#: ../capplets/common/gconf-property-editor.c:196
-msgid "Callback to be issued when data are to be converted to GConf from the widget"
+#: ../capplets/common/gconf-property-editor.c:159
+msgid ""
+"Callback to be issued when data are to be converted to GConf from the widget"
 msgstr ""
 "Retorno de llamada que se debe emitir cuando se vayan a convertir datos del "
 "widget a gconf"
 
-#: ../capplets/common/gconf-property-editor.c:201
+#: ../capplets/common/gconf-property-editor.c:164
 msgid "UI Control"
 msgstr "Control de IU"
 
-#: ../capplets/common/gconf-property-editor.c:202
+#: ../capplets/common/gconf-property-editor.c:165
 msgid "Object that controls the property (normally a widget)"
 msgstr "Objeto que controla la propiedad (generalmente, un widget)"
 
-#: ../capplets/common/gconf-property-editor.c:217
+#: ../capplets/common/gconf-property-editor.c:180
 msgid "Property editor object data"
 msgstr "Datos de objeto del editor de propiedades"
 
-#: ../capplets/common/gconf-property-editor.c:218
+#: ../capplets/common/gconf-property-editor.c:181
 msgid "Custom data required by the specific property editor"
-msgstr "Datos personalizados requeridos por el editor de propiedades específico"
+msgstr ""
+"Datos personalizados requeridos por el editor de propiedades específico"
 
-#: ../capplets/common/gconf-property-editor.c:224
+#: ../capplets/common/gconf-property-editor.c:187
 msgid "Property editor data freeing callback"
 msgstr "Retorno de llamada de liberación de datos del editor de propiedades"
 
-#: ../capplets/common/gconf-property-editor.c:225
+#: ../capplets/common/gconf-property-editor.c:188
 msgid "Callback to be issued when property editor object data is to be freed"
 msgstr ""
 "Retorno de llamada que se debe emitir cuando se vayan a liberar datos de "
 "objeto del editor de propiedades"
 
-#: ../capplets/common/gconf-property-editor.c:1467
+#: ../capplets/common/gconf-property-editor.c:1429
 #, c-format
 msgid ""
 "Couldn't find the file '%s'.\n"
@@ -1390,7 +1399,7 @@ msgstr ""
 "Compruebe si existe y vuelva a intentarlo o elija una imagen de fondo "
 "distinta."
 
-#: ../capplets/common/gconf-property-editor.c:1475
+#: ../capplets/common/gconf-property-editor.c:1437
 #, c-format
 msgid ""
 "I don't know how to open the file '%s'.\n"
@@ -1403,43 +1412,43 @@ msgstr ""
 "\n"
 "Seleccione una imagen distinta."
 
-#: ../capplets/common/gconf-property-editor.c:1594
+#: ../capplets/common/gconf-property-editor.c:1556
 msgid "Please select an image."
 msgstr "Por favor seleccione una imagen."
 
-#: ../capplets/common/gconf-property-editor.c:1599
+#: ../capplets/common/gconf-property-editor.c:1561
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: ../capplets/common/gnome-theme-info.c:632
+#: ../capplets/common/gnome-theme-info.c:629
 msgid "Default Pointer - Current"
 msgstr "Puntero predeterminado - Actual"
 
-#: ../capplets/common/gnome-theme-info.c:636
+#: ../capplets/common/gnome-theme-info.c:633
 msgid "White Pointer"
 msgstr "Puntero blanco"
 
-#: ../capplets/common/gnome-theme-info.c:637
+#: ../capplets/common/gnome-theme-info.c:634
 msgid "White Pointer - Current"
 msgstr "Puntero blanco - Actual"
 
-#: ../capplets/common/gnome-theme-info.c:641
+#: ../capplets/common/gnome-theme-info.c:638
 msgid "Large Pointer"
 msgstr "Puntero grande"
 
-#: ../capplets/common/gnome-theme-info.c:642
+#: ../capplets/common/gnome-theme-info.c:639
 msgid "Large Pointer - Current"
 msgstr "Puntero grande - Actual"
 
-#: ../capplets/common/gnome-theme-info.c:646
+#: ../capplets/common/gnome-theme-info.c:643
 msgid "Large White Pointer - Current"
 msgstr "Puntero blanco grande - Actual"
 
-#: ../capplets/common/gnome-theme-info.c:647
+#: ../capplets/common/gnome-theme-info.c:644
 msgid "Large White Pointer"
 msgstr "Puntero blanco grande"
 
-#: ../capplets/common/gnome-theme-info.c:1574
+#: ../capplets/common/gnome-theme-info.c:1610
 #, c-format
 msgid ""
 "This theme will not look as intended because the required GTK+ theme '%s' is "
@@ -1448,7 +1457,7 @@ msgstr ""
 "Este tema no se mostrará como se pretende porque el el tema GTK+ necesario «%"
 "s» no está instalado."
 
-#: ../capplets/common/gnome-theme-info.c:1582
+#: ../capplets/common/gnome-theme-info.c:1618
 #, c-format
 msgid ""
 "This theme will not look as intended because the required window manager "
@@ -1457,7 +1466,7 @@ msgstr ""
 "Este tema no se mostrará como se pretende porque el tema del gestor de "
 "ventanas necesario «%s» no está instalado."
 
-#: ../capplets/common/gnome-theme-info.c:1589
+#: ../capplets/common/gnome-theme-info.c:1625
 #, c-format
 msgid ""
 "This theme will not look as intended because the required icon theme '%s' is "
@@ -1466,15 +1475,6 @@ msgstr ""
 "Este tema no se mostrará como se pretende porque el tema de iconos necesario "
 "«%s» no está instalado."
 
-#: ../capplets/common/gnome-theme-info.c:1613
-#, c-format
-msgid ""
-"This theme will not look as intended because the required GTK+ theme engine "
-"'%s' is not installed."
-msgstr ""
-"Este tema no se mostrará como se pretende porque el motor de temas GTK+ "
-"necesario «%s» no está instalado."
-
 #: ../capplets/default-applications/default-applications.desktop.in.in.h:1
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Preferred Applications"
@@ -1492,32 +1492,23 @@ msgstr "Iniciar la tecnología de asistencia visual preferida"
 msgid "Visual Assistance"
 msgstr "Asistencia visual"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:80
-#: ../capplets/default-applications/gnome-da-capplet.c:112
-#: ../capplets/default-applications/gnome-da-capplet.c:133
-#: ../capplets/default-applications/gnome-da-capplet.c:177
-#: ../capplets/default-applications/gnome-da-capplet.c:222
-#: ../capplets/default-applications/gnome-da-capplet.c:279
-#: ../capplets/default-applications/gnome-da-capplet.c:330
-#: ../capplets/default-applications/gnome-da-capplet.c:381
-#: ../capplets/default-applications/gnome-da-capplet.c:434
-#: ../capplets/default-applications/gnome-da-capplet.c:484
-#: ../capplets/default-applications/gnome-da-capplet.c:877
-#: ../capplets/default-applications/gnome-da-capplet.c:899
+#: ../capplets/default-applications/gnome-da-capplet.c:94
+#: ../capplets/default-applications/gnome-da-capplet.c:345
+#: ../capplets/default-applications/gnome-da-capplet.c:366
 #, c-format
 msgid "Error saving configuration: %s"
 msgstr "Error al guardar la configuración: %s"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:1100
+#: ../capplets/default-applications/gnome-da-capplet.c:650
 msgid "Could not load the main interface"
 msgstr "No es posible cargar el interfaz principal"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:1102
+#: ../capplets/default-applications/gnome-da-capplet.c:652
 msgid "Please make sure that the applet is properly installed"
 msgstr "Asegúrese de que la miniaplicación está instalada correctamente"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/default-applications/gnome-da-capplet.c:1328
+#: ../capplets/default-applications/gnome-da-capplet.c:879
 msgid "Specify the name of the page to show (internet|multimedia|system|a11y)"
 msgstr ""
 "Especifique el nombre de la página para mostrar (internet|multimedia|system|"
@@ -1942,7 +1933,7 @@ msgid "Sound"
 msgstr "Sonido"
 
 #: ../capplets/keybindings/01-desktop-key.xml.in.h:1
-#: ../libslab/bookmark-agent.c:1156
+#: ../libslab/bookmark-agent.c:1158
 msgid "Desktop"
 msgstr "Escritorio"
 
@@ -1979,50 +1970,54 @@ msgstr "El tipo de combinación."
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:493
+#: ../capplets/keybindings/gnome-keybinding-properties.c:171
 msgid "<Unknown Action>"
 msgstr "<Acción desconocida>"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:885
+#: ../capplets/keybindings/gnome-keybinding-properties.c:804
+msgid "Custom Shortcuts"
+msgstr "Combinación personalizada"
+
+#: ../capplets/keybindings/gnome-keybinding-properties.c:999
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
 "using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time.\n"
+"Please try with a key such as Control, Alt or Shift at the same time."
 msgstr ""
 "No se puede usar la combinación de teclas «%s» porque se haría imposible "
 "escribir usando esta tecla.\n"
-"Por favor, inténtelo con una tecla como Control, Alt o Mayúsculas al mismo "
-"tiempo.\n"
+"Por favor, inténtelo con una tecla como Control, Alt o Mayús. al mismo "
+"tiempo."
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:914
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1028
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
-" \"%s\"\n"
+" \"%s\""
 msgstr ""
 "La combinación «%s» ya se usa para:\n"
-"«%s»\n"
+"«%s»"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:946
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1060
 #, c-format
-msgid "Error setting new accelerator in configuration database: %s\n"
+msgid "Error setting new accelerator in configuration database: %s"
 msgstr ""
-"Error al definir una combinación nueva en la base de datos de configuración: "
-"%s\n"
+"Error al establecer una combinación nueva en la base de datos de "
+"configuración: %s"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:998
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1112
 #, c-format
-msgid "Error unsetting accelerator in configuration database: %s\n"
+msgid "Error unsetting accelerator in configuration database: %s"
 msgstr ""
 "Error al borrar una combinación de teclas en la base de datos de "
-"configuración: %s\n"
+"configuración: %s"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1129
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1294
 msgid "Action"
 msgstr "Acción"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1153
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1316
 msgid "Shortcut"
 msgstr "Combinación"
 
@@ -2050,11 +2045,17 @@ msgstr "Asigne una combinación de teclas a comandos"
 #: ../capplets/keyboard/gnome-keyboard-properties.c:253
 #: ../capplets/sound/sound-properties-capplet.c:1155
 #: ../capplets/sound/sound-properties-capplet.c:1157
-msgid "Just apply settings and quit (compatibility only; now handled by daemon)"
+msgid ""
+"Just apply settings and quit (compatibility only; now handled by daemon)"
 msgstr ""
 "Tan sólo aplicar la configuración y salir (sólo por compatibilidad; "
 "manipulado ahora por un demonio)"
 
+#: ../capplets/keyboard/gnome-keyboard-properties.c:256
+#: ../capplets/sound/sound-properties-capplet.c:1159
+msgid "Retrieve and store legacy settings"
+msgstr "Obtener y almacenar configuración heredada"
+
 #: ../capplets/keyboard/gnome-keyboard-properties.c:260
 msgid "Start the page with the typing break settings showing"
 msgstr "Iniciar la página mostrando la configuración del descanso de escritura"
@@ -2129,7 +2130,8 @@ msgstr "Co_mentarios sobre el sonido..."
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:15
 msgid "Beep when _accessibility features are turned on or off"
-msgstr "Pitar cuando se activen o desactiven las características de _accesibilidad"
+msgstr ""
+"Pitar cuando se activen o desactiven las características de _accesibilidad"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:16
 msgid "Beep when a _modifier key is pressed"
@@ -2208,7 +2210,8 @@ msgstr "General"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:34
 msgid "Key presses _repeat when key is held down"
-msgstr "La pulsaciones de teclas se _repiten cuando la tecla se mantiene pulsada"
+msgstr ""
+"La pulsaciones de teclas se _repiten cuando la tecla se mantiene pulsada"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:35
 msgid "Keyboard Accessibility Audio Feedback"
@@ -2407,7 +2410,8 @@ msgstr "Desactivado"
 #. TRANSLATORS: don't translate the terms in brackets
 #: ../capplets/mouse/gnome-mouse-properties.c:443
 msgid "Specify the name of the page to show (general|accessibility)"
-msgstr "Especifique el nombre de la página para mostrar (general|accessibility)"
+msgstr ""
+"Especifique el nombre de la página para mostrar (general|accessibility)"
 
 #: ../capplets/mouse/gnome-mouse-properties.c:452
 msgid "- GNOME Mouse Preferences"
@@ -2550,7 +2554,8 @@ msgstr "_Tiempo de espera:"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:51
 msgid "_Trigger secondary click by holding down the primary button"
-msgstr "D_isparar la pulsación secundaria al mantener pulsado el botón primario"
+msgstr ""
+"D_isparar la pulsación secundaria al mantener pulsado el botón primario"
 
 #: ../capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
@@ -2805,7 +2810,8 @@ msgstr "Campana _visual del sistema"
 
 #: ../capplets/windows/gnome-window-properties.c:344
 msgid "Cannot start the preferences application for your window manager"
-msgstr "No se puede iniciar la aplicación de preferencias para su gestor de ventanas"
+msgstr ""
+"No se puede iniciar la aplicación de preferencias para su gestor de ventanas"
 
 #. translators: this is the Control key
 #: ../capplets/windows/gnome-window-properties.c:602
@@ -2881,36 +2887,36 @@ msgid "Windows"
 msgstr "Ventanas"
 
 #. make start action
-#: ../libslab/application-tile.c:369
+#: ../libslab/application-tile.c:372
 #, c-format
 msgid "<b>Start %s</b>"
 msgstr "<b>Iniciar %s</b>"
 
-#: ../libslab/application-tile.c:388 ../libslab/bookmark-agent.c:1059
+#: ../libslab/application-tile.c:391 ../libslab/bookmark-agent.c:1059
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../libslab/application-tile.c:435
+#: ../libslab/application-tile.c:438
 msgid "Upgrade"
 msgstr "Actualizar"
 
-#: ../libslab/application-tile.c:450
+#: ../libslab/application-tile.c:453
 msgid "Uninstall"
 msgstr "Desinstalar"
 
-#: ../libslab/application-tile.c:777 ../libslab/document-tile.c:741
+#: ../libslab/application-tile.c:780 ../libslab/document-tile.c:760
 msgid "Remove from Favorites"
 msgstr "Quitar de favoritos"
 
-#: ../libslab/application-tile.c:779 ../libslab/document-tile.c:743
+#: ../libslab/application-tile.c:782 ../libslab/document-tile.c:762
 msgid "Add to Favorites"
 msgstr "Añadir a favoritos"
 
-#: ../libslab/application-tile.c:864
+#: ../libslab/application-tile.c:867
 msgid "Remove from Startup Programs"
 msgstr "Quitar de los programas de inicio"
 
-#: ../libslab/application-tile.c:866
+#: ../libslab/application-tile.c:869
 msgid "Add to Startup Programs"
 msgstr "Añadir a los programas de inicio"
 
@@ -2941,31 +2947,31 @@ msgstr "Salida"
 msgid "Shutdown"
 msgstr "Apagar"
 
-#: ../libslab/bookmark-agent.c:1089
+#: ../libslab/bookmark-agent.c:1090
 msgid "New Spreadsheet"
 msgstr "Hoja de cálculo nueva"
 
-#: ../libslab/bookmark-agent.c:1093
+#: ../libslab/bookmark-agent.c:1095
 msgid "New Document"
 msgstr "Documento nuevo"
 
-#: ../libslab/bookmark-agent.c:1145
+#: ../libslab/bookmark-agent.c:1147
 msgid "Home"
 msgstr "Domicilio"
 
-#: ../libslab/bookmark-agent.c:1150
+#: ../libslab/bookmark-agent.c:1152
 msgid "Documents"
 msgstr "Documentos"
 
-#: ../libslab/bookmark-agent.c:1163
+#: ../libslab/bookmark-agent.c:1165
 msgid "File System"
 msgstr "Sistema de archivos"
 
-#: ../libslab/bookmark-agent.c:1167
+#: ../libslab/bookmark-agent.c:1169
 msgid "Network Servers"
 msgstr "Servidores de red"
 
-#: ../libslab/bookmark-agent.c:1196
+#: ../libslab/bookmark-agent.c:1198
 msgid "Search"
 msgstr "Buscar"
 
@@ -2976,72 +2982,72 @@ msgid "<b>Open</b>"
 msgstr "<b>Abrir</b>"
 
 #. make rename action
-#: ../libslab/directory-tile.c:189 ../libslab/document-tile.c:228
+#: ../libslab/directory-tile.c:189 ../libslab/document-tile.c:242
 msgid "Rename..."
 msgstr "Renombrar…"
 
 #: ../libslab/directory-tile.c:203 ../libslab/directory-tile.c:212
-#: ../libslab/document-tile.c:242 ../libslab/document-tile.c:251
+#: ../libslab/document-tile.c:256 ../libslab/document-tile.c:265
 msgid "Send To..."
 msgstr "Enviar a…"
 
 #. make move to trash action
-#: ../libslab/directory-tile.c:227 ../libslab/document-tile.c:277
+#: ../libslab/directory-tile.c:227 ../libslab/document-tile.c:291
 msgid "Move to Trash"
 msgstr "Mover a la papelera"
 
 #: ../libslab/directory-tile.c:237 ../libslab/directory-tile.c:450
-#: ../libslab/document-tile.c:287 ../libslab/document-tile.c:854
+#: ../libslab/document-tile.c:301 ../libslab/document-tile.c:873
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../libslab/directory-tile.c:575 ../libslab/document-tile.c:1026
+#: ../libslab/directory-tile.c:575 ../libslab/document-tile.c:1045
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "¿Está seguro de que quiere borrar permanentemente «%s»?"
 
-#: ../libslab/directory-tile.c:580 ../libslab/document-tile.c:1030
+#: ../libslab/directory-tile.c:580 ../libslab/document-tile.c:1049
 msgid "If you delete an item, it is permanently lost."
 msgstr "Si borra un elemento se pierde para siempre."
 
-#: ../libslab/document-tile.c:189
+#: ../libslab/document-tile.c:203
 #, c-format
 msgid "<b>Open with \"%s\"</b>"
 msgstr "<b>Abrir con «%s»</b>"
 
-#: ../libslab/document-tile.c:201
+#: ../libslab/document-tile.c:215
 msgid "Open with Default Application"
 msgstr "Abrir con la aplicación predeterminada"
 
-#: ../libslab/document-tile.c:212
+#: ../libslab/document-tile.c:226
 msgid "Open in File Manager"
 msgstr "Abrir en el gestor de archivos"
 
-#: ../libslab/document-tile.c:637
+#: ../libslab/document-tile.c:656
 msgid "?"
 msgstr "?"
 
-#: ../libslab/document-tile.c:644
+#: ../libslab/document-tile.c:663
 msgid "%l:%M %p"
 msgstr "%H:%M"
 
-#: ../libslab/document-tile.c:652
+#: ../libslab/document-tile.c:671
 msgid "Today %l:%M %p"
 msgstr "Hoy %H:%M"
 
-#: ../libslab/document-tile.c:662
+#: ../libslab/document-tile.c:681
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %H:%M"
 
-#: ../libslab/document-tile.c:674
+#: ../libslab/document-tile.c:693
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../libslab/document-tile.c:682
+#: ../libslab/document-tile.c:701
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: ../libslab/document-tile.c:684
+#: ../libslab/document-tile.c:703
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
@@ -3076,7 +3082,8 @@ msgstr "Etiqueta «%s» inesperada dentro de «%s»"
 #: ../libslab/libslab-bookmarkfile.c:1929
 #, c-format
 msgid "No valid bookmark file found in data dirs"
-msgstr "No se encontró un archivo de marcadores válido en los directorios de datos"
+msgstr ""
+"No se encontró un archivo de marcadores válido en los directorios de datos"
 
 #: ../libslab/libslab-bookmarkfile.c:2130
 #, c-format
@@ -3200,7 +3207,8 @@ msgstr "Sonidos del sistema"
 #: ../libwindow-settings/gnome-wm-manager.c:318
 #, c-format
 msgid "Window manager \"%s\" has not registered a configuration tool\n"
-msgstr "El gestor de ventanas «%s» no ha registrado una herramienta de configuración\n"
+msgstr ""
+"El gestor de ventanas «%s» no ha registrado una herramienta de configuración\n"
 
 #: ../libwindow-settings/metacity-window-manager.c:402
 msgid "Maximize"
@@ -3325,7 +3333,8 @@ msgstr ""
 "desktop]"
 
 #: ../shell/control-center.schemas.in.h:14
-msgid "if true, the control-center will close when a \"Common Task\" is activated."
+msgid ""
+"if true, the control-center will close when a \"Common Task\" is activated."
 msgstr ""
 "Si es verdadero, el centro de control se cerrará cuando se active una «Tarea "
 "común»."
@@ -3438,22 +3447,27 @@ msgstr "Establece la tipografía predeterminada para las aplicaciones"
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
-msgstr "Si está puesto a «true», entonces las tipografías OpenType se miniaturizarán."
+msgstr ""
+"Si está puesto a «true», entonces las tipografías OpenType se miniaturizarán."
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:2
 msgid "If set to true, then PCF fonts will be thumbnailed."
-msgstr "Si está puesto a «true», entonces las tipografías PFC se miniaturizarán."
+msgstr ""
+"Si está puesto a «true», entonces las tipografías PFC se miniaturizarán."
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:3
 msgid "If set to true, then TrueType fonts will be thumbnailed."
-msgstr "Si está puesto a «true», entonces las tipografías TrueType se miniaturizarán."
+msgstr ""
+"Si está puesto a «true», entonces las tipografías TrueType se miniaturizarán."
 
 #: ../vfs-methods/fontilus/fontilus.schemas.in.h:4
 msgid "If set to true, then Type1 fonts will be thumbnailed."
-msgstr "Si está puesto a «true», entonces las tipografías Type1 se miniaturizarán."
+msgstr ""
+"Si está puesto a «true», entonces las tipografías Type1 se miniaturizarán."
 
 #: ../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 ""
 "Ponga en esta clave el comando que se debe usar para crear miniaturas de las "
 "tipografías OpenType."
@@ -3465,7 +3479,8 @@ msgstr ""
 "tipografías 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 ""
 "Ponga en esta clave el comando que se debe usar para crear miniaturas de las "
 "tipografías TrueType."
@@ -3626,14 +3641,16 @@ msgstr "Tema de iconos"
 
 #: ../vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
-msgstr "Si se establece a «true», entonces los temas instalados se miniaturizarán."
+msgstr ""
+"Si se establece a «true», entonces los temas instalados se miniaturizarán."
 
 #: ../vfs-methods/themus/themus.schemas.in.h:2
 msgid "If set to true, then themes will be thumbnailed."
 msgstr "Si se establece a «true», entonces los temas se miniautizarán."
 
 #: ../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 ""
 "Establezca esta clave con el comando utilizado para crear las miniaturas de "
 "los temas instalados."
@@ -3677,3 +3694,5 @@ msgstr "Aplicar tema"
 msgid "Sets the default theme"
 msgstr "Establece el tema predeterminado"
 
+#~ msgid "Just apply settings and quit"
+#~ msgstr "Aplicar los cambios y salir"
diff --git a/po/gl.po b/po/gl.po
index 5cdebc4b5..e459b5b2a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-30 11:20+0200\n"
-"PO-Revision-Date: 2008-04-30 11:29+0200\n"
+"POT-Creation-Date: 2008-06-03 21:55+0200\n"
+"PO-Revision-Date: 2008-06-03 21:56+0200\n"
 "Last-Translator: Ignacio Casal Quinteiro <icq@svn.gnome.org>\n"
 "Language-Team: Galego <proxecto@trasno.net>\n"
 "MIME-Version: 1.0\n"
@@ -58,12 +58,12 @@ msgid "No Image"
 msgstr "Sen imaxe"
 
 #: ../capplets/about-me/gnome-about-me.c:769
-#: ../capplets/appearance/appearance-desktop.c:1054
+#: ../capplets/appearance/appearance-desktop.c:661
 msgid "Images"
 msgstr "Imaxes"
 
 #: ../capplets/about-me/gnome-about-me.c:773
-#: ../capplets/appearance/theme-installer.c:695
+#: ../capplets/appearance/theme-installer.c:717
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
@@ -506,11 +506,11 @@ msgid "Enable support for GNOME assistive technologies at login"
 msgstr ""
 "Activa o soporte para as tecnoloxías adaptadas do Gnome ao iniciar sesión"
 
-#: ../capplets/appearance/appearance-desktop.c:1022
+#: ../capplets/appearance/appearance-desktop.c:629
 msgid "Add Wallpaper"
 msgstr "Engadir unha imaxe de fondo"
 
-#: ../capplets/appearance/appearance-desktop.c:1058
+#: ../capplets/appearance/appearance-desktop.c:665
 msgid "All files"
 msgstr "Todos os ficheiros"
 
@@ -562,64 +562,43 @@ msgstr "Usar o tipo de letra anterior"
 msgid "Use selected font"
 msgstr "Uar o tipo de letra seleccionado"
 
-#: ../capplets/appearance/appearance-main.c:108
+#: ../capplets/appearance/appearance-main.c:107
 msgid "Specify the filename of a theme to install"
 msgstr "Especificar o nome do ficheiro do tema a instalar"
 
-#: ../capplets/appearance/appearance-main.c:109
+#: ../capplets/appearance/appearance-main.c:108
 msgid "filename"
 msgstr "nome de ficheiro"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/appearance/appearance-main.c:116
+#: ../capplets/appearance/appearance-main.c:115
 msgid "Specify the name of the page to show (theme|background|fonts|interface)"
 msgstr ""
 "Especificar o nome da páxina a mostrar (tema|fondo|tipos de letra|interface)"
 
-#: ../capplets/appearance/appearance-main.c:117
-#: ../capplets/default-applications/gnome-da-capplet.c:1329
+#: ../capplets/appearance/appearance-main.c:116
+#: ../capplets/default-applications/gnome-da-capplet.c:880
 #: ../capplets/mouse/gnome-mouse-properties.c:444
 msgid "page"
 msgstr "páxina"
 
-#: ../capplets/appearance/appearance-main.c:124
+#: ../capplets/appearance/appearance-main.c:123
 msgid "[WALLPAPER...]"
 msgstr "[IMAXE DE FONDO...]"
 
-#: ../capplets/appearance/appearance-style.c:156
+#: ../capplets/appearance/appearance-style.c:159
 #: ../capplets/common/gnome-theme-info.c:439
-#: ../capplets/common/gnome-theme-info.c:638
+#: ../capplets/common/gnome-theme-info.c:628
 msgid "Default Pointer"
 msgstr "O punteiro por defecto"
 
-#: ../capplets/appearance/appearance-themes.c:362
-#, c-format
-msgid ""
-"This theme will not look as intended because the required GTK+ theme '%s' is "
-"not installed."
-msgstr ""
-"Este tema non se mostrará como se pretende porque o tema GTK+ '%s' non está "
-"instalado."
-
-#: ../capplets/appearance/appearance-themes.c:369
-#, c-format
-msgid ""
-"This theme will not look as intended because the required window manager "
-"theme '%s' is not installed."
-msgstr ""
-"Este tema non se mostrará como se pretende porque o tema do xestor de ventás "
-"necesario '%s' non está instalado."
-
-#: ../capplets/appearance/appearance-themes.c:375
-#, c-format
-msgid ""
-"This theme will not look as intended because the required icon theme '%s' is "
-"not installed."
-msgstr ""
-"Este tema non se mostrará como se pretende porque o tema de iconas necesario "
-"'%s' non está instalado."
+#: ../capplets/appearance/appearance-style.c:221
+#: ../capplets/appearance/appearance-themes.c:685
+msgid "Install"
+msgstr "Instalar"
 
-#: ../capplets/appearance/appearance-themes.c:399
+#: ../capplets/appearance/appearance-style.c:241
+#: ../capplets/common/gnome-theme-info.c:1634
 #, c-format
 msgid ""
 "This theme will not look as intended because the required GTK+ theme engine "
@@ -628,19 +607,19 @@ msgstr ""
 "Este tema non se mostrará como se pretende porque o motor de temas GTK+ "
 "necesario '%s' non está instalado."
 
-#: ../capplets/appearance/appearance-themes.c:716
+#: ../capplets/appearance/appearance-themes.c:673
 msgid "Apply Background"
 msgstr "Aplicar fondo"
 
-#: ../capplets/appearance/appearance-themes.c:720
+#: ../capplets/appearance/appearance-themes.c:677
 msgid "Apply Font"
 msgstr "Aplicar tipo de letra"
 
-#: ../capplets/appearance/appearance-themes.c:724
+#: ../capplets/appearance/appearance-themes.c:681
 msgid "Revert Font"
 msgstr "Revertir tipo de letra"
 
-#: ../capplets/appearance/appearance-themes.c:750
+#: ../capplets/appearance/appearance-themes.c:711
 msgid ""
 "The current theme suggests a background and a font. Also, the last applied "
 "font suggestion can be reverted."
@@ -648,7 +627,7 @@ msgstr ""
 "O tema actual suxire un fondo e un tipo de letra. Ademáis, pódese revertir a "
 "última suxestión de tipo de letra."
 
-#: ../capplets/appearance/appearance-themes.c:752
+#: ../capplets/appearance/appearance-themes.c:713
 msgid ""
 "The current theme suggests a background. Also, the last applied font "
 "suggestion can be reverted."
@@ -656,11 +635,11 @@ msgstr ""
 "O tema actual suxire un fondo e un tipo de letra. Ademáis, pódese revertir a "
 "última suxestión de tipo de letra aplicada."
 
-#: ../capplets/appearance/appearance-themes.c:754
+#: ../capplets/appearance/appearance-themes.c:715
 msgid "The current theme suggests a background and a font."
 msgstr "O tema actual suxire un fondo e un tipo de letra."
 
-#: ../capplets/appearance/appearance-themes.c:756
+#: ../capplets/appearance/appearance-themes.c:717
 msgid ""
 "The current theme suggests a font. Also, the last applied font suggestion "
 "can be reverted."
@@ -668,20 +647,20 @@ msgstr ""
 "O tema actual suxire un tipo de letra. Ademáis, pódese revertir a última "
 "suxestión de tipo de letra aplicada."
 
-#: ../capplets/appearance/appearance-themes.c:758
+#: ../capplets/appearance/appearance-themes.c:719
 msgid "The current theme suggests a background."
 msgstr "O tema actual suxire un fondo."
 
-#: ../capplets/appearance/appearance-themes.c:760
+#: ../capplets/appearance/appearance-themes.c:721
 msgid "The last applied font suggestion can be reverted."
 msgstr "Pódese revertir a última suxestión de tipo de letra aplicada."
 
-#: ../capplets/appearance/appearance-themes.c:762
+#: ../capplets/appearance/appearance-themes.c:723
 msgid "The current theme suggests a font."
 msgstr "O tema actual suxire un tipo de letra."
 
-#: ../capplets/appearance/appearance-themes.c:1082
-#: ../capplets/default-applications/gnome-da-capplet.c:1080
+#: ../capplets/appearance/appearance-themes.c:1046
+#: ../capplets/default-applications/gnome-da-capplet.c:630
 #: ../capplets/sound/sound-properties-capplet.c:328
 msgid "Custom"
 msgstr "Personalizar"
@@ -1070,11 +1049,11 @@ msgstr "Instalador de temas"
 msgid "Gnome Theme Package"
 msgstr "Paquete de tema de Gnome"
 
-#: ../capplets/appearance/gnome-wp-info.c:45
+#: ../capplets/appearance/gnome-wp-info.c:50
 msgid "No Wallpaper"
 msgstr "Sen imaxe de fondo"
 
-#: ../capplets/appearance/gnome-wp-item.c:212
+#: ../capplets/appearance/gnome-wp-item.c:209
 msgid "Slide Show"
 msgstr "Presentación de diapositivas"
 
@@ -1082,7 +1061,7 @@ msgstr "Presentación de diapositivas"
 #. * mime type, x pixel(s) by y pixel(s)
 #. * Folder: /path/to/file
 #.
-#: ../capplets/appearance/gnome-wp-item.c:220
+#: ../capplets/appearance/gnome-wp-item.c:217
 #, c-format
 msgid ""
 "<b>%s</b>\n"
@@ -1093,37 +1072,37 @@ msgstr ""
 "%s, %d %s por %d %s\n"
 "Cartafol: %s"
 
-#: ../capplets/appearance/gnome-wp-item.c:226
-#: ../capplets/appearance/gnome-wp-item.c:228
+#: ../capplets/appearance/gnome-wp-item.c:223
+#: ../capplets/appearance/gnome-wp-item.c:225
 msgid "pixel"
 msgid_plural "pixels"
 msgstr[0] "píxel"
 msgstr[1] "píxeles"
 
-#: ../capplets/appearance/theme-installer.c:166
-#: ../capplets/appearance/theme-installer.c:216
+#: ../capplets/appearance/theme-installer.c:171
+#: ../capplets/appearance/theme-installer.c:221
 msgid "Cannot install theme"
 msgstr "Non se pode instalar o tema"
 
-#: ../capplets/appearance/theme-installer.c:168
+#: ../capplets/appearance/theme-installer.c:173
 #, c-format
 msgid "The %s utility is not installed."
 msgstr "A utilidade %s non está instalada."
 
-#: ../capplets/appearance/theme-installer.c:218
+#: ../capplets/appearance/theme-installer.c:223
 msgid "There was a problem while extracting the theme."
 msgstr "Ocorreu un problema extraendo o tema."
 
-#: ../capplets/appearance/theme-installer.c:241
+#: ../capplets/appearance/theme-installer.c:246
 msgid "There was an error installing the selected file"
 msgstr "Ocorreu un erro instalando o ficheiro seleccionado"
 
-#: ../capplets/appearance/theme-installer.c:242
+#: ../capplets/appearance/theme-installer.c:247
 #, c-format
 msgid "\"%s\" does not appear to be a valid theme."
 msgstr "\"%s\" non parece ser un tema válido."
 
-#: ../capplets/appearance/theme-installer.c:243
+#: ../capplets/appearance/theme-installer.c:248
 #, c-format
 msgid ""
 "\"%s\" does not appear to be a valid theme. It may be a theme engine which "
@@ -1132,47 +1111,47 @@ msgstr ""
 "\"%s\" non parece ser un tema válido. Pode ser un motor de temas que debe "
 "compilar."
 
-#: ../capplets/appearance/theme-installer.c:282
+#: ../capplets/appearance/theme-installer.c:287
 #, c-format
 msgid "GNOME Theme %s correctly installed"
 msgstr "O tema de Gnome %s instalouse correctamente"
 
-#: ../capplets/appearance/theme-installer.c:342
+#: ../capplets/appearance/theme-installer.c:354
 #, c-format
 msgid "Installation for theme \"%s\" failed."
 msgstr "Fallou a instalación do tema \"%s\"."
 
-#: ../capplets/appearance/theme-installer.c:374
+#: ../capplets/appearance/theme-installer.c:392
 #, c-format
 msgid "The theme \"%s\" has been installed."
 msgstr "Foi instalado o tema \"%s\"."
 
-#: ../capplets/appearance/theme-installer.c:380
+#: ../capplets/appearance/theme-installer.c:398
 msgid "Would you like to apply it now, or keep your current theme?"
 msgstr "Quere aplicalo agora, ou manter o tema actual?"
 
-#: ../capplets/appearance/theme-installer.c:382
+#: ../capplets/appearance/theme-installer.c:400
 msgid "Keep Current Theme"
 msgstr "Manter o tema actual"
 
-#: ../capplets/appearance/theme-installer.c:384
+#: ../capplets/appearance/theme-installer.c:402
 msgid "Apply New Theme"
 msgstr "Aplicar o tema novo"
 
-#: ../capplets/appearance/theme-installer.c:486
+#: ../capplets/appearance/theme-installer.c:505
 msgid "Failed to create temporary directory"
 msgstr "Fallou ao crear o directorio temporal"
 
-#: ../capplets/appearance/theme-installer.c:546
+#: ../capplets/appearance/theme-installer.c:568
 msgid "New themes have been successfully installed."
 msgstr "Os novos temas instaláronse satisfactoriamente."
 
-#: ../capplets/appearance/theme-installer.c:573
+#: ../capplets/appearance/theme-installer.c:595
 msgid "No theme file location specified to install"
 msgstr ""
 "Non se especificou ningunha localización do ficheiro de tema para instalar"
 
-#: ../capplets/appearance/theme-installer.c:593
+#: ../capplets/appearance/theme-installer.c:615
 #, c-format
 msgid ""
 "Insufficient permissions to install the theme in:\n"
@@ -1181,7 +1160,7 @@ msgstr ""
 "Permisos insuficientes para instalar o tema en:\n"
 "%s"
 
-#: ../capplets/appearance/theme-installer.c:615
+#: ../capplets/appearance/theme-installer.c:637
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -1190,11 +1169,11 @@ msgstr ""
 "%s é a ruta onde se instalarán o ficheiros de temas. Isto non se pode "
 "seleccionar como localización de orixe"
 
-#: ../capplets/appearance/theme-installer.c:684
+#: ../capplets/appearance/theme-installer.c:706
 msgid "Select Theme"
 msgstr "Seleccionar tema"
 
-#: ../capplets/appearance/theme-installer.c:688
+#: ../capplets/appearance/theme-installer.c:710
 msgid "Theme Packages"
 msgstr "Paquetes de tema"
 
@@ -1203,23 +1182,27 @@ msgstr "Paquetes de tema"
 msgid "Theme name must be present"
 msgstr "O nome do tema debe estar presente"
 
-#: ../capplets/appearance/theme-save.c:161
+#: ../capplets/appearance/theme-save.c:154
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "O tema xa existe. Quere substituílo?"
 
-#: ../capplets/appearance/theme-save.c:162
+#: ../capplets/appearance/theme-save.c:155
 #: ../capplets/common/file-transfer-dialog.c:450
 msgid "_Overwrite"
 msgstr "_Substituír"
 
-#: ../capplets/appearance/theme-util.c:69
+#: ../capplets/appearance/theme-util.c:134
 msgid "Would you like to delete this theme?"
 msgstr "Quere eliminar este tema?"
 
-#: ../capplets/appearance/theme-util.c:121
+#: ../capplets/appearance/theme-util.c:179
 msgid "Theme cannot be deleted"
 msgstr "O tema non se pode eliminar"
 
+#: ../capplets/appearance/theme-util.c:304
+msgid "Could not install theme engine"
+msgstr "Non se puido instalar o motor do tema"
+
 #: ../capplets/common/activate-settings-daemon.c:16
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -1240,17 +1223,7 @@ msgstr ""
 msgid "Unable to load stock icon '%s'\n"
 msgstr "Non se puido cargar a icona xenérica'%s'\n"
 
-#: ../capplets/common/capplet-util.c:240 ../capplets/common/capplet-util.c:242
-msgid "Just apply settings and quit"
-msgstr "Aplicar as configuracións e saír"
-
-#: ../capplets/common/capplet-util.c:244
-#: ../capplets/keyboard/gnome-keyboard-properties.c:256
-#: ../capplets/sound/sound-properties-capplet.c:1159
-msgid "Retrieve and store legacy settings"
-msgstr "Obter e almacenar opcións anteriores"
-
-#: ../capplets/common/capplet-util.c:344
+#: ../capplets/common/capplet-util.c:80
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "Ocorreu un erro ao mostrar a axuda: %s"
@@ -1331,84 +1304,84 @@ msgstr "_Saltar"
 msgid "Overwrite _All"
 msgstr "_Substituír todo"
 
-#: ../capplets/common/gconf-property-editor.c:170
+#: ../capplets/common/gconf-property-editor.c:133
 msgid "Key"
 msgstr "Tecla"
 
-#: ../capplets/common/gconf-property-editor.c:171
+#: ../capplets/common/gconf-property-editor.c:134
 msgid "GConf key to which this property editor is attached"
 msgstr "Tecla do GConf á que está anexado este editor de propiedades"
 
-#: ../capplets/common/gconf-property-editor.c:177
+#: ../capplets/common/gconf-property-editor.c:140
 msgid "Callback"
 msgstr "Chamada de retorno"
 
-#: ../capplets/common/gconf-property-editor.c:178
+#: ../capplets/common/gconf-property-editor.c:141
 msgid "Issue this callback when the value associated with key gets changed"
 msgstr ""
 "Emitir esta chamada de retorno cando se modifique o valor asociado a unha "
 "tecla"
 
-#: ../capplets/common/gconf-property-editor.c:183
+#: ../capplets/common/gconf-property-editor.c:146
 msgid "Change set"
 msgstr "Conxunto de cambios"
 
-#: ../capplets/common/gconf-property-editor.c:184
+#: ../capplets/common/gconf-property-editor.c:147
 msgid ""
 "GConf change set containing data to be forwarded to the gconf client on apply"
 msgstr ""
 "Conxunto de cambios que conteñen datos do GConf e que se reenviarán ao "
 "cliente GConf cando se apliquen"
 
-#: ../capplets/common/gconf-property-editor.c:189
+#: ../capplets/common/gconf-property-editor.c:152
 msgid "Conversion to widget callback"
 msgstr "Chamada de retorno de conversión a widget"
 
-#: ../capplets/common/gconf-property-editor.c:190
+#: ../capplets/common/gconf-property-editor.c:153
 msgid ""
 "Callback to be issued when data are to be converted from GConf to the widget"
 msgstr ""
 "Chamada de retorno que debe emitirse cando os datos sexan convertidos do "
 "GConf ao widget"
 
-#: ../capplets/common/gconf-property-editor.c:195
+#: ../capplets/common/gconf-property-editor.c:158
 msgid "Conversion from widget callback"
 msgstr "Chamada de retorno de conversión desde widget"
 
-#: ../capplets/common/gconf-property-editor.c:196
+#: ../capplets/common/gconf-property-editor.c:159
 msgid ""
 "Callback to be issued when data are to be converted to GConf from the widget"
 msgstr ""
 "Chamada de retorno que debe emitirse cando os datos se convertan para o "
 "GConf desde o widget"
 
-#: ../capplets/common/gconf-property-editor.c:201
+#: ../capplets/common/gconf-property-editor.c:164
 msgid "UI Control"
 msgstr "Control da interface de usuario"
 
-#: ../capplets/common/gconf-property-editor.c:202
+#: ../capplets/common/gconf-property-editor.c:165
 msgid "Object that controls the property (normally a widget)"
 msgstr "Obxecto que controla a propiedade (normalmente un widget)"
 
-#: ../capplets/common/gconf-property-editor.c:217
+#: ../capplets/common/gconf-property-editor.c:180
 msgid "Property editor object data"
 msgstr "Datos de obxecto do editor de propiedades"
 
-#: ../capplets/common/gconf-property-editor.c:218
+#: ../capplets/common/gconf-property-editor.c:181
 msgid "Custom data required by the specific property editor"
 msgstr "Datos personalizados requiridos polo editor específico de propiedades"
 
-#: ../capplets/common/gconf-property-editor.c:224
+#: ../capplets/common/gconf-property-editor.c:187
 msgid "Property editor data freeing callback"
 msgstr "Chamada de retorno que libera datos do editor de propiedades"
 
-#: ../capplets/common/gconf-property-editor.c:225
+#: ../capplets/common/gconf-property-editor.c:188
 msgid "Callback to be issued when property editor object data is to be freed"
 msgstr ""
 "Chamada de retorno que se emite cando se van liberar os datos de obxecto do "
 "editor de propiedades"
 
-#: ../capplets/common/gconf-property-editor.c:1467
+#: ../capplets/common/gconf-property-editor.c:1429
 #, c-format
 msgid ""
 "Couldn't find the file '%s'.\n"
@@ -1421,7 +1394,7 @@ msgstr ""
 "Asegúrese de que existe e volva a tentalo ou escolla unha imaxe de fondo "
 "diferente."
 
-#: ../capplets/common/gconf-property-editor.c:1475
+#: ../capplets/common/gconf-property-editor.c:1437
 #, c-format
 msgid ""
 "I don't know how to open the file '%s'.\n"
@@ -1434,42 +1407,69 @@ msgstr ""
 "\n"
 "Seleccione no seu lugar outra imaxe diferente."
 
-#: ../capplets/common/gconf-property-editor.c:1594
+#: ../capplets/common/gconf-property-editor.c:1556
 msgid "Please select an image."
 msgstr "Seleccione unha imaxe."
 
-#: ../capplets/common/gconf-property-editor.c:1599
+#: ../capplets/common/gconf-property-editor.c:1561
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: ../capplets/common/gnome-theme-info.c:639
+#: ../capplets/common/gnome-theme-info.c:629
 msgid "Default Pointer - Current"
 msgstr "Punteiro predeterminado - Actual"
 
-#: ../capplets/common/gnome-theme-info.c:643
+#: ../capplets/common/gnome-theme-info.c:633
 msgid "White Pointer"
 msgstr "Punteiro branco"
 
-#: ../capplets/common/gnome-theme-info.c:644
+#: ../capplets/common/gnome-theme-info.c:634
 msgid "White Pointer - Current"
 msgstr "Punteiro branco - Actual"
 
-#: ../capplets/common/gnome-theme-info.c:648
+#: ../capplets/common/gnome-theme-info.c:638
 msgid "Large Pointer"
 msgstr "Punteiro grande"
 
-#: ../capplets/common/gnome-theme-info.c:649
+#: ../capplets/common/gnome-theme-info.c:639
 msgid "Large Pointer - Current"
 msgstr "Punteiro grande - Actual"
 
-#: ../capplets/common/gnome-theme-info.c:653
+#: ../capplets/common/gnome-theme-info.c:643
 msgid "Large White Pointer - Current"
 msgstr "Punteiro branco grande - Actual"
 
-#: ../capplets/common/gnome-theme-info.c:654
+#: ../capplets/common/gnome-theme-info.c:644
 msgid "Large White Pointer"
 msgstr "Punteiro branco grande"
 
+#: ../capplets/common/gnome-theme-info.c:1610
+#, c-format
+msgid ""
+"This theme will not look as intended because the required GTK+ theme '%s' is "
+"not installed."
+msgstr ""
+"Este tema non se mostrará como se pretende porque o tema GTK+ '%s' non está "
+"instalado."
+
+#: ../capplets/common/gnome-theme-info.c:1618
+#, c-format
+msgid ""
+"This theme will not look as intended because the required window manager "
+"theme '%s' is not installed."
+msgstr ""
+"Este tema non se mostrará como se pretende porque o tema do xestor de ventás "
+"necesario '%s' non está instalado."
+
+#: ../capplets/common/gnome-theme-info.c:1625
+#, c-format
+msgid ""
+"This theme will not look as intended because the required icon theme '%s' is "
+"not installed."
+msgstr ""
+"Este tema non se mostrará como se pretende porque o tema de iconas necesario "
+"'%s' non está instalado."
+
 #: ../capplets/default-applications/default-applications.desktop.in.in.h:1
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Preferred Applications"
@@ -1487,32 +1487,23 @@ msgstr "Iniciar a tecnoloxía de asistencia visual preferida"
 msgid "Visual Assistance"
 msgstr "Asistencia visual"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:80
-#: ../capplets/default-applications/gnome-da-capplet.c:112
-#: ../capplets/default-applications/gnome-da-capplet.c:133
-#: ../capplets/default-applications/gnome-da-capplet.c:177
-#: ../capplets/default-applications/gnome-da-capplet.c:222
-#: ../capplets/default-applications/gnome-da-capplet.c:279
-#: ../capplets/default-applications/gnome-da-capplet.c:330
-#: ../capplets/default-applications/gnome-da-capplet.c:381
-#: ../capplets/default-applications/gnome-da-capplet.c:434
-#: ../capplets/default-applications/gnome-da-capplet.c:484
-#: ../capplets/default-applications/gnome-da-capplet.c:877
-#: ../capplets/default-applications/gnome-da-capplet.c:899
+#: ../capplets/default-applications/gnome-da-capplet.c:94
+#: ../capplets/default-applications/gnome-da-capplet.c:345
+#: ../capplets/default-applications/gnome-da-capplet.c:366
 #, c-format
 msgid "Error saving configuration: %s"
 msgstr "Erro ao gardar a configuración: %s"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:1100
+#: ../capplets/default-applications/gnome-da-capplet.c:650
 msgid "Could not load the main interface"
 msgstr "Non se puido cargar a interface principal"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:1102
+#: ../capplets/default-applications/gnome-da-capplet.c:652
 msgid "Please make sure that the applet is properly installed"
 msgstr "Asegúrese de que a miniaplicación está instalada correctamente"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/default-applications/gnome-da-capplet.c:1328
+#: ../capplets/default-applications/gnome-da-capplet.c:879
 msgid "Specify the name of the page to show (internet|multimedia|system|a11y)"
 msgstr ""
 "Especificar o nome da páxina a mostrar (internet|multimedia|system|a11y)"
@@ -1936,7 +1927,7 @@ msgid "Sound"
 msgstr "Son"
 
 #: ../capplets/keybindings/01-desktop-key.xml.in.h:1
-#: ../libslab/bookmark-agent.c:1156
+#: ../libslab/bookmark-agent.c:1158
 msgid "Desktop"
 msgstr "Escritorio"
 
@@ -1973,48 +1964,52 @@ msgstr "O tipo de tecla rápida."
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:493
+#: ../capplets/keybindings/gnome-keybinding-properties.c:171
 msgid "<Unknown Action>"
 msgstr "<Acción descoñecida>"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:885
+#: ../capplets/keybindings/gnome-keybinding-properties.c:804
+msgid "Custom Shortcuts"
+msgstr "Atallos personalizados"
+
+#: ../capplets/keybindings/gnome-keybinding-properties.c:999
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
 "using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time.\n"
+"Please try with a key such as Control, Alt or Shift at the same time."
 msgstr ""
 "Non se pode usar o atallo \"%s\" porque se faría imposible teclear usando "
 "esta tecla.\n"
-"Ténteo cunha tecla como Control, Alt ou Maiús ao mesmo tempo.\n"
+"Ténteo cunha tecla como Control, Alt ou Maiús ao mesmo tempo."
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:914
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1028
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
-" \"%s\"\n"
+" \"%s\""
 msgstr ""
 "O atallo \"%s\" xa se usa para:\n"
-" \"%s\"\n"
+" \"%s\""
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:946
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1060
 #, c-format
-msgid "Error setting new accelerator in configuration database: %s\n"
+msgid "Error setting new accelerator in configuration database: %s"
 msgstr ""
-"Erro ao configurar un novo acelerador na base de datos da configuración: %s\n"
+"Erro ao configurar un novo acelerador na base de datos da configuración: %s"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:998
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1112
 #, c-format
-msgid "Error unsetting accelerator in configuration database: %s\n"
+msgid "Error unsetting accelerator in configuration database: %s"
 msgstr ""
 "Erro ao eliminar a configuración dunha tecla rápida na base de datos de "
-"configuración: %s\n"
+"configuración: %s"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1129
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1294
 msgid "Action"
 msgstr "Acción"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1153
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1316
 msgid "Shortcut"
 msgstr "Atallo"
 
@@ -2048,6 +2043,11 @@ msgstr ""
 "Aplicar a configuración e saír (só compatibilidade; xestionado agora polo "
 "daemon)"
 
+#: ../capplets/keyboard/gnome-keyboard-properties.c:256
+#: ../capplets/sound/sound-properties-capplet.c:1159
+msgid "Retrieve and store legacy settings"
+msgstr "Obter e almacenar opcións anteriores"
+
 #: ../capplets/keyboard/gnome-keyboard-properties.c:260
 msgid "Start the page with the typing break settings showing"
 msgstr "Iniciar a páxina mostrando a configuración do descanso de escritura"
@@ -2874,36 +2874,36 @@ msgid "Windows"
 msgstr "Ventás"
 
 #. make start action
-#: ../libslab/application-tile.c:369
+#: ../libslab/application-tile.c:372
 #, c-format
 msgid "<b>Start %s</b>"
 msgstr "<b>Iniciar %s</b>"
 
-#: ../libslab/application-tile.c:388 ../libslab/bookmark-agent.c:1059
+#: ../libslab/application-tile.c:391 ../libslab/bookmark-agent.c:1059
 msgid "Help"
 msgstr "Axuda"
 
-#: ../libslab/application-tile.c:435
+#: ../libslab/application-tile.c:438
 msgid "Upgrade"
 msgstr "Actualizar"
 
-#: ../libslab/application-tile.c:450
+#: ../libslab/application-tile.c:453
 msgid "Uninstall"
 msgstr "Desinstalar"
 
-#: ../libslab/application-tile.c:777 ../libslab/document-tile.c:741
+#: ../libslab/application-tile.c:780 ../libslab/document-tile.c:760
 msgid "Remove from Favorites"
 msgstr "Eliminar dos preferidos"
 
-#: ../libslab/application-tile.c:779 ../libslab/document-tile.c:743
+#: ../libslab/application-tile.c:782 ../libslab/document-tile.c:762
 msgid "Add to Favorites"
 msgstr "Engadir aos preferidos"
 
-#: ../libslab/application-tile.c:864
+#: ../libslab/application-tile.c:867
 msgid "Remove from Startup Programs"
 msgstr "Eliminar dos programas de inicio"
 
-#: ../libslab/application-tile.c:866
+#: ../libslab/application-tile.c:869
 msgid "Add to Startup Programs"
 msgstr "Engadir aos programas de inicio"
 
@@ -2934,31 +2934,31 @@ msgstr "Terminar a sesión"
 msgid "Shutdown"
 msgstr "Apagar"
 
-#: ../libslab/bookmark-agent.c:1089
+#: ../libslab/bookmark-agent.c:1090
 msgid "New Spreadsheet"
 msgstr "Nova folla de cálculo"
 
-#: ../libslab/bookmark-agent.c:1093
+#: ../libslab/bookmark-agent.c:1095
 msgid "New Document"
 msgstr "Novo documento"
 
-#: ../libslab/bookmark-agent.c:1145
+#: ../libslab/bookmark-agent.c:1147
 msgid "Home"
 msgstr "Inicio"
 
-#: ../libslab/bookmark-agent.c:1150
+#: ../libslab/bookmark-agent.c:1152
 msgid "Documents"
 msgstr "Documentos"
 
-#: ../libslab/bookmark-agent.c:1163
+#: ../libslab/bookmark-agent.c:1165
 msgid "File System"
 msgstr "Sistema de ficheiros"
 
-#: ../libslab/bookmark-agent.c:1167
+#: ../libslab/bookmark-agent.c:1169
 msgid "Network Servers"
 msgstr "Servidores de rede"
 
-#: ../libslab/bookmark-agent.c:1196
+#: ../libslab/bookmark-agent.c:1198
 msgid "Search"
 msgstr "Buscar"
 
@@ -2969,72 +2969,72 @@ msgid "<b>Open</b>"
 msgstr "<b>Abrir</b>"
 
 #. make rename action
-#: ../libslab/directory-tile.c:189 ../libslab/document-tile.c:228
+#: ../libslab/directory-tile.c:189 ../libslab/document-tile.c:242
 msgid "Rename..."
 msgstr "Renomear..."
 
 #: ../libslab/directory-tile.c:203 ../libslab/directory-tile.c:212
-#: ../libslab/document-tile.c:242 ../libslab/document-tile.c:251
+#: ../libslab/document-tile.c:256 ../libslab/document-tile.c:265
 msgid "Send To..."
 msgstr "Enviar a..."
 
 #. make move to trash action
-#: ../libslab/directory-tile.c:227 ../libslab/document-tile.c:277
+#: ../libslab/directory-tile.c:227 ../libslab/document-tile.c:291
 msgid "Move to Trash"
 msgstr "Mover ao lixo"
 
 #: ../libslab/directory-tile.c:237 ../libslab/directory-tile.c:450
-#: ../libslab/document-tile.c:287 ../libslab/document-tile.c:854
+#: ../libslab/document-tile.c:301 ../libslab/document-tile.c:873
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../libslab/directory-tile.c:575 ../libslab/document-tile.c:1026
+#: ../libslab/directory-tile.c:575 ../libslab/document-tile.c:1045
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Está seguro de que quere borrar permanentemente \"%s\"?"
 
-#: ../libslab/directory-tile.c:580 ../libslab/document-tile.c:1030
+#: ../libslab/directory-tile.c:580 ../libslab/document-tile.c:1049
 msgid "If you delete an item, it is permanently lost."
 msgstr "Se borra un elemento, perderase permanentemente."
 
-#: ../libslab/document-tile.c:189
+#: ../libslab/document-tile.c:203
 #, c-format
 msgid "<b>Open with \"%s\"</b>"
 msgstr "<b>Abrir con \"%s\"</b>"
 
-#: ../libslab/document-tile.c:201
+#: ../libslab/document-tile.c:215
 msgid "Open with Default Application"
 msgstr "Abrir coa aplicación predeterminada"
 
-#: ../libslab/document-tile.c:212
+#: ../libslab/document-tile.c:226
 msgid "Open in File Manager"
 msgstr "Abrir co xestor de ficheiros"
 
-#: ../libslab/document-tile.c:637
+#: ../libslab/document-tile.c:656
 msgid "?"
 msgstr "?"
 
-#: ../libslab/document-tile.c:644
+#: ../libslab/document-tile.c:663
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: ../libslab/document-tile.c:652
+#: ../libslab/document-tile.c:671
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %H:%M"
 
-#: ../libslab/document-tile.c:662
+#: ../libslab/document-tile.c:681
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %H:%M"
 
-#: ../libslab/document-tile.c:674
+#: ../libslab/document-tile.c:693
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../libslab/document-tile.c:682
+#: ../libslab/document-tile.c:701
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: ../libslab/document-tile.c:684
+#: ../libslab/document-tile.c:703
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
@@ -3602,19 +3602,19 @@ msgstr "_Aplicar tipo de letra"
 msgid "Themes"
 msgstr "Temas"
 
-#: ../vfs-methods/themus/themus-properties-view.c:127
+#: ../vfs-methods/themus/themus-properties-view.c:128
 msgid "Description"
 msgstr "Descrición"
 
-#: ../vfs-methods/themus/themus-properties-view.c:134
+#: ../vfs-methods/themus/themus-properties-view.c:135
 msgid "Control theme"
 msgstr "Tema de control"
 
-#: ../vfs-methods/themus/themus-properties-view.c:140
+#: ../vfs-methods/themus/themus-properties-view.c:141
 msgid "Window border theme"
 msgstr "Tema do bordo da ventá"
 
-#: ../vfs-methods/themus/themus-properties-view.c:146
+#: ../vfs-methods/themus/themus-properties-view.c:147
 msgid "Icon theme"
 msgstr "Tema de icona"
 
@@ -3673,6 +3673,9 @@ msgstr "Aplicar tema"
 msgid "Sets the default theme"
 msgstr "Establece o tema predeterminado"
 
+#~ msgid "Just apply settings and quit"
+#~ msgstr "Aplicar as configuracións e saír"
+
 #~ msgid ""
 #~ "Centered\n"
 #~ "Fill screen\n"
diff --git a/po/hu.po b/po/hu.po
index 29ff413c7..096bd0fde 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -656,7 +656,7 @@ msgstr "A legjobb _kontraszt"
 
 #: ../capplets/appearance/data/appearance.glade.h:14
 msgid "C_ustomize..."
-msgstr "_Testreszabás..."
+msgstr "T_estreszabás..."
 
 #: ../capplets/appearance/data/appearance.glade.h:15
 msgid "C_ut"
@@ -882,7 +882,7 @@ msgstr "Be_meneti mezők:"
 
 #: ../capplets/appearance/data/appearance.glade.h:74
 msgid "_Install..."
-msgstr "_Telepítés..."
+msgstr "Tele_pítés..."
 
 #: ../capplets/appearance/data/appearance.glade.h:75
 msgid "_Medium"
diff --git a/po/nb.po b/po/nb.po
index 628dcb985..724cb7114 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.21.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-14 14:08+0200\n"
-"PO-Revision-Date: 2008-05-14 14:08+0200\n"
+"POT-Creation-Date: 2008-06-07 18:31+0200\n"
+"PO-Revision-Date: 2008-06-07 18:32+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -53,12 +53,12 @@ msgid "No Image"
 msgstr "Ingen bilder"
 
 #: ../capplets/about-me/gnome-about-me.c:769
-#: ../capplets/appearance/appearance-desktop.c:1069
+#: ../capplets/appearance/appearance-desktop.c:661
 msgid "Images"
 msgstr "Bilder"
 
 #: ../capplets/about-me/gnome-about-me.c:773
-#: ../capplets/appearance/theme-installer.c:695
+#: ../capplets/appearance/theme-installer.c:717
 msgid "All Files"
 msgstr "Alle filer"
 
@@ -495,11 +495,11 @@ msgstr "Hjelpeteknologier"
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Aktiver støtte for GNOME hjelpefunksjoner ved pålogging"
 
-#: ../capplets/appearance/appearance-desktop.c:1037
+#: ../capplets/appearance/appearance-desktop.c:629
 msgid "Add Wallpaper"
 msgstr "Legg til bakgrunn"
 
-#: ../capplets/appearance/appearance-desktop.c:1073
+#: ../capplets/appearance/appearance-desktop.c:665
 msgid "All files"
 msgstr "Alle filer"
 
@@ -549,32 +549,32 @@ msgstr "Bruk forrige skrift"
 msgid "Use selected font"
 msgstr "Bruk valgt skrift"
 
-#: ../capplets/appearance/appearance-main.c:108
+#: ../capplets/appearance/appearance-main.c:107
 msgid "Specify the filename of a theme to install"
 msgstr "Oppgi filnavn på et tema som skal installeres"
 
-#: ../capplets/appearance/appearance-main.c:109
+#: ../capplets/appearance/appearance-main.c:108
 msgid "filename"
 msgstr "filnavn"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/appearance/appearance-main.c:116
+#: ../capplets/appearance/appearance-main.c:115
 msgid "Specify the name of the page to show (theme|background|fonts|interface)"
 msgstr "Oppgi navn på fanen som skal vises (theme|background|fonts|interface)"
 
-#: ../capplets/appearance/appearance-main.c:117
-#: ../capplets/default-applications/gnome-da-capplet.c:1329
+#: ../capplets/appearance/appearance-main.c:116
+#: ../capplets/default-applications/gnome-da-capplet.c:880
 #: ../capplets/mouse/gnome-mouse-properties.c:444
 msgid "page"
 msgstr "side"
 
-#: ../capplets/appearance/appearance-main.c:124
+#: ../capplets/appearance/appearance-main.c:123
 msgid "[WALLPAPER...]"
 msgstr "[BAKGRUNN...]"
 
 #: ../capplets/appearance/appearance-style.c:160
-#: ../capplets/common/gnome-theme-info.c:442
-#: ../capplets/common/gnome-theme-info.c:631
+#: ../capplets/common/gnome-theme-info.c:439
+#: ../capplets/common/gnome-theme-info.c:628
 msgid "Default Pointer"
 msgstr "Forvalgt peker"
 
@@ -584,7 +584,7 @@ msgid "Install"
 msgstr "Installer"
 
 #: ../capplets/appearance/appearance-style.c:242
-#: ../capplets/common/gnome-theme-info.c:1637
+#: ../capplets/common/gnome-theme-info.c:1634
 #, c-format
 msgid ""
 "This theme will not look as intended because the required GTK+ theme engine "
@@ -644,7 +644,7 @@ msgid "The current theme suggests a font."
 msgstr "Aktivt tema foreslår en skrift."
 
 #: ../capplets/appearance/appearance-themes.c:1047
-#: ../capplets/default-applications/gnome-da-capplet.c:1080
+#: ../capplets/default-applications/gnome-da-capplet.c:630
 #: ../capplets/sound/sound-properties-capplet.c:328
 msgid "Custom"
 msgstr "Egendefinert"
@@ -1032,7 +1032,7 @@ msgstr "Installering av tema"
 msgid "Gnome Theme Package"
 msgstr "GNOME temapakke"
 
-#: ../capplets/appearance/gnome-wp-info.c:49
+#: ../capplets/appearance/gnome-wp-info.c:50
 msgid "No Wallpaper"
 msgstr "Ingen bakgrunn"
 
@@ -1062,30 +1062,30 @@ msgid_plural "pixels"
 msgstr[0] "piksel"
 msgstr[1] "piksler"
 
-#: ../capplets/appearance/theme-installer.c:166
-#: ../capplets/appearance/theme-installer.c:216
+#: ../capplets/appearance/theme-installer.c:171
+#: ../capplets/appearance/theme-installer.c:221
 msgid "Cannot install theme"
 msgstr "Kan ikke installere tema"
 
-#: ../capplets/appearance/theme-installer.c:168
+#: ../capplets/appearance/theme-installer.c:173
 #, c-format
 msgid "The %s utility is not installed."
 msgstr "Verktøyet %s er ikke installert."
 
-#: ../capplets/appearance/theme-installer.c:218
+#: ../capplets/appearance/theme-installer.c:223
 msgid "There was a problem while extracting the theme."
 msgstr "Det oppsto et problem under utpakking av tema."
 
-#: ../capplets/appearance/theme-installer.c:241
+#: ../capplets/appearance/theme-installer.c:246
 msgid "There was an error installing the selected file"
 msgstr "Det oppsto en feil under installering av valgt fil"
 
-#: ../capplets/appearance/theme-installer.c:242
+#: ../capplets/appearance/theme-installer.c:247
 #, c-format
 msgid "\"%s\" does not appear to be a valid theme."
 msgstr "«%s» ser ikke ut til å være et gyldig tema."
 
-#: ../capplets/appearance/theme-installer.c:243
+#: ../capplets/appearance/theme-installer.c:248
 #, c-format
 msgid ""
 "\"%s\" does not appear to be a valid theme. It may be a theme engine which "
@@ -1094,46 +1094,46 @@ msgstr ""
 "«%s» ser ikke ut til å være et gyldig tema. Det kan være en temamotor som du "
 "må kompilere."
 
-#: ../capplets/appearance/theme-installer.c:282
+#: ../capplets/appearance/theme-installer.c:287
 #, c-format
 msgid "GNOME Theme %s correctly installed"
 msgstr "GNOME tema %s ble korrekt installert"
 
-#: ../capplets/appearance/theme-installer.c:342
+#: ../capplets/appearance/theme-installer.c:354
 #, c-format
 msgid "Installation for theme \"%s\" failed."
 msgstr "Installasjon av tema «%s» feilet."
 
-#: ../capplets/appearance/theme-installer.c:374
+#: ../capplets/appearance/theme-installer.c:392
 #, c-format
 msgid "The theme \"%s\" has been installed."
 msgstr "Tema «%s» er installert."
 
-#: ../capplets/appearance/theme-installer.c:380
+#: ../capplets/appearance/theme-installer.c:398
 msgid "Would you like to apply it now, or keep your current theme?"
 msgstr "Vil du bruke det nå, eller beholde aktivt tema?"
 
-#: ../capplets/appearance/theme-installer.c:382
+#: ../capplets/appearance/theme-installer.c:400
 msgid "Keep Current Theme"
 msgstr "Behold nåværende tema"
 
-#: ../capplets/appearance/theme-installer.c:384
+#: ../capplets/appearance/theme-installer.c:402
 msgid "Apply New Theme"
 msgstr "Bruk nytt tema"
 
-#: ../capplets/appearance/theme-installer.c:486
+#: ../capplets/appearance/theme-installer.c:505
 msgid "Failed to create temporary directory"
 msgstr "Kunne ikke opprette midlertidig katalog"
 
-#: ../capplets/appearance/theme-installer.c:546
+#: ../capplets/appearance/theme-installer.c:568
 msgid "New themes have been successfully installed."
 msgstr "Nye tema ble installert."
 
-#: ../capplets/appearance/theme-installer.c:573
+#: ../capplets/appearance/theme-installer.c:595
 msgid "No theme file location specified to install"
 msgstr "Ingen lokasjon oppgitt for installasjon av temafil"
 
-#: ../capplets/appearance/theme-installer.c:593
+#: ../capplets/appearance/theme-installer.c:615
 #, c-format
 msgid ""
 "Insufficient permissions to install the theme in:\n"
@@ -1142,7 +1142,7 @@ msgstr ""
 "Ikke nok rettigheter til å installere tema i:\n"
 "%s"
 
-#: ../capplets/appearance/theme-installer.c:615
+#: ../capplets/appearance/theme-installer.c:637
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -1151,11 +1151,11 @@ msgstr ""
 "%s er stien hvor temafilene vil bli installert. Denne kan ikke velges som "
 "kildelokasjon"
 
-#: ../capplets/appearance/theme-installer.c:684
+#: ../capplets/appearance/theme-installer.c:706
 msgid "Select Theme"
 msgstr "Velg tema"
 
-#: ../capplets/appearance/theme-installer.c:688
+#: ../capplets/appearance/theme-installer.c:710
 msgid "Theme Packages"
 msgstr "Temapakker"
 
@@ -1173,15 +1173,15 @@ msgstr "Tema eksisterer allerede. Vil du erstatte det?"
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: ../capplets/appearance/theme-util.c:131
+#: ../capplets/appearance/theme-util.c:134
 msgid "Would you like to delete this theme?"
 msgstr "Vil du slette dette temaet?"
 
-#: ../capplets/appearance/theme-util.c:176
+#: ../capplets/appearance/theme-util.c:179
 msgid "Theme cannot be deleted"
 msgstr "Tema kan ikke slettes"
 
-#: ../capplets/appearance/theme-util.c:301
+#: ../capplets/appearance/theme-util.c:304
 msgid "Could not install theme engine"
 msgstr "Kan ikke installere temamotor"
 
@@ -1205,17 +1205,7 @@ msgstr ""
 msgid "Unable to load stock icon '%s'\n"
 msgstr "Kan ikke laste standard ikon «%s»\n"
 
-#: ../capplets/common/capplet-util.c:240 ../capplets/common/capplet-util.c:242
-msgid "Just apply settings and quit"
-msgstr "Bare aktiver innstillingene og avslutt"
-
-#: ../capplets/common/capplet-util.c:244
-#: ../capplets/keyboard/gnome-keyboard-properties.c:256
-#: ../capplets/sound/sound-properties-capplet.c:1159
-msgid "Retrieve and store legacy settings"
-msgstr "Hent og lagre gamle innstillinger"
-
-#: ../capplets/common/capplet-util.c:344
+#: ../capplets/common/capplet-util.c:80
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "Det oppsto en feil under visning av hjelp: %s"
@@ -1296,82 +1286,82 @@ msgstr "_Hopp over"
 msgid "Overwrite _All"
 msgstr "Overskriv _alle"
 
-#: ../capplets/common/gconf-property-editor.c:170
+#: ../capplets/common/gconf-property-editor.c:133
 msgid "Key"
 msgstr "Nøkkel"
 
-#: ../capplets/common/gconf-property-editor.c:171
+#: ../capplets/common/gconf-property-editor.c:134
 msgid "GConf key to which this property editor is attached"
 msgstr "GConf-nøkkel hvor egenskapsredigereren er festet"
 
-#: ../capplets/common/gconf-property-editor.c:177
+#: ../capplets/common/gconf-property-editor.c:140
 msgid "Callback"
 msgstr "Tilbakekall"
 
-#: ../capplets/common/gconf-property-editor.c:178
+#: ../capplets/common/gconf-property-editor.c:141
 msgid "Issue this callback when the value associated with key gets changed"
 msgstr ""
 "Send dette tilbakekallet når verdien som er assosiert med nøkkelen blir "
 "endret"
 
-#: ../capplets/common/gconf-property-editor.c:183
+#: ../capplets/common/gconf-property-editor.c:146
 msgid "Change set"
 msgstr "Endringssett"
 
-#: ../capplets/common/gconf-property-editor.c:184
+#: ../capplets/common/gconf-property-editor.c:147
 msgid ""
 "GConf change set containing data to be forwarded to the gconf client on apply"
 msgstr ""
 "GConf endringssett inneholder data som skal videresendes til gconf-klienten "
 "når det aktiveres"
 
-#: ../capplets/common/gconf-property-editor.c:189
+#: ../capplets/common/gconf-property-editor.c:152
 msgid "Conversion to widget callback"
 msgstr "Konvertering til widget-tilbakekall"
 
-#: ../capplets/common/gconf-property-editor.c:190
+#: ../capplets/common/gconf-property-editor.c:153
 msgid ""
 "Callback to be issued when data are to be converted from GConf to the widget"
 msgstr ""
 "Tilbakekall som skal brukes når data skal konverteres fra GConf til widget"
 
-#: ../capplets/common/gconf-property-editor.c:195
+#: ../capplets/common/gconf-property-editor.c:158
 msgid "Conversion from widget callback"
 msgstr "Konvertering fra widget tilbakekall"
 
-#: ../capplets/common/gconf-property-editor.c:196
+#: ../capplets/common/gconf-property-editor.c:159
 msgid ""
 "Callback to be issued when data are to be converted to GConf from the widget"
 msgstr ""
 "Tilbakekall som skal brukes når data skal konverteres til GConf fra widgetene"
 
-#: ../capplets/common/gconf-property-editor.c:201
+#: ../capplets/common/gconf-property-editor.c:164
 msgid "UI Control"
 msgstr "UI-kontroll"
 
-#: ../capplets/common/gconf-property-editor.c:202
+#: ../capplets/common/gconf-property-editor.c:165
 msgid "Object that controls the property (normally a widget)"
 msgstr "Objekt som kontrollerer egenskapen (vanligvis et widget)"
 
-#: ../capplets/common/gconf-property-editor.c:217
+#: ../capplets/common/gconf-property-editor.c:180
 msgid "Property editor object data"
 msgstr "Objektdata for redigering av egenskaper"
 
-#: ../capplets/common/gconf-property-editor.c:218
+#: ../capplets/common/gconf-property-editor.c:181
 msgid "Custom data required by the specific property editor"
 msgstr "Egendefinerte data som kreves av redigering av egenskaper"
 
-#: ../capplets/common/gconf-property-editor.c:224
+#: ../capplets/common/gconf-property-editor.c:187
 msgid "Property editor data freeing callback"
 msgstr "Tilbakekall som frigir data for redigering av egenskaper"
 
-#: ../capplets/common/gconf-property-editor.c:225
+#: ../capplets/common/gconf-property-editor.c:188
 msgid "Callback to be issued when property editor object data is to be freed"
 msgstr ""
 "Tilbakekall som skal utstedes når objektdata for redigering av egenskaper "
 "skal frigis"
 
-#: ../capplets/common/gconf-property-editor.c:1467
+#: ../capplets/common/gconf-property-editor.c:1429
 #, c-format
 msgid ""
 "Couldn't find the file '%s'.\n"
@@ -1384,7 +1374,7 @@ msgstr ""
 "Vennligst sjekk at denne eksisterer og prøv på nytt, eller velg et annet "
 "bakgrunnsbilde."
 
-#: ../capplets/common/gconf-property-editor.c:1475
+#: ../capplets/common/gconf-property-editor.c:1437
 #, c-format
 msgid ""
 "I don't know how to open the file '%s'.\n"
@@ -1397,43 +1387,43 @@ msgstr ""
 "\n"
 "Vennligst velg et annet bilde i stedet."
 
-#: ../capplets/common/gconf-property-editor.c:1594
+#: ../capplets/common/gconf-property-editor.c:1556
 msgid "Please select an image."
 msgstr "Vennligst velg et bilde."
 
-#: ../capplets/common/gconf-property-editor.c:1599
+#: ../capplets/common/gconf-property-editor.c:1561
 msgid "_Select"
 msgstr "_Velg"
 
-#: ../capplets/common/gnome-theme-info.c:632
+#: ../capplets/common/gnome-theme-info.c:629
 msgid "Default Pointer - Current"
 msgstr "Forvalgt peker - nåværende"
 
-#: ../capplets/common/gnome-theme-info.c:636
+#: ../capplets/common/gnome-theme-info.c:633
 msgid "White Pointer"
 msgstr "Hvit peker"
 
-#: ../capplets/common/gnome-theme-info.c:637
+#: ../capplets/common/gnome-theme-info.c:634
 msgid "White Pointer - Current"
 msgstr "Hvit peker - nåværende"
 
-#: ../capplets/common/gnome-theme-info.c:641
+#: ../capplets/common/gnome-theme-info.c:638
 msgid "Large Pointer"
 msgstr "Stor peker"
 
-#: ../capplets/common/gnome-theme-info.c:642
+#: ../capplets/common/gnome-theme-info.c:639
 msgid "Large Pointer - Current"
 msgstr "Stor peker - nåværende"
 
-#: ../capplets/common/gnome-theme-info.c:646
+#: ../capplets/common/gnome-theme-info.c:643
 msgid "Large White Pointer - Current"
 msgstr "Stor hvit peker - nåværende"
 
-#: ../capplets/common/gnome-theme-info.c:647
+#: ../capplets/common/gnome-theme-info.c:644
 msgid "Large White Pointer"
 msgstr "Stor hvit peker"
 
-#: ../capplets/common/gnome-theme-info.c:1613
+#: ../capplets/common/gnome-theme-info.c:1610
 #, c-format
 msgid ""
 "This theme will not look as intended because the required GTK+ theme '%s' is "
@@ -1442,7 +1432,7 @@ msgstr ""
 "Dette temaet vil ikke se ut som det var tenkt fordi GTK+-tema «%s» ikke er "
 "installert."
 
-#: ../capplets/common/gnome-theme-info.c:1621
+#: ../capplets/common/gnome-theme-info.c:1618
 #, c-format
 msgid ""
 "This theme will not look as intended because the required window manager "
@@ -1451,7 +1441,7 @@ msgstr ""
 "Dette temaet vil ikke se ut som det var tenkt fordi tema «%s» for "
 "vindushåndtereren ikke er installert."
 
-#: ../capplets/common/gnome-theme-info.c:1628
+#: ../capplets/common/gnome-theme-info.c:1625
 #, c-format
 msgid ""
 "This theme will not look as intended because the required icon theme '%s' is "
@@ -1477,32 +1467,23 @@ msgstr "Start foretrukket visuell hjelpeteknologi"
 msgid "Visual Assistance"
 msgstr "Visuell hjelpeteknologi"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:80
-#: ../capplets/default-applications/gnome-da-capplet.c:112
-#: ../capplets/default-applications/gnome-da-capplet.c:133
-#: ../capplets/default-applications/gnome-da-capplet.c:177
-#: ../capplets/default-applications/gnome-da-capplet.c:222
-#: ../capplets/default-applications/gnome-da-capplet.c:279
-#: ../capplets/default-applications/gnome-da-capplet.c:330
-#: ../capplets/default-applications/gnome-da-capplet.c:381
-#: ../capplets/default-applications/gnome-da-capplet.c:434
-#: ../capplets/default-applications/gnome-da-capplet.c:484
-#: ../capplets/default-applications/gnome-da-capplet.c:877
-#: ../capplets/default-applications/gnome-da-capplet.c:899
+#: ../capplets/default-applications/gnome-da-capplet.c:94
+#: ../capplets/default-applications/gnome-da-capplet.c:345
+#: ../capplets/default-applications/gnome-da-capplet.c:366
 #, c-format
 msgid "Error saving configuration: %s"
 msgstr "Feil ved lagring av konfigurasjonsdatabase: %s"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:1100
+#: ../capplets/default-applications/gnome-da-capplet.c:650
 msgid "Could not load the main interface"
 msgstr "Kunne ikke laste brukergrensesnittet"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:1102
+#: ../capplets/default-applications/gnome-da-capplet.c:652
 msgid "Please make sure that the applet is properly installed"
 msgstr "Sjekk at programmet er korrekt installert"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/default-applications/gnome-da-capplet.c:1328
+#: ../capplets/default-applications/gnome-da-capplet.c:879
 msgid "Specify the name of the page to show (internet|multimedia|system|a11y)"
 msgstr "Oppgi navn på siden som skal vises (internet|multimedia|system|a11y)"
 
@@ -1962,46 +1943,48 @@ msgstr "Type hurtigtast."
 msgid "Disabled"
 msgstr "Slått av"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:493
+#: ../capplets/keybindings/gnome-keybinding-properties.c:171
 msgid "<Unknown Action>"
 msgstr "<Ukjent handling>"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:885
+#: ../capplets/keybindings/gnome-keybinding-properties.c:804
+msgid "Custom Shortcuts"
+msgstr "Egendefinerte snarveier"
+
+#: ../capplets/keybindings/gnome-keybinding-properties.c:999
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
 "using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time.\n"
+"Please try with a key such as Control, Alt or Shift at the same time."
 msgstr ""
-"Snarveien «%s» kan ikke brukes fordi den vil være umulig å skrive med denne "
-"tasten.\n"
-"Vennligst prøv igjen med en tastekombinasjon som inneholder Control, Alt "
-"eller Shift.\n"
+"Snarveien «%s» kan ikke brukes fordi den vil være umulig å skrive med denne tasten.\n"
+"Vennligst prøv igjen med en tastekombinasjon som inneholder Control, Alt eller Shift."
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:914
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1028
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
-" \"%s\"\n"
+" \"%s\""
 msgstr ""
 "Snarveien «%s» er allerede brukt for:\n"
-" «%s»\n"
+" «%s»"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:946
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1060
 #, c-format
-msgid "Error setting new accelerator in configuration database: %s\n"
-msgstr "Feil under setting av ny snarvei i konfigurasjonsdatabasen: %s\n"
+msgid "Error setting new accelerator in configuration database: %s"
+msgstr "Feil under setting av ny snarvei i konfigurasjonsdatabasen: %s"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:998
-#, c-format
-msgid "Error unsetting accelerator in configuration database: %s\n"
-msgstr "Feil under fjerning av snarveitast i konfigurasjonsdatabasen: %s\n"
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1112
+#, fuzzy, c-format
+msgid "Error unsetting accelerator in configuration database: %s"
+msgstr "Feil under fjerning av snarveitast i konfigurasjonsdatabasen: %s"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1129
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1294
 msgid "Action"
 msgstr "Handling"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1153
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1316
 msgid "Shortcut"
 msgstr "Snarvei"
 
@@ -2035,6 +2018,11 @@ msgstr ""
 "Bare aktiver innstillinger og avslutt (kun for kompatibilitet; håndteres av "
 "en daemon nå)"
 
+#: ../capplets/keyboard/gnome-keyboard-properties.c:256
+#: ../capplets/sound/sound-properties-capplet.c:1159
+msgid "Retrieve and store legacy settings"
+msgstr "Hent og lagre gamle innstillinger"
+
 #: ../capplets/keyboard/gnome-keyboard-properties.c:260
 msgid "Start the page with the typing break settings showing"
 msgstr "Start siden med innstillingene for skrivepause fremme"
diff --git a/po/th.po b/po/th.po
index 369a0ef44..e49ec734e 100644
--- a/po/th.po
+++ b/po/th.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-11 08:22+0700\n"
-"PO-Revision-Date: 2008-02-11 08:24+0700\n"
+"POT-Creation-Date: 2008-06-11 16:52+0700\n"
+"PO-Revision-Date: 2008-06-11 17:36+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -49,25 +49,25 @@ msgstr "ปุ่มที่จะแสดงในกล่องโต้ต
 msgid "Show more _details"
 msgstr "แสดง_รายละเอียดเพิ่มเติม"
 
-#: capplets/about-me/gnome-about-me.c:665
+#: capplets/about-me/gnome-about-me.c:739
 msgid "Select Image"
 msgstr "กำหนดรูป"
 
-#: capplets/about-me/gnome-about-me.c:667
+#: capplets/about-me/gnome-about-me.c:741
 msgid "No Image"
 msgstr "ไม่มีรูป"
 
-#: capplets/about-me/gnome-about-me.c:695
-#: capplets/appearance/appearance-desktop.c:1141
+#: capplets/about-me/gnome-about-me.c:769
+#: capplets/appearance/appearance-desktop.c:661
 msgid "Images"
 msgstr "รูปภาพ"
 
-#: capplets/about-me/gnome-about-me.c:699
-#: capplets/appearance/theme-installer.c:700
+#: capplets/about-me/gnome-about-me.c:773
+#: capplets/appearance/theme-installer.c:717
 msgid "All Files"
 msgstr "ทุกแฟ้ม"
 
-#: capplets/about-me/gnome-about-me.c:836
+#: capplets/about-me/gnome-about-me.c:911
 msgid ""
 "There was an error while trying to get the addressbook information\n"
 "Evolution Data Server can't handle the protocol"
@@ -75,16 +75,16 @@ msgstr ""
 "เกิดข้อผิดพลาดขณะพยายามอ่านข้อมูลสมุดที่อยู่\n"
 "Evolution Data Server ไม่สามารถจัดการกับโพรโทคอลได้"
 
-#: capplets/about-me/gnome-about-me.c:857
+#: capplets/about-me/gnome-about-me.c:932
 msgid "Unable to open address book"
 msgstr "เปิดสมุดที่อยู่ไม่สำเร็จ"
 
-#: capplets/about-me/gnome-about-me.c:871
+#: capplets/about-me/gnome-about-me.c:946
 msgid "Unknown login ID, the user database might be corrupted"
 msgstr "ไม่รู้จักชื่อผู้ใช้ที่ระบุ ฐานข้อมูลผู้ใช้อาจจะเสียก็ได้"
 
-#: capplets/about-me/gnome-about-me.c:901
-#: capplets/about-me/gnome-about-me.c:903
+#: capplets/about-me/gnome-about-me.c:976
+#: capplets/about-me/gnome-about-me.c:978
 #, c-format
 msgid "About %s"
 msgstr "เกี่ยวกับ %s"
@@ -219,7 +219,7 @@ msgid "Personal Info"
 msgstr "ข้อมูลส่วนตัว"
 
 #: capplets/about-me/gnome-about-me.glade.h:32
-#: capplets/about-me/gnome-about-me-password.c:934
+#: capplets/about-me/gnome-about-me-password.c:938
 msgid ""
 "Please type your password again in the <b>Retype new password</b> field."
 msgstr "กรุณาป้อนรหัสผ่านซ้ำอีกครั้งในช่อง <b>ป้อนรหัสผ่านใหม่อีกครั้ง</b>"
@@ -399,33 +399,33 @@ msgid "The old and new passwords are the same."
 msgstr "รหัสผ่านใหม่เหมือนกันกับรหัสผ่านเก่า"
 
 #. translators: Unable to launch <program>: <error message>
-#: capplets/about-me/gnome-about-me-password.c:818
+#: capplets/about-me/gnome-about-me-password.c:820
 #, c-format
 msgid "Unable to launch %s: %s"
 msgstr "ไม่สามารถเรียกคำสั่ง %s: %s"
 
-#: capplets/about-me/gnome-about-me-password.c:821
+#: capplets/about-me/gnome-about-me-password.c:824
 msgid "Unable to launch backend"
 msgstr "เรียกแบ็กเอ็นด์ไม่สำเร็จ"
 
-#: capplets/about-me/gnome-about-me-password.c:822
+#: capplets/about-me/gnome-about-me-password.c:825
 msgid "A system error has occurred"
 msgstr "เกิดข้อผิดพลาดของระบบ"
 
 #. Update status message
-#: capplets/about-me/gnome-about-me-password.c:842
+#: capplets/about-me/gnome-about-me-password.c:845
 msgid "Checking password..."
 msgstr "กำลังตรวจสอบรหัสผ่าน..."
 
-#: capplets/about-me/gnome-about-me-password.c:928
+#: capplets/about-me/gnome-about-me-password.c:932
 msgid "Click <b>Change password</b> to change your password."
 msgstr "กดปุ่ม <b>เปลี่ยนรหัสผ่าน</b> เพื่อเปลี่ยนรหัสผ่านของคุณ"
 
-#: capplets/about-me/gnome-about-me-password.c:931
+#: capplets/about-me/gnome-about-me-password.c:935
 msgid "Please type your password in the <b>New password</b> field."
 msgstr "กรุณาตั้งรหัสผ่านในช่อง <b>รหัสผ่านใหม่</b>"
 
-#: capplets/about-me/gnome-about-me-password.c:937
+#: capplets/about-me/gnome-about-me-password.c:941
 msgid "The two passwords are not equal."
 msgstr "รหัสผ่านที่ป้อนทั้งสองครั้งไม่ตรงกัน"
 
@@ -468,14 +468,22 @@ msgid "Jump to the Keyboard Accessibility dialog"
 msgstr "ไปยังกล่องโต้ตอบปรับแต่งสิ่งอำนวยความสะดวกสำหรับแป้นพิมพ์"
 
 #: capplets/accessibility/at-properties/at-enable-dialog.glade.h:10
+msgid "Jump to the Mouse Accessibility dialog"
+msgstr "ไปยังกล่องโต้ตอบปรับแต่งสิ่งอำนวยความสะดวกสำหรับเมาส์"
+
+#: capplets/accessibility/at-properties/at-enable-dialog.glade.h:11
 msgid "_Enable assistive technologies"
 msgstr "ใ_ช้เทคโนโลยีสิ่งอำนวยความสะดวก"
 
-#: capplets/accessibility/at-properties/at-enable-dialog.glade.h:11
+#: capplets/accessibility/at-properties/at-enable-dialog.glade.h:12
 msgid "_Keyboard Accessibility"
 msgstr "สิ่งอำนวยความสะดวกสำหรับแป้น_พิมพ์"
 
-#: capplets/accessibility/at-properties/at-enable-dialog.glade.h:12
+#: capplets/accessibility/at-properties/at-enable-dialog.glade.h:13
+msgid "_Mouse Accessibility"
+msgstr "สิ่งอำนวยความสะดวกสำหรับเ_มาส์"
+
+#: capplets/accessibility/at-properties/at-enable-dialog.glade.h:14
 msgid "_Preferred Applications"
 msgstr "เลือกโ_ปรแกรมหลักๆ"
 
@@ -487,11 +495,11 @@ msgstr "เทคโนโลยีสิ่งอำนวยความสะ
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "ใช้เทคโนโลยีสิ่งอำนวยความสะดวกเมื่อเข้าระบบ"
 
-#: capplets/appearance/appearance-desktop.c:1109
+#: capplets/appearance/appearance-desktop.c:629
 msgid "Add Wallpaper"
 msgstr "เพิ่มภาพพื้นหลัง"
 
-#: capplets/appearance/appearance-desktop.c:1145
+#: capplets/appearance/appearance-desktop.c:665
 msgid "All files"
 msgstr "ทุกแฟ้ม"
 
@@ -535,56 +543,99 @@ msgstr "ใช้แบบอักษรเดิม"
 msgid "Use selected font"
 msgstr "ใช้แบบอักษรที่เลือก"
 
-#: capplets/appearance/appearance-main.c:108
+#: capplets/appearance/appearance-main.c:107
 msgid "Specify the filename of a theme to install"
 msgstr "ระบุชื่อแฟ้มของชุดตกแต่งที่จะติดตั้ง"
 
-#: capplets/appearance/appearance-main.c:109
+#: capplets/appearance/appearance-main.c:108
 msgid "filename"
 msgstr "ชื่อแฟ้ม"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: capplets/appearance/appearance-main.c:116
+#: capplets/appearance/appearance-main.c:115
 msgid "Specify the name of the page to show (theme|background|fonts|interface)"
 msgstr "ระบุหน้าที่ต้องการแสดง (theme|background|fonts|interface)"
 
-#: capplets/appearance/appearance-main.c:117
+#: capplets/appearance/appearance-main.c:116
+#: capplets/default-applications/gnome-da-capplet.c:880
+#: capplets/mouse/gnome-mouse-properties.c:444
 msgid "page"
 msgstr "หน้า"
 
-#: capplets/appearance/appearance-main.c:124
+#: capplets/appearance/appearance-main.c:123
 msgid "[WALLPAPER...]"
 msgstr "[WALLPAPER...]"
 
-#: capplets/appearance/appearance-style.c:156
+#: capplets/appearance/appearance-style.c:159
 #: capplets/common/gnome-theme-info.c:439
-#: capplets/common/gnome-theme-info.c:638
+#: capplets/common/gnome-theme-info.c:628
 msgid "Default Pointer"
 msgstr "ตัวชี้ปริยาย"
 
-#: capplets/appearance/appearance-themes.c:534
+#: capplets/appearance/appearance-style.c:221
+#: capplets/appearance/appearance-themes.c:685
+msgid "Install"
+msgstr "ติดตั้ง"
+
+#: capplets/appearance/appearance-style.c:241
+#: capplets/common/gnome-theme-info.c:1634
+#, c-format
+msgid ""
+"This theme will not look as intended because the required GTK+ theme engine "
+"'%s' is not installed."
+msgstr ""
+"ชุดตกแต่งนี้อาจแสดงไม่เหมือนที่ออกแบบไว้ เพราะกลไกชุดตกแต่ง GTK+ '%s' ที่ต้องการ ไม่ได้ติดตั้งไว้"
+
+#: capplets/appearance/appearance-themes.c:673
 msgid "Apply Background"
 msgstr "ตกลงใช้พื้นหลัง"
 
-#: capplets/appearance/appearance-themes.c:538
+#: capplets/appearance/appearance-themes.c:677
 msgid "Apply Font"
 msgstr "ตกลงใช้แบบอักษร"
 
-#: capplets/appearance/appearance-themes.c:563
+#: capplets/appearance/appearance-themes.c:681
+msgid "Revert Font"
+msgstr "ย้อนค่าแบบอักษรกลับคืน"
+
+#: capplets/appearance/appearance-themes.c:711
+msgid ""
+"The current theme suggests a background and a font. Also, the last applied "
+"font suggestion can be reverted."
+msgstr ""
+"ชุดตกแต่งนี้แนะนำพื้นหลังและแบบอักษร นอกจากนี้ ยังสามารถย้อนคืนค่าแบบอักษรที่แนะนำไว้ได้ด้วย"
+
+#: capplets/appearance/appearance-themes.c:713
+msgid ""
+"The current theme suggests a background. Also, the last applied font "
+"suggestion can be reverted."
+msgstr "ชุดตกแต่งนี้แนะนำพื้นหลัง นอกจากนี้ ยังสามารถย้อนคืนค่าแบบอักษรที่แนะนำไว้ได้ด้วย"
+
+#: capplets/appearance/appearance-themes.c:715
 msgid "The current theme suggests a background and a font."
 msgstr "ชุดตกแต่งนี้แนะนำพื้นหลังและแบบอักษร"
 
-#: capplets/appearance/appearance-themes.c:568
+#: capplets/appearance/appearance-themes.c:717
+msgid ""
+"The current theme suggests a font. Also, the last applied font suggestion "
+"can be reverted."
+msgstr "ชุดตกแต่งนี้แนะนำแบบอักษร นอกจากนี้ ยังสามารถย้อนคืนค่าแบบอักษรที่แนะนำไว้ได้ด้วย"
+
+#: capplets/appearance/appearance-themes.c:719
 msgid "The current theme suggests a background."
 msgstr "ชุดตกแต่งนี้แนะนำพื้นหลัง"
 
-#: capplets/appearance/appearance-themes.c:573
+#: capplets/appearance/appearance-themes.c:721
+msgid "The last applied font suggestion can be reverted."
+msgstr "สามารถย้อนคืนค่าแบบอักษรที่แนะนำไว้ได้"
+
+#: capplets/appearance/appearance-themes.c:723
 msgid "The current theme suggests a font."
 msgstr "ชุดตกแต่งนี้แนะนำแบบอักษร"
 
-#: capplets/appearance/appearance-themes.c:857
-#: capplets/default-applications/gnome-da-capplet.c:1080
-#: capplets/sound/sound-properties-capplet.c:327
+#: capplets/appearance/appearance-themes.c:1046
+#: capplets/default-applications/gnome-da-capplet.c:630
+#: capplets/sound/sound-properties-capplet.c:328
 msgid "Custom"
 msgstr "กำหนดเอง"
 
@@ -647,124 +698,106 @@ msgid "C_ut"
 msgstr "_ตัด"
 
 #: capplets/appearance/data/appearance.glade.h:16
-msgid ""
-"Centered\n"
-"Fill screen\n"
-"Scaled\n"
-"Zoom\n"
-"Tiled"
-msgstr ""
-"วางตรงกลาง\n"
-"ยืดเต็มหน้าจอ\n"
-"ขยายพอดีหน้าจอ\n"
-"ซูมเต็มหน้าจอ\n"
-"เรียงกระเบื้อง"
-
-#: capplets/appearance/data/appearance.glade.h:21
 msgid "Changing your cursor theme takes effect the next time you log in."
 msgstr "การเปลี่ยนชุดตกแต่งตัวชี้จะมีผลเมื่อคุณเข้าระบบครั้งต่อไป"
 
-#: capplets/appearance/data/appearance.glade.h:22
+#: capplets/appearance/data/appearance.glade.h:17
 msgid "Colors"
 msgstr "สี"
 
-#: capplets/appearance/data/appearance.glade.h:23
+#: capplets/appearance/data/appearance.glade.h:18
 msgid "Controls"
 msgstr "ปุ่มควบคุมต่างๆ"
 
-#: capplets/appearance/data/appearance.glade.h:24
+#: capplets/appearance/data/appearance.glade.h:19
 msgid "Customize Theme"
 msgstr "ปรับแต่งชุดตกแต่งเอง"
 
-#: capplets/appearance/data/appearance.glade.h:25
+#: capplets/appearance/data/appearance.glade.h:20
 msgid "D_etails..."
 msgstr "_รายละเอียด..."
 
-#: capplets/appearance/data/appearance.glade.h:26
+#: capplets/appearance/data/appearance.glade.h:21
 msgid "Des_ktop font:"
 msgstr "แบบอักษรของ_พื้นโต๊ะ:"
 
-#: capplets/appearance/data/appearance.glade.h:27
+#: capplets/appearance/data/appearance.glade.h:22
 msgid "Edit"
 msgstr "แก้ไข"
 
-#: capplets/appearance/data/appearance.glade.h:28
+#: capplets/appearance/data/appearance.glade.h:23
 msgid "Font Rendering Details"
 msgstr "รายละเอียดการวาดตัวอักษร"
 
-#: capplets/appearance/data/appearance.glade.h:29
+#: capplets/appearance/data/appearance.glade.h:24
 msgid "Fonts"
 msgstr "แบบอักษร"
 
-#: capplets/appearance/data/appearance.glade.h:30
-msgid "Go _to Fonts Folder"
-msgstr "ไ_ปโฟลเดอร์แบบอักษร"
-
-#: capplets/appearance/data/appearance.glade.h:31
+#: capplets/appearance/data/appearance.glade.h:25
 msgid "Gra_yscale"
 msgstr "ไล่สีเ_ทา"
 
-#: capplets/appearance/data/appearance.glade.h:32
+#: capplets/appearance/data/appearance.glade.h:26
 msgid "Icons"
 msgstr "ไอคอน"
 
-#: capplets/appearance/data/appearance.glade.h:33
+#: capplets/appearance/data/appearance.glade.h:27
 msgid "Interface"
 msgstr "ติดต่อผู้ใช้"
 
-#: capplets/appearance/data/appearance.glade.h:34
+#: capplets/appearance/data/appearance.glade.h:28
 msgid "Large"
 msgstr "ใหญ่"
 
-#: capplets/appearance/data/appearance.glade.h:35
+#: capplets/appearance/data/appearance.glade.h:29
 msgid "N_one"
 msgstr "ไ_ม่ใช้"
 
-#: capplets/appearance/data/appearance.glade.h:36
+#: capplets/appearance/data/appearance.glade.h:30
 msgid "New File"
 msgstr "แฟ้มใหม่"
 
-#: capplets/appearance/data/appearance.glade.h:37
+#: capplets/appearance/data/appearance.glade.h:31
 msgid "Open File"
 msgstr "เปิดแฟ้ม"
 
-#: capplets/appearance/data/appearance.glade.h:38
+#: capplets/appearance/data/appearance.glade.h:32
 msgid "Open a dialog to specify the color"
 msgstr "เปิดกล่องโต้ตอบเพื่อเลือกสี"
 
-#: capplets/appearance/data/appearance.glade.h:39
+#: capplets/appearance/data/appearance.glade.h:33
 msgid "Pointer"
 msgstr "ตัวชี้"
 
-#: capplets/appearance/data/appearance.glade.h:40
+#: capplets/appearance/data/appearance.glade.h:34
 msgid "R_esolution:"
 msgstr "ความ_ละเอียด:"
 
-#: capplets/appearance/data/appearance.glade.h:41
+#: capplets/appearance/data/appearance.glade.h:35
 msgid "Save File"
 msgstr "บันทึกแฟ้ม"
 
-#: capplets/appearance/data/appearance.glade.h:42
+#: capplets/appearance/data/appearance.glade.h:36
 msgid "Save Theme As..."
 msgstr "บันทึกชุดตกแต่งเป็น..."
 
-#: capplets/appearance/data/appearance.glade.h:43
+#: capplets/appearance/data/appearance.glade.h:37
 msgid "Save _As..."
 msgstr "บันทึกเป็_น..."
 
-#: capplets/appearance/data/appearance.glade.h:44
+#: capplets/appearance/data/appearance.glade.h:38
 msgid "Save _background image"
 msgstr "บันทึกภาพ_พื้นหลัง"
 
-#: capplets/appearance/data/appearance.glade.h:45
+#: capplets/appearance/data/appearance.glade.h:39
 msgid "Show _icons in menus"
 msgstr "แสดงไ_อคอนในเมนู"
 
-#: capplets/appearance/data/appearance.glade.h:46
+#: capplets/appearance/data/appearance.glade.h:40
 msgid "Small"
 msgstr "เล็ก"
 
-#: capplets/appearance/data/appearance.glade.h:47
+#: capplets/appearance/data/appearance.glade.h:41
 msgid ""
 "Solid color\n"
 "Horizontal gradient\n"
@@ -774,19 +807,19 @@ msgstr ""
 "ไล่สีตามแนวนอน\n"
 "ไล่สีตามแนวตั้ง"
 
-#: capplets/appearance/data/appearance.glade.h:50
+#: capplets/appearance/data/appearance.glade.h:44
 msgid "Sub_pixel (LCDs)"
 msgstr "_พิกเซลย่อย (สำหรับจอ LCD)"
 
-#: capplets/appearance/data/appearance.glade.h:51
+#: capplets/appearance/data/appearance.glade.h:45
 msgid "Sub_pixel smoothing (LCDs)"
 msgstr "_จัดการพิกเซลย่อย (LCDs)"
 
-#: capplets/appearance/data/appearance.glade.h:52
+#: capplets/appearance/data/appearance.glade.h:46
 msgid "Text"
 msgstr "ข้อความ"
 
-#: capplets/appearance/data/appearance.glade.h:53
+#: capplets/appearance/data/appearance.glade.h:47
 msgid ""
 "Text below items\n"
 "Text beside items\n"
@@ -798,161 +831,175 @@ msgstr ""
 "ไอคอนเท่านั้น\n"
 "ข้อความเท่านั้น"
 
-#: capplets/appearance/data/appearance.glade.h:57
+#: capplets/appearance/data/appearance.glade.h:51
 msgid "The current controls theme does not support color schemes."
 msgstr "ชุดตกแต่งปุ่มควบคุมที่ใช้อยู่ ไม่สนับสนุนแนวการใช้สี"
 
-#: capplets/appearance/data/appearance.glade.h:58
+#: capplets/appearance/data/appearance.glade.h:52
 #: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "ชุดตกแต่ง"
 
-#: capplets/appearance/data/appearance.glade.h:59
+#: capplets/appearance/data/appearance.glade.h:53
+msgid ""
+"Tiled\n"
+"Zoom\n"
+"Centered\n"
+"Scaled\n"
+"Fill screen"
+msgstr ""
+"เรียงกระเบื้อง\n"
+"ซูมเต็มหน้าจอ\n"
+"วางตรงกลาง\n"
+"ขยายพอดีหน้าจอ\n"
+"ยืดเต็มหน้าจอ"
+
+#: capplets/appearance/data/appearance.glade.h:58
 msgid "Toolbar _button labels:"
 msgstr "รูปแบบของปุ่_มในแถบเครื่องมือ:"
 
 #. vertical hinting, pixel order blue, green, red
-#: capplets/appearance/data/appearance.glade.h:61
+#: capplets/appearance/data/appearance.glade.h:60
 msgid "VB_GR"
 msgstr "VB_GR"
 
-#: capplets/appearance/data/appearance.glade.h:62
+#: capplets/appearance/data/appearance.glade.h:61
 msgid "Window Border"
 msgstr "กรอบหน้าต่าง"
 
-#: capplets/appearance/data/appearance.glade.h:63
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:47
+#: capplets/appearance/data/appearance.glade.h:62
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:50
 msgid "_Add..."
 msgstr "เ_พิ่ม..."
 
-#: capplets/appearance/data/appearance.glade.h:64
+#: capplets/appearance/data/appearance.glade.h:63
 msgid "_Application font:"
 msgstr "แบบอักษรของโ_ปรแกรม:"
 
 #. pixel order blue, green, red
-#: capplets/appearance/data/appearance.glade.h:66
+#: capplets/appearance/data/appearance.glade.h:65
 msgid "_BGR"
 msgstr "_BGR"
 
-#: capplets/appearance/data/appearance.glade.h:67
+#: capplets/appearance/data/appearance.glade.h:66
 msgid "_Copy"
 msgstr "_คัดลอก"
 
-#: capplets/appearance/data/appearance.glade.h:68
+#: capplets/appearance/data/appearance.glade.h:67
 msgid "_Description:"
 msgstr "_คำบรรยาย:"
 
-#: capplets/appearance/data/appearance.glade.h:69
+#: capplets/appearance/data/appearance.glade.h:68
 msgid "_Document font:"
 msgstr "แบบอักษรของเ_อกสาร:"
 
-#: capplets/appearance/data/appearance.glade.h:70
+#: capplets/appearance/data/appearance.glade.h:69
 msgid "_Editable menu shortcut keys"
 msgstr "แก้ไขปุ่ม_ลัดเมนูได้"
 
-#: capplets/appearance/data/appearance.glade.h:71
+#: capplets/appearance/data/appearance.glade.h:70
 msgid "_File"
 msgstr "แ_ฟ้ม"
 
-#: capplets/appearance/data/appearance.glade.h:72
+#: capplets/appearance/data/appearance.glade.h:71
 msgid "_Fixed width font:"
 msgstr "แบบอักษรความกว้าง_คงที่:"
 
-#: capplets/appearance/data/appearance.glade.h:73
+#: capplets/appearance/data/appearance.glade.h:72
 msgid "_Full"
 msgstr "เ_ต็มที่"
 
-#: capplets/appearance/data/appearance.glade.h:74
+#: capplets/appearance/data/appearance.glade.h:73
 msgid "_Input boxes:"
 msgstr "กล่อง_ป้อนข้อความ:"
 
-#: capplets/appearance/data/appearance.glade.h:75
+#: capplets/appearance/data/appearance.glade.h:74
 msgid "_Install..."
 msgstr "_ติดตั้ง..."
 
-#: capplets/appearance/data/appearance.glade.h:76
+#: capplets/appearance/data/appearance.glade.h:75
 msgid "_Medium"
 msgstr "_กลาง"
 
-#: capplets/appearance/data/appearance.glade.h:77
+#: capplets/appearance/data/appearance.glade.h:76
 msgid "_Monochrome"
 msgstr "_สีเดียว"
 
-#: capplets/appearance/data/appearance.glade.h:78
+#: capplets/appearance/data/appearance.glade.h:77
 msgid "_Name:"
 msgstr "_ชื่อ:"
 
-#: capplets/appearance/data/appearance.glade.h:79
+#: capplets/appearance/data/appearance.glade.h:78
 msgid "_New"
 msgstr "ใ_หม่"
 
-#: capplets/appearance/data/appearance.glade.h:80
+#: capplets/appearance/data/appearance.glade.h:79
 msgid "_None"
 msgstr "_ไม่ใช้"
 
-#: capplets/appearance/data/appearance.glade.h:81
+#: capplets/appearance/data/appearance.glade.h:80
 msgid "_Open"
 msgstr "_เปิด"
 
-#: capplets/appearance/data/appearance.glade.h:82
+#: capplets/appearance/data/appearance.glade.h:81
 msgid "_Paste"
 msgstr "_แปะ"
 
-#: capplets/appearance/data/appearance.glade.h:83
+#: capplets/appearance/data/appearance.glade.h:82
 msgid "_Print"
 msgstr "_พิมพ์"
 
-#: capplets/appearance/data/appearance.glade.h:84
+#: capplets/appearance/data/appearance.glade.h:83
 msgid "_Quit"
 msgstr "_ออก"
 
 #. pixel order red, green, blue
-#: capplets/appearance/data/appearance.glade.h:86
+#: capplets/appearance/data/appearance.glade.h:85
 msgid "_RGB"
 msgstr "_RGB"
 
-#: capplets/appearance/data/appearance.glade.h:87
+#: capplets/appearance/data/appearance.glade.h:86
 msgid "_Reset to Defaults"
 msgstr "_กลับไปใช้ค่าปริยาย"
 
-#: capplets/appearance/data/appearance.glade.h:88
+#: capplets/appearance/data/appearance.glade.h:87
 msgid "_Save"
 msgstr "_บันทึก"
 
-#: capplets/appearance/data/appearance.glade.h:89
+#: capplets/appearance/data/appearance.glade.h:88
 msgid "_Selected items:"
 msgstr "สิ่งที่เ_ลือก:"
 
-#: capplets/appearance/data/appearance.glade.h:90
+#: capplets/appearance/data/appearance.glade.h:89
 msgid "_Size:"
 msgstr "_ขนาด:"
 
-#: capplets/appearance/data/appearance.glade.h:91
+#: capplets/appearance/data/appearance.glade.h:90
 msgid "_Slight"
 msgstr "_นิดหน่อย"
 
-#: capplets/appearance/data/appearance.glade.h:92
+#: capplets/appearance/data/appearance.glade.h:91
 msgid "_Style:"
 msgstr "_ลักษณะ:"
 
-#: capplets/appearance/data/appearance.glade.h:93
+#: capplets/appearance/data/appearance.glade.h:92
 msgid "_Tooltips:"
 msgstr "_คำแนะนำเครื่องมือ:"
 
 #. vertical hinting, pixel order red, green, blue
-#: capplets/appearance/data/appearance.glade.h:95
+#: capplets/appearance/data/appearance.glade.h:94
 msgid "_VRGB"
 msgstr "_VRGB"
 
-#: capplets/appearance/data/appearance.glade.h:96
+#: capplets/appearance/data/appearance.glade.h:95
 msgid "_Window title font:"
 msgstr "แบบอักษรของ_ชื่อหน้าต่าง:"
 
-#: capplets/appearance/data/appearance.glade.h:97
+#: capplets/appearance/data/appearance.glade.h:96
 msgid "_Windows:"
 msgstr "ห_น้าต่าง:"
 
-#: capplets/appearance/data/appearance.glade.h:98
+#: capplets/appearance/data/appearance.glade.h:97
 msgid "dots per inch"
 msgstr "จุด/นิ้ว"
 
@@ -976,11 +1023,11 @@ msgstr "เครื่องมือติดตั้งชุดตกแต
 msgid "Gnome Theme Package"
 msgstr "แพกเกจชุดตกแต่ง GNOME"
 
-#: capplets/appearance/gnome-wp-info.c:45
+#: capplets/appearance/gnome-wp-info.c:50
 msgid "No Wallpaper"
 msgstr "ไม่ใช้รูปพื้นโต๊ะ"
 
-#: capplets/appearance/gnome-wp-item.c:200
+#: capplets/appearance/gnome-wp-item.c:209
 msgid "Slide Show"
 msgstr "การแสดงสไลด์"
 
@@ -988,7 +1035,7 @@ msgstr "การแสดงสไลด์"
 #. * mime type, x pixel(s) by y pixel(s)
 #. * Folder: /path/to/file
 #.
-#: capplets/appearance/gnome-wp-item.c:208
+#: capplets/appearance/gnome-wp-item.c:217
 #, c-format
 msgid ""
 "<b>%s</b>\n"
@@ -999,8 +1046,8 @@ msgstr ""
 "%s, %d %s × %d %s\n"
 "โฟลเดอร์: %s"
 
-#: capplets/appearance/gnome-wp-item.c:214
-#: capplets/appearance/gnome-wp-item.c:216
+#: capplets/appearance/gnome-wp-item.c:223
+#: capplets/appearance/gnome-wp-item.c:225
 msgid "pixel"
 msgid_plural "pixels"
 msgstr[0] "พิกเซล"
@@ -1040,41 +1087,41 @@ msgstr "\"%s\" ดูเหมือนไม่ใช่ชุดตกแต�
 msgid "GNOME Theme %s correctly installed"
 msgstr "ติดตั้งชุดตกแต่ง %s สำเร็จแล้ว"
 
-#: capplets/appearance/theme-installer.c:347
+#: capplets/appearance/theme-installer.c:354
 #, c-format
 msgid "Installation for theme \"%s\" failed."
 msgstr "ติดตั้งชุดตกแต่ง \"%s\" ไม่สำเร็จ"
 
-#: capplets/appearance/theme-installer.c:379
+#: capplets/appearance/theme-installer.c:392
 #, c-format
 msgid "The theme \"%s\" has been installed."
 msgstr "ชุดตกแต่ง \"%s\" ติดตั้งเรียบร้อยแล้ว"
 
-#: capplets/appearance/theme-installer.c:385
+#: capplets/appearance/theme-installer.c:398
 msgid "Would you like to apply it now, or keep your current theme?"
 msgstr "คุณต้องการใช้ชุดตกแต่งนี้เลยหรือไม่ หรือจะใช้ชุดตกแต่งเดิมต่อไป?"
 
-#: capplets/appearance/theme-installer.c:387
+#: capplets/appearance/theme-installer.c:400
 msgid "Keep Current Theme"
 msgstr "ใช้ชุดตกแต่งเดิม"
 
-#: capplets/appearance/theme-installer.c:389
+#: capplets/appearance/theme-installer.c:402
 msgid "Apply New Theme"
 msgstr "ใช้ชุดตกแต่งใหม่"
 
-#: capplets/appearance/theme-installer.c:491
+#: capplets/appearance/theme-installer.c:505
 msgid "Failed to create temporary directory"
 msgstr "สร้างโฟลเดอร์ชั่วคราวไม่สำเร็จ"
 
-#: capplets/appearance/theme-installer.c:551
+#: capplets/appearance/theme-installer.c:568
 msgid "New themes have been successfully installed."
 msgstr "ติดตั้งชุดตกแต่งชุดใหม่เรียบร้อยแล้ว"
 
-#: capplets/appearance/theme-installer.c:579
+#: capplets/appearance/theme-installer.c:595
 msgid "No theme file location specified to install"
 msgstr "ไม่ได้กำหนดตำแหน่งของแฟ้มชุดตกแต่งที่จะติดตั้ง"
 
-#: capplets/appearance/theme-installer.c:599
+#: capplets/appearance/theme-installer.c:615
 #, c-format
 msgid ""
 "Insufficient permissions to install the theme in:\n"
@@ -1083,18 +1130,18 @@ msgstr ""
 "คุณไม่มีสิทธิเพียงพอที่จะติดตั้งชุดตกแต่งใน:\n"
 "%s"
 
-#: capplets/appearance/theme-installer.c:621
+#: capplets/appearance/theme-installer.c:637
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
 "selected as the source location"
 msgstr "%s เป็นตำแหน่งที่ จะติดตั้งชุดตกแต่ง จะเลือกตำแหน่งนี้ เป็นที่มาของชุดตกแต่งไม่ได้"
 
-#: capplets/appearance/theme-installer.c:689
+#: capplets/appearance/theme-installer.c:706
 msgid "Select Theme"
 msgstr "เลือกชุดตกแต่ง"
 
-#: capplets/appearance/theme-installer.c:693
+#: capplets/appearance/theme-installer.c:710
 msgid "Theme Packages"
 msgstr "แพกเกจชุดตกแต่ง"
 
@@ -1103,22 +1150,27 @@ msgstr "แพกเกจชุดตกแต่ง"
 msgid "Theme name must be present"
 msgstr "ชุดตกแต่งต้องมีชื่อ"
 
-#: capplets/appearance/theme-save.c:161
+#: capplets/appearance/theme-save.c:154
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "มีชุดตกแต่งนี้อยู่แล้ว จะเขียนทับหรือไม่?"
 
-#: capplets/appearance/theme-save.c:162
+#: capplets/appearance/theme-save.c:155
+#: capplets/common/file-transfer-dialog.c:450
 msgid "_Overwrite"
 msgstr "เขียน_ทับ"
 
-#: capplets/appearance/theme-util.c:69
+#: capplets/appearance/theme-util.c:134
 msgid "Would you like to delete this theme?"
 msgstr "คุณต้องการลบชุดตกแต่งนี้หรือไม่?"
 
-#: capplets/appearance/theme-util.c:121
+#: capplets/appearance/theme-util.c:179
 msgid "Theme cannot be deleted"
 msgstr "ไม่สามารถลบชุดตกแต่งได้"
 
+#: capplets/appearance/theme-util.c:304
+msgid "Could not install theme engine"
+msgstr "ติดตั้งกลไกชุดตกแต่งไม่สำเร็จ"
+
 #: capplets/common/activate-settings-daemon.c:16
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -1137,157 +1189,156 @@ msgstr ""
 msgid "Unable to load stock icon '%s'\n"
 msgstr "อ่านไอคอนสำเร็จรูป '%s' ไม่สำเร็จ\n"
 
-#: capplets/common/capplet-util.c:240 capplets/common/capplet-util.c:242
-msgid "Just apply settings and quit"
-msgstr "ใช้ค่าที่ตั้งและปิดหน้าต่าง"
-
-#: capplets/common/capplet-util.c:244
-#: capplets/keyboard/gnome-keyboard-properties.c:249
-#: capplets/sound/sound-properties-capplet.c:1030
-msgid "Retrieve and store legacy settings"
-msgstr "อ่านค่าที่ตั้งไว้ในรุ่นก่อน"
-
-#: capplets/common/capplet-util.c:344
+#: capplets/common/capplet-util.c:80
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "เกิดข้อผิดพลาดขณะแสดงวิธีใช้: %s"
 
-#: capplets/common/file-transfer-dialog.c:94
+#: capplets/common/file-transfer-dialog.c:98
 #, c-format
 msgid "Copying file: %u of %u"
 msgstr "กำลังคัดลอกแฟ้ม: %u จาก %u"
 
-#: capplets/common/file-transfer-dialog.c:154
+#: capplets/common/file-transfer-dialog.c:145
 #, c-format
 msgid "Copying '%s'"
 msgstr "กำลังคัดลอก '%s'"
 
 #: capplets/common/file-transfer-dialog.c:185
-#: capplets/common/file-transfer-dialog.c:309
+#: capplets/common/file-transfer-dialog.c:312
 msgid "Copying files"
 msgstr "กำลังคัดลอกแฟ้ม"
 
-#: capplets/common/file-transfer-dialog.c:221
+#: capplets/common/file-transfer-dialog.c:224
 msgid "Parent Window"
 msgstr "หน้าต่างแม่"
 
-#: capplets/common/file-transfer-dialog.c:222
+#: capplets/common/file-transfer-dialog.c:225
 msgid "Parent window of the dialog"
 msgstr "หน้าต่างแม่ของกล่องโต้ตอบ"
 
-#: capplets/common/file-transfer-dialog.c:228
+#: capplets/common/file-transfer-dialog.c:231
 msgid "From URI"
 msgstr "จาก URI"
 
-#: capplets/common/file-transfer-dialog.c:229
+#: capplets/common/file-transfer-dialog.c:232
 msgid "URI currently transferring from"
 msgstr "URI ที่กำลังถ่ายโอนข้อมูลจาก"
 
-#: capplets/common/file-transfer-dialog.c:236
+#: capplets/common/file-transfer-dialog.c:239
 msgid "To URI"
 msgstr "ไปยัง URI"
 
-#: capplets/common/file-transfer-dialog.c:237
+#: capplets/common/file-transfer-dialog.c:240
 msgid "URI currently transferring to"
 msgstr "URI ที่กำลังถ่ายโอนข้อมูลไปยัง"
 
-#: capplets/common/file-transfer-dialog.c:244
+#: capplets/common/file-transfer-dialog.c:247
 msgid "Fraction completed"
 msgstr "อัตราส่วนที่เสร็จแล้ว"
 
-#: capplets/common/file-transfer-dialog.c:245
+#: capplets/common/file-transfer-dialog.c:248
 msgid "Fraction of transfer currently completed"
 msgstr "อัตราส่วนของข้อมูลที่ถ่ายโอนเสร็จแล้ว"
 
-#: capplets/common/file-transfer-dialog.c:252
+#: capplets/common/file-transfer-dialog.c:255
 msgid "Current URI index"
 msgstr "URI ปัจจุบัน"
 
-#: capplets/common/file-transfer-dialog.c:253
+#: capplets/common/file-transfer-dialog.c:256
 msgid "Current URI index - starts from 1"
 msgstr "URI ปัจจุบัน (เริ่มจาก 1)"
 
-#: capplets/common/file-transfer-dialog.c:260
+#: capplets/common/file-transfer-dialog.c:263
 msgid "Total URIs"
 msgstr "URI ทั้งหมดรวม"
 
-#: capplets/common/file-transfer-dialog.c:261
+#: capplets/common/file-transfer-dialog.c:264
 msgid "Total number of URIs"
 msgstr "จำนวนของ URI ทั้งหมด"
 
-#: capplets/common/file-transfer-dialog.c:422
-msgid "Connecting..."
-msgstr "กำลังเชื่อมต่อ..."
+#: capplets/common/file-transfer-dialog.c:444
+#, c-format
+msgid "File '%s' already exists. Do you want to overwrite it?"
+msgstr "มีแฟ้ม '%s' อยู่ก่อนแล้ว จะเขียนทับหรือไม่?"
+
+#: capplets/common/file-transfer-dialog.c:447
+msgid "_Skip"
+msgstr "_ข้าม"
 
-#: capplets/common/gconf-property-editor.c:170
+#: capplets/common/file-transfer-dialog.c:448
+msgid "Overwrite _All"
+msgstr "เขียนทับทั้งห_มด"
+
+#: capplets/common/gconf-property-editor.c:133
 msgid "Key"
 msgstr "คีย์"
 
-#: capplets/common/gconf-property-editor.c:171
+#: capplets/common/gconf-property-editor.c:134
 msgid "GConf key to which this property editor is attached"
 msgstr "คีย์ของ GConf ที่เครื่องมือแก้ไขคุณสมบัตินี้แนบอยู่ด้วย"
 
-#: capplets/common/gconf-property-editor.c:177
+#: capplets/common/gconf-property-editor.c:140
 msgid "Callback"
 msgstr "เรียกกลับ"
 
-#: capplets/common/gconf-property-editor.c:178
+#: capplets/common/gconf-property-editor.c:141
 msgid "Issue this callback when the value associated with key gets changed"
 msgstr "ใช้การเรียกกลับหากค่าที่ติดกับคีย์เปลี่ยนไป"
 
-#: capplets/common/gconf-property-editor.c:183
+#: capplets/common/gconf-property-editor.c:146
 msgid "Change set"
 msgstr "ชุดการเปลี่ยนแปลง"
 
-#: capplets/common/gconf-property-editor.c:184
+#: capplets/common/gconf-property-editor.c:147
 msgid ""
 "GConf change set containing data to be forwarded to the gconf client on apply"
 msgstr ""
 "ชุดการเปลี่ยนแปลงของ GConf ซึ่งเก็บข้อมูลที่จะส่งต่อไปยังไคลเอนต์ของ gconf เมื่อจะเริ่มใช้"
 
-#: capplets/common/gconf-property-editor.c:189
+#: capplets/common/gconf-property-editor.c:152
 msgid "Conversion to widget callback"
 msgstr "การแปลงค่าเป็น callback ของวิดเจ็ต"
 
-#: capplets/common/gconf-property-editor.c:190
+#: capplets/common/gconf-property-editor.c:153
 msgid ""
 "Callback to be issued when data are to be converted from GConf to the widget"
 msgstr "callback จะถูกกำหนดขึ้นเวลาข้อมูลถูกแปลงจาก GConf ไปเป็นวิดเจ็ต"
 
-#: capplets/common/gconf-property-editor.c:195
+#: capplets/common/gconf-property-editor.c:158
 msgid "Conversion from widget callback"
 msgstr "การแปลงจากค่า callback ของวิดเจ็ต"
 
-#: capplets/common/gconf-property-editor.c:196
+#: capplets/common/gconf-property-editor.c:159
 msgid ""
 "Callback to be issued when data are to be converted to GConf from the widget"
 msgstr "callback จะถูกกำหนดขึ้นเวลาข้อมูลถูกแปลงจากวิดเจ็ตไปเป็น GConf"
 
-#: capplets/common/gconf-property-editor.c:201
+#: capplets/common/gconf-property-editor.c:164
 msgid "UI Control"
 msgstr "ตัวควบคุม UI"
 
-#: capplets/common/gconf-property-editor.c:202
+#: capplets/common/gconf-property-editor.c:165
 msgid "Object that controls the property (normally a widget)"
 msgstr "วัตถุที่ทำหน้าที่ควบคุมคุณสมบัติ (โดยปกติจะเป็นวิดเจ็ต)"
 
-#: capplets/common/gconf-property-editor.c:217
+#: capplets/common/gconf-property-editor.c:180
 msgid "Property editor object data"
 msgstr "ข้อมูลของวัตถุเครื่องมือแก้ไขคุณสมบัติ"
 
-#: capplets/common/gconf-property-editor.c:218
+#: capplets/common/gconf-property-editor.c:181
 msgid "Custom data required by the specific property editor"
 msgstr "ข้อมูลกำหนดเองที่ต้องใช้สำหรับเครื่องมือแก้ไขคุณสมบัติ"
 
-#: capplets/common/gconf-property-editor.c:224
+#: capplets/common/gconf-property-editor.c:187
 msgid "Property editor data freeing callback"
 msgstr "callback เมื่อปล่อยข้อมูลของเครื่องมือแก้ไขคุณสมบัติ"
 
-#: capplets/common/gconf-property-editor.c:225
+#: capplets/common/gconf-property-editor.c:188
 msgid "Callback to be issued when property editor object data is to be freed"
 msgstr "callback ที่จะเรียกเมื่อข้อมูลของเครื่องมือแก้ไขคุณสมบัติจะถูกปล่อย"
 
-#: capplets/common/gconf-property-editor.c:1468
+#: capplets/common/gconf-property-editor.c:1429
 #, c-format
 msgid ""
 "Couldn't find the file '%s'.\n"
@@ -1299,7 +1350,7 @@ msgstr ""
 "\n"
 "กรุณาตรวจดูว่าภาพนี้มีอยู่จริงแล้วลองใหม่ หรือเลือกภาพพื้นหลังอื่น"
 
-#: capplets/common/gconf-property-editor.c:1476
+#: capplets/common/gconf-property-editor.c:1437
 #, c-format
 msgid ""
 "I don't know how to open the file '%s'.\n"
@@ -1312,42 +1363,66 @@ msgstr ""
 "\n"
 "กรุณาเลือกภาพอื่น"
 
-#: capplets/common/gconf-property-editor.c:1595
+#: capplets/common/gconf-property-editor.c:1556
 msgid "Please select an image."
 msgstr "กรุณาเลือกภาพที่จะใช้"
 
-#: capplets/common/gconf-property-editor.c:1600
+#: capplets/common/gconf-property-editor.c:1561
 msgid "_Select"
 msgstr "เ_ลือก"
 
-#: capplets/common/gnome-theme-info.c:639
+#: capplets/common/gnome-theme-info.c:629
 msgid "Default Pointer - Current"
 msgstr "ตัวชี้ปริยาย - ใช้อยู่"
 
-#: capplets/common/gnome-theme-info.c:643
+#: capplets/common/gnome-theme-info.c:633
 msgid "White Pointer"
 msgstr "ตัวชี้ขาว"
 
-#: capplets/common/gnome-theme-info.c:644
+#: capplets/common/gnome-theme-info.c:634
 msgid "White Pointer - Current"
 msgstr "ตัวชี้ขาว - ใช้อยู่"
 
-#: capplets/common/gnome-theme-info.c:648
+#: capplets/common/gnome-theme-info.c:638
 msgid "Large Pointer"
 msgstr "ตัวชี้ใหญ่"
 
-#: capplets/common/gnome-theme-info.c:649
+#: capplets/common/gnome-theme-info.c:639
 msgid "Large Pointer - Current"
 msgstr "ตัวชี้ใหญ่ - ใช้อยู่"
 
-#: capplets/common/gnome-theme-info.c:653
+#: capplets/common/gnome-theme-info.c:643
 msgid "Large White Pointer - Current"
 msgstr "ตัวชี้ขาวใหญ่ - ใช้อยู่"
 
-#: capplets/common/gnome-theme-info.c:654
+#: capplets/common/gnome-theme-info.c:644
 msgid "Large White Pointer"
 msgstr "ตัวชี้ขาวใหญ่"
 
+#: capplets/common/gnome-theme-info.c:1610
+#, c-format
+msgid ""
+"This theme will not look as intended because the required GTK+ theme '%s' is "
+"not installed."
+msgstr ""
+"ชุดตกแต่งนี้อาจแสดงไม่เหมือนที่ออกแบบไว้ เพราะชุดตกแต่ง GTK+ '%s' ที่ต้องการ ไม่ได้ติดตั้งไว้"
+
+#: capplets/common/gnome-theme-info.c:1618
+#, c-format
+msgid ""
+"This theme will not look as intended because the required window manager "
+"theme '%s' is not installed."
+msgstr ""
+"ชุดตกแต่งนี้อาจแสดงไม่เหมือนที่ออกแบบไว้ เพราะชุดตกแต่งหน้าต่าง '%s' ที่ต้องการ ไม่ได้ติดตั้งไว้"
+
+#: capplets/common/gnome-theme-info.c:1625
+#, c-format
+msgid ""
+"This theme will not look as intended because the required icon theme '%s' is "
+"not installed."
+msgstr ""
+"ชุดตกแต่งนี้อาจแสดงไม่เหมือนที่ออกแบบไว้ เพราะชุดตกแต่งไอคอน '%s' ที่ต้องการ ไม่ได้ติดตั้งไว้"
+
 #: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Preferred Applications"
@@ -1365,30 +1440,26 @@ msgstr "เรียกโปรแกรมอำนวยความสะด
 msgid "Visual Assistance"
 msgstr "สิ่งอำนวยความสะดวกสำหรับสายตา"
 
-#: capplets/default-applications/gnome-da-capplet.c:80
-#: capplets/default-applications/gnome-da-capplet.c:112
-#: capplets/default-applications/gnome-da-capplet.c:133
-#: capplets/default-applications/gnome-da-capplet.c:177
-#: capplets/default-applications/gnome-da-capplet.c:222
-#: capplets/default-applications/gnome-da-capplet.c:279
-#: capplets/default-applications/gnome-da-capplet.c:330
-#: capplets/default-applications/gnome-da-capplet.c:381
-#: capplets/default-applications/gnome-da-capplet.c:434
-#: capplets/default-applications/gnome-da-capplet.c:484
-#: capplets/default-applications/gnome-da-capplet.c:877
-#: capplets/default-applications/gnome-da-capplet.c:899
+#: capplets/default-applications/gnome-da-capplet.c:94
+#: capplets/default-applications/gnome-da-capplet.c:345
+#: capplets/default-applications/gnome-da-capplet.c:366
 #, c-format
 msgid "Error saving configuration: %s"
 msgstr "เกิดข้อผิดพลาดขณะบันทึกค่าตั้ง: %s"
 
-#: capplets/default-applications/gnome-da-capplet.c:1100
+#: capplets/default-applications/gnome-da-capplet.c:650
 msgid "Could not load the main interface"
 msgstr "อ่านส่วนติดต่อผู้ใช้หลักไม่สำเร็จ"
 
-#: capplets/default-applications/gnome-da-capplet.c:1102
+#: capplets/default-applications/gnome-da-capplet.c:652
 msgid "Please make sure that the applet is properly installed"
 msgstr "กรุณาตรวจสอบการติดตั้งแอพเพล็ตว่าเรียบร้อยดีหรือไม่"
 
+#. TRANSLATORS: don't translate the terms in brackets
+#: capplets/default-applications/gnome-da-capplet.c:879
+msgid "Specify the name of the page to show (internet|multimedia|system|a11y)"
+msgstr "ระบุหน้าที่ต้องการแสดง (internet|multimedia|system|a11y)"
+
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:1
 msgid "<b>Image Viewer</b>"
 msgstr "<b>โปรแกรมแสดงรูป</b>"
@@ -1430,7 +1501,7 @@ msgid "<b>Web Browser</b>"
 msgstr "<b>เว็บเบราว์เซอร์</b>"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:11
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:13
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:12
 #: capplets/mouse/gnome-mouse-properties.glade.h:28
 msgid "Accessibility"
 msgstr "สิ่งอำนวยความสะดวก"
@@ -1742,20 +1813,20 @@ msgstr "ค่าตั้งปริยาย"
 msgid "Screen %d Settings\n"
 msgstr "ค่าตั้งของจอ %d\n"
 
-#: capplets/display/main.c:592
+#: capplets/display/main.c:593
 msgid "Screen Resolution Preferences"
 msgstr "ค่าตั้งความละเอียดของจอ"
 
-#: capplets/display/main.c:627
+#: capplets/display/main.c:628
 #, c-format
 msgid "_Make default for this computer (%s) only"
 msgstr "_ตั้งให้เป็นค่าปริยายสำหรับเครื่องนี้ (%s) เท่านั้น"
 
-#: capplets/display/main.c:644
+#: capplets/display/main.c:648
 msgid "Options"
 msgstr "ตัวเลือก"
 
-#: capplets/display/main.c:664
+#: capplets/display/main.c:668
 #, c-format
 msgid ""
 "Testing the new settings. If you don't respond in %d second the previous "
@@ -1765,30 +1836,30 @@ msgid_plural ""
 "settings will be restored."
 msgstr[0] "กำลังทดลองใช้ค่าตั้งใหม่  ถ้าคุณไม่ตอบรับภายใน %d วินาที จะกลับไปใช้ค่าเดิม"
 
-#: capplets/display/main.c:704
+#: capplets/display/main.c:708
 msgid "Keep Resolution"
 msgstr "ใช้ความละเอียดนี้"
 
-#: capplets/display/main.c:708
+#: capplets/display/main.c:712
 msgid "Do you want to keep this resolution?"
 msgstr "จะตกลงใช้ความละเอียดนี้หรือไม่?"
 
-#: capplets/display/main.c:734
+#: capplets/display/main.c:738
 msgid "Use _Previous Resolution"
 msgstr "ใช้ความละเอียดเ_ดิม"
 
-#: capplets/display/main.c:735
+#: capplets/display/main.c:739
 msgid "_Keep Resolution"
 msgstr "ใช้ความละเอียด_นี้"
 
-#: capplets/display/main.c:883
+#: capplets/display/main.c:888
 msgid ""
 "The X server does not support the XRandR extension.  Runtime resolution "
 "changes to the display size are not available."
 msgstr ""
 "X server ไม่สนับสนุนส่วนขยาย XRandR จึงไม่สามารถเปลี่ยนความละเอียดของจอขณะทำงานได้"
 
-#: capplets/display/main.c:890
+#: capplets/display/main.c:895
 msgid ""
 "The version of the XRandR extension is incompatible with this program. "
 "Runtime changes to the display size are not available."
@@ -1803,6 +1874,7 @@ msgstr "เสียง"
 # This contains shortcuts for "volume up/down", e-mail, move windows, etc.,.
 # "misclenous" is more suitable than "desktop"
 #: capplets/keybindings/01-desktop-key.xml.in.h:1
+#: libslab/bookmark-agent.c:1158
 msgid "Desktop"
 msgstr "เบ็ดเตล็ด"
 
@@ -1834,49 +1906,53 @@ msgid "The type of accelerator."
 msgstr "แบบของตัวเร่ง"
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:112
+#: capplets/keybindings/gnome-keybinding-properties.c:90
 #: typing-break/drwright.c:483
 msgid "Disabled"
 msgstr "ไม่ใช้"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:523
+#: capplets/keybindings/gnome-keybinding-properties.c:171
 msgid "<Unknown Action>"
 msgstr "<ปฏิบัติการที่ไม่รู้จัก>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:915
+#: capplets/keybindings/gnome-keybinding-properties.c:804
+msgid "Custom Shortcuts"
+msgstr "ปุ่มลัดกำหนดเอง"
+
+#: capplets/keybindings/gnome-keybinding-properties.c:999
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
 "using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time.\n"
+"Please try with a key such as Control, Alt or Shift at the same time."
 msgstr ""
 "ไม่สามารถใช้ปุ่มลัด \"%s\" ได้ เพราะจะทำให้ใช้ปุ่มนี้ป้อนข้อความไม่ได้\n"
-"กรุณาใช้ปุ่มอย่าง Control, Alt หรือ Shift ประกอบด้วย\n"
+"กรุณาใช้ปุ่มอย่าง Control, Alt หรือ Shift ประกอบด้วย"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:944
+#: capplets/keybindings/gnome-keybinding-properties.c:1028
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
-" \"%s\"\n"
+" \"%s\""
 msgstr ""
 "ปุ่มลัด \"%s\" ถูกใช้อยู่แล้วสำหรับ:\n"
-" \"%s\"\n"
+" \"%s\""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:976
+#: capplets/keybindings/gnome-keybinding-properties.c:1060
 #, c-format
-msgid "Error setting new accelerator in configuration database: %s\n"
-msgstr "เกิดข้อผิดพลาดขณะจัดเก็บปุ่มลัดใหม่ลงในฐานข้อมูลค่าปรับแต่ง: %s\n"
+msgid "Error setting new accelerator in configuration database: %s"
+msgstr "เกิดข้อผิดพลาดขณะจัดเก็บปุ่มลัดใหม่ลงในฐานข้อมูลค่าปรับแต่ง: %s"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:1026
+#: capplets/keybindings/gnome-keybinding-properties.c:1112
 #, c-format
-msgid "Error unsetting accelerator in configuration database: %s\n"
-msgstr "เกิดข้อผิดพลาด ขณะลบปุ่มลัดออกจาก ฐานข้อมูลค่าปรับแต่ง: %s\n"
+msgid "Error unsetting accelerator in configuration database: %s"
+msgstr "เกิดข้อผิดพลาดขณะลบปุ่มลัดออกจากฐานข้อมูลค่าปรับแต่ง: %s"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:1141
+#: capplets/keybindings/gnome-keybinding-properties.c:1294
 msgid "Action"
 msgstr "ปฏิบัติการ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:1165
+#: capplets/keybindings/gnome-keybinding-properties.c:1316
 msgid "Shortcut"
 msgstr "ปุ่มลัด"
 
@@ -1900,24 +1976,29 @@ msgstr ""
 msgid "Assign shortcut keys to commands"
 msgstr "ตั้งปุ่มลัดสำหรับเรียกใช้คำสั่งต่างๆ"
 
-#: capplets/keyboard/gnome-keyboard-properties.c:241
-#: capplets/keyboard/gnome-keyboard-properties.c:246
-#: capplets/sound/sound-properties-capplet.c:1026
-#: capplets/sound/sound-properties-capplet.c:1028
+#: capplets/keyboard/gnome-keyboard-properties.c:248
+#: capplets/keyboard/gnome-keyboard-properties.c:253
+#: capplets/sound/sound-properties-capplet.c:1155
+#: capplets/sound/sound-properties-capplet.c:1157
 msgid ""
 "Just apply settings and quit (compatibility only; now handled by daemon)"
 msgstr ""
 "เริ่มใช้ค่าที่กำหนดแล้วออกจากโปรแกรม (ใช้เพื่อความเข้ากันได้เท่านั้น; ปัจจุบันถูกจัดการโดยดีมอน)"
 
-#: capplets/keyboard/gnome-keyboard-properties.c:253
+#: capplets/keyboard/gnome-keyboard-properties.c:256
+#: capplets/sound/sound-properties-capplet.c:1159
+msgid "Retrieve and store legacy settings"
+msgstr "อ่านค่าที่ตั้งไว้ในรุ่นก่อน"
+
+#: capplets/keyboard/gnome-keyboard-properties.c:260
 msgid "Start the page with the typing break settings showing"
 msgstr "เปิดหน้าต่างโดยเลือกแท็บการตั้งค่าการหยุดพักการพิมพ์"
 
-#: capplets/keyboard/gnome-keyboard-properties.c:258
+#: capplets/keyboard/gnome-keyboard-properties.c:265
 msgid "Start the page with the accessibility settings showing"
 msgstr "เปิดหน้าต่างโดยเลือกแท็บการตั้งค่าเทคโนโลยีสิ่งอำนวยความสะดวก"
 
-#: capplets/keyboard/gnome-keyboard-properties.c:267
+#: capplets/keyboard/gnome-keyboard-properties.c:274
 msgid "- GNOME Keyboard Preferences"
 msgstr "- ปรับแต่งแป้นพิมพ์สำหรับ GNOME"
 
@@ -1945,42 +2026,42 @@ msgstr "<b>พิมพ์แบบช้า</b>"
 msgid "<b>Sticky Keys</b>"
 msgstr "<b>ค้างปุ่มกด</b>"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:7
-msgid "<b>_Lock screen to enforce typing break</b>"
-msgstr "<b>_ล็อคหน้าจอเพื่อบังคับให้พักหยุดพิมพ์</b>"
-
 #. fast acceleration
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:8
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:7
 #: capplets/mouse/gnome-mouse-properties.glade.h:13
 msgid "<small><i>Fast</i></small>"
 msgstr "<small><i>ถี่</i></small>"
 
 #. long delay
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:9
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:8
 #: capplets/mouse/gnome-mouse-properties.glade.h:19
 msgid "<small><i>Long</i></small>"
 msgstr "<small><i>นาน</i></small>"
 
 #. short delay
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:10
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:9
 #: capplets/mouse/gnome-mouse-properties.glade.h:23
 msgid "<small><i>Short</i></small>"
 msgstr "<small><i>สั้น</i></small>"
 
 #. slow acceleration
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:11
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:10
 #: capplets/mouse/gnome-mouse-properties.glade.h:25
 msgid "<small><i>Slow</i></small>"
 msgstr "<small><i>ช้า</i></small>"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:12
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:11
 msgid "A_cceleration:"
 msgstr "ความเร่_ง:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:14
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:13
 msgid "All_ow postponing of breaks"
 msgstr "_ยอมให้ผัดเวลาพักพิมพ์ไปชั่วครู่"
 
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:14
+msgid "Audio _Feedback..."
+msgstr "การตอบสนองด้วยเ_สียง..."
+
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:15
 msgid "Beep when _accessibility features are turned on or off"
 msgstr "บี๊บเมื่อเทคโนโลยีสิ่งอำนวยความสะดวกถูก_ปิดหรือเปิด"
@@ -2010,177 +2091,189 @@ msgid "Beep when key is _rejected"
 msgstr "บี๊บเมื่อปุ่มถู_กปฏิเสธ"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:22
+msgid "By _country"
+msgstr "ตาม_ประเทศ"
+
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:23
+msgid "By _language"
+msgstr "ตาม_ภาษา"
+
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:24
 msgid "Check if breaks are allowed to be postponed"
 msgstr "เลือกถ้าจะยอมให้ผัดเวลาของการพักพิมพ์ออกไปชั่วคราว"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:23
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:25
 msgid "Choose a Keyboard Model"
 msgstr "เลือกรุ่นแป้นพิมพ์"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:24
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:26
 msgid "Choose a Layout"
 msgstr "เลือกผังแป้นพิมพ์"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:25
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:27
 msgid "Cursor _blinks in text fields"
 msgstr "เคอร์เซอร์_กะพริบในช่องข้อความ"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:28
 #: capplets/mouse/gnome-mouse-properties.glade.h:31
 msgid "Cursor blinks speed"
 msgstr "ความเร็วของการกะพริบของตัวชี้"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:27
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:29
 #: capplets/mouse/gnome-mouse-properties.glade.h:32
 msgid "D_elay:"
 msgstr "ร_อ:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:28
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:30
 msgid "Disa_ble sticky keys if two keys are pressed together"
 msgstr "เลิกใช้การค้างปุ่มถ้ามีการกดปุ่มสองปุ่ม_พร้อมกัน"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:29
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:31
 msgid "Duration of the break when typing is disallowed"
 msgstr "ระยะเวลาของการพักห้ามพิมพ์"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:30
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:32
 msgid "Duration of work before forcing a break"
 msgstr "ระยะเวลาทำงานก่อนที่จะบังคับให้พัก"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:31
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:33
 #: capplets/mouse/gnome-mouse-properties.glade.h:36
 msgid "General"
 msgstr "ทั่วไป"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:32
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:34
 msgid "Key presses _repeat when key is held down"
 msgstr "ซ้ำปุ่_มเมื่อกดปุ่มค้างไว้"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:33
-msgid "Keyboard Accessibility Notifications"
-msgstr "การแจ้งเหตุเกี่ยวกับสิ่งอำนวยความสะดวกสำหรับแป้นพิมพ์"
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:35
+msgid "Keyboard Accessibility Audio Feedback"
+msgstr "การตอบสนองด้วยเสียงในสิ่งอำนวยความสะดวกสำหรับแป้นพิมพ์"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:34
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:36
 msgid "Keyboard Layout Options"
 msgstr "ตัวเลือกสำหรับผังแป้นพิมพ์"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:35
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:37
 msgid "Keyboard Preferences"
 msgstr "ปรับแต่งแป้นพิมพ์"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:36
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:38
 msgid "Keyboard _model:"
 msgstr "รุ่_นแป้นพิมพ์"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:37
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:39
 msgid "Layout _Options..."
 msgstr "ตัวเ_ลือกสำหรับผังแป้นพิมพ์..."
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:38
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:40
 msgid "Layouts"
 msgstr "ผังแป้นพิมพ์"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:39
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:41
 msgid ""
 "Lock screen after a certain duration to help prevent repetitive keyboard use "
 "injuries"
 msgstr ""
 "ล็อคหน้าจอหลังจากทำงานไประยะเวลาหนึ่ง เพื่อช่วยป้องกันการปวดนิ้วและข้อมือจากการพิมพ์ต่อเนื่อง"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:40
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:42
 msgid "Mouse Keys"
 msgstr "บังคับเมาส์ด้วยแป้น"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:41
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:43
 msgid "Preview:"
 msgstr "ตัวอย่าง:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:42
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:44
 msgid "Repeat keys speed"
 msgstr "ความเร็วของการซ้ำปุ่มเมื่อกดค้าง"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:43
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:45
 msgid "Reset to De_faults"
 msgstr "_กลับไปใช้ค่าปริยาย"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:44
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:46
 msgid "S_peed:"
 msgstr "_ความเร็ว:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:45
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:47
 msgid "Separate _layout for each window"
 msgstr "_จำภาษาสำหรับแต่ละหน้าต่าง"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:46
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:48
 msgid "Typing Break"
 msgstr "เวลาพักพิมพ์"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:48
-msgid "_Allow to control the pointer using the keyboard"
-msgstr "เ_ปิดใช้การบังคับตัวชี้เมาส์ด้วยแป้นพิมพ์"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:49
-msgid "_Allow to turn accessibility features on and off from the keyboard"
-msgstr "เ_ปิดใช้การเปิดปิดเทคโนโลยีสิ่งอำนวยความสะดวกโดยใช้แป้นพิมพ์"
+msgid "_Accessibility features can be toggled with keyboard shortcuts"
+msgstr "เทคโนโลยีสิ่งอำนวยความสะดวกสามารถเ_ปิด-ปิดได้โดยใช้แป้นพิมพ์"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:50
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:51
 msgid "_Break interval lasts:"
 msgstr "_พักเป็นระยะเวลา:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:51
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:52
+msgid "_Country:"
+msgstr "ประเ_ทศ:"
+
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:53
 #: capplets/mouse/gnome-mouse-properties.glade.h:43
 msgid "_Delay:"
 msgstr "_รอ:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:52
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:54
 msgid "_Ignore fast duplicate keypresses"
 msgstr "ไ_ม่รับการกดปุ่มรัว"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:53
-msgid "_Layouts:"
-msgstr "_ผังแป้นพิมพ์:"
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:55
+msgid "_Language:"
+msgstr "ภ_าษา:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:54
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:56
+msgid "_Lock screen to enforce typing break"
+msgstr "_ล็อคหน้าจอเพื่อบังคับให้หยุดพักพิมพ์"
+
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:57
 msgid "_Models:"
 msgstr "_รุ่นแป้นพิมพ์:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:55
-msgid "_Notifications..."
-msgstr "การแจ้งเ_หตุ..."
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:56
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:58
 msgid "_Only accept long keypresses"
 msgstr "_รับเฉพาะปุ่มที่กดแช่"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:57
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:59
+msgid "_Pointer can be controlled using the keypad"
+msgstr "เ_ปิดใช้การบังคับตัวชี้เมาส์ด้วยแป้นพิมพ์"
+
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:60
 msgid "_Selected layouts:"
 msgstr "ผังแป้นพิมพ์ที่เ_ลือก:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:58
-msgid "_Simulate simultanous keypresses"
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:61
+msgid "_Simulate simultaneous keypresses"
 msgstr "_จำลองการกดปุ่มประกอบพร้อมกัน"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:59
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:62
 msgid "_Speed:"
 msgstr "ความเร็_ว:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:60
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:63
 msgid "_Type to test settings:"
 msgstr "_ลองพิมพ์เพื่อทดสอบ:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:61
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:64
 msgid "_Variants:"
 msgstr "แบบ_ย่อย:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:62
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:65
 msgid "_Vendors:"
 msgstr "ผู้_ผลิต:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:63
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:66
 msgid "_Work interval lasts:"
 msgstr "ร_ะยะเวลาทำงานก่อนจะพัก:"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:64
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:67
 msgid "minutes"
 msgstr "นาที"
 
@@ -2188,16 +2281,15 @@ msgstr "นาที"
 msgid "Unknown"
 msgstr "ไม่รู้จัก"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkbltadd.c:211
-#: capplets/keyboard/gnome-keyboard-properties-xkblt.c:307
+#: capplets/keyboard/gnome-keyboard-properties-xkblt.c:305
+msgid "Layout"
+msgstr "ผังแป้นพิมพ์"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkblt.c:311
 #: capplets/keyboard/gnome-keyboard-properties-xkbot.c:211
 msgid "Default"
 msgstr "ค่าปริยาย"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkblt.c:301
-msgid "Layout"
-msgstr "ผังแป้นพิมพ์"
-
 #: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:169
 msgid "Vendors"
 msgstr "ผู้ผลิต"
@@ -2244,6 +2336,15 @@ msgstr "เลื่อนลง"
 msgid "gesture|Disabled"
 msgstr "ไม่ใช้"
 
+#. TRANSLATORS: don't translate the terms in brackets
+#: capplets/mouse/gnome-mouse-properties.c:443
+msgid "Specify the name of the page to show (general|accessibility)"
+msgstr "ระบุหน้าที่ต้องการแสดง (general|accessibility)"
+
+#: capplets/mouse/gnome-mouse-properties.c:452
+msgid "- GNOME Mouse Preferences"
+msgstr "- ปรับแต่งเมาส์สำหรับ GNOME"
+
 #: capplets/mouse/gnome-mouse-properties.glade.h:1
 msgid "<b>Double-Click Timeout</b>"
 msgstr "<b>ความเร็วของดับเบิลคลิก</b>"
@@ -2416,21 +2517,21 @@ msgid "<b>_Use authentication</b>"
 msgstr "<b>ใ_ช้การตรวจสอบสิทธิ์</b>"
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Advanced Configuration"
-msgstr "ค่าตั้งเพิ่มเติม"
-
-#: capplets/network/gnome-network-preferences.glade.h:7
 msgid "Autoconfiguration _URL:"
 msgstr "_URL สำหรับใช้จัดตั้งค่าอัตโนมัติ"
 
-#: capplets/network/gnome-network-preferences.glade.h:8
+#: capplets/network/gnome-network-preferences.glade.h:7
 msgid "HTTP Proxy Details"
 msgstr "รายละเอียดพร็อกซี HTTP"
 
-#: capplets/network/gnome-network-preferences.glade.h:9
+#: capplets/network/gnome-network-preferences.glade.h:8
 msgid "H_TTP proxy:"
 msgstr "พร็อกซี H_TTP:"
 
+#: capplets/network/gnome-network-preferences.glade.h:9
+msgid "Ignored Hosts"
+msgstr "โฮสต์ที่ไม่ผ่านพร็อกซี"
+
 #: capplets/network/gnome-network-preferences.glade.h:10
 msgid "Network Proxy Preferences"
 msgstr "ตั้งค่าพร็อกซีเครือข่าย"
@@ -2485,48 +2586,48 @@ msgstr "ไม่รู้จักอุปกรณ์ควบคุมระ
 msgid "Failed to construct test pipeline for '%s'"
 msgstr "สร้างไปป์ไลน์ทดสอบสำหรับ '%s' ไม่สำเร็จ"
 
-#: capplets/sound/sound-properties-capplet.c:325
-#: capplets/sound/sound-properties-capplet.c:378
+#: capplets/sound/sound-properties-capplet.c:326
+#: capplets/sound/sound-properties-capplet.c:447
 msgid "Not connected"
 msgstr "ยังไม่เชื่อมต่อ"
 
-#: capplets/sound/sound-properties-capplet.c:661
+#: capplets/sound/sound-properties-capplet.c:785
 msgid "Autodetect"
 msgstr "ตรวจสอบอัตโนมัติ"
 
-#: capplets/sound/sound-properties-capplet.c:666
-#: capplets/sound/sound-properties-capplet.c:667
+#: capplets/sound/sound-properties-capplet.c:790
+#: capplets/sound/sound-properties-capplet.c:791
 msgid "ALSA - Advanced Linux Sound Architecture"
 msgstr "ALSA - Advanced Linux Sound Architecture"
 
-#: capplets/sound/sound-properties-capplet.c:668
+#: capplets/sound/sound-properties-capplet.c:792
 msgid "Artsd - ART Sound Daemon"
 msgstr "Artsd - ART Sound Daemon"
 
-#: capplets/sound/sound-properties-capplet.c:669
-#: capplets/sound/sound-properties-capplet.c:670
+#: capplets/sound/sound-properties-capplet.c:793
+#: capplets/sound/sound-properties-capplet.c:794
 msgid "ESD - Enlightened Sound Daemon"
 msgstr "ESD - Enlightened Sound Daemon"
 
-#: capplets/sound/sound-properties-capplet.c:671
-#: capplets/sound/sound-properties-capplet.c:672
+#: capplets/sound/sound-properties-capplet.c:797
+#: capplets/sound/sound-properties-capplet.c:800
 msgid "OSS - Open Sound System"
 msgstr "OSS - Open Sound System"
 
-#: capplets/sound/sound-properties-capplet.c:673
-#: capplets/sound/sound-properties-capplet.c:674
+#: capplets/sound/sound-properties-capplet.c:802
+#: capplets/sound/sound-properties-capplet.c:803
 msgid "PulseAudio Sound Server"
 msgstr "เซิร์ฟเวอร์เสียง PulseAudio"
 
-#: capplets/sound/sound-properties-capplet.c:675
+#: capplets/sound/sound-properties-capplet.c:804
 msgid "Test Sound"
 msgstr "เสียงทดสอบ"
 
-#: capplets/sound/sound-properties-capplet.c:676
+#: capplets/sound/sound-properties-capplet.c:805
 msgid "Silence"
 msgstr "เงียบ"
 
-#: capplets/sound/sound-properties-capplet.c:1043
+#: capplets/sound/sound-properties-capplet.c:1172
 msgid "- GNOME Sound Preferences"
 msgstr "- ค่าตั้งของเสียงสำหรับ GNOME"
 
@@ -2559,8 +2660,8 @@ msgid "Devices"
 msgstr "อุปกรณ์"
 
 #: capplets/sound/sound-properties.glade.h:8
-msgid "E_nable software sound mixing (ESD)"
-msgstr "เ_ปิดใช้การปรับเสียงด้วยซอฟต์แวร์ (ESD)"
+msgid "E_nable software sound mixing"
+msgstr "เ_ปิดใช้การปรับเสียงด้วยซอฟต์แวร์"
 
 #: capplets/sound/sound-properties.glade.h:9
 msgid "Flash _entire screen"
@@ -2704,36 +2805,36 @@ msgid "Windows"
 msgstr "หน้าต่าง"
 
 #. make start action
-#: libslab/application-tile.c:369
+#: libslab/application-tile.c:372
 #, c-format
 msgid "<b>Start %s</b>"
 msgstr "<b>เริ่ม %s</b>"
 
-#: libslab/application-tile.c:388
+#: libslab/application-tile.c:391 libslab/bookmark-agent.c:1059
 msgid "Help"
 msgstr "วิธีใช้"
 
-#: libslab/application-tile.c:435
+#: libslab/application-tile.c:438
 msgid "Upgrade"
 msgstr "ปรับรุ่น"
 
-#: libslab/application-tile.c:450
+#: libslab/application-tile.c:453
 msgid "Uninstall"
 msgstr "ถอดถอน"
 
-#: libslab/application-tile.c:777 libslab/document-tile.c:737
+#: libslab/application-tile.c:780 libslab/document-tile.c:760
 msgid "Remove from Favorites"
 msgstr "ลบออกจากรายการโปรด"
 
-#: libslab/application-tile.c:779 libslab/document-tile.c:739
+#: libslab/application-tile.c:782 libslab/document-tile.c:762
 msgid "Add to Favorites"
 msgstr "เพิ่มในรายการโปรด"
 
-#: libslab/application-tile.c:864
+#: libslab/application-tile.c:867
 msgid "Remove from Startup Programs"
 msgstr "ลบออกจากรายการโปรแกรมขณะเริ่ม"
 
-#: libslab/application-tile.c:866
+#: libslab/application-tile.c:869
 msgid "Add to Startup Programs"
 msgstr "เพิ่มในรายการโปรแกรมขณะเริ่ม"
 
@@ -2752,27 +2853,43 @@ msgstr ""
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: libslab/bookmark-agent.c:1060
+#: libslab/bookmark-agent.c:1061
+msgid "Lock Screen"
+msgstr "ล็อคหน้าจอ"
+
+#: libslab/bookmark-agent.c:1063 libsounds/sound-view.c:45
+msgid "Logout"
+msgstr "ออกจากระบบ"
+
+#: libslab/bookmark-agent.c:1065
+msgid "Shutdown"
+msgstr "ปิดเครื่อง"
+
+#: libslab/bookmark-agent.c:1090
 msgid "New Spreadsheet"
 msgstr "สร้างตารางคำนวณ"
 
-#: libslab/bookmark-agent.c:1064
+#: libslab/bookmark-agent.c:1095
 msgid "New Document"
 msgstr "สร้างเอกสาร"
 
-#: libslab/bookmark-agent.c:1114
+#: libslab/bookmark-agent.c:1147
 msgid "Home"
 msgstr "บ้าน"
 
-#: libslab/bookmark-agent.c:1130
+#: libslab/bookmark-agent.c:1152
+msgid "Documents"
+msgstr "เอกสาร"
+
+#: libslab/bookmark-agent.c:1165
 msgid "File System"
 msgstr "ระบบแฟ้ม"
 
-#: libslab/bookmark-agent.c:1134
+#: libslab/bookmark-agent.c:1169
 msgid "Network Servers"
 msgstr "เซิร์ฟเวอร์ในเครือข่าย"
 
-#: libslab/bookmark-agent.c:1163
+#: libslab/bookmark-agent.c:1198
 msgid "Search"
 msgstr "ค้นหา"
 
@@ -2783,72 +2900,72 @@ msgid "<b>Open</b>"
 msgstr "<b>เปิด</b>"
 
 #. make rename action
-#: libslab/directory-tile.c:189 libslab/document-tile.c:228
+#: libslab/directory-tile.c:189 libslab/document-tile.c:242
 msgid "Rename..."
 msgstr "เปลี่ยนชื่อ..."
 
 #: libslab/directory-tile.c:203 libslab/directory-tile.c:212
-#: libslab/document-tile.c:242 libslab/document-tile.c:251
+#: libslab/document-tile.c:256 libslab/document-tile.c:265
 msgid "Send To..."
 msgstr "ส่งไปยัง..."
 
 #. make move to trash action
-#: libslab/directory-tile.c:227 libslab/document-tile.c:277
+#: libslab/directory-tile.c:227 libslab/document-tile.c:291
 msgid "Move to Trash"
 msgstr "ทิ้งลงถังขยะ"
 
 #: libslab/directory-tile.c:237 libslab/directory-tile.c:450
-#: libslab/document-tile.c:287 libslab/document-tile.c:850
+#: libslab/document-tile.c:301 libslab/document-tile.c:873
 msgid "Delete"
 msgstr "ลบ"
 
-#: libslab/directory-tile.c:575 libslab/document-tile.c:1022
+#: libslab/directory-tile.c:575 libslab/document-tile.c:1045
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "ยืนยันที่จะลบ \"%s\" อย่างถาวรหรือไม่?"
 
-#: libslab/directory-tile.c:580 libslab/document-tile.c:1026
+#: libslab/directory-tile.c:580 libslab/document-tile.c:1049
 msgid "If you delete an item, it is permanently lost."
 msgstr "ถ้าคุณลบ รายการนี้จะสูญหายอย่างถาวร"
 
-#: libslab/document-tile.c:189
+#: libslab/document-tile.c:203
 #, c-format
 msgid "<b>Open with \"%s\"</b>"
 msgstr "<b>เปิดด้วย \"%s\"</b>"
 
-#: libslab/document-tile.c:201
+#: libslab/document-tile.c:215
 msgid "Open with Default Application"
 msgstr "เปิดด้วยโปรแกรมปริยาย"
 
-#: libslab/document-tile.c:212
+#: libslab/document-tile.c:226
 msgid "Open in File Manager"
 msgstr "เปิดในโปรแกรมจัดการแฟ้ม"
 
-#: libslab/document-tile.c:633
+#: libslab/document-tile.c:656
 msgid "?"
 msgstr "?"
 
-#: libslab/document-tile.c:640
+#: libslab/document-tile.c:663
 msgid "%l:%M %p"
 msgstr "%H:%M"
 
-#: libslab/document-tile.c:648
+#: libslab/document-tile.c:671
 msgid "Today %l:%M %p"
 msgstr "วันนี้ %H:%M"
 
-#: libslab/document-tile.c:658
+#: libslab/document-tile.c:681
 msgid "Yesterday %l:%M %p"
 msgstr "เมื่อวาน %H:%M"
 
-#: libslab/document-tile.c:670
+#: libslab/document-tile.c:693
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: libslab/document-tile.c:678
+#: libslab/document-tile.c:701
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: libslab/document-tile.c:680
+#: libslab/document-tile.c:703
 msgid "%b %d %Y"
 msgstr "%d %b %Ey"
 
@@ -2950,10 +3067,6 @@ msgstr "ลบออกจากรายการระบบ"
 msgid "Login"
 msgstr "เข้าระบบ"
 
-#: libsounds/sound-view.c:45
-msgid "Logout"
-msgstr "ออกจากระบบ"
-
 #: libsounds/sound-view.c:46
 msgid "Boing"
 msgstr "แจ้งเพื่อทราบ"
@@ -2994,16 +3107,16 @@ msgstr "หาแฟ้มเสียงสำหรับเหตุการ
 msgid "Select Sound File"
 msgstr "เลือกแฟ้มเสียง"
 
-#: libsounds/sound-view.c:203
+#: libsounds/sound-view.c:210
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "แฟ้ม %s ไม่ใช่แฟ้ม wav ที่ใช้ได้"
 
-#: libsounds/sound-view.c:264
+#: libsounds/sound-view.c:271
 msgid "Select sound file..."
 msgstr "เลือกแฟ้มเสียง..."
 
-#: libsounds/sound-view.c:366
+#: libsounds/sound-view.c:373
 msgid "System Sounds"
 msgstr "เสียงของระบบ"
 
@@ -3012,19 +3125,27 @@ msgstr "เสียงของระบบ"
 msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr "โปรแกรมจัดการหน้าต่าง \"%s\" ยังไม่ได้ลงทะเบียนเครื่องมือปรับแต่ง\n"
 
-#: libwindow-settings/metacity-window-manager.c:390
+#: libwindow-settings/metacity-window-manager.c:402
 msgid "Maximize"
 msgstr "ขยายเต็มจอ"
 
-#: libwindow-settings/metacity-window-manager.c:391
+#: libwindow-settings/metacity-window-manager.c:403
+msgid "Maximize Vertically"
+msgstr "ขยายเต็มแนวดิ่ง"
+
+#: libwindow-settings/metacity-window-manager.c:404
+msgid "Maximize Horizontally"
+msgstr "ขยายเต็มแนวนอน"
+
+#: libwindow-settings/metacity-window-manager.c:405
 msgid "Minimize"
 msgstr "ย่อเก็บ"
 
-#: libwindow-settings/metacity-window-manager.c:392
+#: libwindow-settings/metacity-window-manager.c:406
 msgid "Roll up"
 msgstr "ม้วนขึ้น"
 
-#: libwindow-settings/metacity-window-manager.c:393
+#: libwindow-settings/metacity-window-manager.c:407
 msgid "None"
 msgstr "ไม่ทำอะไร"
 
@@ -3373,19 +3494,19 @@ msgstr "_ตกลงใช้แบบอักษรใหม่"
 msgid "Themes"
 msgstr "ชุดตกแต่ง"
 
-#: vfs-methods/themus/themus-properties-view.c:127
+#: vfs-methods/themus/themus-properties-view.c:128
 msgid "Description"
 msgstr "คำอธิบาย:"
 
-#: vfs-methods/themus/themus-properties-view.c:134
+#: vfs-methods/themus/themus-properties-view.c:135
 msgid "Control theme"
 msgstr "ชุดรูปแบบการควบคุม"
 
-#: vfs-methods/themus/themus-properties-view.c:140
+#: vfs-methods/themus/themus-properties-view.c:141
 msgid "Window border theme"
 msgstr "ชุดรูปแบบกรอบหน้าต่าง"
 
-#: vfs-methods/themus/themus-properties-view.c:146
+#: vfs-methods/themus/themus-properties-view.c:147
 msgid "Icon theme"
 msgstr "ชุดรูปแบบไอคอน"
 
@@ -3439,6 +3560,40 @@ msgstr "เลือกชุดตกแต่ง"
 msgid "Sets the default theme"
 msgstr "กำหนดชุดตกแต่งปริยาย"
 
+#~ msgid ""
+#~ "Centered\n"
+#~ "Fill screen\n"
+#~ "Scaled\n"
+#~ "Zoom\n"
+#~ "Tiled"
+#~ msgstr ""
+#~ "วางตรงกลาง\n"
+#~ "ยืดเต็มหน้าจอ\n"
+#~ "ขยายพอดีหน้าจอ\n"
+#~ "ซูมเต็มหน้าจอ\n"
+#~ "เรียงกระเบื้อง"
+
+#~ msgid "Go _to Fonts Folder"
+#~ msgstr "ไ_ปโฟลเดอร์แบบอักษร"
+
+#~ msgid "Just apply settings and quit"
+#~ msgstr "ใช้ค่าที่ตั้งและปิดหน้าต่าง"
+
+#~ msgid "Connecting..."
+#~ msgstr "กำลังเชื่อมต่อ..."
+
+#~ msgid "Keyboard Accessibility Notifications"
+#~ msgstr "การแจ้งเหตุเกี่ยวกับสิ่งอำนวยความสะดวกสำหรับแป้นพิมพ์"
+
+#~ msgid "_Layouts:"
+#~ msgstr "_ผังแป้นพิมพ์:"
+
+#~ msgid "_Notifications..."
+#~ msgstr "การแจ้งเ_หตุ..."
+
+#~ msgid "Advanced Configuration"
+#~ msgstr "ค่าตั้งเพิ่มเติม"
+
 #~ msgid "Autostart the preferred AT"
 #~ msgstr "เรียกโปรแกรมอำนวยความสะดวกโดยอัตโนมัติ"
 
@@ -3765,9 +3920,6 @@ msgstr "กำหนดชุดตกแต่งปริยาย"
 #~ msgid "There was an error launching the keyboard tool: %s"
 #~ msgstr "เกิดข้อผิดพลาดขณะเรียกใช้เครื่องมือปรับแต่งแป้นพิมพ์: %s"
 
-#~ msgid "_Accessibility"
-#~ msgstr "_สิ่งอำนวยความสะดวก"
-
 #~ msgid "Choose..."
 #~ msgstr "เลือก..."
 
@@ -4055,12 +4207,6 @@ msgstr "กำหนดชุดตกแต่งปริยาย"
 #~ msgid "Edited %m/%d/%Y"
 #~ msgstr "แก้ไขเมื่อ %d/%m/%Ey"
 
-#~ msgid "Lock Screen"
-#~ msgstr "ล็อคหน้าจอ"
-
-#~ msgid "Shutdown"
-#~ msgstr "ปิดเครื่อง"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
@@ -4122,9 +4268,6 @@ msgstr "กำหนดชุดตกแต่งปริยาย"
 #~ "<b>ชนิด:</b> %s\n"
 #~ "<b>ที่เก็บ:</b> %s"
 
-#~ msgid "Install..."
-#~ msgstr "_ติดตั้ง..."
-
 #~ msgid "background size|%s, %d %s x %d %s"
 #~ msgstr "%s, %d %s x %d %s"
 
@@ -4216,9 +4359,6 @@ msgstr "กำหนดชุดตกแต่งปริยาย"
 #~ msgid "_Install Theme..."
 #~ msgstr "_ติดตั้งชุดตกแต่ง..."
 
-#~ msgid "_Revert"
-#~ msgstr "คืน_กลับ"
-
 #~ msgid "_Save Theme..."
 #~ msgstr "_บันทึกชุดตกแต่ง..."
 
@@ -4293,9 +4433,6 @@ msgstr "กำหนดชุดตกแต่งปริยาย"
 #~ msgid "Medium"
 #~ msgstr "กลาง"
 
-#~ msgid "- GNOME Mouse Preferences"
-#~ msgstr "- ปรับแต่งเมาส์สำหรับ GNOME"
-
 #~ msgid "Help Unavailable"
 #~ msgstr "ไม่มีคู่มือวิธีใช้"
 
diff --git a/po/vi.po b/po/vi.po
index e60848d28..5ed574b52 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -2,20 +2,20 @@
 # Copyright © 2008 Free Software Foundation, Inc.
 # Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2004,2007.
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2008.
-# 
+#
 msgid ""
-""
-msgstr "Project-Id-Version: gnome-control-center GNOME TRUNK\n"
+msgstr ""
+"Project-Id-Version: gnome-control-center 2.23.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-03 03:33+0000\n"
-"PO-Revision-Date: 2008-01-05 17:24+1030\n"
+"POT-Creation-Date: 2008-06-01 16:58+0000\n"
+"PO-Revision-Date: 2008-06-02 16:03+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b1\n"
+"X-Generator: LocFactoryEditor 1.7b3\n"
 
 #: ../capplets/about-me/eel-alert-dialog.c:114
 msgid "Image/label border"
@@ -45,41 +45,42 @@ msgstr "Các nút hiển thị trong hộp thoại báo động"
 msgid "Show more _details"
 msgstr "Hiện chi tiết _hơn"
 
-#: ../capplets/about-me/gnome-about-me.c:665
+#: ../capplets/about-me/gnome-about-me.c:739
 msgid "Select Image"
 msgstr "Chọn ảnh"
 
-#: ../capplets/about-me/gnome-about-me.c:667
+#: ../capplets/about-me/gnome-about-me.c:741
 msgid "No Image"
 msgstr "Không ảnh"
 
-#: ../capplets/about-me/gnome-about-me.c:695
-#: ../capplets/appearance/appearance-desktop.c:1100
+#: ../capplets/about-me/gnome-about-me.c:769
+#: ../capplets/appearance/appearance-desktop.c:1080
 msgid "Images"
 msgstr "Ảnh"
 
-#: ../capplets/about-me/gnome-about-me.c:699
-#: ../capplets/appearance/theme-installer.c:700
+#: ../capplets/about-me/gnome-about-me.c:773
+#: ../capplets/appearance/theme-installer.c:717
 msgid "All Files"
 msgstr "Mọi tập tin"
 
-#: ../capplets/about-me/gnome-about-me.c:836
+#: ../capplets/about-me/gnome-about-me.c:911
 msgid ""
 "There was an error while trying to get the addressbook information\n"
 "Evolution Data Server can't handle the protocol"
-msgstr "Gặp lỗi khi cố gọi thông tin sổ địa chỉ.\n"
+msgstr ""
+"Gặp lỗi khi cố gọi thông tin sổ địa chỉ.\n"
 "Trình phục vụ Dữ liệu Evolution không thể quản lý giao thức"
 
-#: ../capplets/about-me/gnome-about-me.c:857
+#: ../capplets/about-me/gnome-about-me.c:932
 msgid "Unable to open address book"
 msgstr "Không thể mở Sổ địa chỉ"
 
-#: ../capplets/about-me/gnome-about-me.c:871
+#: ../capplets/about-me/gnome-about-me.c:946
 msgid "Unknown login ID, the user database might be corrupted"
 msgstr "Không biết thông tin đăng nhập, có lẽ cơ sở dữ liệu người dùng bị hỏng"
 
-#: ../capplets/about-me/gnome-about-me.c:901
-#: ../capplets/about-me/gnome-about-me.c:903
+#: ../capplets/about-me/gnome-about-me.c:976
+#: ../capplets/about-me/gnome-about-me.c:978
 #, c-format
 msgid "About %s"
 msgstr "Giới thiệu %s"
@@ -214,7 +215,7 @@ msgid "Personal Info"
 msgstr "Thông tin cá nhân"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:32
-#: ../capplets/about-me/gnome-about-me-password.c:934
+#: ../capplets/about-me/gnome-about-me-password.c:938
 msgid ""
 "Please type your password again in the <b>Retype new password</b> field."
 msgstr "Hãy gõ lại mật khẩu vào trường <b>Gõ lại mật khẩu mới</b>."
@@ -233,7 +234,8 @@ msgid ""
 "click <b>Authenticate</b>.\n"
 "After you have authenticated, enter your new password, retype it for "
 "verification and click <b>Change password</b>."
-msgstr "Để thay đổi mật khẩu, hãy nhập mật khẩu hiện thời vào trường bên dưới và "
+msgstr ""
+"Để thay đổi mật khẩu, hãy nhập mật khẩu hiện thời vào trường bên dưới và "
 "nhấn vào <b>Xác thực</b>.\n"
 "Sau khi xác thực, nhập mật khẩu mới, gõ lại để thẩm tra, rồi nhấn vào <b>Đổi "
 "mật khẩu</b>."
@@ -333,29 +335,32 @@ msgstr "Tiến trình con đã thoát bất ngờ"
 #: ../capplets/about-me/gnome-about-me-password.c:297
 #, c-format
 msgid "Could not shutdown backend_stdin IO channel: %s"
-msgstr "Không thể tắt kệnh nhập/xuất hậu phương thiết bị nhập chuẩn backend_stdin: %s"
+msgstr ""
+"Không thể tắt kệnh nhập/xuất hậu phương thiết bị nhập chuẩn backend_stdin: %s"
 
 #: ../capplets/about-me/gnome-about-me-password.c:310
 #, c-format
 msgid "Could not shutdown backend_stdout IO channel: %s"
-msgstr "Không thể tắt kệnh nhập/xuất hậu phương thiết bị xuất chuẩn backend_stdin: %s"
+msgstr ""
+"Không thể tắt kệnh nhập/xuất hậu phương thiết bị xuất chuẩn backend_stdin: %s"
 
 #: ../capplets/about-me/gnome-about-me-password.c:409
 msgid "Authenticated!"
 msgstr "Mới xác thực."
 
-#.This is a re-auth, and it failed.
-#.* The password must have been changed in the meantime!
-#.* Ask the user to re-authenticate
+#. This is a re-auth, and it failed.
+#. * The password must have been changed in the meantime!
+#. * Ask the user to re-authenticate
 #.
-#.Update status message and auth state
-#.Authentication failure
+#. Update status message and auth state
+#. Authentication failure
 #: ../capplets/about-me/gnome-about-me-password.c:475
 #: ../capplets/about-me/gnome-about-me-password.c:551
 msgid ""
 "Your password has been changed since you initially authenticated! Please re-"
 "authenticate."
-msgstr "Mật khẩu của bạn bị thay đổi kể từ bạn đã xác thực đầu tiên. Xin hãy xác "
+msgstr ""
+"Mật khẩu của bạn bị thay đổi kể từ bạn đã xác thực đầu tiên. Xin hãy xác "
 "thực lại."
 
 #: ../capplets/about-me/gnome-about-me-password.c:477
@@ -366,8 +371,8 @@ msgstr "Mật khẩu không đúng."
 msgid "Your password has been changed."
 msgstr "Mật khẩu của bạn bị thay đổi."
 
-#.What does this indicate?
-#.* "Authentication information cannot be recovered?" from libpam?
+#. What does this indicate?
+#. * "Authentication information cannot be recovered?" from libpam?
 #: ../capplets/about-me/gnome-about-me-password.c:534
 #, c-format
 msgid "System error: %s."
@@ -393,34 +398,34 @@ msgstr "Mật khẩu mới phải chứa ký tự thuộc số hay đặc biệt
 msgid "The old and new passwords are the same."
 msgstr "Hai mật khẩu cũ và mật khẩu mới là trùng."
 
-#.translators: Unable to launch <program>: <error message>
-#: ../capplets/about-me/gnome-about-me-password.c:818
+#. translators: Unable to launch <program>: <error message>
+#: ../capplets/about-me/gnome-about-me-password.c:820
 #, c-format
 msgid "Unable to launch %s: %s"
 msgstr "Không thể khởi chạy %s: %s"
 
-#: ../capplets/about-me/gnome-about-me-password.c:821
+#: ../capplets/about-me/gnome-about-me-password.c:824
 msgid "Unable to launch backend"
 msgstr "Không thể khởi chạy hậu phương"
 
-#: ../capplets/about-me/gnome-about-me-password.c:822
+#: ../capplets/about-me/gnome-about-me-password.c:825
 msgid "A system error has occurred"
 msgstr "Gặp lỗi hệ thống"
 
-#.Update status message
-#: ../capplets/about-me/gnome-about-me-password.c:842
+#. Update status message
+#: ../capplets/about-me/gnome-about-me-password.c:845
 msgid "Checking password..."
 msgstr "Đang kiểm tra mật khẩu..."
 
-#: ../capplets/about-me/gnome-about-me-password.c:928
+#: ../capplets/about-me/gnome-about-me-password.c:932
 msgid "Click <b>Change password</b> to change your password."
 msgstr "Hãy nhấn vào nút <b>Đổi mật khẩu</b> để thay đổi mật khẩu."
 
-#: ../capplets/about-me/gnome-about-me-password.c:931
+#: ../capplets/about-me/gnome-about-me-password.c:935
 msgid "Please type your password in the <b>New password</b> field."
 msgstr "Hãy gõ mật khẩu vào trường <b>Mật khẩu mới</b>."
 
-#: ../capplets/about-me/gnome-about-me-password.c:937
+#: ../capplets/about-me/gnome-about-me-password.c:941
 msgid "The two passwords are not equal."
 msgstr "Hai mật khẩu không trùng."
 
@@ -437,14 +442,15 @@ msgid "Accessible Lo_gin"
 msgstr "Đăn_g nhập có thể truy cập"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:4
-msgid "Assistive Technology Preferences"
-msgstr "Tùy thích công nghệ trợ giúp"
+msgid "Assistive Technologies Preferences"
+msgstr "Tùy thích Công nghệ Giúp đỡ"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:5
 msgid ""
 "Changes to enable assistive technologies will not take effect until your "
 "next log in."
-msgstr "Những thay đổi để hiệu lực công nghệ trợ giúp sẽ không tác động cho đến lần "
+msgstr ""
+"Những thay đổi để hiệu lực công nghệ trợ giúp sẽ không tác động cho đến lần "
 "đăng nhập kế tiếp của bạn."
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:6
@@ -464,242 +470,38 @@ msgid "Jump to the Keyboard Accessibility dialog"
 msgstr "Tới hộp thoại Truy cập bàn phím"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:10
-msgid "_Enable assistive technologies"
-msgstr "_Bật công nghệ trợ giúp"
+msgid "Jump to the Mouse Accessibility dialog"
+msgstr "Nhảy tới hộp thoại Truy cập Con chuột"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:11
+msgid "_Enable assistive technologies"
+msgstr "_Bật công nghệ giúp đỡ"
+
+#: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:12
 msgid "_Keyboard Accessibility"
 msgstr "Truy cập _bàn phím"
 
-#: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:12
+#: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:13
+msgid "_Mouse Accessibility"
+msgstr "Truy cập _con chuột"
+
+#: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:14
 msgid "_Preferred Applications"
 msgstr "Ứng dụng ư_a thích"
 
 #: ../capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
-msgid "Assistive Technology"
-msgstr "Công nghệ Trợ giúp"
+msgid "Assistive Technologies"
+msgstr "Công nghệ Giúp đỡ"
 
 #: ../capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Bật hỗ trợ cho công nghệ trợ giúp GNOME lúc đăng nhập"
 
-#: ../capplets/accessibility/keyboard/accessibility-keyboard.c:250
-#, c-format
-msgid "There was an error launching the mouse preferences dialog: %s"
-msgstr "Gặp lỗi khi chạy thoại cho các tùy thích của chuột: %s"
-
-#: ../capplets/accessibility/keyboard/accessibility-keyboard.c:346
-#: ../capplets/accessibility/keyboard/accessibility-keyboard.c:407
-#, c-format
-msgid "Unable to import AccessX settings from file '%s'"
-msgstr "Không thể nhập các thông số AccessX từ tập tin « %s »"
-
-#: ../capplets/accessibility/keyboard/accessibility-keyboard.c:444
-msgid "Import Feature Settings File"
-msgstr "Nhập tập tin các thiết lập tính năng"
-
-#: ../capplets/accessibility/keyboard/accessibility-keyboard.c:448
-msgid "_Import"
-msgstr "_Nhập"
-
-#: ../capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
-msgid "Keyboard Accessibility"
-msgstr "Tính năng truy cập bàn phím"
-
-#: ../capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
-msgid "Set your keyboard accessibility preferences"
-msgstr "Lập tùy thích cho khả năng truy cập bàn phím của bạn"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c:59
-msgid ""
-"This system does not seem to have the XKB extension.  The keyboard "
-"accessibility features will not operate without it."
-msgstr "Có vẻ như hệ thống không có phần mở rộng XKB. Tính năng khả năng truy cập "
-"bàn phím sẽ không hoạt động nếu thiếu nó."
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "<b>Enable Bo_unce Keys</b>"
-msgstr "<b>Bật phím _nảy</b>"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-msgid "<b>Enable Slo_w Keys</b>"
-msgstr "<b>Bật phím _chậm</b>"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "<b>Enable _Mouse Keys</b>"
-msgstr "<b>Bật phím _chuột</b>"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "<b>Enable _Repeat Keys</b>"
-msgstr "<b>Bật phím _lặp</b>"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
-msgid "<b>Enable _Sticky Keys</b>"
-msgstr "<b>Bật phím _dính</b>"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
-msgid "<b>Features</b>"
-msgstr "<b>Tính năng</b>"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
-msgid "<b>Toggle Keys</b>"
-msgstr "<b>Phím bật/tắt</b>"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
-msgid "Basic"
-msgstr "Cơ bản"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
-msgid "Beep if key is re_jected"
-msgstr "Kêu bíp khi phím bị _nhả ra"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-msgid "Beep when _features turned on or off from keyboard"
-msgstr "Kêu bíp khi bật hay tắt _tính năng từ bàn phím"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "Beep when _modifier is pressed"
-msgstr "Kêu bíp khi phím _biến đổi được nhấn"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Kêu một bíp khi LED bật và kêu hai bíp khi LED tắt."
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
-msgid "Beep when key is:"
-msgstr "Kêu bíp khi phím được:"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
-msgid "Del_ay:"
-msgstr "T_rễ:"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
-msgid "Delay between keypress and pointer mo_vement:"
-msgstr "Khoảng t_rễ giữa nhấn phím và di chuyển con trỏ:"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
-msgid "Disa_ble if two keys pressed together"
-msgstr "_Tắt nếu 2 phím được nhấn đồng thời"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-msgid "E_nable Toggle Keys"
-msgstr "_Hiệu lực chạy phím bật/tất"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Filters"
-msgstr "Bộ lọc"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "I_gnore duplicate keypresses within:"
-msgstr "Bỏ _qua việc nhấn đúp phím trong khoảng:"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
-msgstr "Bỏ qua mọi chuỗi phím nhấn của CÙNG một phím nếu xảy ra trong một khoảng "
-"thời gian chọn trước."
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Keyboard Accessibility Preferences (AccessX)"
-msgstr "Tùy thích khả năng truy cập bàn phím (AccessX)"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Ma_ximum pointer speed:"
-msgstr "Tốc độ con trỏ _tối đa:"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:41
-msgid "Mouse Keys"
-msgstr "Phím chuột"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "Mouse _Preferences..."
-msgstr "_Tùy thích cho chuột..."
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid ""
-"Only accept keys after they have been pressed and held for a user adjustable "
-"amount of time."
-msgstr "Chỉ chấp nhận phím khi chúng được nhấn và giữ trong một khoảng thời gian mà "
-"người dùng có thể sửa đổi."
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
-msgstr "Thực hiện thao tác nhấn nhiều phím đồng thời bằng cách nhấn phím bổ trợ theo "
-"thứ tự."
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:45
-msgid "S_peed:"
-msgstr "_Tốc độ:"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid "Time to acce_lerate to maximum speed:"
-msgstr "Thời gian _tăng tốc đến tốc độ tối đa:"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
-msgid "Turn the numeric keypad into a mouse control pad."
-msgstr "Dùng vùng phím số như bộ điều khiển chuột."
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "_Disable if unused for:"
-msgstr "_Tắt nếu không dùng trong:"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "_Enable keyboard accessibility features"
-msgstr "_Bật chạy tính năng khả năng truy cập bàn phím"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "_Import Feature Settings..."
-msgstr "Nhậ_p các thiết lập tính năng…"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "_Only accept keys held for:"
-msgstr "C_hỉ chấp nhận phím được giữ trong:"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:61
-msgid "_Type to test settings:"
-msgstr "_Gõ để thử thiết lập ra:"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
-msgid "_accepted"
-msgstr "được c_hấp nhận"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
-msgid "_pressed"
-msgstr "được n_hấn"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
-msgid "_rejected"
-msgstr "được n_hả"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
-msgid "characters/second"
-msgstr "ký tự/giây"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:19
-msgid "milliseconds"
-msgstr "mili giây"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
-msgid "pixels/second"
-msgstr "điểm ảnh/giây"
-
-#: ../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
-#: ../capplets/windows/gnome-window-properties.glade.h:10
-msgid "seconds"
-msgstr "giây"
-
-#: ../capplets/appearance/appearance-desktop.c:1068
+#: ../capplets/appearance/appearance-desktop.c:1048
 msgid "Add Wallpaper"
-msgstr "Thêm Ảnh nền"
+msgstr "Thêm ảnh nền trang trí"
 
-#: ../capplets/appearance/appearance-desktop.c:1104
+#: ../capplets/appearance/appearance-desktop.c:1084
 msgid "All files"
 msgstr "Mọi tập tin"
 
@@ -713,10 +515,12 @@ 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 "
 "smaller than %d."
-msgid_plural "The font selected is %d points large, and may make it difficult to "
+msgid_plural ""
+"The font selected is %d points large, and may make it difficult to "
 "effectively use the computer. It is recommended that you select a size "
 "smaller than %d."
-msgstr[0] "Phông chữ đã chọn có cỡ %d điểm, hơi lớn thì có thể bạn sẽ gặp khó khăn sử "
+msgstr[0] ""
+"Phông chữ đã chọn có cỡ %d điểm, hơi lớn thì có thể bạn sẽ gặp khó khăn sử "
 "dụng máy này. Khuyên bạn chọn một cỡ nhỏ hơn %d."
 
 #: ../capplets/appearance/appearance-font.c:511
@@ -725,10 +529,12 @@ 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 "
 "sized font."
-msgid_plural "The font selected is %d points large, and may make it difficult to "
+msgid_plural ""
+"The font selected is %d points large, and may make it difficult to "
 "effectively use the computer. It is recommended that you select a smaller "
 "sized font."
-msgstr[0] "Phông chữ đã chọn có cỡ %d điểm, hơi lớn thì có thể bạn sẽ gặp khó khăn sử "
+msgstr[0] ""
+"Phông chữ đã chọn có cỡ %d điểm, hơi lớn thì có thể bạn sẽ gặp khó khăn sử "
 "dụng máy này. Khuyên bạn chọn một cỡ nhỏ hơn."
 
 #: ../capplets/appearance/appearance-font.c:533
@@ -739,56 +545,105 @@ msgstr "Dùng phông cũ"
 msgid "Use selected font"
 msgstr "Dùng phông được chọn"
 
-#: ../capplets/appearance/appearance-main.c:108
+#: ../capplets/appearance/appearance-main.c:107
 msgid "Specify the filename of a theme to install"
 msgstr "Chưa xác định tên tập tin sắc thái cần cài đặt"
 
-#: ../capplets/appearance/appearance-main.c:109
+#: ../capplets/appearance/appearance-main.c:108
 msgid "filename"
 msgstr "tên-tập-tin"
 
-#.TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/appearance/appearance-main.c:116
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplets/appearance/appearance-main.c:115
 msgid "Specify the name of the page to show (theme|background|fonts|interface)"
 msgstr "Hãy ghi rõ tên của trang cần hiển thị (sắc thái|nền|phông|giao diện)"
 
-#: ../capplets/appearance/appearance-main.c:117
+#: ../capplets/appearance/appearance-main.c:116
+#: ../capplets/default-applications/gnome-da-capplet.c:880
+#: ../capplets/mouse/gnome-mouse-properties.c:444
 msgid "page"
 msgstr "trang"
 
-#: ../capplets/appearance/appearance-main.c:124
+#: ../capplets/appearance/appearance-main.c:123
 msgid "[WALLPAPER...]"
 msgstr "[ẢNH NỀN...]"
 
-#: ../capplets/appearance/appearance-style.c:156
+#: ../capplets/appearance/appearance-style.c:159
 #: ../capplets/common/gnome-theme-info.c:439
-#: ../capplets/common/gnome-theme-info.c:638
+#: ../capplets/common/gnome-theme-info.c:628
 msgid "Default Pointer"
 msgstr "Con trỏ mặc định"
 
-#: ../capplets/appearance/appearance-themes.c:534
+#: ../capplets/appearance/appearance-style.c:221
+#: ../capplets/appearance/appearance-themes.c:685
+msgid "Install"
+msgstr "Cài đặt"
+
+#: ../capplets/appearance/appearance-style.c:241
+#: ../capplets/common/gnome-theme-info.c:1634
+#, c-format
+msgid ""
+"This theme will not look as intended because the required GTK+ theme engine "
+"'%s' is not installed."
+msgstr ""
+"Sắc thái này sẽ không hình như mong đợi vì chưa cài đặt cơ chế sắc thái GTK+ "
+"« %s »."
+
+#: ../capplets/appearance/appearance-themes.c:673
 msgid "Apply Background"
 msgstr "Áp dụng nền"
 
-#: ../capplets/appearance/appearance-themes.c:538
+#: ../capplets/appearance/appearance-themes.c:677
 msgid "Apply Font"
 msgstr "Áp dụng phông"
 
-#: ../capplets/appearance/appearance-themes.c:563
+#: ../capplets/appearance/appearance-themes.c:681
+msgid "Revert Font"
+msgstr "Hoàn nguyên phông"
+
+#: ../capplets/appearance/appearance-themes.c:711
+msgid ""
+"The current theme suggests a background and a font. Also, the last applied "
+"font suggestion can be reverted."
+msgstr ""
+"Sắc thái hiện thời đề nghị nền và phông. Hơn nữa, phông đã gợi ý cuối cùng "
+"có thể bị hoàn nguyên."
+
+#: ../capplets/appearance/appearance-themes.c:713
+msgid ""
+"The current theme suggests a background. Also, the last applied font "
+"suggestion can be reverted."
+msgstr ""
+"Sắc thái hiện thời đề nghị nền. Hơn nữa, phông đã gợi ý cuối cùng có thể bị "
+"hoàn nguyên."
+
+#: ../capplets/appearance/appearance-themes.c:715
 msgid "The current theme suggests a background and a font."
-msgstr "Sắc thái này đề nghị nền và phông."
+msgstr "Sắc thái hiện thời đề nghị nền và phông."
 
-#: ../capplets/appearance/appearance-themes.c:568
+#: ../capplets/appearance/appearance-themes.c:717
+msgid ""
+"The current theme suggests a font. Also, the last applied font suggestion "
+"can be reverted."
+msgstr ""
+"Sắc thái hiện thời đề nghị phông. Hơn nữa, phông đã gợi ý cuối cùng có thể "
+"bị hoàn nguyên."
+
+#: ../capplets/appearance/appearance-themes.c:719
 msgid "The current theme suggests a background."
-msgstr "Sắc thái này đề nghị nền."
+msgstr "Sắc thái hiện thời đề nghị nền."
+
+#: ../capplets/appearance/appearance-themes.c:721
+msgid "The last applied font suggestion can be reverted."
+msgstr "Phông đã gợi ý cuối cùng có thể bị hoàn nguyên."
 
-#: ../capplets/appearance/appearance-themes.c:573
+#: ../capplets/appearance/appearance-themes.c:723
 msgid "The current theme suggests a font."
-msgstr "Sắc thái này đề nghị phông."
+msgstr "Sắc thái hiện thời đề nghị phông."
 
-#: ../capplets/appearance/appearance-themes.c:857
-#: ../capplets/default-applications/gnome-da-capplet.c:1080
-#: ../capplets/sound/sound-properties-capplet.c:327
+#: ../capplets/appearance/appearance-themes.c:1046
+#: ../capplets/default-applications/gnome-da-capplet.c:630
+#: ../capplets/sound/sound-properties-capplet.c:328
 msgid "Custom"
 msgstr "Tự chọn"
 
@@ -796,221 +651,221 @@ msgstr "Tự chọn"
 msgid "<b>C_olors</b>"
 msgstr "<b>Mà_u sắc</b>"
 
-#: ../capplets/appearance/data/appearance.glade.h:2
+#. font hinting
+#: ../capplets/appearance/data/appearance.glade.h:3
 msgid "<b>Hinting</b>"
 msgstr "<b>Tinh chỉnh phông</b>"
 
-#: ../capplets/appearance/data/appearance.glade.h:3
+#: ../capplets/appearance/data/appearance.glade.h:4
 msgid "<b>Menus and Toolbars</b>"
 msgstr "<b>Trình đơn và Thanh công cụ</b>"
 
-#: ../capplets/appearance/data/appearance.glade.h:4
+#: ../capplets/appearance/data/appearance.glade.h:5
 msgid "<b>Preview</b>"
-msgstr "<b>Xem trước</b>"
+msgstr "<b>Xem thử</b>"
 
-#: ../capplets/appearance/data/appearance.glade.h:5
+#: ../capplets/appearance/data/appearance.glade.h:6
 msgid "<b>Rendering</b>"
 msgstr "<b>Vẽ phông</b>"
 
-#: ../capplets/appearance/data/appearance.glade.h:6
+#: ../capplets/appearance/data/appearance.glade.h:7
 msgid "<b>Smoothing</b>"
 msgstr "<b>Làm mịn</b>"
 
-#: ../capplets/appearance/data/appearance.glade.h:7
+#: ../capplets/appearance/data/appearance.glade.h:8
 msgid "<b>Subpixel Order</b>"
 msgstr "<b>Thứ tự điểm ảnh con</b>"
 
-#: ../capplets/appearance/data/appearance.glade.h:8
+#: ../capplets/appearance/data/appearance.glade.h:9
 msgid "<b>_Wallpaper</b>"
-msgstr "<b>Ảnh _nền</b>"
+msgstr "<b>Ảnh trang trí _nền</b>"
 
-#: ../capplets/appearance/data/appearance.glade.h:9
+#: ../capplets/appearance/data/appearance.glade.h:10
 msgid "Appearance Preferences"
 msgstr "Tùy thích Diện mạo"
 
-#: ../capplets/appearance/data/appearance.glade.h:10
+#: ../capplets/appearance/data/appearance.glade.h:11
 msgid "Background"
 msgstr "Ảnh nền"
 
-#: ../capplets/appearance/data/appearance.glade.h:11
+#: ../capplets/appearance/data/appearance.glade.h:12
 msgid "Best _shapes"
 msgstr "_Hình tốt nhất"
 
-#: ../capplets/appearance/data/appearance.glade.h:12
+#: ../capplets/appearance/data/appearance.glade.h:13
 msgid "Best co_ntrast"
 msgstr "Độ _tương phản tốt nhất"
 
-#: ../capplets/appearance/data/appearance.glade.h:13
+#: ../capplets/appearance/data/appearance.glade.h:14
 msgid "C_ustomize..."
 msgstr "_Tự chọn..."
 
-#: ../capplets/appearance/data/appearance.glade.h:14
+#: ../capplets/appearance/data/appearance.glade.h:15
 msgid "C_ut"
 msgstr "_Cắt"
 
-#: ../capplets/appearance/data/appearance.glade.h:15
-msgid ""
-"Centered\n"
-"Fill screen\n"
-"Scaled\n"
-"Zoom\n"
-"Tiled"
-msgstr "Ở giữa\n"
-"Toàn màn hình\n"
-"Co dãn\n"
-"Phóng/thu\n"
-"Lát đều"
-
-#: ../capplets/appearance/data/appearance.glade.h:20
+#: ../capplets/appearance/data/appearance.glade.h:16
 msgid "Changing your cursor theme takes effect the next time you log in."
 msgstr "Việc thay đổi sắc thái con trỏ sẽ có tác động lần kế tiếp đăng nhập."
 
-#: ../capplets/appearance/data/appearance.glade.h:21
+#: ../capplets/appearance/data/appearance.glade.h:17
 msgid "Colors"
 msgstr "Màu sắc"
 
-#: ../capplets/appearance/data/appearance.glade.h:22
+#: ../capplets/appearance/data/appearance.glade.h:18
 msgid "Controls"
 msgstr "Điều khiển"
 
-#: ../capplets/appearance/data/appearance.glade.h:23
+#: ../capplets/appearance/data/appearance.glade.h:19
 msgid "Customize Theme"
 msgstr "Tùy chỉnh sắc thái"
 
-#: ../capplets/appearance/data/appearance.glade.h:24
+#: ../capplets/appearance/data/appearance.glade.h:20
 msgid "D_etails..."
 msgstr "_Chi tiết..."
 
-#: ../capplets/appearance/data/appearance.glade.h:25
+#: ../capplets/appearance/data/appearance.glade.h:21
 msgid "Des_ktop font:"
 msgstr "Phông chữ _giao diện:"
 
-#: ../capplets/appearance/data/appearance.glade.h:26
+#: ../capplets/appearance/data/appearance.glade.h:22
 msgid "Edit"
 msgstr "Sửa"
 
-#: ../capplets/appearance/data/appearance.glade.h:27
+#: ../capplets/appearance/data/appearance.glade.h:23
 msgid "Font Rendering Details"
 msgstr "Chi tiết vẽ phông chữ"
 
-#: ../capplets/appearance/data/appearance.glade.h:28
+#: ../capplets/appearance/data/appearance.glade.h:24
 msgid "Fonts"
 msgstr "Phông"
 
-#: ../capplets/appearance/data/appearance.glade.h:29
-msgid "Go _to Fonts Folder"
-msgstr "_Tới thư mục Phông"
-
-#: ../capplets/appearance/data/appearance.glade.h:30
+#: ../capplets/appearance/data/appearance.glade.h:25
 msgid "Gra_yscale"
 msgstr "Mức _xám"
 
-#: ../capplets/appearance/data/appearance.glade.h:31
+#: ../capplets/appearance/data/appearance.glade.h:26
 msgid "Icons"
 msgstr "Biểu tượng"
 
-#: ../capplets/appearance/data/appearance.glade.h:32
+#: ../capplets/appearance/data/appearance.glade.h:27
 msgid "Interface"
 msgstr "Giao diện"
 
-#: ../capplets/appearance/data/appearance.glade.h:33
+#: ../capplets/appearance/data/appearance.glade.h:28
 msgid "Large"
 msgstr "Lớn"
 
-#: ../capplets/appearance/data/appearance.glade.h:34
+#: ../capplets/appearance/data/appearance.glade.h:29
 msgid "N_one"
 msgstr "K_hông có"
 
-#: ../capplets/appearance/data/appearance.glade.h:35
+#: ../capplets/appearance/data/appearance.glade.h:30
 msgid "New File"
 msgstr "Tập tin mới"
 
-#: ../capplets/appearance/data/appearance.glade.h:36
+#: ../capplets/appearance/data/appearance.glade.h:31
 msgid "Open File"
 msgstr "Mở tập tin"
 
-#: ../capplets/appearance/data/appearance.glade.h:37
+#: ../capplets/appearance/data/appearance.glade.h:32
 msgid "Open a dialog to specify the color"
 msgstr "Mở hộp thoại để chọn màu"
 
-#: ../capplets/appearance/data/appearance.glade.h:38
+#: ../capplets/appearance/data/appearance.glade.h:33
 msgid "Pointer"
 msgstr "Con trỏ"
 
-#: ../capplets/appearance/data/appearance.glade.h:39
+#: ../capplets/appearance/data/appearance.glade.h:34
 msgid "R_esolution:"
 msgstr "Độ _phân giải:"
 
-#: ../capplets/appearance/data/appearance.glade.h:40
+#: ../capplets/appearance/data/appearance.glade.h:35
 msgid "Save File"
 msgstr "Lưu tập tin"
 
-#: ../capplets/appearance/data/appearance.glade.h:41
+#: ../capplets/appearance/data/appearance.glade.h:36
 msgid "Save Theme As..."
 msgstr "Lưu mới Sắc thái..."
 
-#: ../capplets/appearance/data/appearance.glade.h:42
+#: ../capplets/appearance/data/appearance.glade.h:37
 msgid "Save _As..."
 msgstr "Lưu _dạng..."
 
-#: ../capplets/appearance/data/appearance.glade.h:43
+#: ../capplets/appearance/data/appearance.glade.h:38
 msgid "Save _background image"
 msgstr "Lưu ảnh _nền"
 
-#: ../capplets/appearance/data/appearance.glade.h:44
+#: ../capplets/appearance/data/appearance.glade.h:39
 msgid "Show _icons in menus"
 msgstr "Hiển thị b_iểu tượng trong các trình đơn"
 
-#: ../capplets/appearance/data/appearance.glade.h:45
+#: ../capplets/appearance/data/appearance.glade.h:40
 msgid "Small"
 msgstr "Nhỏ"
 
-#: ../capplets/appearance/data/appearance.glade.h:46
+#: ../capplets/appearance/data/appearance.glade.h:41
 msgid ""
 "Solid color\n"
 "Horizontal gradient\n"
 "Vertical gradient"
-msgstr "Màu đặc\n"
+msgstr ""
+"Màu đặc\n"
 "Dốc ngang\n"
 "Dốc dọc"
 
-#: ../capplets/appearance/data/appearance.glade.h:49
+#: ../capplets/appearance/data/appearance.glade.h:44
 msgid "Sub_pixel (LCDs)"
 msgstr "Điểm_con (màn hình LCD)"
 
-#: ../capplets/appearance/data/appearance.glade.h:50
+#: ../capplets/appearance/data/appearance.glade.h:45
 msgid "Sub_pixel smoothing (LCDs)"
 msgstr "Làm mịn điểm _con (màn hình LCD)"
 
-#: ../capplets/appearance/data/appearance.glade.h:51
+#: ../capplets/appearance/data/appearance.glade.h:46
 msgid "Text"
 msgstr "Nhãn"
 
-#: ../capplets/appearance/data/appearance.glade.h:52
+#: ../capplets/appearance/data/appearance.glade.h:47
 msgid ""
 "Text below items\n"
 "Text beside items\n"
 "Icons only\n"
 "Text only"
-msgstr "Nhãn bên dưới mục\n"
+msgstr ""
+"Nhãn bên dưới mục\n"
 "Nhãn bên cạnh mục\n"
 "Chỉ hình\n"
 "Chỉ nhãn"
 
-#: ../capplets/appearance/data/appearance.glade.h:56
+#: ../capplets/appearance/data/appearance.glade.h:51
 msgid "The current controls theme does not support color schemes."
 msgstr "Sắc thái điều khiển đang dùng không hỗ trợ giản đồ màu."
 
-#: ../capplets/appearance/data/appearance.glade.h:57
+#: ../capplets/appearance/data/appearance.glade.h:52
 #: ../vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Sắc thái"
 
+#: ../capplets/appearance/data/appearance.glade.h:53
+msgid ""
+"Tiled\n"
+"Zoom\n"
+"Centered\n"
+"Scaled\n"
+"Fill screen"
+msgstr ""
+"Xếp lát\n"
+"Thu/Phóng\n"
+"Ở giữa\n"
+"Co giãn\n"
+"Màn hình đầy"
+
 #: ../capplets/appearance/data/appearance.glade.h:58
 msgid "Toolbar _button labels:"
 msgstr "_Nhãn nút thanh công cụ:"
 
-#.vertical hinting, pixel order blue, green, red
+#. vertical hinting, pixel order blue, green, red
 #: ../capplets/appearance/data/appearance.glade.h:60
 msgid "VB_GR"
 msgstr "VB_GR"
@@ -1020,7 +875,7 @@ msgid "Window Border"
 msgstr "Viền cửa sổ"
 
 #: ../capplets/appearance/data/appearance.glade.h:62
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:48
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:50
 msgid "_Add..."
 msgstr "Thê_m..."
 
@@ -1028,7 +883,7 @@ msgstr "Thê_m..."
 msgid "_Application font:"
 msgstr "Phông ứ_ng dụng:"
 
-#.pixel order blue, green, red
+#. pixel order blue, green, red
 #: ../capplets/appearance/data/appearance.glade.h:65
 msgid "_BGR"
 msgstr "_BGR"
@@ -1105,7 +960,7 @@ msgstr "_In"
 msgid "_Quit"
 msgstr "T_hoát"
 
-#.pixel order red, green, blue
+#. pixel order red, green, blue
 #: ../capplets/appearance/data/appearance.glade.h:85
 msgid "_RGB"
 msgstr "_RGB"
@@ -1138,7 +993,7 @@ msgstr "_Kiểu dạng:"
 msgid "_Tooltips:"
 msgstr "_Mẹo công cụ :"
 
-#.vertical hinting, pixel order red, green, blue
+#. vertical hinting, pixel order red, green, blue
 #: ../capplets/appearance/data/appearance.glade.h:94
 msgid "_VRGB"
 msgstr "_VRGB"
@@ -1175,26 +1030,31 @@ msgstr "Trình cài đặt sắc thái"
 msgid "Gnome Theme Package"
 msgstr "Gói Sắc thái Gnome"
 
-#: ../capplets/appearance/gnome-wp-info.c:45
+#: ../capplets/appearance/gnome-wp-info.c:50
 msgid "No Wallpaper"
 msgstr "Không ảnh nền"
 
-#.translators: <b>wallpaper name</b>
-#.* mime type, x pixel(s) by y pixel(s)
-#.* Folder: /path/to/file
+#: ../capplets/appearance/gnome-wp-item.c:209
+msgid "Slide Show"
+msgstr "Chiếu ảnh"
+
+#. translators: <b>wallpaper name</b>
+#. * mime type, x pixel(s) by y pixel(s)
+#. * Folder: /path/to/file
 #.
-#: ../capplets/appearance/gnome-wp-item.c:364
+#: ../capplets/appearance/gnome-wp-item.c:217
 #, c-format
 msgid ""
 "<b>%s</b>\n"
 "%s, %d %s by %d %s\n"
 "Folder: %s"
-msgstr "<b>%s</b>\n"
+msgstr ""
+"<b>%s</b>\n"
 "%s, %d %s by %d %s\n"
 "Thư mục: %s"
 
-#: ../capplets/appearance/gnome-wp-item.c:370
-#: ../capplets/appearance/gnome-wp-item.c:372
+#: ../capplets/appearance/gnome-wp-item.c:223
+#: ../capplets/appearance/gnome-wp-item.c:225
 msgid "pixel"
 msgid_plural "pixels"
 msgstr[0] "điểm ảnh"
@@ -1227,91 +1087,101 @@ msgstr "Có vẻ là « %s » không phải là một sắc thái hợp lệ."
 msgid ""
 "\"%s\" does not appear to be a valid theme. It may be a theme engine which "
 "you need to compile."
-msgstr "Có vẻ là « %s » không phải là một sắc thái hợp lệ. Có lẽ nó là một cơ chế sắc thái mà bạn cần phải biên dịch."
+msgstr ""
+"Có vẻ là « %s » không phải là một sắc thái hợp lệ. Có lẽ nó là một cơ chế sắc "
+"thái mà bạn cần phải biên dịch."
 
 #: ../capplets/appearance/theme-installer.c:287
 #, c-format
 msgid "GNOME Theme %s correctly installed"
 msgstr "Sắc thái GNOME %s đã được cài đặt"
 
-#: ../capplets/appearance/theme-installer.c:347
+#: ../capplets/appearance/theme-installer.c:354
 #, c-format
 msgid "Installation for theme \"%s\" failed."
 msgstr "Lỗi cài đặt sắc thái « %s »."
 
-#: ../capplets/appearance/theme-installer.c:379
+#: ../capplets/appearance/theme-installer.c:392
 #, c-format
 msgid "The theme \"%s\" has been installed."
 msgstr "Đã cài đặt sắc thái \"%s\"."
 
-#: ../capplets/appearance/theme-installer.c:385
+#: ../capplets/appearance/theme-installer.c:398
 msgid "Would you like to apply it now, or keep your current theme?"
 msgstr "Bạn muốn dùng nó từ giờ hay dùng lại sắc thái cũ?"
 
-#: ../capplets/appearance/theme-installer.c:387
+#: ../capplets/appearance/theme-installer.c:400
 msgid "Keep Current Theme"
 msgstr "Giữ sắc thái hiện có"
 
-#: ../capplets/appearance/theme-installer.c:389
+#: ../capplets/appearance/theme-installer.c:402
 msgid "Apply New Theme"
 msgstr "Áp dụng sắc thái mới"
 
-#: ../capplets/appearance/theme-installer.c:491
+#: ../capplets/appearance/theme-installer.c:505
 msgid "Failed to create temporary directory"
 msgstr "Lỗi tạo thư mục tạm thời"
 
-#: ../capplets/appearance/theme-installer.c:551
+#: ../capplets/appearance/theme-installer.c:568
 msgid "New themes have been successfully installed."
 msgstr "Một số sắc thái mới đã được cài đặt."
 
-#: ../capplets/appearance/theme-installer.c:579
+#: ../capplets/appearance/theme-installer.c:595
 msgid "No theme file location specified to install"
 msgstr "Chưa xác định địa điểm tập tin sắc thái cần cài đặt"
 
-#: ../capplets/appearance/theme-installer.c:599
+#: ../capplets/appearance/theme-installer.c:615
 #, c-format
 msgid ""
 "Insufficient permissions to install the theme in:\n"
 "%s"
-msgstr "Không đủ quyền để cài đặt sắc thái vào :\n"
+msgstr ""
+"Không đủ quyền để cài đặt sắc thái vào :\n"
 "%s"
 
-#: ../capplets/appearance/theme-installer.c:621
+#: ../capplets/appearance/theme-installer.c:637
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
 "selected as the source location"
-msgstr "« %s » là đường dẫn nơi các tập tin sắc thái sẽ được cài đặt. Địa điểm này "
+msgstr ""
+"« %s » là đường dẫn nơi các tập tin sắc thái sẽ được cài đặt. Địa điểm này "
 "không thể là địa điểm nguồn."
 
-#: ../capplets/appearance/theme-installer.c:689
+#: ../capplets/appearance/theme-installer.c:706
 msgid "Select Theme"
 msgstr "Chọn sắc thái"
 
-#: ../capplets/appearance/theme-installer.c:693
+#: ../capplets/appearance/theme-installer.c:710
 msgid "Theme Packages"
 msgstr "Gói Sắc thái"
 
 #: ../capplets/appearance/theme-save.c:91
+#, c-format
 msgid "Theme name must be present"
 msgstr "Sắc thái phải có tên"
 
-#: ../capplets/appearance/theme-save.c:161
+#: ../capplets/appearance/theme-save.c:154
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Sắc thái đã có. Bạn có muốn thay thế nó không?"
 
-#: ../capplets/appearance/theme-save.c:162
+#: ../capplets/appearance/theme-save.c:155
+#: ../capplets/common/file-transfer-dialog.c:450
 msgid "_Overwrite"
 msgstr "_Ghi đè"
 
-#: ../capplets/appearance/theme-util.c:69
+#: ../capplets/appearance/theme-util.c:134
 msgid "Would you like to delete this theme?"
 msgstr "Bạn có muốn xoá sắc thái này không?"
 
-#: ../capplets/appearance/theme-util.c:121
+#: ../capplets/appearance/theme-util.c:179
 msgid "Theme cannot be deleted"
 msgstr "Sắc thái không xóa được"
 
+#: ../capplets/appearance/theme-util.c:304
+msgid "Could not install theme engine"
+msgstr "Không thể cài đặt cơ chế sắc thái"
+
 #: ../capplets/common/activate-settings-daemon.c:16
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -1319,230 +1189,259 @@ msgid ""
 "effect. This could indicate a problem with Bonobo, or a non-GNOME (e.g. KDE) "
 "settings manager may already be active and conflicting with the GNOME "
 "settings manager."
-msgstr "Không thể khởi động trình quản lý thông số « gnome-settings-daemon ».\n"
+msgstr ""
+"Không thể khởi động trình quản lý thông số « gnome-settings-daemon ».\n"
 "Không có chương trình này, một vài tùy thích sẽ không có tác dụng. Có lẽ do "
 "Bonobo hoặc một trình quản lý thông số ứng dụng phi GNOME (v.d. KDE) đang "
 "hoạt động và gây xung đột với GNOME."
 
-#: ../capplets/common/capplet-stock-icons.c:92
+#: ../capplets/common/capplet-stock-icons.c:67
 #, c-format
 msgid "Unable to load stock icon '%s'\n"
-msgstr "Không thể tải biểu tượng chuẩn « %s »\n"
-
-#: ../capplets/common/capplet-util.c:240
-#: ../capplets/common/capplet-util.c:242
-msgid "Just apply settings and quit"
-msgstr "Chỉ áp dụng các thiết lập rồi thoát"
-
-#: ../capplets/common/capplet-util.c:244
-#: ../capplets/keyboard/gnome-keyboard-properties.c:252
-#: ../capplets/sound/sound-properties-capplet.c:1030
-msgid "Retrieve and store legacy settings"
-msgstr "Nhận và lưu thiết lập cũ"
+msgstr "Không thể nạp biểu tượng kho « %s »\n"
 
-#: ../capplets/common/capplet-util.c:344
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:390
+#: ../capplets/common/capplet-util.c:80
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "Gặp lỗi khi hiển thị trợ giúp: %s"
 
-#: ../capplets/common/file-transfer-dialog.c:94
+#: ../capplets/common/file-transfer-dialog.c:98
 #, c-format
 msgid "Copying file: %u of %u"
 msgstr "Đang sao chép tập tin: %u trên %u"
 
-#: ../capplets/common/file-transfer-dialog.c:154
+#: ../capplets/common/file-transfer-dialog.c:145
 #, c-format
 msgid "Copying '%s'"
 msgstr "Đang sao chép « %s »"
 
 #: ../capplets/common/file-transfer-dialog.c:185
-#: ../capplets/common/file-transfer-dialog.c:309
+#: ../capplets/common/file-transfer-dialog.c:312
 msgid "Copying files"
 msgstr "Đang sao chép tập tin"
 
-#: ../capplets/common/file-transfer-dialog.c:221
+#: ../capplets/common/file-transfer-dialog.c:224
 msgid "Parent Window"
 msgstr "Cửa sổ cha"
 
-#: ../capplets/common/file-transfer-dialog.c:222
+#: ../capplets/common/file-transfer-dialog.c:225
 msgid "Parent window of the dialog"
 msgstr "Cửa sổ cha của hộp thoại"
 
-#: ../capplets/common/file-transfer-dialog.c:228
+#: ../capplets/common/file-transfer-dialog.c:231
 msgid "From URI"
 msgstr "Từ địa chỉ URI"
 
-#: ../capplets/common/file-transfer-dialog.c:229
+#: ../capplets/common/file-transfer-dialog.c:232
 msgid "URI currently transferring from"
 msgstr "Hiện thời truyền từ địa chỉ URI này."
 
-#: ../capplets/common/file-transfer-dialog.c:236
+#: ../capplets/common/file-transfer-dialog.c:239
 msgid "To URI"
 msgstr "Tới địa chỉ URI"
 
-#: ../capplets/common/file-transfer-dialog.c:237
+#: ../capplets/common/file-transfer-dialog.c:240
 msgid "URI currently transferring to"
 msgstr "Hiện thời truyền đến địa chỉ URI này."
 
-#: ../capplets/common/file-transfer-dialog.c:244
+#: ../capplets/common/file-transfer-dialog.c:247
 msgid "Fraction completed"
 msgstr "Phần hoàn tất"
 
-#: ../capplets/common/file-transfer-dialog.c:245
+#: ../capplets/common/file-transfer-dialog.c:248
 msgid "Fraction of transfer currently completed"
 msgstr "Phần truyền hiện thời đã hoàn tất"
 
-#: ../capplets/common/file-transfer-dialog.c:252
+#: ../capplets/common/file-transfer-dialog.c:255
 msgid "Current URI index"
 msgstr "Chỉ mục địa chỉ URI hiện thời"
 
-#: ../capplets/common/file-transfer-dialog.c:253
+#: ../capplets/common/file-transfer-dialog.c:256
 msgid "Current URI index - starts from 1"
 msgstr "Chỉ mục địa chỉ URI hiện thời — bắt đầu từ 1"
 
-#: ../capplets/common/file-transfer-dialog.c:260
+#: ../capplets/common/file-transfer-dialog.c:263
 msgid "Total URIs"
 msgstr "Tổng địa chỉ URI"
 
-#: ../capplets/common/file-transfer-dialog.c:261
+#: ../capplets/common/file-transfer-dialog.c:264
 msgid "Total number of URIs"
 msgstr "Tổng số địa chỉ URI"
 
-#: ../capplets/common/file-transfer-dialog.c:422
-msgid "Connecting..."
-msgstr "Đang kết nối..."
+#: ../capplets/common/file-transfer-dialog.c:444
+#, c-format
+msgid "File '%s' already exists. Do you want to overwrite it?"
+msgstr "Tập tin « %s » đã có. Bạn có muốn ghi đè lên nó không?"
+
+#: ../capplets/common/file-transfer-dialog.c:447
+msgid "_Skip"
+msgstr "_Bỏ qua"
+
+#: ../capplets/common/file-transfer-dialog.c:448
+msgid "Overwrite _All"
+msgstr "_Ghi đè tất cả"
 
-#: ../capplets/common/gconf-property-editor.c:170
+#: ../capplets/common/gconf-property-editor.c:133
 msgid "Key"
-msgstr "Khóa"
+msgstr "Khoá"
 
-#: ../capplets/common/gconf-property-editor.c:171
+#: ../capplets/common/gconf-property-editor.c:134
 msgid "GConf key to which this property editor is attached"
-msgstr "Khóa GConf gắn với bộ soạn thảo thuộc tính"
+msgstr "Khoá GConf gắn với bộ soạn thảo thuộc tính"
 
-#: ../capplets/common/gconf-property-editor.c:177
+#: ../capplets/common/gconf-property-editor.c:140
 msgid "Callback"
 msgstr "Gọi lui"
 
-#: ../capplets/common/gconf-property-editor.c:178
+#: ../capplets/common/gconf-property-editor.c:141
 msgid "Issue this callback when the value associated with key gets changed"
 msgstr "Thực hiện cuộc gọi ngược này khi giá trị tương ứng với khóa thay đổi"
 
-#: ../capplets/common/gconf-property-editor.c:183
+#: ../capplets/common/gconf-property-editor.c:146
 msgid "Change set"
 msgstr "Tập thay đổi"
 
-#: ../capplets/common/gconf-property-editor.c:184
+#: ../capplets/common/gconf-property-editor.c:147
 msgid ""
 "GConf change set containing data to be forwarded to the gconf client on apply"
-msgstr "Tập thay đổi GConf chứa dữ liệu sẽ chuyển tiếp cho ứng dụng khách GConf theo "
+msgstr ""
+"Tập thay đổi GConf chứa dữ liệu sẽ chuyển tiếp cho ứng dụng khách GConf theo "
 "yêu cầu"
 
-#: ../capplets/common/gconf-property-editor.c:189
+#: ../capplets/common/gconf-property-editor.c:152
 msgid "Conversion to widget callback"
 msgstr "Chuyển đổi sang ô điều khiển gọi ngược"
 
-#: ../capplets/common/gconf-property-editor.c:190
+#: ../capplets/common/gconf-property-editor.c:153
 msgid ""
 "Callback to be issued when data are to be converted from GConf to the widget"
-msgstr "Thực hiện cuộc gọi ngược khi dữ liệu sẽ được chuyển đổi từ GConf sang ô điều "
+msgstr ""
+"Thực hiện cuộc gọi ngược khi dữ liệu sẽ được chuyển đổi từ GConf sang ô điều "
 "khiển"
 
-#: ../capplets/common/gconf-property-editor.c:195
+#: ../capplets/common/gconf-property-editor.c:158
 msgid "Conversion from widget callback"
 msgstr "Chuyển đổi từ ô điều khiển gọi ngược"
 
-#: ../capplets/common/gconf-property-editor.c:196
+#: ../capplets/common/gconf-property-editor.c:159
 msgid ""
 "Callback to be issued when data are to be converted to GConf from the widget"
-msgstr "Thực hiện cuộc gọi ngược khi dữ liệu sẽ được chuyển đổi từ ô điều khiển sang "
+msgstr ""
+"Thực hiện cuộc gọi ngược khi dữ liệu sẽ được chuyển đổi từ ô điều khiển sang "
 "GConf"
 
-#: ../capplets/common/gconf-property-editor.c:201
+#: ../capplets/common/gconf-property-editor.c:164
 msgid "UI Control"
 msgstr "Điều khiển giao diện người dùng (UI)"
 
-#: ../capplets/common/gconf-property-editor.c:202
+#: ../capplets/common/gconf-property-editor.c:165
 msgid "Object that controls the property (normally a widget)"
 msgstr "Đối tượng điều khiển thuộc tính (thường là ô điều khiển)"
 
-#: ../capplets/common/gconf-property-editor.c:217
+#: ../capplets/common/gconf-property-editor.c:180
 msgid "Property editor object data"
 msgstr "Dữ liệu đối tượng trình biên soạn thuộc tính"
 
-#: ../capplets/common/gconf-property-editor.c:218
+#: ../capplets/common/gconf-property-editor.c:181
 msgid "Custom data required by the specific property editor"
 msgstr "Dữ liệu tự chọn được yêu cầu bởi trình hiệu chỉnh thuộc tính xác định"
 
-#: ../capplets/common/gconf-property-editor.c:224
+#: ../capplets/common/gconf-property-editor.c:187
 msgid "Property editor data freeing callback"
 msgstr "Gọi lui nhả dữ liệu bộ biên tập thuộc tính"
 
-#: ../capplets/common/gconf-property-editor.c:225
+#: ../capplets/common/gconf-property-editor.c:188
 msgid "Callback to be issued when property editor object data is to be freed"
 msgstr "Thực hiện gọi lui khi sẽ nhả dữ liệu đối tương bộ biên tập thuộc tính"
 
-#: ../capplets/common/gconf-property-editor.c:1468
+#: ../capplets/common/gconf-property-editor.c:1429
 #, c-format
 msgid ""
 "Couldn't find the file '%s'.\n"
 "\n"
 "Please make sure it exists and try again, or choose a different background "
 "picture."
-msgstr "Không tìm thấy tập tin « %s ».\n"
+msgstr ""
+"Không tìm thấy tập tin « %s ».\n"
 "\n"
 "Hãy kiểm tra lại xem tập tin có tồn tại hay chưa rồi thử lại, hoặc chọn một "
 "ảnh nền khác."
 
-#: ../capplets/common/gconf-property-editor.c:1476
+#: ../capplets/common/gconf-property-editor.c:1437
 #, c-format
 msgid ""
 "I don't know how to open the file '%s'.\n"
 "Perhaps it's a kind of picture that is not yet supported.\n"
 "\n"
 "Please select a different picture instead."
-msgstr "Không biết phải mở tập tin « %s » như thế nào.\n"
+msgstr ""
+"Không biết phải mở tập tin « %s » như thế nào.\n"
 "Có lẽ đây là loại ảnh chưa được hỗ trợ.\n"
 "\n"
 "Hãy chọn ảnh khác thay thế."
 
-#: ../capplets/common/gconf-property-editor.c:1595
+#: ../capplets/common/gconf-property-editor.c:1556
 msgid "Please select an image."
 msgstr "Hãy chọn ảnh."
 
-#: ../capplets/common/gconf-property-editor.c:1600
+#: ../capplets/common/gconf-property-editor.c:1561
 msgid "_Select"
 msgstr "_Chọn"
 
-#: ../capplets/common/gnome-theme-info.c:639
+#: ../capplets/common/gnome-theme-info.c:629
 msgid "Default Pointer - Current"
 msgstr "Con trỏ mặc định — hiện thời"
 
-#: ../capplets/common/gnome-theme-info.c:643
+#: ../capplets/common/gnome-theme-info.c:633
 msgid "White Pointer"
 msgstr "Con trỏ trắng"
 
-#: ../capplets/common/gnome-theme-info.c:644
+#: ../capplets/common/gnome-theme-info.c:634
 msgid "White Pointer - Current"
 msgstr "Con trỏ trắng — hiện thời"
 
-#: ../capplets/common/gnome-theme-info.c:648
+#: ../capplets/common/gnome-theme-info.c:638
 msgid "Large Pointer"
 msgstr "Con trỏ lớn"
 
-#: ../capplets/common/gnome-theme-info.c:649
+#: ../capplets/common/gnome-theme-info.c:639
 msgid "Large Pointer - Current"
 msgstr "Con trỏ lớn — hiện thời"
 
-#: ../capplets/common/gnome-theme-info.c:653
+#: ../capplets/common/gnome-theme-info.c:643
 msgid "Large White Pointer - Current"
 msgstr "Con trỏ trắng lớn — hiện thời"
 
-#: ../capplets/common/gnome-theme-info.c:654
+#: ../capplets/common/gnome-theme-info.c:644
 msgid "Large White Pointer"
 msgstr "Con trỏ trắng lớn"
 
+#: ../capplets/common/gnome-theme-info.c:1610
+#, c-format
+msgid ""
+"This theme will not look as intended because the required GTK+ theme '%s' is "
+"not installed."
+msgstr ""
+"Sắc thái này sẽ không hình như mong đợi vì chưa cài đặt sắc thái GTK+ « %s »."
+
+#: ../capplets/common/gnome-theme-info.c:1618
+#, c-format
+msgid ""
+"This theme will not look as intended because the required window manager "
+"theme '%s' is not installed."
+msgstr ""
+"Sắc thái này sẽ không hình như mong đợi vì chưa cài đặt sắc thái bộ quản lý "
+"cửa sổ « %s »."
+
+#: ../capplets/common/gnome-theme-info.c:1625
+#, c-format
+msgid ""
+"This theme will not look as intended because the required icon theme '%s' is "
+"not installed."
+msgstr ""
+"Sắc thái này sẽ không hình như mong đợi vì chưa cài đặt sắc thái biểu tượng « "
+"%s »."
+
 #: ../capplets/default-applications/default-applications.desktop.in.in.h:1
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Preferred Applications"
@@ -1553,37 +1452,38 @@ msgid "Select your default applications"
 msgstr "Chọn các ứng dụng mặc định của bạn"
 
 #: ../capplets/default-applications/gnome-at-session.desktop.in.in.h:1
-msgid "Autostart the preferred AT"
-msgstr "Tự động khởi chạy công nghệ trợ giúp đã thích"
+msgid "Start the preferred visual assistive technology"
+msgstr "Chạy công nghệ giúp đỡ thị lực GNOME đã muốn"
 
 #: ../capplets/default-applications/gnome-at-session.desktop.in.in.h:2
-msgid "Visual"
-msgstr "Thị lực"
-
-#: ../capplets/default-applications/gnome-da-capplet.c:80
-#: ../capplets/default-applications/gnome-da-capplet.c:112
-#: ../capplets/default-applications/gnome-da-capplet.c:133
-#: ../capplets/default-applications/gnome-da-capplet.c:177
-#: ../capplets/default-applications/gnome-da-capplet.c:222
-#: ../capplets/default-applications/gnome-da-capplet.c:279
-#: ../capplets/default-applications/gnome-da-capplet.c:330
-#: ../capplets/default-applications/gnome-da-capplet.c:381
-#: ../capplets/default-applications/gnome-da-capplet.c:434
-#: ../capplets/default-applications/gnome-da-capplet.c:484
-#: ../capplets/default-applications/gnome-da-capplet.c:877
-#: ../capplets/default-applications/gnome-da-capplet.c:899
+msgid "Visual Assistance"
+msgstr "Giúp đỡ thị lực"
+
+#: ../capplets/default-applications/gnome-da-capplet.c:94
+#: ../capplets/default-applications/gnome-da-capplet.c:345
+#: ../capplets/default-applications/gnome-da-capplet.c:366
 #, c-format
 msgid "Error saving configuration: %s"
 msgstr "Gặp lỗi khi lưu cấu hình: %s"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:1100
+#: ../capplets/default-applications/gnome-da-capplet.c:650
 msgid "Could not load the main interface"
-msgstr "Không thể tài giao diện chính"
+msgstr "Không thể nạp giao diện chính"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:1102
+#: ../capplets/default-applications/gnome-da-capplet.c:652
 msgid "Please make sure that the applet is properly installed"
 msgstr "Hãy kiểm tra xem tiểu dụng này đã được cài đặt đúng"
 
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplets/default-applications/gnome-da-capplet.c:879
+msgid "Specify the name of the page to show (internet|multimedia|system|a11y)"
+msgstr ""
+"Hãy ghi rõ tên của trang cần hiển thị:\n"
+" • internet\n"
+" • multimedia\t\tnhạc/ảnh/phim\n"
+" • system\t\t\thệ thống\n"
+" • a11y"
+
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:1
 msgid "<b>Image Viewer</b>"
 msgstr "<b>Bộ Xem Ảnh</b>"
@@ -1625,7 +1525,8 @@ msgid "<b>Web Browser</b>"
 msgstr "<b>Bộ duyệt Web</b>"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:11
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:14
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:12
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:28
 msgid "Accessibility"
 msgstr "Khả năng truy cập"
 
@@ -1664,7 +1565,7 @@ msgstr "Mở liên kết trong cửa sổ _mới"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid "Open link with web browser _default"
-msgstr "Mở liên kết bằng trình duyệt Mạng _mặc định"
+msgstr "Mở liên kết bằng trình duyệt Web _mặc định"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Run at st_art"
@@ -1792,110 +1693,118 @@ msgid "Konqueror"
 msgstr "Konqueror"
 
 #: ../capplets/default-applications/gnome-default-applications.xml.in.h:26
+msgid "Konsole"
+msgstr "Konsole"
+
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:27
 msgid "Linux Screen Reader"
 msgstr "Bộ đọc màn hình Linux"
 
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:27
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:28
 msgid "Linux Screen Reader with Magnifier"
 msgstr "Bộ đọc màn hình Linux có Kính lúp"
 
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:28
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:29
 msgid "Midori"
 msgstr "Midori"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:29
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:30
 msgid "Mozilla"
 msgstr "Mozilla"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:30
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:31
 msgid "Mozilla 1.6"
 msgstr "Mozilla 1.6"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:31
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:32
 msgid "Mozilla Mail"
 msgstr "Mozilla Mail"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:32
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:33
 msgid "Mozilla Thunderbird"
 msgstr "Mozilla Thunderbird"
 
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:33
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:34
 msgid "Muine Music Player"
 msgstr "Bộ Phát Nhạc Muine"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:34
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:35
 msgid "Mutt"
 msgstr "Mutt"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:35
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:36
 msgid "NXterm"
 msgstr "NXterm"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:36
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:37
 msgid "Netscape Communicator"
 msgstr "Netscape Communicator"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:37
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:38
 msgid "Opera"
 msgstr "Opera"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:38
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:39
 msgid "Orca"
 msgstr "Orca"
 
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:39
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:40
 msgid "Orca with Magnifier"
 msgstr "Orca có Kính lúp"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:40
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:41
 msgid "RXVT"
 msgstr "RXVT"
 
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:41
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:42
 msgid "Rhythmbox Music Player"
 msgstr "Bộ Phát Nhạc Rhythmbox"
 
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:42
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:43
 msgid "SeaMonkey"
 msgstr "SeaMonkey"
 
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:43
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:44
 msgid "SeaMonkey Mail"
 msgstr "Thư tín SeaMonkey"
 
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:44
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:45
 msgid "Standard XTerminal"
 msgstr "XTerminal chuẩn"
 
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:45
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:46
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:46
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:47
 msgid "Sylpheed-Claws"
 msgstr "Sylpheed-Claws"
 
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:48
+msgid "Terminator"
+msgstr "Terminator"
+
 # Name: don't translate / Tên: đừng dịch
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:47
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:49
 msgid "Thunderbird"
 msgstr "Thunderbird"
 
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:48
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:50
 msgid "Totem Movie Player"
 msgstr "Bộ Phát Phim Totem"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:49
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:51
 msgid "aterm"
 msgstr "aterm"
 
@@ -1949,57 +1858,61 @@ msgstr "Thiết lập mặc định"
 msgid "Screen %d Settings\n"
 msgstr "Thiết lập màn hình %d\n"
 
-#: ../capplets/display/main.c:592
+#: ../capplets/display/main.c:593
 msgid "Screen Resolution Preferences"
 msgstr "Tùy thích độ phân giải màn hình"
 
-#: ../capplets/display/main.c:627
+#: ../capplets/display/main.c:628
 #, c-format
 msgid "_Make default for this computer (%s) only"
 msgstr "_Chọn làm mặc định chỉ cho máy tính này (%s) thôi"
 
-#: ../capplets/display/main.c:644
+#: ../capplets/display/main.c:648
 msgid "Options"
 msgstr "Tùy chọn"
 
-#: ../capplets/display/main.c:664
+#: ../capplets/display/main.c:668
 #, c-format
 msgid ""
 "Testing the new settings. If you don't respond in %d second the previous "
 "settings will be restored."
-msgid_plural "Testing the new settings. If you don't respond in %d seconds the previous "
+msgid_plural ""
+"Testing the new settings. If you don't respond in %d seconds the previous "
 "settings will be restored."
-msgstr[0] "Đang thử ra thiết lập mới. Nếu bạn không trả lời trong vòng %d giây thì sẽ "
+msgstr[0] ""
+"Đang thử ra thiết lập mới. Nếu bạn không trả lời trong vòng %d giây thì sẽ "
 "phục hồi thiết lập trước."
 
-#: ../capplets/display/main.c:704
+#: ../capplets/display/main.c:708
 msgid "Keep Resolution"
 msgstr "Giữ độ phân giải"
 
-#: ../capplets/display/main.c:708
+#: ../capplets/display/main.c:712
 msgid "Do you want to keep this resolution?"
 msgstr "Bạn có muốn giữ nguyên độ phân giải này không?"
 
-#: ../capplets/display/main.c:734
+#: ../capplets/display/main.c:738
 msgid "Use _Previous Resolution"
 msgstr "Dùng độ _phân giải cũ"
 
-#: ../capplets/display/main.c:735
+#: ../capplets/display/main.c:739
 msgid "_Keep Resolution"
 msgstr "_Giữ độ phân giải"
 
-#: ../capplets/display/main.c:883
+#: ../capplets/display/main.c:888
 msgid ""
 "The X server does not support the XRandR extension.  Runtime resolution "
 "changes to the display size are not available."
-msgstr "Trình phục vụ X này không hỗ trợ phần mở rộng XRandR. Trong khi chạy thì "
+msgstr ""
+"Trình phục vụ X này không hỗ trợ phần mở rộng XRandR. Trong khi chạy thì "
 "không thể thay đổi độ phân giải để thay đổi kích cỡ màn hình."
 
-#: ../capplets/display/main.c:890
+#: ../capplets/display/main.c:895
 msgid ""
 "The version of the XRandR extension is incompatible with this program. "
 "Runtime changes to the display size are not available."
-msgstr "Phiên bản của phần mở rộng XRandR không tương thích với chương trình. Trong "
+msgstr ""
+"Phiên bản của phần mở rộng XRandR không tương thích với chương trình. Trong "
 "khi chạy thì không thể thay đổi cỡ màn hình."
 
 #: ../capplets/keybindings/00-multimedia-key.xml.in.h:1
@@ -2008,6 +1921,7 @@ msgid "Sound"
 msgstr "Âm thanh"
 
 #: ../capplets/keybindings/01-desktop-key.xml.in.h:1
+#: ../libslab/bookmark-agent.c:1158
 msgid "Desktop"
 msgstr "Desktop"
 
@@ -2039,53 +1953,58 @@ msgid "The type of accelerator."
 msgstr "Kiểu phím tắt."
 
 #: ../capplets/keybindings/eggcellrendererkeys.c:242
-#: ../capplets/keybindings/gnome-keybinding-properties.c:112
-#: ../libbackground/applier.c:624
-#: ../typing-break/drwright.c:482
+#: ../capplets/keybindings/gnome-keybinding-properties.c:90
+#: ../typing-break/drwright.c:483
 msgid "Disabled"
 msgstr "Tắt"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:523
+#: ../capplets/keybindings/gnome-keybinding-properties.c:171
 msgid "<Unknown Action>"
 msgstr "<Hành động lạ>"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:915
+#: ../capplets/keybindings/gnome-keybinding-properties.c:804
+msgid "Custom Shortcuts"
+msgstr "Lối tắt tự chọn"
+
+#: ../capplets/keybindings/gnome-keybinding-properties.c:999
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
 "using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time.\n"
-msgstr "Không thể dùng phím tắt \"%s\" vì không thể gõ nó bằng phím này.\n"
-"Hãy thử lại với phím như Ctrl, Alt hay Shift đồng thời.\n"
+"Please try with a key such as Control, Alt or Shift at the same time."
+msgstr ""
+"Không thể dùng phím tắt « %s » vì sẽ không thể gõ nó bằng phím này.\n"
+"Hãy thử lại với phím như Ctrl, Alt hay Shift đồng thời."
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:944
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1028
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
-" \"%s\"\n"
-msgstr "Lối tắt « %s » đã dùng cho:\n"
-" « %s »\n"
+" \"%s\""
+msgstr ""
+"Phím tắt « %s » đã dùng cho:\n"
+" « %s »"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:976
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1060
 #, c-format
-msgid "Error setting new accelerator in configuration database: %s\n"
-msgstr "Gặp lỗi khi thiết lập phím tắt mới trong cơ sở dữ liệu cấu hình: %s\n"
+msgid "Error setting new accelerator in configuration database: %s"
+msgstr "Gặp lỗi khi thiết lập phím tắt mới trong cơ sở dữ liệu cấu hình: %s"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1026
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1112
 #, c-format
-msgid "Error unsetting accelerator in configuration database: %s\n"
-msgstr "Gặp lỗi khi hủy thiết lập phím tắt trong cơ sở dữ liệu cấu hình: %s\n"
+msgid "Error unsetting accelerator in configuration database: %s"
+msgstr "Gặp lỗi khi hủy thiết lập phím tắt trong cơ sở dữ liệu cấu hình: %s"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1141
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1294
 msgid "Action"
 msgstr "Hành động"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1165
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1316
 msgid "Shortcut"
 msgstr "Phím tắt"
 
 #.
-#.* vim: sw=2 ts=8 cindent noai bs=2
+#. * vim: sw=2 ts=8 cindent noai bs=2
 #.
 #: ../capplets/keybindings/gnome-keybinding-properties.glade.h:1
 #: ../capplets/keybindings/keybinding.desktop.in.in.h:2
@@ -2096,282 +2015,312 @@ msgstr "Phím tắt"
 msgid ""
 "To edit a shortcut key, click on the corresponding row and type a new "
 "accelerator, or press backspace to clear."
-msgstr "Để sửa đổi phím tắt, nhấn vào hàng tương ứng rồi gõ phím tắt mới, hoặc nhấn "
+msgstr ""
+"Để sửa đổi phím tắt, nhấn vào hàng tương ứng rồi gõ phím tắt mới, hoặc nhấn "
 "xóa lui để xoá."
 
 #: ../capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Gán phím tắt cho lệnh"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:244
-#: ../capplets/keyboard/gnome-keyboard-properties.c:249
-#: ../capplets/sound/sound-properties-capplet.c:1026
-#: ../capplets/sound/sound-properties-capplet.c:1028
+#: ../capplets/keyboard/gnome-keyboard-properties.c:248
+#: ../capplets/keyboard/gnome-keyboard-properties.c:253
+#: ../capplets/sound/sound-properties-capplet.c:1155
+#: ../capplets/sound/sound-properties-capplet.c:1157
 msgid ""
 "Just apply settings and quit (compatibility only; now handled by daemon)"
-msgstr "Chỉ áp dụng các thiết lập rồi thoát (chỉ để tương thích; lúc này được xử lý "
+msgstr ""
+"Chỉ áp dụng các thiết lập rồi thoát (chỉ để tương thích; lúc này được xử lý "
 "bởi tiến trình nền)"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.c:256
+#: ../capplets/sound/sound-properties-capplet.c:1159
+msgid "Retrieve and store legacy settings"
+msgstr "Nhận và lưu thiết lập cũ"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.c:260
 msgid "Start the page with the typing break settings showing"
 msgstr "Khởi động trang kèm hiển thị thiết lập thư giãn nhập liệu"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:261
+#: ../capplets/keyboard/gnome-keyboard-properties.c:265
 msgid "Start the page with the accessibility settings showing"
 msgstr "Trang đầu hiển thị thiết lập khả năng truy cập"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:270
+#: ../capplets/keyboard/gnome-keyboard-properties.c:274
 msgid "- GNOME Keyboard Preferences"
 msgstr "- Tùy thích bàn phím"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:2
 msgid "<b>Bounce Keys</b>"
 msgstr "<b>Phím nảy</b>"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:3
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:2
 msgid "<b>Cursor Blinking</b>"
 msgstr "<b>Chớp nháy con trỏ</b>"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:4
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:3
 msgid "<b>General</b>"
 msgstr "<b>Chung</b>"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:5
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:4
 msgid "<b>Repeat Keys</b>"
 msgstr "<b>Phím Lặp</b>"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:6
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:5
 msgid "<b>Slow Keys</b>"
 msgstr "<b>Phím chậm</b>"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:7
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:6
 msgid "<b>Sticky Keys</b>"
 msgstr "<b>Phím dính</b>"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:8
-msgid "<b>_Lock screen to enforce typing break</b>"
-msgstr "<b>_Khoá bàn phím để buộc thư giãn nhập liệu</b>"
-
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:9
+#. fast acceleration
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:7
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:13
 msgid "<small><i>Fast</i></small>"
 msgstr "<small><i>Nhanh</i></small>"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:10
+#. long delay
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:8
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:19
 msgid "<small><i>Long</i></small>"
 msgstr "<small><i>Dài</i></small>"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:11
+#. short delay
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:9
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:23
 msgid "<small><i>Short</i></small>"
 msgstr "<small><i>Ngắn</i></small>"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:12
+#. slow acceleration
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:10
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:25
 msgid "<small><i>Slow</i></small>"
 msgstr "<small><i>Chậm</i></small>"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:13
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:11
 msgid "A_cceleration:"
 msgstr "_Phím tắt:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:15
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:13
 msgid "All_ow postponing of breaks"
 msgstr "_Cho phép hoãn thư giãn"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:16
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:14
+msgid "Audio _Feedback..."
+msgstr "_Phản hồi âm thanh"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:15
 msgid "Beep when _accessibility features are turned on or off"
 msgstr "Kêu bíp khi bật hay tắt tính năng _khả năng truy cập"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:17
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:16
 msgid "Beep when a _modifier key is pressed"
 msgstr "Kêu bíp khi phím _biến đổi được nhấn"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:18
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:17
 msgid "Beep when a _toggle key is pressed"
 msgstr "Kêu bíp khi phím bật/_tắt được nhấn"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:19
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "Beep when a key is pr_essed"
 msgstr "Kêu bíp kh_i phím được nhấn"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:20
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:19
 msgid "Beep when a key is reje_cted"
 msgstr "Kêu bíp khi phím bị từ c_hối"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:21
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:20
 msgid "Beep when key is _accepted"
 msgstr "Kêu bíp khi phím được _chấp nhận"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:22
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:21
 msgid "Beep when key is _rejected"
 msgstr "Kêu bíp khi phím bị từ c_hối"
 
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:22
+msgid "By _country"
+msgstr "Theo quố_c gia"
+
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:23
+msgid "By _language"
+msgstr "Theo _ngôn ngữ"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:24
 msgid "Check if breaks are allowed to be postponed"
 msgstr "Đánh dấu nếu cho phép hoãn thư giãn"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:24
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:25
 msgid "Choose a Keyboard Model"
 msgstr "Chọn mô hình bàn phím"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:25
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:26
 msgid "Choose a Layout"
 msgstr "Chọn bố trí"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:26
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:27
 msgid "Cursor _blinks in text fields"
 msgstr "Chớp nháy con trỏ trong trường nhập _văn bản"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:27
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:28
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:31
 msgid "Cursor blinks speed"
 msgstr "Tốc độ chốp con trỏ"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:28
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:29
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:32
 msgid "D_elay:"
 msgstr "T_rễ:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:29
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:30
 msgid "Disa_ble sticky keys if two keys are pressed together"
 msgstr "Tắt phím _dính nếu 2 phím được nhấn đồng thời"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:30
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:31
 msgid "Duration of the break when typing is disallowed"
 msgstr "Khoảng thư giãn, khi bị cấm nhập liệu"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:31
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:32
 msgid "Duration of work before forcing a break"
 msgstr "Khoảng làm việc trước khi buộc thư giãn"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:32
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:33
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:36
 msgid "General"
 msgstr "Chung"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:33
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:34
 msgid "Key presses _repeat when key is held down"
 msgstr "Phím nhấn được _lặp lại khi được giữ nhấn xuống"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:34
-msgid "Keyboard Accessibility Notifications"
-msgstr "Thông báo truy cập bàn phím"
-
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:35
-msgid "Keyboard Layout Options"
-msgstr "Tùy chọn bố trí bàn phím"
+msgid "Keyboard Accessibility Audio Feedback"
+msgstr "Phản hồi Âm thanh Truy cập Bàn phím"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:36
-msgid "Keyboard Preferences"
-msgstr "Tùy thích bàn phím"
+msgid "Keyboard Layout Options"
+msgstr "Tùy chọn Bố trí Bàn phím"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:37
+msgid "Keyboard Preferences"
+msgstr "Tùy thích Bàn phím"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:38
 msgid "Keyboard _model:"
 msgstr "_Mô hình bàn phím:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:38
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:39
 msgid "Layout _Options..."
-msgstr "Tù_y chọn bố trí..."
+msgstr "Tù_y chọn Bố trí..."
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:39
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:40
 msgid "Layouts"
 msgstr "Bố trí"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:40
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:41
 msgid ""
 "Lock screen after a certain duration to help prevent repetitive keyboard use "
 "injuries"
-msgstr "Khoá màn hình sau một khoảng thời gian nhất định để tránh thương tổn do sử "
+msgstr ""
+"Khoá màn hình sau một khoảng thời gian nhất định để tránh thương tổn do sử "
 "dụng bàn phím liên tục"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:42
+msgid "Mouse Keys"
+msgstr "Phím chuột"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:43
 msgid "Preview:"
 msgstr "Xem thử :"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:43
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:44
 msgid "Repeat keys speed"
 msgstr "Tốc độ gõ lại cùng phím"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:44
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:45
 msgid "Reset to De_faults"
 msgstr "Đặt lại về _mặc định"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:46
+msgid "S_peed:"
+msgstr "_Tốc độ:"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:47
 msgid "Separate _layout for each window"
 msgstr "_Bố trí riêng cho mỗi cửa sổ"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:47
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:48
 msgid "Typing Break"
 msgstr "Thư giãn nhập liệu"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:49
-msgid "_Allow to control the pointer using the keyboard"
-msgstr "Ch_o phép điều khiển con trỏ bằng bàn phím"
-
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:50
-msgid "_Allow to turn accessibility features on and off from the keyboard"
-msgstr "Ch_o phép bật/tắt tính năng khả năng truy cập từ bàn phím"
+msgid "_Accessibility features can be toggled with keyboard shortcuts"
+msgstr "Ch_o phép bật/tắt tính năng khả năng truy cập dùng phím tắt"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:51
 msgid "_Break interval lasts:"
 msgstr "Khoảng _thư giãn dài:"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:52
+msgid "_Country:"
+msgstr "_Quốc gia:"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:53
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:43
 msgid "_Delay:"
 msgstr "Khoảng _trễ:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:53
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:54
 msgid "_Ignore fast duplicate keypresses"
 msgstr "Bỏ _qua phím được bấm nhanh nhiều lần"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:54
-msgid "_Layouts:"
-msgstr "_Bố trí:"
-
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:55
-msgid "_Models:"
-msgstr "_Mô hình:"
+msgid "_Language:"
+msgstr "_Ngôn ngữ :"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:56
-msgid "_Notifications..."
-msgstr "Thô_ng báo..."
+msgid "_Lock screen to enforce typing break"
+msgstr "_Khoá màn hình để buộc thư giãn nhập liệu"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:57
+msgid "_Models:"
+msgstr "_Mô hình:"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:58
 msgid "_Only accept long keypresses"
 msgstr "C_hỉ chấp nhận phím được bấm lâu"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:58
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:59
+msgid "_Pointer can be controlled using the keypad"
+msgstr "Ch_o phép điều khiển con trỏ bằng vùng số"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:60
 msgid "_Selected layouts:"
 msgstr "_Bố trí được chọn:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:59
-msgid "_Simulate simultanous keypresses"
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:61
+msgid "_Simulate simultaneous keypresses"
 msgstr "_Mô phỏng các phím được bấm đồng thời"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:60
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:62
 msgid "_Speed:"
 msgstr "_Tốc độ:"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:62
-msgid "_Variants:"
-msgstr "_Biến thế:"
-
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:63
-msgid "_Vendors:"
-msgstr "Nhà _sản xuất:"
+msgid "_Type to test settings:"
+msgstr "_Gõ để thử thiết lập ra:"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:64
-msgid "_Work interval lasts:"
-msgstr "Khoảng làm _việc dài:"
+msgid "_Variants:"
+msgstr "_Biến thể:"
 
-# Name: don't translate/Tên: đừng dịch
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:65
-msgid "gtk-close"
-msgstr "gtk-close"
+msgid "_Vendors:"
+msgstr "Nhà _sản xuất:"
 
-# Name: don't translate/Tên: đừng dịch
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:66
-msgid "gtk-help"
-msgstr "gtk-help"
+msgid "_Work interval lasts:"
+msgstr "Khoảng làm _việc dài:"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:67
 msgid "minutes"
@@ -2379,18 +2328,17 @@ msgstr "phút"
 
 #: ../capplets/keyboard/gnome-keyboard-properties-xkb.c:82
 msgid "Unknown"
-msgstr "Không biết"
+msgstr "Không rõ"
+
+#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:305
+msgid "Layout"
+msgstr "Bố trí"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-xkbltadd.c:211
-#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:307
+#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:311
 #: ../capplets/keyboard/gnome-keyboard-properties-xkbot.c:211
 msgid "Default"
 msgstr "Mặc định"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:301
-msgid "Layout"
-msgstr "Bố trí"
-
 #: ../capplets/keyboard/gnome-keyboard-properties-xkbmc.c:169
 msgid "Vendors"
 msgstr "Nhà sản xuất"
@@ -2407,111 +2355,185 @@ msgstr "Bàn phím"
 msgid "Set your keyboard preferences"
 msgstr "Lập các tùy thích cho bàn phím của bạn"
 
-#: ../capplets/localization/localization.desktop.in.in.h:1
-msgid "Language and Location"
-msgstr "Ngôn ngữ và Chỗ"
-
-#: ../capplets/localization/localization.desktop.in.in.h:2
-msgid "Set your language and location preferences"
-msgstr "Đặt các tùy thích về ngôn ngữ và chỗ của bạn"
-
-#: ../capplets/localization/localization.glade.h:1
-msgid ""
-"<i>Region and language changes take effect the next time you log in.</i>"
-msgstr "<i>Các thay đổi về ngôn ngữ và chỗ sẽ có tác động lần kế tiếp bạn đăng nhập.</i>"
-
-#: ../capplets/localization/localization.glade.h:2
-msgid "Localization Preferences"
-msgstr "Tuỳ thích địa phương hoá"
-
-#: ../capplets/localization/localization.glade.h:3
-msgid "Region:"
-msgstr "Vùng:"
-
-#: ../capplets/localization/localization.glade.h:4
-msgid "Selected languages:"
-msgstr "Ngôn ngữ đã chọn:"
-
-#.set the timeout value  label with correct value of timeout
-#: ../capplets/mouse/gnome-mouse-properties.c:126
-#: ../capplets/mouse/gnome-mouse-properties.c:384
-#, c-format
-msgid "%d millisecond"
-msgid_plural "%d milliseconds"
-msgstr[0] "%d mili giây"
+#. Translators: this is the gesture to trigger/choose the click type.
+#. Don't include the prefix "gesture|" in the translation.
+#: ../capplets/mouse/gnome-mouse-accessibility.c:89
+msgid "gesture|Move left"
+msgstr "Di chuyển qua trái"
+
+#. Translators: this is the gesture to trigger/choose the click type.
+#. Don't include the prefix "gesture|" in the translation.
+#: ../capplets/mouse/gnome-mouse-accessibility.c:94
+msgid "gesture|Move right"
+msgstr "Di chuyển qua phải"
+
+#. Translators: this is the gesture to trigger/choose the click type.
+#. Don't include the prefix "gesture|" in the translation.
+#: ../capplets/mouse/gnome-mouse-accessibility.c:99
+msgid "gesture|Move up"
+msgstr "Di chuyển lên"
+
+#. Translators: this is the gesture to trigger/choose the click type.
+#. Don't include the prefix "gesture|" in the translation.
+#: ../capplets/mouse/gnome-mouse-accessibility.c:104
+msgid "gesture|Move down"
+msgstr "Di chuyển xuống"
+
+#. Translators: this is the gesture to trigger/choose the click type.
+#. Don't include the prefix "gesture|" in the translation.
+#: ../capplets/mouse/gnome-mouse-accessibility.c:109
+msgid "gesture|Disabled"
+msgstr "Bị tắt"
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplets/mouse/gnome-mouse-properties.c:443
+msgid "Specify the name of the page to show (general|accessibility)"
+msgstr ""
+"Hãy ghi rõ tên của trang cần hiển thị:\n"
+" • general\t\tchung\n"
+" • accessibility\tkhả năng truy cập."
+
+#: ../capplets/mouse/gnome-mouse-properties.c:452
+msgid "- GNOME Mouse Preferences"
+msgstr "— Tùy thích Con chuột GNOME"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:1
-msgid "<b>Double-Click Timeout </b>"
+msgid "<b>Double-Click Timeout</b>"
 msgstr "<b>Thời hạn nhấp đúp</b>"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:2
 msgid "<b>Drag and Drop</b>"
-msgstr "<b>Kéo và thả</b>"
-
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:3
-msgid "<b>Mouse Orientation</b>"
-msgstr "<b>Hướng chuột</b>"
+msgstr "<b>Kéo và Thả</b>"
 
+#. Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:4
-msgid "<b>Speed</b>"
-msgstr "<b>Tốc độ</b>"
+msgid "<b>Dwell Click</b>"
+msgstr "<b>Nhấn giữ</b>"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:5
-msgid "<i>Fast</i>"
-msgstr "<i>Nhanh</i>"
+msgid "<b>Locate Pointer</b>"
+msgstr "<b>Con trỏ định vị</b>"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:6
-msgid "<i>High</i>"
-msgstr "<i>Cao</i>"
+msgid "<b>Mouse Orientation</b>"
+msgstr "<b>Hướng chuột</b>"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:7
-msgid "<i>Large</i>"
-msgstr "<i>Lớn</i>"
+msgid "<b>Pointer Speed</b>"
+msgstr "<b>Tốc độ Con trò</b>"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:8
-msgid "<i>Low</i>"
-msgstr "<i>Thấp</i>"
+msgid "<b>Simulated Secondary Click</b>"
+msgstr "<b>Cú nhấn thứ hai đã mô phỏng</b>"
 
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:9
-msgid "<i>Slow</i>"
-msgstr "<i>Chậm</i>"
-
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:10
-msgid "<i>Small</i>"
-msgstr "<i>Nhỏ</i>"
+msgid ""
+"<i>To test your double-click settings, try to double-click on the light bulb."
+"</i>"
+msgstr "<i>Để thử thiết lập nhấn đôi, hãy thử nhấn đôi vào bóng đèn.</i>"
 
+#. Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:11
-msgid "Buttons"
-msgstr "Nút"
+msgid ""
+"<i>You can also use the Dwell Click panel applet to choose the click type.</"
+"i>"
+msgstr ""
+"<i>Bạn cũng có thể sử dụng tiểu dụng bảng điều khiển Nhấn Giữ (Dwell Click) "
+"để chọn kiểu cú nhấn.</i>"
+
+#. high sensitivity
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:15
+msgid "<small><i>High</i></small>"
+msgstr "<small><i>Cao</i></small>"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:12
-msgid "Motion"
-msgstr "Chuyển động"
+#. large threshold
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:17
+msgid "<small><i>Large</i></small>"
+msgstr "<small><i>Lớn</i></small>"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:13
+#. low sensitivity
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:21
+msgid "<small><i>Low</i></small>"
+msgstr "<small><i>Thấp</i></small>"
+
+#. small threshold
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:27
+msgid "<small><i>Small</i></small>"
+msgstr "<small><i>Nhỏ</i></small>"
+
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:29
+msgid "Choose type of click _beforehand"
+msgstr "Chọn _sẵn kiểu cú nhấn"
+
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:30
+msgid "Choose type of click with mo_use gestures"
+msgstr "Chọn kiể_u cú nhấn với động tác con chuột"
+
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:33
+msgid "D_ouble click:"
+msgstr "Nhấn đô_i:"
+
+#. click to initiate drag-and-drop (like normally click and hold)
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:35
+msgid "D_rag click:"
+msgstr "Nhấn _kéo:"
+
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:37
 msgid "Mouse Preferences"
-msgstr "Tùy thích con chuột"
+msgstr "Tùy thích Con chuột"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:14
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:38
+msgid "Seco_ndary click:"
+msgstr "Cú _nhấn thứ hai:"
+
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:39
+msgid "Sh_ow position of pointer when the Control key is pressed"
+msgstr "Hiện vị trí c_on trỏ khi phím Control được bấm"
+
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:40
+msgid "Show click type _window"
+msgstr "Hiện cửa _sổ kiểu cú nhấn"
+
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:41
+msgid "Thr_eshold:"
+msgstr "_Ngưỡng:"
+
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:42
 msgid "_Acceleration:"
-msgstr "_Phím tắt:"
+msgstr "_Tăng tốc:"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:15
-msgid "_Left-handed mouse"
-msgstr "Chuột tay _trái"
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:44
+msgid "_Initiate click when stopping pointer movement"
+msgstr "Bắt đầu nhấn kh_i dừng con trỏ di chuyển"
+
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:45
+msgid "_Left-handed"
+msgstr "Tay t_rái"
+
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:46
+msgid "_Motion threshold:"
+msgstr "Ngưỡng di chu_yển:"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:16
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:47
+msgid "_Right-handed"
+msgstr "Tay _phải"
+
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:48
 msgid "_Sensitivity:"
 msgstr "Độ _nhạy:"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:17
-msgid "_Threshold:"
-msgstr "_Ngưỡng:"
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:49
+msgid "_Single click:"
+msgstr "_Cú nhấn đơn:"
 
-#: ../capplets/mouse/gnome-mouse-properties.glade.h:18
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:50
 msgid "_Timeout:"
 msgstr "_Thời hạn:"
 
+#: ../capplets/mouse/gnome-mouse-properties.glade.h:51
+msgid "_Trigger secondary click by holding down the primary button"
+msgstr "_Gây ra cú nhấn phụ bằng cách ấn giữ cái nút chính"
+
 #: ../capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Chuột"
@@ -2529,82 +2551,78 @@ msgid "Set your network proxy preferences"
 msgstr "Đặt tùy thích máy phục vụ ủy nhiệm mạng cho bạn."
 
 #: ../capplets/network/gnome-network-preferences.glade.h:1
-msgid "      "
-msgstr "      "
-
-#: ../capplets/network/gnome-network-preferences.glade.h:2
 msgid "<b>Di_rect internet connection</b>"
 msgstr "<b>Kết nối Mạng t_rực tiếp</b>"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:3
+#: ../capplets/network/gnome-network-preferences.glade.h:2
 msgid "<b>Ignore Host List</b>"
 msgstr "<b>Bỏ qua danh sách máy</b>"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:4
+#: ../capplets/network/gnome-network-preferences.glade.h:3
 msgid "<b>_Automatic proxy configuration</b>"
 msgstr "<b>Cấu hình ủy nhiệm _tự động</b>"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:5
+#: ../capplets/network/gnome-network-preferences.glade.h:4
 msgid "<b>_Manual proxy configuration</b>"
 msgstr "<b>_Tự cấu hình ủy nhiệm</b>"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:6
+#: ../capplets/network/gnome-network-preferences.glade.h:5
 msgid "<b>_Use authentication</b>"
 msgstr "<b>_Sử dụng xác thực</b>"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:7
-msgid "Advanced Configuration"
-msgstr "Cấu hình nâng cao"
-
-#: ../capplets/network/gnome-network-preferences.glade.h:8
+#: ../capplets/network/gnome-network-preferences.glade.h:6
 msgid "Autoconfiguration _URL:"
 msgstr "Địa chỉ _URL cấu hình tự động:"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:9
+#: ../capplets/network/gnome-network-preferences.glade.h:7
 msgid "HTTP Proxy Details"
 msgstr "Chi tiết ủy nhiệm HTTP"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:10
+#: ../capplets/network/gnome-network-preferences.glade.h:8
 msgid "H_TTP proxy:"
 msgstr "Ủy nhiệm _HTTP:"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:11
+#: ../capplets/network/gnome-network-preferences.glade.h:9
+msgid "Ignored Hosts"
+msgstr "Máy đã bỏ qua"
+
+#: ../capplets/network/gnome-network-preferences.glade.h:10
 msgid "Network Proxy Preferences"
 msgstr "Tùy thích máy phục vụ ủy nhiệm mạng"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:12
+#: ../capplets/network/gnome-network-preferences.glade.h:11
 msgid "Port:"
 msgstr "Cổng:"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:13
+#: ../capplets/network/gnome-network-preferences.glade.h:12
 msgid "Proxy Configuration"
 msgstr "Cấu hình ủy nhiệm"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:14
+#: ../capplets/network/gnome-network-preferences.glade.h:13
 msgid "S_ocks host:"
 msgstr "Máy S_OCKS:"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:15
+#: ../capplets/network/gnome-network-preferences.glade.h:14
 msgid "U_sername:"
 msgstr "Tên _người dùng:"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:16
+#: ../capplets/network/gnome-network-preferences.glade.h:15
 msgid "_Details"
 msgstr "_Chi tiết"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:17
+#: ../capplets/network/gnome-network-preferences.glade.h:16
 msgid "_FTP proxy:"
 msgstr "Ủy nhiệm _FTP:"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:18
+#: ../capplets/network/gnome-network-preferences.glade.h:17
 msgid "_Password:"
 msgstr "_Mật khẩu:"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:19
+#: ../capplets/network/gnome-network-preferences.glade.h:18
 msgid "_Secure HTTP proxy:"
 msgstr "Ủy nhiệm _bảo mật HTTP:"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:20
+#: ../capplets/network/gnome-network-preferences.glade.h:19
 msgid "_Use the same proxy for all protocols"
 msgstr "_Dùng cùng uỷ nhiệm mạng cho mọi giao thức"
 
@@ -2622,54 +2640,54 @@ msgstr "Điều khiển âm lượng lạ %d"
 msgid "Failed to construct test pipeline for '%s'"
 msgstr "Lỗi tạo ống dẫn thử nghiệm '%s'"
 
-#: ../capplets/sound/sound-properties-capplet.c:325
-#: ../capplets/sound/sound-properties-capplet.c:378
+#: ../capplets/sound/sound-properties-capplet.c:326
+#: ../capplets/sound/sound-properties-capplet.c:447
 msgid "Not connected"
 msgstr "Chưa kết nối"
 
-#: ../capplets/sound/sound-properties-capplet.c:661
+#: ../capplets/sound/sound-properties-capplet.c:785
 msgid "Autodetect"
 msgstr "Tự dò tìm"
 
-#: ../capplets/sound/sound-properties-capplet.c:666
-#: ../capplets/sound/sound-properties-capplet.c:667
+#: ../capplets/sound/sound-properties-capplet.c:790
+#: ../capplets/sound/sound-properties-capplet.c:791
 msgid "ALSA - Advanced Linux Sound Architecture"
 msgstr "ALSA - Advanced Linux Sound Architecture"
 
-#: ../capplets/sound/sound-properties-capplet.c:668
+#: ../capplets/sound/sound-properties-capplet.c:792
 msgid "Artsd - ART Sound Daemon"
 msgstr "Artsd - ART Sound Daemon"
 
-#: ../capplets/sound/sound-properties-capplet.c:669
-#: ../capplets/sound/sound-properties-capplet.c:670
+#: ../capplets/sound/sound-properties-capplet.c:793
+#: ../capplets/sound/sound-properties-capplet.c:794
 msgid "ESD - Enlightened Sound Daemon"
 msgstr "ESD - Enlightened Sound Daemon"
 
-#: ../capplets/sound/sound-properties-capplet.c:671
-#: ../capplets/sound/sound-properties-capplet.c:672
+#: ../capplets/sound/sound-properties-capplet.c:797
+#: ../capplets/sound/sound-properties-capplet.c:800
 msgid "OSS - Open Sound System"
 msgstr "OSS - Open Sound System"
 
-#: ../capplets/sound/sound-properties-capplet.c:673
-#: ../capplets/sound/sound-properties-capplet.c:674
+#: ../capplets/sound/sound-properties-capplet.c:802
+#: ../capplets/sound/sound-properties-capplet.c:803
 msgid "PulseAudio Sound Server"
 msgstr "PulseAudio Sound Server"
 
-#: ../capplets/sound/sound-properties-capplet.c:675
+#: ../capplets/sound/sound-properties-capplet.c:804
 msgid "Test Sound"
 msgstr "Thử nghiệm âm thanh"
 
-#: ../capplets/sound/sound-properties-capplet.c:676
+#: ../capplets/sound/sound-properties-capplet.c:805
 msgid "Silence"
 msgstr "Im lặng"
 
-#: ../capplets/sound/sound-properties-capplet.c:1043
+#: ../capplets/sound/sound-properties-capplet.c:1172
 msgid "- GNOME Sound Preferences"
-msgstr "- Tùy thích âm thanh"
+msgstr "— Tùy thích Âm thanh GNOME"
 
 #: ../capplets/sound/sound-properties.glade.h:1
 msgid "<b>Audio Conferencing</b>"
-msgstr "<b>Hội thảo âm thanh</b>"
+msgstr "<b>Hội thảo Âm thanh</b>"
 
 #: ../capplets/sound/sound-properties.glade.h:2
 msgid "<b>Default Mixer Tracks</b>"
@@ -2689,15 +2707,15 @@ msgstr "<span weight=\"bold\" size=\"x-large\">Đang thử...</span>"
 
 #: ../capplets/sound/sound-properties.glade.h:6
 msgid "Click OK to finish."
-msgstr "Nhấn vào Được để làm xong."
+msgstr "Nhấn vào nút OK để kết thúc."
 
 #: ../capplets/sound/sound-properties.glade.h:7
 msgid "Devices"
 msgstr "Thiết bị"
 
 #: ../capplets/sound/sound-properties.glade.h:8
-msgid "E_nable software sound mixing (ESD)"
-msgstr "Bật hoà tiế_ng kiểu phần mềm (ESD)"
+msgid "E_nable software sound mixing"
+msgstr "Bật hoà tiế_ng kiểu phần mềm"
 
 #: ../capplets/sound/sound-properties.glade.h:9
 msgid "Flash _entire screen"
@@ -2715,7 +2733,8 @@ msgstr "_Phát lại âm thanh:"
 msgid ""
 "Select the device and tracks to control with the keyboard. Use the Shift and "
 "Control keys to select multiple tracks if required."
-msgstr "Chọn thiết bị và rãnh cần điều khiển bằng bàn phím. Dùng phím Shift và "
+msgstr ""
+"Chọn thiết bị và rãnh cần điều khiển bằng bàn phím. Dùng phím Shift và "
 "Control để chọn nhiều rãnh nếu cần."
 
 #: ../capplets/sound/sound-properties.glade.h:13
@@ -2768,10 +2787,11 @@ msgstr "Bíp hệ thống có kiểu trực _quan"
 
 #: ../capplets/windows/gnome-window-properties.c:344
 msgid "Cannot start the preferences application for your window manager"
-msgstr "Không thể khởi chạy ứng dụng các tùy thích cho trình quản lý cửa sổ của bạn"
+msgstr ""
+"Không thể khởi chạy ứng dụng các tùy thích cho trình quản lý cửa sổ của bạn"
 
 # Name: don't translate / Tên: đừng dịch
-#.translators: this is the Control key
+#. translators: this is the Control key
 #: ../capplets/windows/gnome-window-properties.c:602
 msgid "C_ontrol"
 msgstr "C_ontrol"
@@ -2831,6 +2851,10 @@ msgstr "_Hiện cửa sổ được chọn sau một khoảng thời gian"
 msgid "_Select windows when the mouse moves over them"
 msgstr "Chọn _cửa sổ khi chuột di chuyển trên chúng"
 
+#: ../capplets/windows/gnome-window-properties.glade.h:10
+msgid "seconds"
+msgstr "giây"
+
 #: ../capplets/windows/window-properties.desktop.in.in.h:1
 msgid "Set your window properties"
 msgstr "Đặt thuộc tính cửa sổ"
@@ -2839,323 +2863,37 @@ msgstr "Đặt thuộc tính cửa sổ"
 msgid "Windows"
 msgstr "Cửa sổ"
 
-#: ../gnome-settings-daemon/actions/acme.glade.h:1
-msgid "Volume"
-msgstr "Âm lượng"
-
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:463
-msgid "Slow Keys Alert"
-msgstr "Báo động phím chậm"
-
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:464
-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."
-msgstr "Bạn vừa ấn giữ phím Shift trong 8 giây. Đây là phím tắt của tính năng Phím "
-"chậm, có thể tác động đến cách hoạt động của bàn phím."
-
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:466
-msgid "Do you want to activate Slow Keys?"
-msgstr "Bạn có muốn kích hoạt Phím chậm không?"
-
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:467
-msgid "Do you want to deactivate Slow Keys?"
-msgstr "Bạn có muốn bỏ kích hoạt Phím chậm không?"
-
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:468
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:485
-msgid "_Activate"
-msgstr "_Kích hoạt"
-
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:468
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:485
-msgid "_Deactivate"
-msgstr "_Tắt"
-
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:469
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:486
-msgid "Do_n't activate"
-msgstr "_Đừng kích hoạt"
-
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:469
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:486
-msgid "Do_n't deactivate"
-msgstr "_Đừng tắt"
-
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:478
-msgid "Sticky Keys Alert"
-msgstr "Báo động Phím dính"
-
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:479
-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."
-msgstr "Bạn vừa ấn phím Shift 5 lần trong một dòng. Đây là phím tắt của tính năng "
-"phím dính, có thể tác động đến cách hoạt động của bàn phím."
-
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:481
-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 "
-"keyboard works."
-msgstr "Bạn vừa ấn hai phím cùng lúc, hoặc ấn phím Shift 5 lần trong một dòng. Phím "
-"tắt này tắt tính năng phím Dính, mà có thể tác động đến cách hoạt động của "
-"bàn phím."
-
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:483
-msgid "Do you want to activate Sticky Keys?"
-msgstr "Bạn có muốn kích hoạt Phím dính không?"
-
-#: ../gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:484
-msgid "Do you want to deactivate Sticky Keys?"
-msgstr "Bạn có muốn bỏ kích hoạt Phím dính không?"
-
-#: ../gnome-settings-daemon/gnome-settings-font.c:150
-#, c-format
-msgid ""
-"Cannot create the directory \"%s\".\n"
-"This is needed to allow changing the mouse pointer theme."
-msgstr "Không thể tạo thư mục « %s ».\n"
-"Việc này cần thiết để thay đổi sắc thái con trỏ chuột."
-
-#: ../gnome-settings-daemon/gnome-settings-font.c:171
-#, c-format
-msgid ""
-"Cannot create the directory \"%s\".\n"
-"This is needed to allow changing cursors."
-msgstr "Không thể tạo thư mục « %s ».\n"
-"Việc này là cần thiết để thay đổi con trỏ."
-
-#: ../gnome-settings-daemon/gnome-settings-keybindings.c:275
-#, c-format
-msgid "Key Binding (%s) has its action defined multiple times\n"
-msgstr "Tổ hợp phím (%s) có định nghĩa hành động cho nó nhiều lần\n"
-
-#: ../gnome-settings-daemon/gnome-settings-keybindings.c:281
-#, c-format
-msgid "Key Binding (%s) has its binding defined multiple times\n"
-msgstr "Tổ hợp phím (%s) có định nghĩa tổ hợp cho nó nhiều lần\n"
-
-#: ../gnome-settings-daemon/gnome-settings-keybindings.c:289
-#, c-format
-msgid "Key Binding (%s) is incomplete\n"
-msgstr "Tổ hợp phím (%s) chưa hoàn chỉnh\n"
-
-#: ../gnome-settings-daemon/gnome-settings-keybindings.c:316
-#, c-format
-msgid "Key Binding (%s) is invalid\n"
-msgstr "Tổ hợp phím (%s) không hợp lệ\n"
-
-#: ../gnome-settings-daemon/gnome-settings-keybindings.c:353
-#, c-format
-msgid "It seems that another application already has access to key '%u'."
-msgstr "Dường như có ứng dụng khác đã truy cập phím « %u »."
-
-#: ../gnome-settings-daemon/gnome-settings-keybindings.c:418
-#, c-format
-msgid "Key Binding (%s) is already in use\n"
-msgstr "Tổ hợp phím (%s) đang được dùng\n"
-
-#: ../gnome-settings-daemon/gnome-settings-keybindings.c:489
-#, c-format
-msgid ""
-"Error while trying to run (%s)\n"
-"which is linked to the key (%s)"
-msgstr "Gặp lỗi khi thử chạy (%s)\n"
-"mà được liên kết tới phím (%s)"
-
-#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:98
-#, c-format
-msgid ""
-"Error activating XKB configuration.\n"
-"It can happen under various circumstances:\n"
-"- a bug in libxklavier library\n"
-"- a bug in X server (xkbcomp, xmodmap utilities)\n"
-"- X server with incompatible libxkbfile implementation\n"
-"\n"
-"X server version data:\n"
-"%s\n"
-"%d\n"
-"%s\n"
-"If you report this situation as a bug, please include:\n"
-"- The result of <b>%s</b>\n"
-"- The result of <b>%s</b>"
-msgstr "Gặp lỗi khi kích hoạt cấu hình XKB.\n"
-"Lỗi này có lẽ là:.\n"
-"• lỗi trong thư viên « libxklavier »\n"
-"• lỗi trong trình phục vụ X (tiện ích « xkbcomp », « xmodmap »)\n"
-"• trình phục vụ X mà thực hiện « libxkbfile » một cách không tương thích\n"
-"\n"
-"Dữ liệu phiên bản trình phục vụ X:\n"
-"%s\n"
-"%d\n"
-"%s\n"
-"Nếu bạn báo lỗi cho trường hợp này, vui lòng bao gồm:\n"
-"• Kết quả của <b>%s</b>\n"
-"• Kết quả của <b>%s</b>"
-
-#: ../gnome-settings-daemon/gnome-settings-keyboard-xkb.c:112
-msgid ""
-"You are using XFree 4.3.0.\n"
-"There are known problems with complex XKB configurations.\n"
-"Try using a simpler configuration or taking a fresher version of XFree "
-"software."
-msgstr "Bạn đang dùng XFree phiên bản 4.3.0,\n"
-"mà có một số vấn đề đã biết với các cấu hình XKB phức tạp.\n"
-"Hãy thử dùng cấu hình đơn giản hơn hoặc sử dụng một phiên bản phần mềm XFree "
-"mới hơn."
-
-#: ../gnome-settings-daemon/gnome-settings-multimedia-keys.c:187
-msgid ""
-"Could not get default terminal. Verify that your default terminal command is "
-"set and points to a valid application."
-msgstr "Không thể lấy thiết bị cuối mặc định. Hãy kiểm tra xem lệnh thiết bị cuối "
-"mặc định đã được đặt và chỉ tới ứng dụng hợp lệ."
-
-#: ../gnome-settings-daemon/gnome-settings-multimedia-keys.c:215
-#, c-format
-msgid ""
-"Couldn't execute command: %s\n"
-"Verify that this is a valid command."
-msgstr "Không thể thực hiện lệnh: %s\n"
-"Hãy kiểm tra xem nó là lệnh hợp lệ."
-
-#: ../gnome-settings-daemon/gnome-settings-multimedia-keys.c:230
-msgid ""
-"Couldn't put the machine to sleep.\n"
-"Verify that the machine is correctly configured."
-msgstr "Không thể đặt máy tính vào tình trạng ngủ.\n"
-"Hãy kiểm tra xem máy có được cấu hình đúng hay không."
-
-#: ../gnome-settings-daemon/gnome-settings-screensaver.c:190
-#, c-format
-msgid ""
-"There was an error starting up the screensaver:\n"
-"\n"
-"%s\n"
-"\n"
-"Screensaver functionality will not work in this session."
-msgstr "Gặp lỗi khi khởi chạy trình bảo vệ màn hình:\n"
-"\n"
-"%s\n"
-"\n"
-"Tính năng trình bảo vệ màn hình sẽ không làm việc trong phiên này."
-
-#: ../gnome-settings-daemon/gnome-settings-screensaver.c:200
-msgid "_Do not show this message again"
-msgstr "Đừn_g hiện thông điệp này lần nữa"
-
-#: ../gnome-settings-daemon/gnome-settings-sound.c:199
-#, c-format
-msgid "Couldn't load sound file %s as sample %s"
-msgstr "Không thể tải tập tin âm thanh « %s » làm mẫu « %s »"
-
-#: ../gnome-settings-daemon/gnome-settings-xrdb.c:243
-#: ../gnome-settings-daemon/gnome-settings-xrdb.c:291
-msgid "Cannot determine user's home directory"
-msgstr "Không thể xác định thư mục chính của người dùng"
-
-#: ../gnome-settings-daemon/gnome-settings-xsettings.c:303
-#, c-format
-msgid "GConf key %s set to type %s but its expected type was %s\n"
-msgstr "Khoá GConf « %s » dùng kiểu « %s » nhưng lẽ ra phải dùng kiểu « %s »\n"
-
-#: ../gnome-settings-daemon/modmap-dialog.glade.h:1
-msgid "A_vailable files:"
-msgstr "Tập tin _hiện có :"
-
-#: ../gnome-settings-daemon/modmap-dialog.glade.h:2
-msgid "Do _not show this warning again."
-msgstr "Đừn_g hiện cảnh báo này lần nữa."
-
-#: ../gnome-settings-daemon/modmap-dialog.glade.h:3
-msgid "Load modmap files"
-msgstr "Tải những tập tin « modmap »"
-
-#: ../gnome-settings-daemon/modmap-dialog.glade.h:4
-msgid "Would you like to load the modmap file(s)?"
-msgstr "Bạn có muốn tải tập tin những « modmap » không?"
-
-#: ../gnome-settings-daemon/modmap-dialog.glade.h:5
-msgid "_Load"
-msgstr "_Tải"
-
-#: ../gnome-settings-daemon/modmap-dialog.glade.h:6
-msgid "_Loaded files:"
-msgstr "_Tập tin đã tải:"
-
-#: ../gnome-settings-daemon/reaper.c:103
-msgid "Error creating signal pipe."
-msgstr "Gặp lỗi khi tạo ống dẫn tin hiệu."
-
-#: ../libbackground/applier.c:255
-msgid "Type"
-msgstr "Kiểu"
-
-#: ../libbackground/applier.c:256
-msgid ""
-"Type of bg_applier: BG_APPLIER_ROOT for root window or BG_APPLIER_PREVIEW "
-"for preview"
-msgstr "Kiểu « bg_applier »: « BG_APPLIER_ROOT » cho cửa sổ gốc hoặc « "
-"BG_APPLIER_PREVIEW » cho vùng xem thử"
-
-#: ../libbackground/applier.c:263
-msgid "Preview Width"
-msgstr "Rộng ô xem thử"
-
-#: ../libbackground/applier.c:264
-msgid "Width if applier is a preview: Defaults to 64."
-msgstr "Chiều rộng nếu applier (bộ áp dụng) là ô xem thử. Mặc định là 64."
-
-#: ../libbackground/applier.c:271
-msgid "Preview Height"
-msgstr "Cao ô xem thử"
-
-#: ../libbackground/applier.c:272
-msgid "Height if applier is a preview: Defaults to 48."
-msgstr "Chiều cao nếu applier (bộ áp dụng) là ô xem thử. Mặc định là 48."
-
-#: ../libbackground/applier.c:279
-msgid "Screen"
-msgstr "Màn hình"
-
-#: ../libbackground/applier.c:280
-msgid "Screen on which BGApplier is to draw"
-msgstr "Màn hình để vẽ BGApplier (áp dụng nền)"
-
-#.make start action
-#: ../libslab/application-tile.c:369
+#. make start action
+#: ../libslab/application-tile.c:372
 #, c-format
 msgid "<b>Start %s</b>"
 msgstr "<b>Khởi động %s</b>"
 
-#: ../libslab/application-tile.c:388
+#: ../libslab/application-tile.c:391 ../libslab/bookmark-agent.c:1059
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: ../libslab/application-tile.c:435
+#: ../libslab/application-tile.c:438
 msgid "Upgrade"
 msgstr "Nâng cấp"
 
-#: ../libslab/application-tile.c:450
+#: ../libslab/application-tile.c:453
 msgid "Uninstall"
 msgstr "Huỷ cài đặt"
 
-#: ../libslab/application-tile.c:777
-#: ../libslab/document-tile.c:528
+#: ../libslab/application-tile.c:780 ../libslab/document-tile.c:760
 msgid "Remove from Favorites"
 msgstr "Gỡ khỏi Yêu thích"
 
-#: ../libslab/application-tile.c:779
-#: ../libslab/document-tile.c:530
+#: ../libslab/application-tile.c:782 ../libslab/document-tile.c:762
 msgid "Add to Favorites"
 msgstr "Thêm vào Yêu thích"
 
-#: ../libslab/application-tile.c:864
+#: ../libslab/application-tile.c:867
 msgid "Remove from Startup Programs"
 msgstr "Gỡ khỏi Chương trình Khởi động"
 
-#: ../libslab/application-tile.c:866
+#: ../libslab/application-tile.c:869
 msgid "Add to Startup Programs"
 msgstr "Thêm vào Chương trình Khởi động"
 
@@ -3165,7 +2903,8 @@ msgid ""
 "<span size=\"large\"><b>No matches found.</b> </span><span>\n"
 "\n"
 " Your filter \"<b>%s</b>\" does not match any items.</span>"
-msgstr "<span size=\"large\"><b>Không tìm thấy.</b> </span><span>\n"
+msgstr ""
+"<span size=\"large\"><b>Không tìm thấy.</b> </span><span>\n"
 "\n"
 " Tiêu chuẩn lọc \"<b>%s</b>\" của bạn không trả về kết quả nào.</span>"
 
@@ -3173,102 +2912,130 @@ msgstr "<span size=\"large\"><b>Không tìm thấy.</b> </span><span>\n"
 msgid "Other"
 msgstr "Khác"
 
-#: ../libslab/bookmark-agent.c:1034
+#: ../libslab/bookmark-agent.c:1061
+msgid "Lock Screen"
+msgstr "Khoá màn hình"
+
+#: ../libslab/bookmark-agent.c:1063 ../libsounds/sound-view.c:45
+msgid "Logout"
+msgstr "Đăng xuất"
+
+#: ../libslab/bookmark-agent.c:1065
+msgid "Shutdown"
+msgstr "Tắt máy"
+
+#: ../libslab/bookmark-agent.c:1090
 msgid "New Spreadsheet"
 msgstr "Bảng tính mới"
 
-#: ../libslab/bookmark-agent.c:1038
+#: ../libslab/bookmark-agent.c:1095
 msgid "New Document"
 msgstr "Tài liệu mới"
 
-#: ../libslab/bookmark-agent.c:1088
+#: ../libslab/bookmark-agent.c:1147
 msgid "Home"
 msgstr "Nhà"
 
-#: ../libslab/bookmark-agent.c:1104
+#: ../libslab/bookmark-agent.c:1152
+msgid "Documents"
+msgstr "Tài liệu"
+
+#: ../libslab/bookmark-agent.c:1165
 msgid "File System"
-msgstr "Hệ thống tập tin"
+msgstr "Hệ thống Tập tin"
 
-#: ../libslab/bookmark-agent.c:1108
+#: ../libslab/bookmark-agent.c:1169
 msgid "Network Servers"
 msgstr "Máy phục vụ mạng"
 
-#: ../libslab/bookmark-agent.c:1137
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:25
+#: ../libslab/bookmark-agent.c:1198
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#.make open with default action
+#. make open with default action
 #: ../libslab/directory-tile.c:170
+#, c-format
 msgid "<b>Open</b>"
 msgstr "<b>Mở</b>"
 
-#.make rename action
-#: ../libslab/directory-tile.c:189
-#: ../libslab/document-tile.c:234
+#. make rename action
+#: ../libslab/directory-tile.c:189 ../libslab/document-tile.c:242
 msgid "Rename..."
-msgstr "Đổi tên..."
+msgstr "Thay tên..."
 
-#: ../libslab/directory-tile.c:203
-#: ../libslab/directory-tile.c:212
-#: ../libslab/document-tile.c:248
-#: ../libslab/document-tile.c:257
+#: ../libslab/directory-tile.c:203 ../libslab/directory-tile.c:212
+#: ../libslab/document-tile.c:256 ../libslab/document-tile.c:265
 msgid "Send To..."
-msgstr "Gửi đi..."
+msgstr "Gửi cho..."
 
-#.make move to trash action
-#: ../libslab/directory-tile.c:227
-#: ../libslab/document-tile.c:283
+#. make move to trash action
+#: ../libslab/directory-tile.c:227 ../libslab/document-tile.c:291
 msgid "Move to Trash"
 msgstr "Chuyển vào Sọt rác"
 
-#: ../libslab/directory-tile.c:237
-#: ../libslab/directory-tile.c:450
-#: ../libslab/document-tile.c:293
-#: ../libslab/document-tile.c:641
+#: ../libslab/directory-tile.c:237 ../libslab/directory-tile.c:450
+#: ../libslab/document-tile.c:301 ../libslab/document-tile.c:873
 msgid "Delete"
 msgstr "Xoá"
 
-#: ../libslab/directory-tile.c:575
-#: ../libslab/document-tile.c:813
+#: ../libslab/directory-tile.c:575 ../libslab/document-tile.c:1045
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "Bạn có chắc muốn xoá hoàn toàn « %s » không?"
 
-#: ../libslab/directory-tile.c:580
-#: ../libslab/document-tile.c:817
+#: ../libslab/directory-tile.c:580 ../libslab/document-tile.c:1049
 msgid "If you delete an item, it is permanently lost."
 msgstr "Xoá mục thì nó bị mất hoàn toàn."
 
-#: ../libslab/document-tile.c:155
-msgid "Edited %m/%d/%Y"
-msgstr "Sửa %d/%m/%Y"
-
-#: ../libslab/document-tile.c:195
+#: ../libslab/document-tile.c:203
 #, c-format
 msgid "<b>Open with \"%s\"</b>"
-msgstr "<b>Mở bằng \"%s\"</b>"
+msgstr "<b>Mở bằng « %s »</b>"
 
-#: ../libslab/document-tile.c:207
+#: ../libslab/document-tile.c:215
 msgid "Open with Default Application"
 msgstr "Mở bằng ứng dụng mặc định"
 
-#: ../libslab/document-tile.c:218
+#: ../libslab/document-tile.c:226
 msgid "Open in File Manager"
 msgstr "Mở trong Trình quản lý tập tin"
 
-#: ../libslab/libslab-bookmarkfile.c:700
-#: ../libslab/libslab-bookmarkfile.c:777
-#: ../libslab/libslab-bookmarkfile.c:856
-#: ../libslab/libslab-bookmarkfile.c:903
+#: ../libslab/document-tile.c:656
+msgid "?"
+msgstr "?"
+
+#: ../libslab/document-tile.c:663
+msgid "%l:%M %p"
+msgstr "%l:%M %p"
+
+#: ../libslab/document-tile.c:671
+msgid "Today %l:%M %p"
+msgstr "Hôm nay %l:%M %p"
+
+#: ../libslab/document-tile.c:681
+msgid "Yesterday %l:%M %p"
+msgstr "Hôm qua %l:%M %p"
+
+#: ../libslab/document-tile.c:693
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
+
+#: ../libslab/document-tile.c:701
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: ../libslab/document-tile.c:703
+msgid "%b %d %Y"
+msgstr "%b %d %Y"
+
+#: ../libslab/libslab-bookmarkfile.c:700 ../libslab/libslab-bookmarkfile.c:777
+#: ../libslab/libslab-bookmarkfile.c:856 ../libslab/libslab-bookmarkfile.c:903
 #, c-format
 msgid "Unexpected attribute '%s' for element '%s'"
 msgstr "Gặp thuộc tính bất thường « %s » cho yếu tố « %s »"
 
-#: ../libslab/libslab-bookmarkfile.c:711
-#: ../libslab/libslab-bookmarkfile.c:788
-#: ../libslab/libslab-bookmarkfile.c:798
-#: ../libslab/libslab-bookmarkfile.c:914
+#: ../libslab/libslab-bookmarkfile.c:711 ../libslab/libslab-bookmarkfile.c:788
+#: ../libslab/libslab-bookmarkfile.c:798 ../libslab/libslab-bookmarkfile.c:914
 #, c-format
 msgid "Attribute '%s' of element '%s' not found"
 msgstr "Không tìm thấy thuộc tính « %s » của yếu tố « %s »"
@@ -3290,6 +3057,7 @@ msgid "Unexpected tag '%s' inside '%s'"
 msgstr "Gặp thẻ bất thường « %s » bên trong « %s »"
 
 #: ../libslab/libslab-bookmarkfile.c:1929
+#, c-format
 msgid "No valid bookmark file found in data dirs"
 msgstr "Không tìm thấy tập tin liên kết lưu hợp lệ trong các thư mục dữ liệu"
 
@@ -3342,7 +3110,7 @@ msgstr "Không có ứng dụng tên « %s » đã đăng ký liên kết lưu c
 
 #: ../libslab/search-bar.c:255
 msgid "Find Now"
-msgstr "Tìm"
+msgstr "Tìm ngay"
 
 #: ../libslab/system-tile.c:128
 #, c-format
@@ -3350,6 +3118,7 @@ msgid "<b>Open %s</b>"
 msgstr "<b>Mở %s</b>"
 
 #: ../libslab/system-tile.c:141
+#, c-format
 msgid "Remove from System Items"
 msgstr "Gỡ bỏ ra Mục hệ thống"
 
@@ -3357,10 +3126,6 @@ msgstr "Gỡ bỏ ra Mục hệ thống"
 msgid "Login"
 msgstr "Đăng nhập"
 
-#: ../libsounds/sound-view.c:45
-msgid "Logout"
-msgstr "Đăng xuất"
-
 #: ../libsounds/sound-view.c:46
 msgid "Boing"
 msgstr "Bôing"
@@ -3389,7 +3154,8 @@ msgstr "Chưa lập âm thanh cho dữ kiện này."
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package for a set of default sounds."
-msgstr "Không có tập tin âm thanh cho dữ kiện này.\n"
+msgstr ""
+"Không có tập tin âm thanh cho dữ kiện này.\n"
 "Bạn có thể muốn cài đặt gói phần mềm « gnome-audio »\n"
 "chứa các tập hợp âm thanh mặc định."
 
@@ -3401,16 +3167,16 @@ msgstr "Tập tin âm thanh cho sự kiện này không tồn tại."
 msgid "Select Sound File"
 msgstr "Chọn tập tin âm thanh"
 
-#: ../libsounds/sound-view.c:203
+#: ../libsounds/sound-view.c:210
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Tập tin « %s » không phải là tập tin « .wav » hợp lệ."
 
-#: ../libsounds/sound-view.c:264
+#: ../libsounds/sound-view.c:271
 msgid "Select sound file..."
 msgstr "Chọn tập tin âm thanh..."
 
-#: ../libsounds/sound-view.c:366
+#: ../libsounds/sound-view.c:373
 msgid "System Sounds"
 msgstr "Âm thanh hệ thống"
 
@@ -3419,204 +3185,30 @@ msgstr "Âm thanh hệ thống"
 msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr "Trình quản lý cửa sổ « %s » chưa đăng ký công cụ cấu hình\n"
 
-#: ../libwindow-settings/metacity-window-manager.c:390
+#: ../libwindow-settings/metacity-window-manager.c:402
 msgid "Maximize"
 msgstr "Cực đại hóa"
 
-#: ../libwindow-settings/metacity-window-manager.c:391
+#: ../libwindow-settings/metacity-window-manager.c:403
+msgid "Maximize Vertically"
+msgstr "Phóng to theo chiều dọc"
+
+#: ../libwindow-settings/metacity-window-manager.c:404
+msgid "Maximize Horizontally"
+msgstr "Phóng to theo chiều ngang"
+
+#: ../libwindow-settings/metacity-window-manager.c:405
 msgid "Minimize"
 msgstr "Thu nhỏ"
 
-#: ../libwindow-settings/metacity-window-manager.c:392
+#: ../libwindow-settings/metacity-window-manager.c:406
 msgid "Roll up"
 msgstr "Cuộn lên"
 
-#: ../libwindow-settings/metacity-window-manager.c:393
+#: ../libwindow-settings/metacity-window-manager.c:407
 msgid "None"
 msgstr "Không có"
 
-#: ../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 "Nếu true (đúng) thì bộ xử lý MIME cho « text/plain » (nhập thô) và « text/* "
-"» (bất cứ kiểu văn bản nào) sẽ được giữ cho đồng bộ"
-
-#: ../schemas/apps_gnome_settings_daemon_default_editor.schemas.in.h:2
-msgid "Sync text/plain and text/* handlers"
-msgstr "Đồng bộ hóa bộ xử lý « text/plain » và « text/* »"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:1
-msgid "E-mail"
-msgstr "Thư điện tử"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:2
-msgid "E-mail's shortcut."
-msgstr "Phím tắt thư điện tử."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:3
-msgid "Eject"
-msgstr "Đẩy ra"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:4
-msgid "Eject's shortcut."
-msgstr "Phím tắt đẩy ra."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:5
-msgid "Home folder"
-msgstr "Thư mục chính"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:6
-msgid "Home folder's shortcut."
-msgstr "Phím tắt thư mục chính."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:7
-msgid "Launch calculator"
-msgstr "Khởi chạy bàn tính"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:8
-msgid "Launch calculator's shortcut"
-msgstr "Phím tắt khởi chạy bàn tính"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:9
-msgid "Launch help browser"
-msgstr "Khởi chạy bộ duyệt trợ giúp"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:10
-msgid "Launch help browser's shortcut."
-msgstr "Phím tắt khởi chạy trình duyệt trợ giúp."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:11
-msgid "Launch web browser"
-msgstr "Khởi chạy bộ duyệt Mạng"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:12
-msgid "Launch web browser's shortcut."
-msgstr "Phím tắt khởi chạy trình duyệt Mạng."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:13
-msgid "Lock screen"
-msgstr "Khoá màn hình"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:14
-msgid "Lock screen's shortcut."
-msgstr "Phím tắt khoá màn hình."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:15
-msgid "Log out"
-msgstr "Đăng xuất"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:16
-msgid "Log out's shortcut."
-msgstr "Phím tắt đăng xuất."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:17
-msgid "Media player"
-msgstr "Bộ Phát Ảnh/Nhạc"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:18
-msgid "Media player key's shortcut."
-msgstr "Phím tắt của Bộ Phát Ảnh/Nhạc."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:19
-msgid "Next track key's shortcut."
-msgstr "Phím tắt cho Rãnh kế."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:20
-msgid "Pause"
-msgstr "Tạm dừng"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:21
-msgid "Pause key's shortcut."
-msgstr "Phím tắt cho Tạm dừng."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:22
-msgid "Play (or play/pause)"
-msgstr "Phát (hay phát/tạm dừng)"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:23
-msgid "Play (or play/pause) key's shortcut."
-msgstr "Phím tắt cho Phát (hay phát/tạm dừng)."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:24
-msgid "Previous track key's shortcut."
-msgstr "Phím tắt cho Rãnh trước."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:26
-msgid "Search's shortcut."
-msgstr "Phím tắt tìm kiếm."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:27
-msgid "Skip to next track"
-msgstr "Nhảy tới rãnh kế"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:28
-msgid "Skip to previous track"
-msgstr "Nhảy về rãnh trước"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:29
-msgid "Sleep"
-msgstr "Ngủ"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:30
-msgid "Sleep's shortcut."
-msgstr "Phím tắt lập tính trạng ngủ."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:31
-msgid "Stop playback key"
-msgstr "Phím dừng phát lại"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:32
-msgid "Stop playback key's shortcut."
-msgstr "Phím tắt cho Dừng phát lại."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:33
-msgid "Volume down"
-msgstr "Giảm âm lượng"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:34
-msgid "Volume down's shortcut."
-msgstr "Phím tắt giảm âm lượng."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:35
-msgid "Volume mute"
-msgstr "Câm âm lượng"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:36
-msgid "Volume mute's shortcut."
-msgstr "Phím tắt câm âm lượng."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:37
-msgid "Volume step"
-msgstr "Mức âm lượng"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:38
-msgid "Volume step as percentage of volume."
-msgstr "Mức phần trăm âm lượng."
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:39
-msgid "Volume up"
-msgstr "Tăng âm lượng"
-
-#: ../schemas/apps_gnome_settings_daemon_keybindings.schemas.in.h:40
-msgid "Volume up's shortcut."
-msgstr "Phím tắt tăng âm lượng."
-
-#: ../schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:1
-msgid "Display a dialog when there are errors running the screensaver"
-msgstr "Hiển thị hộp thoại khi có lỗi chạy trình bảo vệ màn hình"
-
-#: ../schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:2
-msgid "Run screensaver at login"
-msgstr "Chạy trình bảo vệ màn hình khi đăng nhập"
-
-#: ../schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:3
-msgid "Show Startup Errors"
-msgstr "Hiển thị các lỗi khởi động"
-
-#: ../schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:4
-msgid "Start screensaver"
-msgstr "Bắt đầu chạy trình bảo vệ màn hình"
-
 #: ../shell/control-center.c:62
 #, c-format
 msgid "key not found [%s]\n"
@@ -3624,7 +3216,7 @@ msgstr "không tìm thấy khoá [%s]\n"
 
 #: ../shell/control-center.c:159
 msgid "Filter"
-msgstr "Bộ lọc"
+msgstr "Lọc"
 
 #: ../shell/control-center.c:159
 msgid "Groups"
@@ -3634,8 +3226,7 @@ msgstr "Nhóm"
 msgid "Common Tasks"
 msgstr "Nhiệm vụ thường gặp"
 
-#: ../shell/control-center.c:163
-#: ../shell/gnomecc.desktop.in.in.h:1
+#: ../shell/control-center.c:163 ../shell/gnomecc.desktop.in.in.h:1
 #: ../shell/gnomecc.directory.in.h:1
 msgid "Control Center"
 msgstr "Trung tâm điều khiển"
@@ -3646,63 +3237,70 @@ msgstr "Đóng trung tâm điều khiển khi kích hoạt một nhiệm vụ"
 
 #: ../shell/control-center.schemas.in.h:2
 msgid "Exit shell on add or remove action performed"
-msgstr "Thoát khỏi hệ vỏ khi thực hiện thêm hoặc gỡ bỏ"
+msgstr "Thoát khỏi trình bao khi làm hành vi thêm hay gỡ bỏ"
 
 #: ../shell/control-center.schemas.in.h:3
 msgid "Exit shell on help action performed"
-msgstr "Thoát khỏi hệ vỏ khi gọi trợ giúp"
+msgstr "Thoát khỏi trình bao khi làm hành vi trợ giúp"
 
 #: ../shell/control-center.schemas.in.h:4
 msgid "Exit shell on start action performed"
-msgstr "Thoát khỏi hệ vỏ khi khởi động ứng dụng"
+msgstr "Thoát khỏi trình bao khi làm hành vi bắt đầu"
 
 #: ../shell/control-center.schemas.in.h:5
 msgid "Exit shell on upgrade or uninstall action performed"
-msgstr "Thoát khỏi hệ vỏ khi nâng cấp hoặc huỷ cài đặt"
+msgstr "Thoát khỏi trình bao khi làm hành vi nâng cấp hoặc huỷ cài đặt"
 
 #: ../shell/control-center.schemas.in.h:6
-msgid "Indicates whether to close the shell when a help action is performed"
-msgstr "Cho biết có đóng hệ vỏ khi gọi trợ giúp hay không"
+msgid "Indicates whether to close the shell when a help action is performed."
+msgstr "Cho biết có nên đóng trình bao khi làm hành vi trợ giúp hay không."
 
 #: ../shell/control-center.schemas.in.h:7
-msgid "Indicates whether to close the shell when a start action is performed"
-msgstr "Cho biết có đóng hệ vỏ khi khởi động ứng dụng hay không"
+msgid "Indicates whether to close the shell when a start action is performed."
+msgstr "Cho biết có nên đóng trình bao khi làm hành vi bắt đầu hay không."
 
 #: ../shell/control-center.schemas.in.h:8
 msgid ""
 "Indicates whether to close the shell when an add or remove action is "
-"performed"
-msgstr "Cho biết có đóng hệ vỏ khi thêm hoặc gỡ hành động hay không"
+"performed."
+msgstr ""
+"Cho biết có nên đóng trình bao khi làm hành vi thêm hoặc gỡ bỏ hay không."
 
 #: ../shell/control-center.schemas.in.h:9
 msgid ""
 "Indicates whether to close the shell when an upgrade or uninstall action is "
-"performed"
-msgstr "Cho biết có đóng hệ vỏ khi nâng cấp hoặc huỷ nâng cấp không"
+"performed."
+msgstr ""
+"Cho biết có nên đóng trình bao khi làm hành vi nâng cấp hoặc hủy cài đặt hay "
+"không."
 
 #: ../shell/control-center.schemas.in.h:10
 msgid "Task names and associated .desktop files"
-msgstr "Tên nhiệm vụ và tập tin .desktop tương ứng"
+msgstr "Tên tác vụ và tập tin .desktop tương ứng"
 
 #: ../shell/control-center.schemas.in.h:11
 msgid ""
 "The task name to be displayed in the control-center followed by a \";\" "
 "separator then the filename of an associated .desktop file to launch for "
 "that task."
-msgstr "Tên nhiệm vụ được hiện thị ở trung tâm điều khiển theo sau bởi \";\" ngăn cách tên tập tin .desktop tương ứng để khởi động đối với nhiệm vụ đó."
+msgstr ""
+"Tên nhiệm vụ được hiện thị ở trung tâm điều khiển theo sau bởi \";\" ngăn "
+"cách tên tập tin .desktop tương ứng để khởi động đối với nhiệm vụ đó."
 
-#.Translators: The format of this string is the task name to be displayed (translate that part) followed by a ";" separator then the filename (DONT translate the file name) of a .desktop file to launch. Multiple entries are separated by a ","
+#. Translators: The format of this string is the task name to be displayed (translate that part) followed by a ";" separator then the filename (DONT translate the file name) of a .desktop file to launch. Multiple entries are separated by a ","
 #: ../shell/control-center.schemas.in.h:13
 msgid ""
 "[Change Theme;gtk-theme-selector.desktop,Set Preferred Applications;default-"
 "applications.desktop,Add Printer;gnome-cups-manager.desktop]"
-msgstr "[Đổi sắc thái;gtk-theme-selector.desktop,Đặt các ứng dụng đã thích;default-"
+msgstr ""
+"[Đổi sắc thái;gtk-theme-selector.desktop,Đặt các ứng dụng đã thích;default-"
 "applications.desktop,Thêm máy in;gnome-cups-manager.desktop]"
 
 #: ../shell/control-center.schemas.in.h:14
 msgid ""
-"if true, the control-center will close when a \"Common Task\" is activated"
-msgstr "nếu bật, trung tâm điều khiển sẽ đóng khi kích hoạt \"Nhiệm vụ thường gặp\""
+"if true, the control-center will close when a \"Common Task\" is activated."
+msgstr ""
+"nếu đúng thì trung tâm điều khiển sẽ đóng khi kích hoạt « Tác vụ thường làm »."
 
 #: ../shell/gnomecc.desktop.in.in.h:2
 msgid "The GNOME configuration tool"
@@ -3716,49 +3314,51 @@ msgstr "_Hoãn thư giãn"
 msgid "Take a break!"
 msgstr "Hãy thư giãn!"
 
-#.{ N_("/_Enabled"),      NULL, GIF_CB (popup_enabled_cb),     POPUP_ITEM_ENABLED, "<ToggleItem>", NULL },
-#: ../typing-break/drwright.c:128
+#. { N_("/_Enabled"),      NULL, GIF_CB (popup_enabled_cb),     POPUP_ITEM_ENABLED, "<ToggleItem>", NULL },
+#. translators: keep the initial "/"
+#: ../typing-break/drwright.c:129
 msgid "/_Preferences"
 msgstr "/_Tùy thích"
 
-#: ../typing-break/drwright.c:129
+#: ../typing-break/drwright.c:130
 msgid "/_About"
 msgstr "/_Giới thiệu"
 
-#: ../typing-break/drwright.c:131
+#: ../typing-break/drwright.c:132
 msgid "/_Take a Break"
-msgstr "/_Thư giãn"
+msgstr "/Thư g_iãn"
 
-#: ../typing-break/drwright.c:500
+#: ../typing-break/drwright.c:501
 #, c-format
 msgid "%d minute until the next break"
 msgid_plural "%d minutes until the next break"
 msgstr[0] "%d phút cho tới lần thư giãn kế tiếp"
 
-#: ../typing-break/drwright.c:504
+#: ../typing-break/drwright.c:505
+#, c-format
 msgid "Less than one minute until the next break"
 msgstr "Ít hơn một phút cho tới lần thư giãn kế tiếp"
 
-#: ../typing-break/drwright.c:591
+#: ../typing-break/drwright.c:592
 #, c-format
 msgid ""
 "Unable to bring up the typing break properties dialog with the following "
 "error: %s"
 msgstr "Không thể mở hộp thoại thuộc tính thư giãn nhập liệu vì lỗi sau: %s"
 
-#: ../typing-break/drwright.c:610
+#: ../typing-break/drwright.c:611
 msgid "Written by Richard Hult <richard@imendio.com>"
 msgstr "Tác giả: Richard Hult <richard@imendio.com>"
 
-#: ../typing-break/drwright.c:611
+#: ../typing-break/drwright.c:612
 msgid "Eye candy added by Anders Carlsson"
 msgstr "« Kẹo xem » thêm bởi Anders Carlsson"
 
-#: ../typing-break/drwright.c:620
+#: ../typing-break/drwright.c:621
 msgid "A computer break reminder."
 msgstr "Bộ nhắc nhở thư giãn máy tính."
 
-#: ../typing-break/drwright.c:622
+#: ../typing-break/drwright.c:623
 msgid "translator-credits"
 msgstr "Nhóm Việt hóa Gnome <gnomevi-list@lists.sourceforge.net>"
 
@@ -3780,7 +3380,8 @@ msgid ""
 "don't seem to have a notification area on your panel. You can add it by "
 "right-clicking on your panel and choosing 'Add to panel', selecting "
 "'Notification area' and clicking 'Add'."
-msgstr "Trình theo dõi nhập liệu dùng vùng thông báo để hiển thị thông tin. Bạn "
+msgstr ""
+"Trình theo dõi nhập liệu dùng vùng thông báo để hiển thị thông tin. Bạn "
 "dường như chưa có vùng thông báo trên bảng điều khiển của bạn. Bạn có thể "
 "thêm vào bằng cách nhắp chuột phải trên bảng điều khiển và chọn « Thêm vào "
 "bảng điều khiển », rồi chọn « Vùng thông báo » và nhắp vào « Thêm »."
@@ -3861,8 +3462,9 @@ msgstr "Có nên tạo ảnh mẫu cho phông chữ Type1 hay không"
 
 #: ../vfs-methods/fontilus/font-view.c:115
 msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "ăằẳẵắặâầẩẫấậêềểễếệôồổỗốộưừửữứựơờởỡớợ abcdđefghiklmnopqrstuvxy. 0123456789 « "
-"» àảãáạèẻẽéẹìỉĩíịỳỷỹýỵòỏõóọùủũúụ?!:;,.₫"
+msgstr ""
+"ăằẳẵắặâầẩẫấậêềểễếệôồổỗốộưừửữứựơờởỡớợ abcdđefghiklmnopqrstuvxy. 0123456789 « » "
+"àảãáạèẻẽéẹìỉĩíịỳỷỹýỵòỏõóọùủũúụ?!:;,.₫"
 
 #: ../vfs-methods/fontilus/font-view.c:276
 msgid "Name:"
@@ -3934,7 +3536,8 @@ msgstr "Lỗi phân tích đối số: %s\n"
 
 #: ../vfs-methods/themus/apply-font.glade.h:1
 msgid "<span weight=\"bold\" size=\"larger\">Apply new font?</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Áp dụng phông chữ mới chứ?</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Áp dụng phông chữ mới chứ?</span>"
 
 #: ../vfs-methods/themus/apply-font.glade.h:2
 msgid "Do _not apply font"
@@ -3944,7 +3547,8 @@ msgstr "_Không áp dụng"
 msgid ""
 "The theme you have selected suggests a new font. A preview of the font is "
 "shown below."
-msgstr "Sắc thái bạn chọn đề nghị phông chữ mới. Bạn có thể xem trước phông chữ đó "
+msgstr ""
+"Sắc thái bạn chọn đề nghị phông chữ mới. Bạn có thể xem trước phông chữ đó "
 "bên dưới."
 
 #: ../vfs-methods/themus/apply-font.glade.h:4
@@ -3955,25 +3559,26 @@ msgstr "Á_p dụng"
 msgid "Themes"
 msgstr "Sắc thái"
 
-#: ../vfs-methods/themus/themus-properties-view.c:126
+#: ../vfs-methods/themus/themus-properties-view.c:128
 msgid "Description"
 msgstr "Mô tả"
 
-#: ../vfs-methods/themus/themus-properties-view.c:133
+#: ../vfs-methods/themus/themus-properties-view.c:135
 msgid "Control theme"
 msgstr "Sắc thái điều khiển"
 
-#: ../vfs-methods/themus/themus-properties-view.c:139
+#: ../vfs-methods/themus/themus-properties-view.c:141
 msgid "Window border theme"
 msgstr "Sắc thái viền cửa sổ"
 
-#: ../vfs-methods/themus/themus-properties-view.c:145
+#: ../vfs-methods/themus/themus-properties-view.c:147
 msgid "Icon theme"
 msgstr "Sắc thái biểu tượng"
 
 #: ../vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
-msgstr "Nếu đặt là true (đúng) thì các sắc thái đã cài đặt sẽ được tạo ảnh mẫu."
+msgstr ""
+"Nếu đặt là true (đúng) thì các sắc thái đã cài đặt sẽ được tạo ảnh mẫu."
 
 #: ../vfs-methods/themus/themus.schemas.in.h:2
 msgid "If set to true, then themes will be thumbnailed."
@@ -3982,7 +3587,8 @@ msgstr "Nếu đặt là true (đúng) thì các sắc thái sẽ được tạo
 #: ../vfs-methods/themus/themus.schemas.in.h:3
 msgid ""
 "Set this key to the command used to create thumbnails for installed themes."
-msgstr "Lập phím này tới lệnh được dùng để tạo các ảnh mẫu cho các sắc thái đã cài "
+msgstr ""
+"Lập phím này tới lệnh được dùng để tạo các ảnh mẫu cho các sắc thái đã cài "
 "đặt."
 
 #: ../vfs-methods/themus/themus.schemas.in.h:4
@@ -4005,7 +3611,7 @@ msgstr "Có nên tạo ảnh mẫu các sắc thái được cài đặt hay kh�
 msgid "Whether to thumbnail themes"
 msgstr "Có nên tạo ảnh mẫu các sắc thái hay không"
 
-#.translators: you may want to include non-western chars here
+#. translators: you may want to include non-western chars here
 #: ../vfs-methods/themus/themus-theme-applier.c:58
 msgid "ABCDEFG"
 msgstr "AĂÂBCDĐEÊ"
@@ -4021,439 +3627,3 @@ msgstr "Áp dụng sắc thái"
 #: ../vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
 msgid "Sets the default theme"
 msgstr "Đặt sắt thái mặc định"
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "The theme is an engine. You need to compile it."
-#~ msgstr "Sắn thái là một động cơ. Cần phải biên dịch nó."
-
-#~ msgid "The file format is invalid"
-#~ msgstr "Khuôn dạng tập tin không hợp lệ"
-
-#~ msgid "This theme is not in a supported format."
-#~ msgstr "Không hỗ trợ dạng thức của sắc thái này."
-
-#~ msgid "The file format is invalid."
-#~ msgstr "Khuôn dạng tập tin không hợp lệ."
-
-#~ msgid "Evolution Mail Reader 1.4"
-#~ msgstr "Trình đọc thư Evolution 1.4"
-
-#~ msgid "Evolution Mail Reader 1.5"
-#~ msgstr "Trình đọc thư Evolution 1.5"
-
-#~ msgid "Evolution Mail Reader 1.6"
-#~ msgstr "Trình đọc thư Evolution 1.6"
-
-#~ msgid "Evolution Mail Reader 2.0"
-#~ msgstr "Trình đọc thư Evolution 2.0"
-
-#~ msgid "Evolution Mail Reader 2.2"
-#~ msgstr "Trình đọc thư Evolution 2.2"
-
-#~ msgid "Evolution Mail Reader 2.4"
-#~ msgstr "Trình đọc thư Evolution 2.4"
-
-#~ msgid "Links Text Browser"
-#~ msgstr "Trình duyệt Mạng văn bản Links"
-
-#~ msgid "Lynx Text Browser"
-#~ msgstr "Trình duyệt Mạng văn bản Lynx"
-
-#~ msgid "Simple OnScreen Keyboard"
-#~ msgstr "Bàn phím đơn giản trên màn hình"
-
-#~ msgid "W3M Text Browser"
-#~ msgstr "Trình duyệt Mạng văn bản W3M"
-
-#~ msgid "_Keep resolution"
-#~ msgstr "_Giữ độ phân giải mới"
-
-#~ msgid "There was an error launching the keyboard tool: %s"
-#~ msgstr "Gặp lỗi khi khởi chạy công cụ bàn phím: %s"
-
-#~ msgid "_Accessibility"
-#~ msgstr "Tính năng _truy cập"
-
-#~ msgid "Choose..."
-#~ msgstr "Chọn..."
-
-#~ msgid "Microsoft Natural Keyboard"
-#~ msgstr "Bàn phím Microsoft Natural"
-
-#~ msgid "_Accessibility..."
-#~ msgstr "Tính năng _truy cập..."
-
-#~ msgid "Do _not show this warning again"
-#~ msgstr "Đừn_g hiện cảnh báo này lần nữa"
-
-#~ msgid ""
-#~ "<b>The X system keyboard settings differ from your current GNOME keyboard "
-#~ "settings.</b>\n"
-#~ "\n"
-#~ "Expected was %s, but the the following settings were found: %s.\n"
-#~ "\n"
-#~ "Which set would you like to use?"
-#~ msgstr "<b>Thiết lập bàn phím X khác biệt với thiết lập bàn phím GNOME hiện có.</"
-#~ "b>\n"
-#~ "\n"
-#~ "Ngờ %s, còn tìm thấy thiết lập theo đây: %s.\n"
-#~ "\n"
-#~ "Bạn có muốn sử dụng điều nào?"
-
-#~ msgid "Use X settings"
-#~ msgstr "Dùng thiết lập X"
-
-#~ msgid "Keep GNOME settings"
-#~ msgstr "Dùng thiết lập GNOME"
-
-#~ msgid "Theme Details"
-#~ msgstr "Chi tiết sắc thái"
-
-#~ msgid ""
-#~ "<big><b>%s</b></big>\n"
-#~ "<b>Width:</b> %d %s\n"
-#~ "<b>Height:</b> %d %s\n"
-#~ "<b>Type:</b> %s\n"
-#~ "<b>Location:</b> %s"
-#~ msgstr "<big><b>%s</b></big>\n"
-#~ "<b>Rộng:</b> %d %s\n"
-#~ "<b>Cao :</b> %d %s\n"
-#~ "<b>Kiểu :</b> %s\n"
-#~ "<b>Vị trí:</b> %s"
-
-#~ msgid "Mobility AT"
-#~ msgstr "Công nghệ trợ giúp di chuyển"
-
-#~ msgid "Run the the preferred GNOME Mobility Assitive Technology"
-#~ msgstr "Chạy công nghệ trợ giúp di chuyển GNOME đã thích"
-
-#~ msgid "Run the the preferred GNOME Visual Assistive Technology"
-#~ msgstr "Chạy công nghệ trợ giúp thị lực GNOME đã thích"
-
-#~ msgid "Visual AT"
-#~ msgstr "Công nghệ trợ giúp thị lực"
-
-#~ msgid "Unknown Pointer"
-#~ msgstr "Con trỏ lạ"
-
-#~ msgid "The default pointer that ships with X"
-#~ msgstr "Con trỏ mặc định đi kèm với X"
-
-#~ msgid "The default pointer inverted"
-#~ msgstr "Con trỏ mặc định đảo màu"
-
-#~ msgid "Large version of normal pointer"
-#~ msgstr "Phiên bản lớn của con trỏ chuẩn"
-
-#~ msgid "Large version of white pointer"
-#~ msgstr "Phiên bản lớn của con trỏ trắng"
-
-#~ msgid "Pointer Theme"
-#~ msgstr "Sắc thái con trỏ"
-
-#~ msgid "<b>Locate Pointer</b>"
-#~ msgstr "<b>Con trỏ định vị</b>"
-
-#~ msgid "Highlight the _pointer when you press Ctrl"
-#~ msgstr "Tô sáng con trỏ khi nhấn _phím Ctrl"
-
-#~ msgid "Pointer Size:"
-#~ msgstr "Cỡ con trỏ :"
-
-#~ msgid "Pointers"
-#~ msgstr "Con trỏ"
-
-#~ msgid ""
-#~ "Small\n"
-#~ "Medium\n"
-#~ "Large"
-#~ msgstr "Nhỏ\n"
-#~ "Trung bình\n"
-#~ "Lớn"
-
-#~ msgid "<b>Applications</b>"
-#~ msgstr "<b>Ứng dụng</b>"
-
-#~ msgid "<b>Support</b>"
-#~ msgstr "<b>Hỗ trợ</b>"
-
-#~ msgid "Start these assistive technologies every time you log in:"
-#~ msgstr "Khởi động những công nghệ trợ giúp này mỗi lần bạn đăng nhập:"
-
-#~ msgid ""
-#~ "No Assistive Technology is available on your system.  The 'gok' package "
-#~ "must be installed in order to get on-screen keyboard support, and the "
-#~ "'orca' package must be installed for screenreading and magnifying "
-#~ "capabilities."
-#~ msgstr "Không có kỹ thuật trợ giúp nào trên hệ thống của bạn. Gói « gok » phải "
-#~ "được cài đặt để hỗ trợ bàn phím ảo, và gói « orca » phải được cài đặt để "
-#~ "hỗ trợ khả năng đọc màn hình và phóng to."
-
-#~ msgid ""
-#~ "Not all available assistive technologies are installed on your system.  "
-#~ "The 'gok' package must be installed in order to get on-screen keyboard "
-#~ "support."
-#~ msgstr "Không phải mọi công nghệ trợ giúp đều được cài đặt trên hệ thống của bạn. "
-#~ "Gói « gok » phải được cài đặt để hỗ trợ Bàn phím ảo."
-
-#~ msgid ""
-#~ "Not all available assistive technologies are installed on your system.  "
-#~ "The 'orca' package must be installed for screenreading and magnifying "
-#~ "capabilities."
-#~ msgstr "Không phải mọi kỹ thuật trợ giúp đều được cài đặt trên hệ thống của bạn. "
-#~ "Gói « orca » phải được cài đặt để hỗ trợ khả năng đọc màn hình và phóng "
-#~ "to."
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "Change your Desktop Background settings"
-#~ msgstr "Thay đổi thiết lập ảnh nền"
-
-#~ msgid "Desktop Background"
-#~ msgstr "Ảnh nền"
-
-#~ msgid "Desktop Background Preferences"
-#~ msgstr "Tùy thích ảnh nền"
-
-#~ msgid "_Add Wallpaper"
-#~ msgstr "Thêm Ảnh _nền"
-
-#~ msgid "_Finish"
-#~ msgstr "_Kết thúc"
-
-#~ msgid "_Remove"
-#~ msgstr "_Loại bỏ"
-
-#~ msgid "Centered"
-#~ msgstr "Ở giữa"
-
-#~ msgid "Fill Screen"
-#~ msgstr "Đầy màn hình"
-
-#~ msgid "Scaled"
-#~ msgstr "Co dãn"
-
-#~ msgid "Zoom"
-#~ msgstr "Thu phóng"
-
-#~ msgid "Tiled"
-#~ msgstr "Lợp"
-
-#~ msgid "Solid Color"
-#~ msgstr "Màu đặc"
-
-#~ msgid "Horizontal Gradient"
-#~ msgstr "Gradient ngang"
-
-#~ msgid "Vertical Gradient"
-#~ msgstr "Gradient dọc"
-
-#~ msgid "- Desktop Background Preferences"
-#~ msgstr "- Tùy thích ảnh nền"
-
-#~ msgid "background size|%s, %d %s x %d %s"
-#~ msgstr "%s, %d %s x %d %s"
-
-#~ msgid "Select fonts for the desktop"
-#~ msgstr "Chọn phông chữ cho giao diện"
-
-#~ msgid "Window Management"
-#~ msgstr "Bộ quản lý cửa sổ"
-
-#~ msgid "A_vailable layouts:"
-#~ msgstr "_Bố trí hiện có:"
-
-#~ msgid "Medium"
-#~ msgstr "Trung bình"
-
-#~ msgid "Theme deleted succesfully. Please select another theme."
-#~ msgstr "Sắc thái đã được xóa bỏ. Hãy chọn sắc thái khác."
-
-#~ msgid ""
-#~ "No themes could be found on your system.  This probably means that your "
-#~ "\"Theme Preferences\" dialog was improperly installed, or you haven't "
-#~ "installed the \"gnome-themes\" package."
-#~ msgstr "Không tìm thấy sắc thái nào trên hệ thống bạn. Có lẽ hộp thoại « Tùy "
-#~ "thích sắc thái » không được cài đặt đúng, hoặc bạn chưa cài đặt gói « "
-#~ "gnome-themes »."
-
-#~ msgid "The theme file location specified to install is invalid"
-#~ msgstr "Địa điểm tập tin sắc thái cần cài đặt không hợp lệ"
-
-#~ msgid "You can save this theme by pressing the Save Theme button."
-#~ msgstr "Có thể lưu sắc thái này bằng việc nhấn nút « Lưu sắc thái »."
-
-#~ msgid ""
-#~ "The default theme schemas could not be found on your system.  This means "
-#~ "that you probably don't have metacity installed, or that your gconf is "
-#~ "configured incorrectly."
-#~ msgstr "Không tìm thấy giản đồ sắc thái mặc định trên hệ thống bạn. Điều này "
-#~ "nghĩa là có lẽ bạn chưa cài đặt « metacity », hoặc GConf bị cấu hình "
-#~ "không đúng."
-
-#~ msgid "Select themes for various parts of the desktop"
-#~ msgstr "Chọn sắc thái cho các phần khác nhau của giao diện"
-
-#~ msgid "<b>You do not have permission to change theme settings</b>"
-#~ msgstr "<b>Bạn không có quyền thay đổi thiết lập sắc thái</b>"
-
-#~ msgid "This theme does not suggest any particular font or background."
-#~ msgstr "Sắc thái này không đề nghị phông chữ hay nền đặc biệt nào."
-
-#~ msgid "This theme suggests a font and a background:"
-#~ msgstr "Sắc thái này đề nghị phông chữ và nền:"
-
-#~ msgid "_Install Theme..."
-#~ msgstr "_Cài đặt sắc thái..."
-
-#~ msgid "_Revert"
-#~ msgstr "_Hoàn nguyên"
-
-#~ msgid "_Save Theme..."
-#~ msgstr "_Lưu sắc thái..."
-
-#~ msgid "theme selection tree"
-#~ msgstr "cây chọn sắc thái"
-
-#~ msgid "Customize the appearance of toolbars and menubars in applications"
-#~ msgstr "Tùy chỉnh diện mạo thanh công cụ và thanh trình đơn trong ứng dụng"
-
-#~ msgid "<b>Behavior and Appearance</b>"
-#~ msgstr "<b>Ứng xử và diện mạo</b>"
-
-#~ msgid "Icons only"
-#~ msgstr "Chỉ hình"
-
-#~ msgid "Menu and Toolbar Preferences"
-#~ msgstr "Tùy thích của thanh công cụ và trình đơn"
-
-#~ msgid "Text below icons"
-#~ msgstr "Chữ dưới hình"
-
-#~ msgid "Text beside icons"
-#~ msgstr "Chữ cạnh hình"
-
-#~ msgid "Text only"
-#~ msgstr "Chỉ có chữ"
-
-#~ msgid "_Detachable toolbars"
-#~ msgstr "Thanh công cụ có thể _tách rời"
-
-#~ msgid "From:"
-#~ msgstr "Từ:"
-
-#~ msgid "To:"
-#~ msgstr "Đến:"
-
-#~ msgid "Sound & Video Preferences"
-#~ msgstr "Tùy thích Âm thanh và Ảnh động"
-
-#~ msgid ""
-#~ "Can not install themes. \n"
-#~ "The gzip utility is not installed."
-#~ msgstr "Không thể cài đặt sắc thái.\n"
-#~ "Chưa cài đặt tiện ích « gzip »."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">The theme \"%s\" has been installed."
-#~ "</span>\n"
-#~ "\n"
-#~ "Would you like to apply it now, or keep your current theme?"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Sắc thái « %s » đã được cài đặt.</"
-#~ "span>\n"
-#~ "\n"
-#~ "Bạn có muốn áp dụng nó ngay bây giờ, hoặc giữ lại sắc thái hiện thời "
-#~ "không?"
-
-#~ msgid "Save Theme"
-#~ msgstr "Lưu sắc thái"
-
-#~ msgid "Theme _Details"
-#~ msgstr "Chi tiết _sắc thái"
-
-#~ msgid "Desktop Preferences"
-#~ msgstr "Tùy thích Nền màn hình"
-
-#~ msgid ""
-#~ "Couldn't load the Glade file.\n"
-#~ "Make sure that this daemon is properly installed."
-#~ msgstr "Không thể tải tập tin Glade.\n"
-#~ "Hãy kiểm tra xem trình nền này được cài đặt đúng."
-
-#~ msgid ""
-#~ "A collection of scripts to run whenever the keyboard state is reloaded. "
-#~ "Useful for re-applying xmodmap based adjustments"
-#~ msgstr "Tập hợp các tập lệnh được dùng bất cứ khi nào tải lại trạng thái bàn "
-#~ "phím. Hữu dụng khi tái lại áp dụng thay đổi dựa trên « xmodmap »"
-
-#~ msgid "A list of modmap files available in the $HOME directory."
-#~ msgstr "Danh sách tập tin « modmap » sẵn sàng trong thư mục « $HOME » (chính)."
-
-#~ msgid "Default group, assigned on window creation"
-#~ msgstr "Nhóm mặc định, được gán khi tạo cửa sổ"
-
-#~ msgid "Keep and manage separate group per window"
-#~ msgstr "Giữ và quản lý nhóm riêng lẽ theo cửa sổ"
-
-#~ msgid "Keyboard Update Handlers"
-#~ msgstr "Bộ xử lý cập nhật bàn phím"
-
-#~ msgid "Keyboard layout"
-#~ msgstr "Bố trí bàn phím"
-
-#~ msgid "Keyboard model"
-#~ msgstr "Mô hình bàn phím"
-
-#~ msgid ""
-#~ "Keyboard settings in gconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-#~ msgstr "Thiết lập bàn phím trong GConf sẽ bị ghi đè từ hệ thống ngay càng sớm "
-#~ "càng tốt (bị phản đối)"
-
-#~ msgid "Save/restore indicators together with layout groups"
-#~ msgstr "Lưu/phục hồi bộ chỉ thị cùng với nhóm bố trí"
-
-#~ msgid "Show layout names instead of group names"
-#~ msgstr "Hiện tên bố trí thay vì tên nhóm"
-
-#~ msgid ""
-#~ "Show layout names instead of group names (only for versions of XFree "
-#~ "supporting multiple layouts)"
-#~ msgstr "Hiện tên bố trí thay vì tên nhóm (chỉ với các phiên bản XFree hỗ trợ đa "
-#~ "bố trí)"
-
-#~ msgid "Suppress the \"X sysconfig changed\" warning message"
-#~ msgstr "Thu hồi thông điệp cảnh báo « Cấu hình hệ thống X đã thay đổi »"
-
-#~ msgid "The Keyboard Preview, X offset"
-#~ msgstr "Bộ xem thử bàn phím, hiệu số X"
-
-#~ msgid "The Keyboard Preview, Y offset"
-#~ msgstr "Bộ xem thử bàn phím, hiệu số Y"
-
-#~ msgid "The Keyboard Preview, height"
-#~ msgstr "Bộ xem thử bàn phím, độ cao"
-
-#~ msgid "The Keyboard Preview, width"
-#~ msgstr "Bộ xem thử bàn phím, độ rộng"
-
-#~ msgid ""
-#~ "Very soon, keyboard settings in gconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since GNOME 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
-#~ msgstr "Cấu hình hệ thống sắp đè thiết lập bàn phím trong GConf. Khóa này bị phản "
-#~ "đối từ Gnome 2.12 thì bạn nên bỏ lập mẫu, các bố trí và phím tùy chọn để "
-#~ "trở về cấu hình hệ thống mặc định."
-
-#~ msgid "keyboard layout"
-#~ msgstr "bố trí bàn phím"
-
-#~ msgid "keyboard model"
-#~ msgstr "mô hình bàn phím"
-
-#~ msgid "modmap file list"
-#~ msgstr "danh sách tập tin « modmap »"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e961188fa..f1148ad52 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-11 22:00+0000\n"
-"PO-Revision-Date: 2008-02-24 19:00+0800\n"
+"POT-Creation-Date: 2008-06-01 16:58+0000\n"
+"PO-Revision-Date: 2008-06-08 20:13+08+0800\n"
 "Last-Translator: Yang Zhang <zyangmath@gmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -47,25 +47,25 @@ msgstr "提醒对话框中显示的按钮"
 msgid "Show more _details"
 msgstr "显示更多细节(_D)"
 
-#: ../capplets/about-me/gnome-about-me.c:665
+#: ../capplets/about-me/gnome-about-me.c:739
 msgid "Select Image"
 msgstr "选择图像"
 
-#: ../capplets/about-me/gnome-about-me.c:667
+#: ../capplets/about-me/gnome-about-me.c:741
 msgid "No Image"
 msgstr "无图像"
 
-#: ../capplets/about-me/gnome-about-me.c:695
-#: ../capplets/appearance/appearance-desktop.c:1141
+#: ../capplets/about-me/gnome-about-me.c:769
+#: ../capplets/appearance/appearance-desktop.c:1080
 msgid "Images"
 msgstr "图像"
 
-#: ../capplets/about-me/gnome-about-me.c:699
-#: ../capplets/appearance/theme-installer.c:700
+#: ../capplets/about-me/gnome-about-me.c:773
+#: ../capplets/appearance/theme-installer.c:717
 msgid "All Files"
 msgstr "全部文件"
 
-#: ../capplets/about-me/gnome-about-me.c:836
+#: ../capplets/about-me/gnome-about-me.c:911
 msgid ""
 "There was an error while trying to get the addressbook information\n"
 "Evolution Data Server can't handle the protocol"
@@ -73,16 +73,16 @@ msgstr ""
 "试图获取地址簿信息时出错\n"
 "Evolution 数据服务器无法处理协议"
 
-#: ../capplets/about-me/gnome-about-me.c:857
+#: ../capplets/about-me/gnome-about-me.c:932
 msgid "Unable to open address book"
 msgstr "无法打开地址簿"
 
-#: ../capplets/about-me/gnome-about-me.c:871
+#: ../capplets/about-me/gnome-about-me.c:946
 msgid "Unknown login ID, the user database might be corrupted"
 msgstr "未知的登录 ID，用户数据库可能已经损坏"
 
-#: ../capplets/about-me/gnome-about-me.c:901
-#: ../capplets/about-me/gnome-about-me.c:903
+#: ../capplets/about-me/gnome-about-me.c:976
+#: ../capplets/about-me/gnome-about-me.c:978
 #, c-format
 msgid "About %s"
 msgstr "关于 %s"
@@ -217,7 +217,7 @@ msgid "Personal Info"
 msgstr "个人信息"
 
 #: ../capplets/about-me/gnome-about-me.glade.h:32
-#: ../capplets/about-me/gnome-about-me-password.c:934
+#: ../capplets/about-me/gnome-about-me-password.c:938
 msgid ""
 "Please type your password again in the <b>Retype new password</b> field."
 msgstr "请在<b>重新输入新密码</b>框中再输入一次密码。"
@@ -396,33 +396,33 @@ msgid "The old and new passwords are the same."
 msgstr "旧密码和新密码相同。"
 
 #. translators: Unable to launch <program>: <error message>
-#: ../capplets/about-me/gnome-about-me-password.c:818
+#: ../capplets/about-me/gnome-about-me-password.c:820
 #, c-format
 msgid "Unable to launch %s: %s"
 msgstr "无法启动 %s：%s"
 
-#: ../capplets/about-me/gnome-about-me-password.c:821
+#: ../capplets/about-me/gnome-about-me-password.c:824
 msgid "Unable to launch backend"
 msgstr "无法调用后端"
 
-#: ../capplets/about-me/gnome-about-me-password.c:822
+#: ../capplets/about-me/gnome-about-me-password.c:825
 msgid "A system error has occurred"
 msgstr "发生了系统错误"
 
 #. Update status message
-#: ../capplets/about-me/gnome-about-me-password.c:842
+#: ../capplets/about-me/gnome-about-me-password.c:845
 msgid "Checking password..."
 msgstr "正在检查密码..."
 
-#: ../capplets/about-me/gnome-about-me-password.c:928
+#: ../capplets/about-me/gnome-about-me-password.c:932
 msgid "Click <b>Change password</b> to change your password."
 msgstr "单击<b>更改密码</b>可更改密码。"
 
-#: ../capplets/about-me/gnome-about-me-password.c:931
+#: ../capplets/about-me/gnome-about-me-password.c:935
 msgid "Please type your password in the <b>New password</b> field."
 msgstr "请在<b>新密码</b>框中输入您的新密码。"
 
-#: ../capplets/about-me/gnome-about-me-password.c:937
+#: ../capplets/about-me/gnome-about-me-password.c:941
 msgid "The two passwords are not equal."
 msgstr "输入的两个密码不同。"
 
@@ -465,14 +465,22 @@ msgid "Jump to the Keyboard Accessibility dialog"
 msgstr "跳转到键盘辅助功能对话框"
 
 #: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:10
+msgid "Jump to the Mouse Accessibility dialog"
+msgstr "跳转到鼠标辅助功能对话框"
+
+#: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:11
 msgid "_Enable assistive technologies"
 msgstr "启用辅助技术(_E)"
 
-#: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:11
+#: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:12
 msgid "_Keyboard Accessibility"
 msgstr "键盘辅助功能(_K)"
 
-#: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:12
+#: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:13
+msgid "_Mouse Accessibility"
+msgstr "鼠标辅助功能(_M)"
+
+#: ../capplets/accessibility/at-properties/at-enable-dialog.glade.h:14
 msgid "_Preferred Applications"
 msgstr "首选应用程序(_P)"
 
@@ -484,11 +492,11 @@ msgstr "辅助技术"
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "登录时启用 GNOME 的辅助技术支持"
 
-#: ../capplets/appearance/appearance-desktop.c:1109
+#: ../capplets/appearance/appearance-desktop.c:1048
 msgid "Add Wallpaper"
 msgstr "添加壁纸"
 
-#: ../capplets/appearance/appearance-desktop.c:1145
+#: ../capplets/appearance/appearance-desktop.c:1084
 msgid "All files"
 msgstr "全部文件"
 
@@ -529,56 +537,97 @@ msgstr "使用先前的字体"
 msgid "Use selected font"
 msgstr "使用选中的字体"
 
-#: ../capplets/appearance/appearance-main.c:108
+#: ../capplets/appearance/appearance-main.c:107
 msgid "Specify the filename of a theme to install"
 msgstr "指定要安装的主题文件名"
 
-#: ../capplets/appearance/appearance-main.c:109
+#: ../capplets/appearance/appearance-main.c:108
 msgid "filename"
 msgstr "文件名"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/appearance/appearance-main.c:116
+#: ../capplets/appearance/appearance-main.c:115
 msgid "Specify the name of the page to show (theme|background|fonts|interface)"
 msgstr "指定要显示的页面名称(theme|background|fonts|interface)"
 
-#: ../capplets/appearance/appearance-main.c:117
+#: ../capplets/appearance/appearance-main.c:116
+#: ../capplets/default-applications/gnome-da-capplet.c:880
+#: ../capplets/mouse/gnome-mouse-properties.c:444
 msgid "page"
 msgstr "page"
 
-#: ../capplets/appearance/appearance-main.c:124
+#: ../capplets/appearance/appearance-main.c:123
 msgid "[WALLPAPER...]"
 msgstr "[壁纸...]"
 
-#: ../capplets/appearance/appearance-style.c:156
+#: ../capplets/appearance/appearance-style.c:159
 #: ../capplets/common/gnome-theme-info.c:439
-#: ../capplets/common/gnome-theme-info.c:638
+#: ../capplets/common/gnome-theme-info.c:628
 msgid "Default Pointer"
 msgstr "默认指针"
 
-#: ../capplets/appearance/appearance-themes.c:534
+#: ../capplets/appearance/appearance-style.c:221
+#: ../capplets/appearance/appearance-themes.c:685
+msgid "Install"
+msgstr "安装"
+
+#: ../capplets/appearance/appearance-style.c:241
+#: ../capplets/common/gnome-theme-info.c:1634
+#, c-format
+msgid ""
+"This theme will not look as intended because the required GTK+ theme engine "
+"'%s' is not installed."
+msgstr "此主题可能与设计之初看起来不同，因为其所需的 GTK+ 主题引擎“%s”未安装。"
+
+#: ../capplets/appearance/appearance-themes.c:673
 msgid "Apply Background"
 msgstr "应用背景"
 
-#: ../capplets/appearance/appearance-themes.c:538
+#: ../capplets/appearance/appearance-themes.c:677
 msgid "Apply Font"
 msgstr "应用字体"
 
-#: ../capplets/appearance/appearance-themes.c:563
+#: ../capplets/appearance/appearance-themes.c:681
+msgid "Revert Font"
+msgstr "恢复字体"
+
+#: ../capplets/appearance/appearance-themes.c:711
+msgid ""
+"The current theme suggests a background and a font. Also, the last applied "
+"font suggestion can be reverted."
+msgstr "当前主题建议了一个背景和一种字体。同时，上次应用的字体建议可被恢复。"
+
+#: ../capplets/appearance/appearance-themes.c:713
+msgid ""
+"The current theme suggests a background. Also, the last applied font "
+"suggestion can be reverted."
+msgstr "当前主题建议了一个背景。同时，上次应用的字体建议可被恢复。"
+
+#: ../capplets/appearance/appearance-themes.c:715
 msgid "The current theme suggests a background and a font."
 msgstr "当前主题建议了一个背景和一种字体。"
 
-#: ../capplets/appearance/appearance-themes.c:568
+#: ../capplets/appearance/appearance-themes.c:717
+msgid ""
+"The current theme suggests a font. Also, the last applied font suggestion "
+"can be reverted."
+msgstr "当前主题建议了一种字体。同时，上次应用的字体建议可被恢复。"
+
+#: ../capplets/appearance/appearance-themes.c:719
 msgid "The current theme suggests a background."
 msgstr "当前主题建议了一个背景。"
 
-#: ../capplets/appearance/appearance-themes.c:573
+#: ../capplets/appearance/appearance-themes.c:721
+msgid "The last applied font suggestion can be reverted."
+msgstr "上次应用的字体建议可被恢复。"
+
+#: ../capplets/appearance/appearance-themes.c:723
 msgid "The current theme suggests a font."
 msgstr "当前主题建议了一种字体。"
 
-#: ../capplets/appearance/appearance-themes.c:857
-#: ../capplets/default-applications/gnome-da-capplet.c:1080
-#: ../capplets/sound/sound-properties-capplet.c:327
+#: ../capplets/appearance/appearance-themes.c:1046
+#: ../capplets/default-applications/gnome-da-capplet.c:630
+#: ../capplets/sound/sound-properties-capplet.c:328
 msgid "Custom"
 msgstr "自定义"
 
@@ -640,120 +689,106 @@ msgid "C_ut"
 msgstr "剪切(_U)"
 
 #: ../capplets/appearance/data/appearance.glade.h:16
-msgid ""
-"Centered\n"
-"Fill screen\n"
-"Scaled\n"
-"Zoom\n"
-"Tiled"
-msgstr ""
-"居中\n"
-"填充屏幕\n"
-"缩小\n"
-"放大\n"
-"平铺"
-
-#: ../capplets/appearance/data/appearance.glade.h:21
 msgid "Changing your cursor theme takes effect the next time you log in."
 msgstr "更改您的指针主题将会在您下次登录时生效。"
 
-#: ../capplets/appearance/data/appearance.glade.h:22
+#: ../capplets/appearance/data/appearance.glade.h:17
 msgid "Colors"
 msgstr "颜色"
 
-#: ../capplets/appearance/data/appearance.glade.h:23
+#: ../capplets/appearance/data/appearance.glade.h:18
 msgid "Controls"
 msgstr "控件"
 
-#: ../capplets/appearance/data/appearance.glade.h:24
+#: ../capplets/appearance/data/appearance.glade.h:19
 msgid "Customize Theme"
 msgstr "自定义主题"
 
-#: ../capplets/appearance/data/appearance.glade.h:25
+#: ../capplets/appearance/data/appearance.glade.h:20
 msgid "D_etails..."
 msgstr "细节(_E)..."
 
-#: ../capplets/appearance/data/appearance.glade.h:26
+#: ../capplets/appearance/data/appearance.glade.h:21
 msgid "Des_ktop font:"
 msgstr "桌面字体(_K)："
 
-#: ../capplets/appearance/data/appearance.glade.h:27
+#: ../capplets/appearance/data/appearance.glade.h:22
 msgid "Edit"
 msgstr "编辑"
 
-#: ../capplets/appearance/data/appearance.glade.h:28
+#: ../capplets/appearance/data/appearance.glade.h:23
 msgid "Font Rendering Details"
 msgstr "字体渲染细节"
 
-#: ../capplets/appearance/data/appearance.glade.h:29
+#: ../capplets/appearance/data/appearance.glade.h:24
 msgid "Fonts"
 msgstr "字体"
 
-#: ../capplets/appearance/data/appearance.glade.h:30
+#: ../capplets/appearance/data/appearance.glade.h:25
 msgid "Gra_yscale"
 msgstr "灰度(_Y)"
 
-#: ../capplets/appearance/data/appearance.glade.h:31
+#: ../capplets/appearance/data/appearance.glade.h:26
 msgid "Icons"
 msgstr "图标"
 
-#: ../capplets/appearance/data/appearance.glade.h:32
+#: ../capplets/appearance/data/appearance.glade.h:27
 msgid "Interface"
 msgstr "界面"
 
-#: ../capplets/appearance/data/appearance.glade.h:33
+#: ../capplets/appearance/data/appearance.glade.h:28
 msgid "Large"
 msgstr "大"
 
-#: ../capplets/appearance/data/appearance.glade.h:34
+#: ../capplets/appearance/data/appearance.glade.h:29
 msgid "N_one"
 msgstr "无(_O)"
 
-#: ../capplets/appearance/data/appearance.glade.h:35
+#: ../capplets/appearance/data/appearance.glade.h:30
 msgid "New File"
 msgstr "新建文件"
 
-#: ../capplets/appearance/data/appearance.glade.h:36
+#: ../capplets/appearance/data/appearance.glade.h:31
 msgid "Open File"
 msgstr "打开文件"
 
-#: ../capplets/appearance/data/appearance.glade.h:37
+#: ../capplets/appearance/data/appearance.glade.h:32
 msgid "Open a dialog to specify the color"
 msgstr "打开指定颜色的对话框"
 
-#: ../capplets/appearance/data/appearance.glade.h:38
+#: ../capplets/appearance/data/appearance.glade.h:33
 msgid "Pointer"
 msgstr "指针"
 
-#: ../capplets/appearance/data/appearance.glade.h:39
+#: ../capplets/appearance/data/appearance.glade.h:34
 msgid "R_esolution:"
 msgstr "分辨率(_E)："
 
-#: ../capplets/appearance/data/appearance.glade.h:40
+#: ../capplets/appearance/data/appearance.glade.h:35
 msgid "Save File"
 msgstr "保存文件"
 
-#: ../capplets/appearance/data/appearance.glade.h:41
+#: ../capplets/appearance/data/appearance.glade.h:36
 msgid "Save Theme As..."
 msgstr "主题另存为..."
 
-#: ../capplets/appearance/data/appearance.glade.h:42
+#: ../capplets/appearance/data/appearance.glade.h:37
 msgid "Save _As..."
 msgstr "另存为(_A)..."
 
-#: ../capplets/appearance/data/appearance.glade.h:43
+#: ../capplets/appearance/data/appearance.glade.h:38
 msgid "Save _background image"
 msgstr "保存背景图像(_B)"
 
-#: ../capplets/appearance/data/appearance.glade.h:44
+#: ../capplets/appearance/data/appearance.glade.h:39
 msgid "Show _icons in menus"
 msgstr "在菜单中显示图标(_I)"
 
-#: ../capplets/appearance/data/appearance.glade.h:45
+#: ../capplets/appearance/data/appearance.glade.h:40
 msgid "Small"
 msgstr "小"
 
-#: ../capplets/appearance/data/appearance.glade.h:46
+#: ../capplets/appearance/data/appearance.glade.h:41
 msgid ""
 "Solid color\n"
 "Horizontal gradient\n"
@@ -763,19 +798,19 @@ msgstr ""
 "水平渐变\n"
 "垂直渐变"
 
-#: ../capplets/appearance/data/appearance.glade.h:49
+#: ../capplets/appearance/data/appearance.glade.h:44
 msgid "Sub_pixel (LCDs)"
 msgstr "次像素(LCD)(_P)"
 
-#: ../capplets/appearance/data/appearance.glade.h:50
+#: ../capplets/appearance/data/appearance.glade.h:45
 msgid "Sub_pixel smoothing (LCDs)"
 msgstr "次像素平滑(LCD)(_P)"
 
-#: ../capplets/appearance/data/appearance.glade.h:51
+#: ../capplets/appearance/data/appearance.glade.h:46
 msgid "Text"
 msgstr "文本"
 
-#: ../capplets/appearance/data/appearance.glade.h:52
+#: ../capplets/appearance/data/appearance.glade.h:47
 msgid ""
 "Text below items\n"
 "Text beside items\n"
@@ -787,15 +822,29 @@ msgstr ""
 "只有图标\n"
 "只有文本"
 
-#: ../capplets/appearance/data/appearance.glade.h:56
+#: ../capplets/appearance/data/appearance.glade.h:51
 msgid "The current controls theme does not support color schemes."
 msgstr "当前控件主题不支持配色方案。"
 
-#: ../capplets/appearance/data/appearance.glade.h:57
+#: ../capplets/appearance/data/appearance.glade.h:52
 #: ../vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "主题"
 
+#: ../capplets/appearance/data/appearance.glade.h:53
+msgid ""
+"Tiled\n"
+"Zoom\n"
+"Centered\n"
+"Scaled\n"
+"Fill screen"
+msgstr ""
+"平铺\n"
+"放大\n"
+"居中\n"
+"缩小\n"
+"适合屏幕"
+
 #: ../capplets/appearance/data/appearance.glade.h:58
 msgid "Toolbar _button labels:"
 msgstr "工具栏按钮标签(_B)："
@@ -810,7 +859,7 @@ msgid "Window Border"
 msgstr "窗口边框"
 
 #: ../capplets/appearance/data/appearance.glade.h:62
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:47
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:50
 msgid "_Add..."
 msgstr "添加(_A)..."
 
@@ -965,11 +1014,11 @@ msgstr "主题安装程序"
 msgid "Gnome Theme Package"
 msgstr "Gnome 主题包"
 
-#: ../capplets/appearance/gnome-wp-info.c:45
+#: ../capplets/appearance/gnome-wp-info.c:50
 msgid "No Wallpaper"
 msgstr "无壁纸"
 
-#: ../capplets/appearance/gnome-wp-item.c:200
+#: ../capplets/appearance/gnome-wp-item.c:209
 msgid "Slide Show"
 msgstr "幻灯片演示"
 
@@ -977,7 +1026,7 @@ msgstr "幻灯片演示"
 #. * mime type, x pixel(s) by y pixel(s)
 #. * Folder: /path/to/file
 #.
-#: ../capplets/appearance/gnome-wp-item.c:208
+#: ../capplets/appearance/gnome-wp-item.c:217
 #, c-format
 msgid ""
 "<b>%s</b>\n"
@@ -988,8 +1037,8 @@ msgstr ""
 "%s, %d %s x %d %s\n"
 "文件夹：%s"
 
-#: ../capplets/appearance/gnome-wp-item.c:214
-#: ../capplets/appearance/gnome-wp-item.c:216
+#: ../capplets/appearance/gnome-wp-item.c:223
+#: ../capplets/appearance/gnome-wp-item.c:225
 msgid "pixel"
 msgid_plural "pixels"
 msgstr[0] "像素"
@@ -1029,41 +1078,41 @@ msgstr "“%s”似乎不是有效的主题。它可能是需要编译才能使�
 msgid "GNOME Theme %s correctly installed"
 msgstr "GNOME 主题 %s 已正确安装"
 
-#: ../capplets/appearance/theme-installer.c:347
+#: ../capplets/appearance/theme-installer.c:354
 #, c-format
 msgid "Installation for theme \"%s\" failed."
 msgstr "主题“%s”的安装失败。"
 
-#: ../capplets/appearance/theme-installer.c:379
+#: ../capplets/appearance/theme-installer.c:392
 #, c-format
 msgid "The theme \"%s\" has been installed."
 msgstr "主题“%s”已安装。"
 
-#: ../capplets/appearance/theme-installer.c:385
+#: ../capplets/appearance/theme-installer.c:398
 msgid "Would you like to apply it now, or keep your current theme?"
 msgstr "您是想要现在就应用，还是保持您当前的主题？"
 
-#: ../capplets/appearance/theme-installer.c:387
+#: ../capplets/appearance/theme-installer.c:400
 msgid "Keep Current Theme"
 msgstr "保持当前主题"
 
-#: ../capplets/appearance/theme-installer.c:389
+#: ../capplets/appearance/theme-installer.c:402
 msgid "Apply New Theme"
 msgstr "应用新主题"
 
-#: ../capplets/appearance/theme-installer.c:491
+#: ../capplets/appearance/theme-installer.c:505
 msgid "Failed to create temporary directory"
 msgstr "创建临时目录失败"
 
-#: ../capplets/appearance/theme-installer.c:551
+#: ../capplets/appearance/theme-installer.c:568
 msgid "New themes have been successfully installed."
 msgstr "新主题已成功安装。"
 
-#: ../capplets/appearance/theme-installer.c:579
+#: ../capplets/appearance/theme-installer.c:595
 msgid "No theme file location specified to install"
 msgstr "未指定要安装得主题文件位置"
 
-#: ../capplets/appearance/theme-installer.c:599
+#: ../capplets/appearance/theme-installer.c:615
 #, c-format
 msgid ""
 "Insufficient permissions to install the theme in:\n"
@@ -1072,41 +1121,47 @@ msgstr ""
 "没有足够的权限将主题安装在：\n"
 "%s"
 
-#: ../capplets/appearance/theme-installer.c:621
+#: ../capplets/appearance/theme-installer.c:637
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
 "selected as the source location"
 msgstr "%s 是将要用来安装主题文件的目标路径。您无法将其选为源位置"
 
-#: ../capplets/appearance/theme-installer.c:689
+#: ../capplets/appearance/theme-installer.c:706
 msgid "Select Theme"
 msgstr "选择主题"
 
-#: ../capplets/appearance/theme-installer.c:693
+#: ../capplets/appearance/theme-installer.c:710
 msgid "Theme Packages"
 msgstr "主题包"
 
 #: ../capplets/appearance/theme-save.c:91
+#, c-format
 msgid "Theme name must be present"
 msgstr "主题必须有名称"
 
-#: ../capplets/appearance/theme-save.c:161
+#: ../capplets/appearance/theme-save.c:154
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "主题已经存在。您是否想要替换？"
 
-#: ../capplets/appearance/theme-save.c:162
+#: ../capplets/appearance/theme-save.c:155
+#: ../capplets/common/file-transfer-dialog.c:450
 msgid "_Overwrite"
 msgstr "覆盖(_O)"
 
-#: ../capplets/appearance/theme-util.c:69
+#: ../capplets/appearance/theme-util.c:134
 msgid "Would you like to delete this theme?"
 msgstr "您是否想要删除此主题？"
 
-#: ../capplets/appearance/theme-util.c:121
+#: ../capplets/appearance/theme-util.c:179
 msgid "Theme cannot be deleted"
 msgstr "主题无法删除"
 
+#: ../capplets/appearance/theme-util.c:304
+msgid "Could not install theme engine"
+msgstr "无法安装主题引擎"
+
 #: ../capplets/common/activate-settings-daemon.c:16
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -1125,156 +1180,155 @@ msgstr ""
 msgid "Unable to load stock icon '%s'\n"
 msgstr "无法装入图标“%s”\n"
 
-#: ../capplets/common/capplet-util.c:240 ../capplets/common/capplet-util.c:242
-msgid "Just apply settings and quit"
-msgstr "应用设置并退出"
-
-#: ../capplets/common/capplet-util.c:244
-#: ../capplets/keyboard/gnome-keyboard-properties.c:249
-#: ../capplets/sound/sound-properties-capplet.c:1030
-msgid "Retrieve and store legacy settings"
-msgstr "取得并保存原有的设置"
-
-#: ../capplets/common/capplet-util.c:344
+#: ../capplets/common/capplet-util.c:80
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "显示帮助时出错：%s"
 
-#: ../capplets/common/file-transfer-dialog.c:94
+#: ../capplets/common/file-transfer-dialog.c:98
 #, c-format
 msgid "Copying file: %u of %u"
 msgstr "正在复制文件：第%u个，共%u个"
 
-#: ../capplets/common/file-transfer-dialog.c:154
+#: ../capplets/common/file-transfer-dialog.c:145
 #, c-format
 msgid "Copying '%s'"
 msgstr "正在复制“%s”"
 
 #: ../capplets/common/file-transfer-dialog.c:185
-#: ../capplets/common/file-transfer-dialog.c:309
+#: ../capplets/common/file-transfer-dialog.c:312
 msgid "Copying files"
 msgstr "正在复制文件"
 
-#: ../capplets/common/file-transfer-dialog.c:221
+#: ../capplets/common/file-transfer-dialog.c:224
 msgid "Parent Window"
 msgstr "父窗口"
 
-#: ../capplets/common/file-transfer-dialog.c:222
+#: ../capplets/common/file-transfer-dialog.c:225
 msgid "Parent window of the dialog"
 msgstr "对话框的父窗口"
 
-#: ../capplets/common/file-transfer-dialog.c:228
+#: ../capplets/common/file-transfer-dialog.c:231
 msgid "From URI"
 msgstr "从 URI"
 
-#: ../capplets/common/file-transfer-dialog.c:229
+#: ../capplets/common/file-transfer-dialog.c:232
 msgid "URI currently transferring from"
 msgstr "当前传输的来源 URI"
 
-#: ../capplets/common/file-transfer-dialog.c:236
+#: ../capplets/common/file-transfer-dialog.c:239
 msgid "To URI"
 msgstr "到 URI"
 
-#: ../capplets/common/file-transfer-dialog.c:237
+#: ../capplets/common/file-transfer-dialog.c:240
 msgid "URI currently transferring to"
 msgstr "当前传输的目的 URI"
 
-#: ../capplets/common/file-transfer-dialog.c:244
+#: ../capplets/common/file-transfer-dialog.c:247
 msgid "Fraction completed"
 msgstr "完成的比例"
 
-#: ../capplets/common/file-transfer-dialog.c:245
+#: ../capplets/common/file-transfer-dialog.c:248
 msgid "Fraction of transfer currently completed"
 msgstr "目前完成的传输比例"
 
-#: ../capplets/common/file-transfer-dialog.c:252
+#: ../capplets/common/file-transfer-dialog.c:255
 msgid "Current URI index"
 msgstr "当前 URI 序号"
 
-#: ../capplets/common/file-transfer-dialog.c:253
+#: ../capplets/common/file-transfer-dialog.c:256
 msgid "Current URI index - starts from 1"
 msgstr "当前 URI 序号 - 从1开始"
 
-#: ../capplets/common/file-transfer-dialog.c:260
+#: ../capplets/common/file-transfer-dialog.c:263
 msgid "Total URIs"
 msgstr "URI 总数"
 
-#: ../capplets/common/file-transfer-dialog.c:261
+#: ../capplets/common/file-transfer-dialog.c:264
 msgid "Total number of URIs"
 msgstr "URI 的总数"
 
-#: ../capplets/common/file-transfer-dialog.c:422
-msgid "Connecting..."
-msgstr "正在连接..."
+#: ../capplets/common/file-transfer-dialog.c:444
+#, c-format
+msgid "File '%s' already exists. Do you want to overwrite it?"
+msgstr "文件“%s”已经存在。您是否想要覆盖？"
+
+#: ../capplets/common/file-transfer-dialog.c:447
+msgid "_Skip"
+msgstr "跳过(_S)"
 
-#: ../capplets/common/gconf-property-editor.c:170
+#: ../capplets/common/file-transfer-dialog.c:448
+msgid "Overwrite _All"
+msgstr "全部覆盖(_A)"
+
+#: ../capplets/common/gconf-property-editor.c:133
 msgid "Key"
 msgstr "键"
 
-#: ../capplets/common/gconf-property-editor.c:171
+#: ../capplets/common/gconf-property-editor.c:134
 msgid "GConf key to which this property editor is attached"
 msgstr "本属性编辑器编辑的 GConf 键"
 
-#: ../capplets/common/gconf-property-editor.c:177
+#: ../capplets/common/gconf-property-editor.c:140
 msgid "Callback"
 msgstr "回调"
 
-#: ../capplets/common/gconf-property-editor.c:178
+#: ../capplets/common/gconf-property-editor.c:141
 msgid "Issue this callback when the value associated with key gets changed"
 msgstr "当和键关联的值改变时执行该回调"
 
-#: ../capplets/common/gconf-property-editor.c:183
+#: ../capplets/common/gconf-property-editor.c:146
 msgid "Change set"
 msgstr "改动集"
 
-#: ../capplets/common/gconf-property-editor.c:184
+#: ../capplets/common/gconf-property-editor.c:147
 msgid ""
 "GConf change set containing data to be forwarded to the gconf client on apply"
 msgstr "包含应用修改时要传递给 gconf 客户端的数据的 GConf 改动集合"
 
-#: ../capplets/common/gconf-property-editor.c:189
+#: ../capplets/common/gconf-property-editor.c:152
 msgid "Conversion to widget callback"
 msgstr "转换到部件时的回调"
 
-#: ../capplets/common/gconf-property-editor.c:190
+#: ../capplets/common/gconf-property-editor.c:153
 msgid ""
 "Callback to be issued when data are to be converted from GConf to the widget"
 msgstr "当数据从 GConf 转换到部件时使用的回调"
 
-#: ../capplets/common/gconf-property-editor.c:195
+#: ../capplets/common/gconf-property-editor.c:158
 msgid "Conversion from widget callback"
 msgstr "从部件转换时的回调"
 
-#: ../capplets/common/gconf-property-editor.c:196
+#: ../capplets/common/gconf-property-editor.c:159
 msgid ""
 "Callback to be issued when data are to be converted to GConf from the widget"
 msgstr "当数据从部件转换到 GConf 时使用的回调"
 
-#: ../capplets/common/gconf-property-editor.c:201
+#: ../capplets/common/gconf-property-editor.c:164
 msgid "UI Control"
 msgstr "用户界面控件"
 
-#: ../capplets/common/gconf-property-editor.c:202
+#: ../capplets/common/gconf-property-editor.c:165
 msgid "Object that controls the property (normally a widget)"
 msgstr "控制属性的对象(通常为部件)"
 
-#: ../capplets/common/gconf-property-editor.c:217
+#: ../capplets/common/gconf-property-editor.c:180
 msgid "Property editor object data"
 msgstr "属性编辑器对象数据"
 
-#: ../capplets/common/gconf-property-editor.c:218
+#: ../capplets/common/gconf-property-editor.c:181
 msgid "Custom data required by the specific property editor"
 msgstr "特定的属性编辑器所需要的自定义数据"
 
-#: ../capplets/common/gconf-property-editor.c:224
+#: ../capplets/common/gconf-property-editor.c:187
 msgid "Property editor data freeing callback"
 msgstr "属性编辑器数据释放回调函数"
 
-#: ../capplets/common/gconf-property-editor.c:225
+#: ../capplets/common/gconf-property-editor.c:188
 msgid "Callback to be issued when property editor object data is to be freed"
 msgstr "当属性编辑器对象数据要被释放时要调用的回调函数"
 
-#: ../capplets/common/gconf-property-editor.c:1468
+#: ../capplets/common/gconf-property-editor.c:1429
 #, c-format
 msgid ""
 "Couldn't find the file '%s'.\n"
@@ -1286,7 +1340,7 @@ msgstr ""
 "\n"
 "请确定该文件存在后重试，或选择另一背景图片。"
 
-#: ../capplets/common/gconf-property-editor.c:1476
+#: ../capplets/common/gconf-property-editor.c:1437
 #, c-format
 msgid ""
 "I don't know how to open the file '%s'.\n"
@@ -1299,42 +1353,63 @@ msgstr ""
 "\n"
 "请选择其他图片。"
 
-#: ../capplets/common/gconf-property-editor.c:1595
+#: ../capplets/common/gconf-property-editor.c:1556
 msgid "Please select an image."
 msgstr "请选择图片。"
 
-#: ../capplets/common/gconf-property-editor.c:1600
+#: ../capplets/common/gconf-property-editor.c:1561
 msgid "_Select"
 msgstr "选择(_S)"
 
-#: ../capplets/common/gnome-theme-info.c:639
+#: ../capplets/common/gnome-theme-info.c:629
 msgid "Default Pointer - Current"
 msgstr "默认指针 - 当前"
 
-#: ../capplets/common/gnome-theme-info.c:643
+#: ../capplets/common/gnome-theme-info.c:633
 msgid "White Pointer"
 msgstr "白指针"
 
-#: ../capplets/common/gnome-theme-info.c:644
+#: ../capplets/common/gnome-theme-info.c:634
 msgid "White Pointer - Current"
 msgstr "白指针 - 当前"
 
-#: ../capplets/common/gnome-theme-info.c:648
+#: ../capplets/common/gnome-theme-info.c:638
 msgid "Large Pointer"
 msgstr "大指针"
 
-#: ../capplets/common/gnome-theme-info.c:649
+#: ../capplets/common/gnome-theme-info.c:639
 msgid "Large Pointer - Current"
 msgstr "大指针 - 当前"
 
-#: ../capplets/common/gnome-theme-info.c:653
+#: ../capplets/common/gnome-theme-info.c:643
 msgid "Large White Pointer - Current"
 msgstr "大号的白色指针 - 当前"
 
-#: ../capplets/common/gnome-theme-info.c:654
+#: ../capplets/common/gnome-theme-info.c:644
 msgid "Large White Pointer"
 msgstr "大号的白色指针"
 
+#: ../capplets/common/gnome-theme-info.c:1610
+#, c-format
+msgid ""
+"This theme will not look as intended because the required GTK+ theme '%s' is "
+"not installed."
+msgstr ""
+
+#: ../capplets/common/gnome-theme-info.c:1618
+#, c-format
+msgid ""
+"This theme will not look as intended because the required window manager "
+"theme '%s' is not installed."
+msgstr ""
+
+#: ../capplets/common/gnome-theme-info.c:1625
+#, c-format
+msgid ""
+"This theme will not look as intended because the required icon theme '%s' is "
+"not installed."
+msgstr ""
+
 #: ../capplets/default-applications/default-applications.desktop.in.in.h:1
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Preferred Applications"
@@ -1352,30 +1427,26 @@ msgstr "启动首选的视觉辅助技术"
 msgid "Visual Assistance"
 msgstr "视觉辅助"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:80
-#: ../capplets/default-applications/gnome-da-capplet.c:112
-#: ../capplets/default-applications/gnome-da-capplet.c:133
-#: ../capplets/default-applications/gnome-da-capplet.c:177
-#: ../capplets/default-applications/gnome-da-capplet.c:222
-#: ../capplets/default-applications/gnome-da-capplet.c:279
-#: ../capplets/default-applications/gnome-da-capplet.c:330
-#: ../capplets/default-applications/gnome-da-capplet.c:381
-#: ../capplets/default-applications/gnome-da-capplet.c:434
-#: ../capplets/default-applications/gnome-da-capplet.c:484
-#: ../capplets/default-applications/gnome-da-capplet.c:877
-#: ../capplets/default-applications/gnome-da-capplet.c:899
+#: ../capplets/default-applications/gnome-da-capplet.c:94
+#: ../capplets/default-applications/gnome-da-capplet.c:345
+#: ../capplets/default-applications/gnome-da-capplet.c:366
 #, c-format
 msgid "Error saving configuration: %s"
 msgstr "保存配置出错：%s"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:1100
+#: ../capplets/default-applications/gnome-da-capplet.c:650
 msgid "Could not load the main interface"
 msgstr "无法装入主界面"
 
-#: ../capplets/default-applications/gnome-da-capplet.c:1102
+#: ../capplets/default-applications/gnome-da-capplet.c:652
 msgid "Please make sure that the applet is properly installed"
 msgstr "请确定小程序已经正确安装了。"
 
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplets/default-applications/gnome-da-capplet.c:879
+msgid "Specify the name of the page to show (internet|multimedia|system|a11y)"
+msgstr "指定要显示的页面名称(internet|multimedia|system|a11y)"
+
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:1
 msgid "<b>Image Viewer</b>"
 msgstr "<b>图像查看器</b>"
@@ -1417,7 +1488,7 @@ msgid "<b>Web Browser</b>"
 msgstr "<b>Web 浏览器</b>"
 
 #: ../capplets/default-applications/gnome-default-applications-properties.glade.h:11
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:13
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:12
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:28
 msgid "Accessibility"
 msgstr "辅助功能"
@@ -1729,20 +1800,20 @@ msgstr "默认设置"
 msgid "Screen %d Settings\n"
 msgstr "第 %d 个屏幕的设置\n"
 
-#: ../capplets/display/main.c:592
+#: ../capplets/display/main.c:593
 msgid "Screen Resolution Preferences"
 msgstr "屏幕分辨率首选项"
 
-#: ../capplets/display/main.c:627
+#: ../capplets/display/main.c:628
 #, c-format
 msgid "_Make default for this computer (%s) only"
 msgstr "只对此计算机(%s)设为默认(_M)"
 
-#: ../capplets/display/main.c:644
+#: ../capplets/display/main.c:648
 msgid "Options"
 msgstr "选项"
 
-#: ../capplets/display/main.c:664
+#: ../capplets/display/main.c:668
 #, c-format
 msgid ""
 "Testing the new settings. If you don't respond in %d second the previous "
@@ -1752,29 +1823,29 @@ msgid_plural ""
 "settings will be restored."
 msgstr[0] "测试新设置。如果您在 %d 秒内不响应的话，将会恢复为先前的设置。"
 
-#: ../capplets/display/main.c:704
+#: ../capplets/display/main.c:708
 msgid "Keep Resolution"
 msgstr "保留分辨率"
 
-#: ../capplets/display/main.c:708
+#: ../capplets/display/main.c:712
 msgid "Do you want to keep this resolution?"
 msgstr "您想保留此分辨率吗？"
 
-#: ../capplets/display/main.c:734
+#: ../capplets/display/main.c:738
 msgid "Use _Previous Resolution"
 msgstr "使用先前的分辨率(_P)"
 
-#: ../capplets/display/main.c:735
+#: ../capplets/display/main.c:739
 msgid "_Keep Resolution"
 msgstr "保留分辨率(_K)"
 
-#: ../capplets/display/main.c:883
+#: ../capplets/display/main.c:888
 msgid ""
 "The X server does not support the XRandR extension.  Runtime resolution "
 "changes to the display size are not available."
 msgstr "Xserver 不支持 XRandR 扩展。无法在运行时刻对显示大小进行更改。"
 
-#: ../capplets/display/main.c:890
+#: ../capplets/display/main.c:895
 msgid ""
 "The version of the XRandR extension is incompatible with this program. "
 "Runtime changes to the display size are not available."
@@ -1786,6 +1857,7 @@ msgid "Sound"
 msgstr "音效"
 
 #: ../capplets/keybindings/01-desktop-key.xml.in.h:1
+#: ../libslab/bookmark-agent.c:1158
 msgid "Desktop"
 msgstr "桌面"
 
@@ -1817,49 +1889,53 @@ msgid "The type of accelerator."
 msgstr "加速键类型。"
 
 #: ../capplets/keybindings/eggcellrendererkeys.c:242
-#: ../capplets/keybindings/gnome-keybinding-properties.c:112
+#: ../capplets/keybindings/gnome-keybinding-properties.c:90
 #: ../typing-break/drwright.c:483
 msgid "Disabled"
 msgstr "禁用"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:523
+#: ../capplets/keybindings/gnome-keybinding-properties.c:171
 msgid "<Unknown Action>"
 msgstr "<未知操作>"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:915
+#: ../capplets/keybindings/gnome-keybinding-properties.c:804
+msgid "Custom Shortcuts"
+msgstr "自定义快捷键"
+
+#: ../capplets/keybindings/gnome-keybinding-properties.c:999
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
 "using this key.\n"
-"Please try with a key such as Control, Alt or Shift at the same time.\n"
+"Please try with a key such as Control, Alt or Shift at the same time."
 msgstr ""
 "无法使用快捷键“%s”，原因是使用此键将无法输入。\n"
-"请同时使用 Ctrl、Alt 或 Shift 再试一次。\n"
+"请同时使用 Ctrl、Alt 或 Shift 再试一次。"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:944
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1028
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
-" \"%s\"\n"
+" \"%s\""
 msgstr ""
 "快捷键“%s”已经用于：\n"
-"“%s”\n"
+"“%s”"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:976
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1060
 #, c-format
-msgid "Error setting new accelerator in configuration database: %s\n"
-msgstr "在配置数据库中设置新加速键时出错：%s\n"
+msgid "Error setting new accelerator in configuration database: %s"
+msgstr "在配置数据库中设置新加速键时出错：%s"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1026
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1112
 #, c-format
-msgid "Error unsetting accelerator in configuration database: %s\n"
-msgstr "在配置数据库中取消设置新加速键时出错：%s\n"
+msgid "Error unsetting accelerator in configuration database: %s"
+msgstr "在配置数据库中取消设置新加速键时出错：%s"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1141
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1294
 msgid "Action"
 msgstr "动作"
 
-#: ../capplets/keybindings/gnome-keybinding-properties.c:1165
+#: ../capplets/keybindings/gnome-keybinding-properties.c:1316
 msgid "Shortcut"
 msgstr "快捷键"
 
@@ -1881,23 +1957,28 @@ msgstr "要编辑快捷键，请单击相应的行，然后输入新加速键，
 msgid "Assign shortcut keys to commands"
 msgstr "为命令指定快捷键"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:241
-#: ../capplets/keyboard/gnome-keyboard-properties.c:246
-#: ../capplets/sound/sound-properties-capplet.c:1026
-#: ../capplets/sound/sound-properties-capplet.c:1028
+#: ../capplets/keyboard/gnome-keyboard-properties.c:248
+#: ../capplets/keyboard/gnome-keyboard-properties.c:253
+#: ../capplets/sound/sound-properties-capplet.c:1155
+#: ../capplets/sound/sound-properties-capplet.c:1157
 msgid ""
 "Just apply settings and quit (compatibility only; now handled by daemon)"
 msgstr "应用设置并退出(仅为兼容，现在已由守护进程处理)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:253
+#: ../capplets/keyboard/gnome-keyboard-properties.c:256
+#: ../capplets/sound/sound-properties-capplet.c:1159
+msgid "Retrieve and store legacy settings"
+msgstr "取得并保存原有的设置"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.c:260
 msgid "Start the page with the typing break settings showing"
 msgstr "以显示的打字间隔设置启动页面"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:258
+#: ../capplets/keyboard/gnome-keyboard-properties.c:265
 msgid "Start the page with the accessibility settings showing"
 msgstr "以显示的辅助功能设置启动页面"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.c:267
+#: ../capplets/keyboard/gnome-keyboard-properties.c:274
 msgid "- GNOME Keyboard Preferences"
 msgstr "- GNOME 键盘首选项"
 
@@ -1925,42 +2006,42 @@ msgstr "<b>筛选键</b>"
 msgid "<b>Sticky Keys</b>"
 msgstr "<b>粘滞键</b>"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:7
-msgid "<b>_Lock screen to enforce typing break</b>"
-msgstr "<b>锁定屏幕来强制打字间断(_L)</b>"
-
 #. fast acceleration
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:8
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:7
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:13
 msgid "<small><i>Fast</i></small>"
 msgstr "<small><i>快</i></small>"
 
 #. long delay
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:9
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:8
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:19
 msgid "<small><i>Long</i></small>"
 msgstr "<small><i>长</i></small>"
 
 #. short delay
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:10
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:9
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:23
 msgid "<small><i>Short</i></small>"
 msgstr "<small><i>短</i></small>"
 
 #. slow acceleration
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:11
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:10
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:25
 msgid "<small><i>Slow</i></small>"
 msgstr "<small><i>慢</i></small>"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:12
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:11
 msgid "A_cceleration:"
 msgstr "加速(_C)："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:14
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:13
 msgid "All_ow postponing of breaks"
 msgstr "允许推迟间断(_O)"
 
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:14
+msgid "Audio _Feedback..."
+msgstr ""
+
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:15
 msgid "Beep when _accessibility features are turned on or off"
 msgstr "辅助功能打开或关闭时鸣笛(_A)"
@@ -1990,176 +2071,188 @@ msgid "Beep when key is _rejected"
 msgstr "拒绝键时鸣笛(_R)"
 
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:22
+msgid "By _country"
+msgstr "按国家/地区(_C)"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:23
+msgid "By _language"
+msgstr "按语言(_L)"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:24
 msgid "Check if breaks are allowed to be postponed"
 msgstr "检查是否允许推迟间断"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:23
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:25
 msgid "Choose a Keyboard Model"
 msgstr "选择键盘型号"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:24
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:26
 msgid "Choose a Layout"
 msgstr "选择布局"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:25
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:27
 msgid "Cursor _blinks in text fields"
 msgstr "文本域中的光标会闪烁(_B)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:26
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:28
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:31
 msgid "Cursor blinks speed"
 msgstr "光标闪烁速度"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:27
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:29
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:32
 msgid "D_elay:"
 msgstr "延时(_E)："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:28
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:30
 msgid "Disa_ble sticky keys if two keys are pressed together"
 msgstr "若同时按两个键则禁用(_B)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:29
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:31
 msgid "Duration of the break when typing is disallowed"
 msgstr "不允许打字时间断持续时间"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:30
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:32
 msgid "Duration of work before forcing a break"
 msgstr "强制间断前的工作持续时间"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:31
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:33
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:36
 msgid "General"
 msgstr "常规"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:32
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:34
 msgid "Key presses _repeat when key is held down"
 msgstr "按住某一键时重复该键(_R)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:33
-msgid "Keyboard Accessibility Notifications"
-msgstr "键盘辅助功能通知"
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:35
+msgid "Keyboard Accessibility Audio Feedback"
+msgstr "键盘辅助功能音频反馈"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:34
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:36
 msgid "Keyboard Layout Options"
 msgstr "键盘布局选项"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:35
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:37
 msgid "Keyboard Preferences"
 msgstr "键盘首选项"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:36
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:38
 msgid "Keyboard _model:"
 msgstr "键盘型号(_M)："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:37
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:39
 msgid "Layout _Options..."
 msgstr "布局选项(_O)..."
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:38
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:40
 msgid "Layouts"
 msgstr "布局"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:39
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:41
 msgid ""
 "Lock screen after a certain duration to help prevent repetitive keyboard use "
 "injuries"
 msgstr "每隔一段时间锁定屏幕，以便重复性的键盘工作使手臂过度劳累"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:40
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:42
 msgid "Mouse Keys"
 msgstr "鼠标键"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:41
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:43
 msgid "Preview:"
 msgstr "预览："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:42
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:44
 msgid "Repeat keys speed"
 msgstr "重复键速度"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:43
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:45
 msgid "Reset to De_faults"
 msgstr "重置为默认值(_F)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:44
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:46
 msgid "S_peed:"
 msgstr "速度(_P)："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:45
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:47
 msgid "Separate _layout for each window"
 msgstr "每个窗口使用独立的布局(_L)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:46
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:48
 msgid "Typing Break"
 msgstr "打字间断"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:48
-msgid "_Allow to control the pointer using the keyboard"
-msgstr "允许使用键盘控制指针(_A)"
-
 #: ../capplets/keyboard/gnome-keyboard-properties.glade.h:49
-msgid "_Allow to turn accessibility features on and off from the keyboard"
-msgstr "允许通过键盘打开或关闭辅助特性(_A)"
+msgid "_Accessibility features can be toggled with keyboard shortcuts"
+msgstr "允许通过快捷键打开或关闭辅助特性(_A)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:50
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:51
 msgid "_Break interval lasts:"
 msgstr "间断间隔持续(_B)："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:51
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:52
+msgid "_Country:"
+msgstr "国家/地区(_C)："
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:53
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:43
 msgid "_Delay:"
 msgstr "延时(_D)："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:52
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:54
 msgid "_Ignore fast duplicate keypresses"
 msgstr "忽略快速重复按键(_I)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:53
-msgid "_Layouts:"
-msgstr "布局(_L)："
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:55
+msgid "_Language:"
+msgstr "语言(_L)："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:54
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:56
+msgid "_Lock screen to enforce typing break"
+msgstr "锁定屏幕来强制打字间断(_L)"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:57
 msgid "_Models:"
 msgstr "型号(_M)："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:55
-msgid "_Notifications..."
-msgstr "通知(_N)..."
-
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:56
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:58
 msgid "_Only accept long keypresses"
 msgstr "仅接受长按键(_O)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:57
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:59
+msgid "_Pointer can be controlled using the keypad"
+msgstr "允许使用键盘控制指针(_P)"
+
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:60
 msgid "_Selected layouts:"
 msgstr "选择布局(_S)："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:58
-msgid "_Simulate simultanous keypresses"
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:61
+msgid "_Simulate simultaneous keypresses"
 msgstr "模拟同时按键(_S)"
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:59
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:62
 msgid "_Speed:"
 msgstr "速度(_S)："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:60
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:63
 msgid "_Type to test settings:"
 msgstr "输入字符来测试设置(_T)："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:61
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:64
 msgid "_Variants:"
 msgstr "变体(_V)："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:62
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:65
 msgid "_Vendors:"
 msgstr "制造商(_V)："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:63
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:66
 msgid "_Work interval lasts:"
 msgstr "工作间隔持续(_W)："
 
-#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:64
+#: ../capplets/keyboard/gnome-keyboard-properties.glade.h:67
 msgid "minutes"
 msgstr "分钟"
 
@@ -2167,16 +2260,15 @@ msgstr "分钟"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-xkbltadd.c:211
-#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:307
+#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:305
+msgid "Layout"
+msgstr "布局"
+
+#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:311
 #: ../capplets/keyboard/gnome-keyboard-properties-xkbot.c:211
 msgid "Default"
 msgstr "默认"
 
-#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:301
-msgid "Layout"
-msgstr "布局"
-
 #: ../capplets/keyboard/gnome-keyboard-properties-xkbmc.c:169
 msgid "Vendors"
 msgstr "制造商"
@@ -2223,6 +2315,15 @@ msgstr "下移"
 msgid "gesture|Disabled"
 msgstr "禁用"
 
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplets/mouse/gnome-mouse-properties.c:443
+msgid "Specify the name of the page to show (general|accessibility)"
+msgstr "指定要显示的页面名称(general|accessibility)"
+
+#: ../capplets/mouse/gnome-mouse-properties.c:452
+msgid "- GNOME Mouse Preferences"
+msgstr "- GNOME 鼠标首选项"
+
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:1
 msgid "<b>Double-Click Timeout</b>"
 msgstr "<b>双击超时</b>"
@@ -2256,18 +2357,14 @@ msgstr "<b>模拟第二击</b>"
 msgid ""
 "<i>To test your double-click settings, try to double-click on the light bulb."
 "</i>"
-msgstr ""
-"<i>测试您的双击设置。请尝试双击右侧的灯泡。"
-"</i>"
-
+msgstr "<i>测试您的双击设置。请尝试双击右侧的灯泡。</i>"
 
 #. Dwell Click = Clicking without hardware buttons (by letting the pointer sit on the click target for a certain amount of time)
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:11
 msgid ""
 "<i>You can also use the Dwell Click panel applet to choose the click type.</"
 "i>"
-msgstr ""
-"<i>您也可以使用 停留点击 面板小程序来选择点击的类型。</i>"
+msgstr "<i>您也可以使用 停留点击 面板小程序来选择点击的类型。</i>"
 
 #. high sensitivity
 #: ../capplets/mouse/gnome-mouse-properties.glade.h:15
@@ -2399,21 +2496,21 @@ msgid "<b>_Use authentication</b>"
 msgstr "<b>需要身份验证(_U)</b>"
 
 #: ../capplets/network/gnome-network-preferences.glade.h:6
-msgid "Advanced Configuration"
-msgstr "高级配置"
-
-#: ../capplets/network/gnome-network-preferences.glade.h:7
 msgid "Autoconfiguration _URL:"
 msgstr "自动配置 _URL："
 
-#: ../capplets/network/gnome-network-preferences.glade.h:8
+#: ../capplets/network/gnome-network-preferences.glade.h:7
 msgid "HTTP Proxy Details"
 msgstr "HTTP 代理细节"
 
-#: ../capplets/network/gnome-network-preferences.glade.h:9
+#: ../capplets/network/gnome-network-preferences.glade.h:8
 msgid "H_TTP proxy:"
 msgstr "H_TTP 代理："
 
+#: ../capplets/network/gnome-network-preferences.glade.h:9
+msgid "Ignored Hosts"
+msgstr "忽略的主机"
+
 #: ../capplets/network/gnome-network-preferences.glade.h:10
 msgid "Network Proxy Preferences"
 msgstr "网络代理首选项"
@@ -2468,48 +2565,48 @@ msgstr "未知的音量控制 %d"
 msgid "Failed to construct test pipeline for '%s'"
 msgstr "为‘%s’创建测试流水线失败"
 
-#: ../capplets/sound/sound-properties-capplet.c:325
-#: ../capplets/sound/sound-properties-capplet.c:378
+#: ../capplets/sound/sound-properties-capplet.c:326
+#: ../capplets/sound/sound-properties-capplet.c:447
 msgid "Not connected"
 msgstr "未连接"
 
-#: ../capplets/sound/sound-properties-capplet.c:661
+#: ../capplets/sound/sound-properties-capplet.c:785
 msgid "Autodetect"
 msgstr "自动检测"
 
-#: ../capplets/sound/sound-properties-capplet.c:666
-#: ../capplets/sound/sound-properties-capplet.c:667
+#: ../capplets/sound/sound-properties-capplet.c:790
+#: ../capplets/sound/sound-properties-capplet.c:791
 msgid "ALSA - Advanced Linux Sound Architecture"
 msgstr "ALSA - 高级 Linux 声音架构"
 
-#: ../capplets/sound/sound-properties-capplet.c:668
+#: ../capplets/sound/sound-properties-capplet.c:792
 msgid "Artsd - ART Sound Daemon"
 msgstr "Artsd - ART 声音守护程序"
 
-#: ../capplets/sound/sound-properties-capplet.c:669
-#: ../capplets/sound/sound-properties-capplet.c:670
+#: ../capplets/sound/sound-properties-capplet.c:793
+#: ../capplets/sound/sound-properties-capplet.c:794
 msgid "ESD - Enlightened Sound Daemon"
 msgstr "ESD - Enlightened 声音守护程序"
 
-#: ../capplets/sound/sound-properties-capplet.c:671
-#: ../capplets/sound/sound-properties-capplet.c:672
+#: ../capplets/sound/sound-properties-capplet.c:797
+#: ../capplets/sound/sound-properties-capplet.c:800
 msgid "OSS - Open Sound System"
 msgstr "OSS - 开放声音系统"
 
-#: ../capplets/sound/sound-properties-capplet.c:673
-#: ../capplets/sound/sound-properties-capplet.c:674
+#: ../capplets/sound/sound-properties-capplet.c:802
+#: ../capplets/sound/sound-properties-capplet.c:803
 msgid "PulseAudio Sound Server"
 msgstr "PulseAudio 声音服务器"
 
-#: ../capplets/sound/sound-properties-capplet.c:675
+#: ../capplets/sound/sound-properties-capplet.c:804
 msgid "Test Sound"
 msgstr "测试声音"
 
-#: ../capplets/sound/sound-properties-capplet.c:676
+#: ../capplets/sound/sound-properties-capplet.c:805
 msgid "Silence"
 msgstr "静音"
 
-#: ../capplets/sound/sound-properties-capplet.c:1043
+#: ../capplets/sound/sound-properties-capplet.c:1172
 msgid "- GNOME Sound Preferences"
 msgstr "- GNOME 声音首选项"
 
@@ -2542,8 +2639,8 @@ msgid "Devices"
 msgstr "设备"
 
 #: ../capplets/sound/sound-properties.glade.h:8
-msgid "E_nable software sound mixing (ESD)"
-msgstr "允许软件混音(ESD)(_N)"
+msgid "E_nable software sound mixing"
+msgstr "允许软件混音(_N)"
 
 #: ../capplets/sound/sound-properties.glade.h:9
 msgid "Flash _entire screen"
@@ -2687,36 +2784,36 @@ msgid "Windows"
 msgstr "窗口"
 
 #. make start action
-#: ../libslab/application-tile.c:369
+#: ../libslab/application-tile.c:372
 #, c-format
 msgid "<b>Start %s</b>"
 msgstr "<b>启动 %s</b>"
 
-#: ../libslab/application-tile.c:388
+#: ../libslab/application-tile.c:391 ../libslab/bookmark-agent.c:1059
 msgid "Help"
 msgstr "帮助"
 
-#: ../libslab/application-tile.c:435
+#: ../libslab/application-tile.c:438
 msgid "Upgrade"
 msgstr "升级"
 
-#: ../libslab/application-tile.c:450
+#: ../libslab/application-tile.c:453
 msgid "Uninstall"
 msgstr "卸载"
 
-#: ../libslab/application-tile.c:777 ../libslab/document-tile.c:737
+#: ../libslab/application-tile.c:780 ../libslab/document-tile.c:760
 msgid "Remove from Favorites"
 msgstr "从收藏夹中删除"
 
-#: ../libslab/application-tile.c:779 ../libslab/document-tile.c:739
+#: ../libslab/application-tile.c:782 ../libslab/document-tile.c:762
 msgid "Add to Favorites"
 msgstr "添加到收藏夹"
 
-#: ../libslab/application-tile.c:864
+#: ../libslab/application-tile.c:867
 msgid "Remove from Startup Programs"
 msgstr "从启动程序中删除"
 
-#: ../libslab/application-tile.c:866
+#: ../libslab/application-tile.c:869
 msgid "Add to Startup Programs"
 msgstr "添加到启动程序"
 
@@ -2735,102 +2832,119 @@ msgstr ""
 msgid "Other"
 msgstr "其它"
 
-#: ../libslab/bookmark-agent.c:1060
+#: ../libslab/bookmark-agent.c:1061
+msgid "Lock Screen"
+msgstr "锁住屏幕"
+
+#: ../libslab/bookmark-agent.c:1063 ../libsounds/sound-view.c:45
+msgid "Logout"
+msgstr "注销"
+
+#: ../libslab/bookmark-agent.c:1065
+msgid "Shutdown"
+msgstr "关机"
+
+#: ../libslab/bookmark-agent.c:1090
 msgid "New Spreadsheet"
 msgstr "新建电子表格"
 
-#: ../libslab/bookmark-agent.c:1064
+#: ../libslab/bookmark-agent.c:1095
 msgid "New Document"
 msgstr "新建文档"
 
-#: ../libslab/bookmark-agent.c:1114
+#: ../libslab/bookmark-agent.c:1147
 msgid "Home"
 msgstr "家庭"
 
-#: ../libslab/bookmark-agent.c:1130
+#: ../libslab/bookmark-agent.c:1152
+msgid "Documents"
+msgstr "文档"
+
+#: ../libslab/bookmark-agent.c:1165
 msgid "File System"
 msgstr "文件系统"
 
-#: ../libslab/bookmark-agent.c:1134
+#: ../libslab/bookmark-agent.c:1169
 msgid "Network Servers"
 msgstr "网络服务器"
 
-#: ../libslab/bookmark-agent.c:1163
+#: ../libslab/bookmark-agent.c:1198
 msgid "Search"
 msgstr "搜索"
 
 #. make open with default action
 #: ../libslab/directory-tile.c:170
+#, c-format
 msgid "<b>Open</b>"
 msgstr "<b>打开</b>"
 
 #. make rename action
-#: ../libslab/directory-tile.c:189 ../libslab/document-tile.c:228
+#: ../libslab/directory-tile.c:189 ../libslab/document-tile.c:242
 msgid "Rename..."
 msgstr "重命名..."
 
 #: ../libslab/directory-tile.c:203 ../libslab/directory-tile.c:212
-#: ../libslab/document-tile.c:242 ../libslab/document-tile.c:251
+#: ../libslab/document-tile.c:256 ../libslab/document-tile.c:265
 msgid "Send To..."
 msgstr "发送至..."
 
 #. make move to trash action
-#: ../libslab/directory-tile.c:227 ../libslab/document-tile.c:277
+#: ../libslab/directory-tile.c:227 ../libslab/document-tile.c:291
 msgid "Move to Trash"
 msgstr "移至回收站"
 
 #: ../libslab/directory-tile.c:237 ../libslab/directory-tile.c:450
-#: ../libslab/document-tile.c:287 ../libslab/document-tile.c:850
+#: ../libslab/document-tile.c:301 ../libslab/document-tile.c:873
 msgid "Delete"
 msgstr "删除"
 
-#: ../libslab/directory-tile.c:575 ../libslab/document-tile.c:1022
+#: ../libslab/directory-tile.c:575 ../libslab/document-tile.c:1045
 #, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr "您确定想要永久删除“%s”吗？"
 
-#: ../libslab/directory-tile.c:580 ../libslab/document-tile.c:1026
+#: ../libslab/directory-tile.c:580 ../libslab/document-tile.c:1049
 msgid "If you delete an item, it is permanently lost."
 msgstr "如果您删除一项的话，它将永久丢失。"
 
-#: ../libslab/document-tile.c:189
+#: ../libslab/document-tile.c:203
 #, c-format
 msgid "<b>Open with \"%s\"</b>"
 msgstr "<b>用“%s”打开</b>"
 
-#: ../libslab/document-tile.c:201
+#: ../libslab/document-tile.c:215
 msgid "Open with Default Application"
 msgstr "用默认应用程序打开"
 
-#: ../libslab/document-tile.c:212
+#: ../libslab/document-tile.c:226
 msgid "Open in File Manager"
 msgstr "在文件管理器中打开"
 
-#: ../libslab/document-tile.c:633
+#: ../libslab/document-tile.c:656
 msgid "?"
 msgstr "?"
 
-#: ../libslab/document-tile.c:640
+#: ../libslab/document-tile.c:663
 msgid "%l:%M %p"
 msgstr "%H:%M"
 
-#: ../libslab/document-tile.c:648
+#: ../libslab/document-tile.c:671
 msgid "Today %l:%M %p"
 msgstr "今天 %H:%M"
 
-#: ../libslab/document-tile.c:658
+#: ../libslab/document-tile.c:681
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %H:%M"
 
-#: ../libslab/document-tile.c:670
+#: ../libslab/document-tile.c:693
 msgid "%a %l:%M %p"
 msgstr "%A%H:%M"
 
-#: ../libslab/document-tile.c:678
+#: ../libslab/document-tile.c:701
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日%H:%M"
 
-#: ../libslab/document-tile.c:680
+#: ../libslab/document-tile.c:703
 msgid "%b %d %Y"
 msgstr "%Y-%m-%d"
 
@@ -2863,6 +2977,7 @@ msgid "Unexpected tag '%s' inside '%s'"
 msgstr "“%2$s”中不应该出现“%1$s”"
 
 #: ../libslab/libslab-bookmarkfile.c:1929
+#, c-format
 msgid "No valid bookmark file found in data dirs"
 msgstr "数据目录中未找到有效的书签文件"
 
@@ -2923,42 +3038,39 @@ msgid "<b>Open %s</b>"
 msgstr "<b>打开 %s</b>"
 
 #: ../libslab/system-tile.c:141
+#, c-format
 msgid "Remove from System Items"
 msgstr "从系统项目中删除"
 
-#: ../libsounds/sound-view.c:43
+#: ../libsounds/sound-view.c:44
 msgid "Login"
 msgstr "登录"
 
-#: ../libsounds/sound-view.c:44
-msgid "Logout"
-msgstr "注销"
-
-#: ../libsounds/sound-view.c:45
+#: ../libsounds/sound-view.c:46
 msgid "Boing"
 msgstr "啵嘤"
 
-#: ../libsounds/sound-view.c:46
+#: ../libsounds/sound-view.c:47
 msgid "Siren"
 msgstr "鸣笛"
 
-#: ../libsounds/sound-view.c:47
+#: ../libsounds/sound-view.c:48
 msgid "Clink"
 msgstr "叮咚"
 
-#: ../libsounds/sound-view.c:48
+#: ../libsounds/sound-view.c:49
 msgid "Beep"
 msgstr "响铃"
 
-#: ../libsounds/sound-view.c:49
+#: ../libsounds/sound-view.c:50
 msgid "No sound"
 msgstr "无声音"
 
-#: ../libsounds/sound-view.c:131
+#: ../libsounds/sound-view.c:132
 msgid "Sound not set for this event."
 msgstr "此事件未设定音效。"
 
-#: ../libsounds/sound-view.c:140
+#: ../libsounds/sound-view.c:141
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package for a set of default sounds."
@@ -2966,24 +3078,24 @@ msgstr ""
 "此事件的声音文件不存在。\n"
 "您需要安装 gnome-audio 软件包以获得一组默认声音。"
 
-#: ../libsounds/sound-view.c:151
+#: ../libsounds/sound-view.c:152
 msgid "The sound file for this event does not exist."
 msgstr "此事件的声音文件不存在。"
 
-#: ../libsounds/sound-view.c:182
+#: ../libsounds/sound-view.c:183
 msgid "Select Sound File"
 msgstr "选择声音文件"
 
-#: ../libsounds/sound-view.c:209
+#: ../libsounds/sound-view.c:210
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "文件 %s 不是有效的 wav 文件"
 
-#: ../libsounds/sound-view.c:270
+#: ../libsounds/sound-view.c:271
 msgid "Select sound file..."
 msgstr "选择声音文件..."
 
-#: ../libsounds/sound-view.c:372
+#: ../libsounds/sound-view.c:373
 msgid "System Sounds"
 msgstr "系统声音"
 
@@ -2992,19 +3104,27 @@ msgstr "系统声音"
 msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr "窗口管理器“%s”没有注册配置工具\n"
 
-#: ../libwindow-settings/metacity-window-manager.c:390
+#: ../libwindow-settings/metacity-window-manager.c:402
 msgid "Maximize"
 msgstr "最大化"
 
-#: ../libwindow-settings/metacity-window-manager.c:391
+#: ../libwindow-settings/metacity-window-manager.c:403
+msgid "Maximize Vertically"
+msgstr "垂直最大化"
+
+#: ../libwindow-settings/metacity-window-manager.c:404
+msgid "Maximize Horizontally"
+msgstr "水平最大化"
+
+#: ../libwindow-settings/metacity-window-manager.c:405
 msgid "Minimize"
 msgstr "最小化"
 
-#: ../libwindow-settings/metacity-window-manager.c:392
+#: ../libwindow-settings/metacity-window-manager.c:406
 msgid "Roll up"
 msgstr "卷起"
 
-#: ../libwindow-settings/metacity-window-manager.c:393
+#: ../libwindow-settings/metacity-window-manager.c:407
 msgid "None"
 msgstr "无"
 
@@ -3130,6 +3250,7 @@ msgid_plural "%d minutes until the next break"
 msgstr[0] "距下次间隔还有 %d 分钟"
 
 #: ../typing-break/drwright.c:505
+#, c-format
 msgid "Less than one minute until the next break"
 msgstr "距下次间隔还有不到一分钟。"
 
@@ -3348,19 +3469,19 @@ msgstr "应用字体(_A)"
 msgid "Themes"
 msgstr "主题"
 
-#: ../vfs-methods/themus/themus-properties-view.c:127
+#: ../vfs-methods/themus/themus-properties-view.c:128
 msgid "Description"
 msgstr "描述"
 
-#: ../vfs-methods/themus/themus-properties-view.c:134
+#: ../vfs-methods/themus/themus-properties-view.c:135
 msgid "Control theme"
 msgstr "控件主题"
 
-#: ../vfs-methods/themus/themus-properties-view.c:140
+#: ../vfs-methods/themus/themus-properties-view.c:141
 msgid "Window border theme"
 msgstr "窗口边框主题"
 
-#: ../vfs-methods/themus/themus-properties-view.c:146
+#: ../vfs-methods/themus/themus-properties-view.c:147
 msgid "Icon theme"
 msgstr "图标主题"
 
@@ -3414,17 +3535,3 @@ msgstr "应用主题"
 msgid "Sets the default theme"
 msgstr "设定默认主题"
 
-#~ msgid "Go _to Fonts Folder"
-#~ msgstr "转到字体文件夹(_T)"
-
-#~ msgid "Autostart the preferred AT"
-#~ msgstr "自动启动首选的辅助技术"
-
-#~ msgid "Visual"
-#~ msgstr "视觉"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid "      "
-#~ msgstr "      "
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 536ec3265..dca604c62 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,5 @@
+==================== 2.23.2 ====================
+
 2008-02-10  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* control-center.schemas.in: Add missing full stops in the long
diff --git a/typing-break/ChangeLog b/typing-break/ChangeLog
index 9b4214f66..f62050fb6 100644
--- a/typing-break/ChangeLog
+++ b/typing-break/ChangeLog
@@ -1,3 +1,15 @@
+2008-06-15  Jens Granseuer  <jensgr@gmx.net>
+
+	Patch by: Andrey Gusev <ronne@list.ru>
+
+	* drwright.c: (update_icon), (blink_timeout_cb),
+	(maybe_change_state), (update_tooltip), (break_window_postpone_cb):
+	when postponing a voluntary break, go back to the state before taking
+	the break instead of going to warn state as we do when a regular
+	break is postponed (bug #134595)
+
+==================== 2.23.2 ====================
+
 2008-03-24  Jens Granseuer  <jensgr@gmx.net>
 
 	* drw-break-window.c: (drw_break_window_init): amend previous commit
diff --git a/typing-break/drwright.c b/typing-break/drwright.c
index 61051abc9..2b4fdc4d4 100644
--- a/typing-break/drwright.c
+++ b/typing-break/drwright.c
@@ -69,6 +69,7 @@ struct _DrWright {
 	GTimer         *idle_timer;
 
 	gint            last_elapsed_time;
+	gint            save_last_time;
 
 	gboolean        is_active;
 
@@ -177,14 +178,9 @@ update_icon (DrWright *dr)
 		r = 0;
 		break;
 
-	case STATE_WARN_IDLE:
-	case STATE_WARN_TYPE:
-		r = ((float)(dr->type_time - dr->warn_time) / dr->type_time) +
-			(float) g_timer_elapsed (dr->timer, NULL) / (float) dr->warn_time;
-		break;
-
 	default:
-		r = (float) g_timer_elapsed (dr->timer, NULL) / (float) dr->type_time;
+		r = (float) (g_timer_elapsed (dr->timer, NULL) + dr->save_last_time) /
+		    (float) dr->type_time;
 		break;
 	}
 
@@ -237,7 +233,7 @@ blink_timeout_cb (DrWright *dr)
 	gfloat r;
 	gint   timeout;
 
-	r = (dr->warn_time - g_timer_elapsed (dr->timer, NULL)) / dr->warn_time;
+	r = (dr->type_time - g_timer_elapsed (dr->timer, NULL) - dr->save_last_time) / dr->warn_time;
 	timeout = BLINK_TIMEOUT + BLINK_TIMEOUT_FACTOR * r;
 
 	if (timeout < BLINK_TIMEOUT_MIN) {
@@ -321,7 +317,7 @@ maybe_change_state (DrWright *dr)
 		g_timer_reset (dr->idle_timer);
 	}
 
-	elapsed_time = g_timer_elapsed (dr->timer, NULL);
+	elapsed_time = g_timer_elapsed (dr->timer, NULL) + dr->save_last_time;
 	elapsed_idle_time = g_timer_elapsed (dr->idle_timer, NULL);
 
 	if (elapsed_time > dr->last_elapsed_time + dr->warn_time) {
@@ -342,6 +338,8 @@ maybe_change_state (DrWright *dr)
 		gtk_status_icon_set_from_pixbuf (dr->icon,
 						 dr->neutral_bar);
 
+		dr->save_last_time = 0;
+
 		g_timer_start (dr->timer);
 		g_timer_start (dr->idle_timer);
 
@@ -355,8 +353,7 @@ maybe_change_state (DrWright *dr)
 
 	case STATE_IDLE:
 		if (elapsed_idle_time >= dr->break_time) {
-			g_timer_start (dr->timer);
-			g_timer_start (dr->idle_timer);
+			dr->state = STATE_BREAK_DONE_SETUP;
 		} else if (dr->is_active) {
 			dr->state = STATE_TYPE;
 		}
@@ -365,7 +362,6 @@ maybe_change_state (DrWright *dr)
 	case STATE_TYPE:
 		if (elapsed_time >= dr->type_time - dr->warn_time) {
 			dr->state = STATE_WARN_TYPE;
-			g_timer_start (dr->timer);
 
 			start_blinking (dr);
  		} else if (elapsed_time >= dr->type_time) {
@@ -378,7 +374,7 @@ maybe_change_state (DrWright *dr)
 		break;
 
 	case STATE_WARN_TYPE:
-		if (elapsed_time >= dr->warn_time) {
+		if (elapsed_time >= dr->type_time) {
 			dr->state = STATE_BREAK_SETUP;
 		}
 		else if (!dr->is_active) {
@@ -436,11 +432,12 @@ maybe_change_state (DrWright *dr)
 
 		gtk_widget_show (dr->break_window);
 
+		dr->save_last_time = elapsed_time;
 		dr->state = STATE_BREAK;
 		break;
 
 	case STATE_BREAK:
-		if (elapsed_time >= dr->break_time) {
+		if (elapsed_time - dr->save_last_time >= dr->break_time) {
 			dr->state = STATE_BREAK_DONE_SETUP;
 		}
 		break;
@@ -486,16 +483,7 @@ update_tooltip (DrWright *dr)
 
 	elapsed_time = g_timer_elapsed (dr->timer, NULL);
 
-	switch (dr->state) {
-	case STATE_WARN_TYPE:
-	case STATE_WARN_IDLE:
-		min = floor (0.5 + (dr->warn_time - elapsed_time) / 60.0);
-		break;
-
-	default:
-		min = floor (0.5 + (dr->type_time - elapsed_time) / 60.0);
-		break;
-	}
+	min = floor (0.5 + (dr->type_time - elapsed_time - dr->save_last_time) / 60.0);
 
 	if (min >= 1) {
 		str = g_strdup_printf (ngettext("%d minute until the next break",
@@ -661,13 +649,22 @@ static void
 break_window_postpone_cb (GtkWidget *window,
 			  DrWright  *dr)
 {
+	gint elapsed_time;
+
 	gtk_widget_destroy (dr->break_window);
 
-	dr->state = STATE_WARN_TYPE;
+	dr->state = STATE_TYPE;
 	dr->break_window = NULL;
 
+	elapsed_time = g_timer_elapsed (dr->timer, NULL) + dr->save_last_time;
+
+	if (elapsed_time >= dr->type_time) {
+		/* time is expired, but break was postponed */
+		dr->save_last_time = dr->type_time - dr->warn_time;
+	}
+
 	g_timer_start (dr->timer);
-	start_blinking (dr);
+	maybe_change_state (dr);
 	update_icon (dr);
 	update_tooltip (dr);
 }
diff --git a/vfs-methods/Makefile.am b/vfs-methods/Makefile.am
index 91c5507d2..fe30f461b 100644
--- a/vfs-methods/Makefile.am
+++ b/vfs-methods/Makefile.am
@@ -1 +1 @@
-SUBDIRS = $(THEMUS) $(FONTILUS)
+SUBDIRS = $(FONTILUS)
diff --git a/vfs-methods/fontilus/ChangeLog b/vfs-methods/fontilus/ChangeLog
index 6f28b0cc6..e02351b58 100644
--- a/vfs-methods/fontilus/ChangeLog
+++ b/vfs-methods/fontilus/ChangeLog
@@ -1,3 +1,5 @@
+==================== 2.23.2 ====================
+
 2008-01-25  Jens Granseuer  <jensgr@gmx.net>
 
 	Patch by: Damien Carberry <damien.carberry@sun.com>
diff --git a/vfs-methods/themus/ChangeLog b/vfs-methods/themus/ChangeLog
index 68b9f4fa4..e0b71aa9f 100644
--- a/vfs-methods/themus/ChangeLog
+++ b/vfs-methods/themus/ChangeLog
@@ -1,3 +1,5 @@
+==================== 2.23.2 ====================
+
 2008-05-04  Jens Granseuer  <jensgr@gmx.net>
 
 	* theme-thumbnailer.c: (main): fix more breakage due to recent