1.1.9GCONF_1_1_9

2002-03-29 Havoc Pennington <hp@pobox.com> * configure.in: 1.1.9 * gconf/gconf-client.c (gconf_client_get_string): clean up some weird cruft * gconf/gconf-internals.c (primitive_value): steal the schema, avoids a copy. * gconf/gconf-value.h, gconf/gconf-value.c: Hide private fields, suggested by Michael. But then make them public again for now due to libgnome/eel being broken. * configure.in (PKGCONFIG_MODULES): require the right versions of various things
author: Havoc Pennington <hp@pobox.com> 2002-03-29 06:27:13 +0000
committer: Havoc Pennington <hp@src.gnome.org> 2002-03-29 06:27:13 +0000
commit: f7315e5a41f1a501ea6b6d41fcb56b5038f0b9db (patch)
tree: 8a11d69b2ba2715c1c6968bd17597ca3b58042fe
parent: 15fd7b87b7dc5fa83dcb740cc82e26faed272402 (diff)
download: gconf-f7315e5a41f1a501ea6b6d41fcb56b5038f0b9db.tar.gz
28 files changed, 4358 insertions, 4270 deletions
diff --git a/ChangeLog b/ChangeLog
index 09d1841a..82bf079c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2002-03-29  Havoc Pennington  <hp@pobox.com>
+
+	* configure.in: 1.1.9
+
+	* gconf/gconf-client.c (gconf_client_get_string): clean up some
+	weird cruft
+
+	* gconf/gconf-internals.c (primitive_value): steal the schema,
+	avoids a copy.
+
+	* gconf/gconf-value.h, gconf/gconf-value.c: Hide private fields,
+	suggested by Michael. But then make them public again 
+	for now due to libgnome/eel being broken.
+
+	* configure.in (PKGCONFIG_MODULES): require the right versions of 
+	various things
+
 2002-03-24  Havoc Pennington  <hp@pobox.com>
 
 	* gconf/gconf-internals.c (gconf_activate_server): save a bit more
diff --git a/configure.in b/configure.in
index b277b633..b3b488fb 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_INIT(gconf/gconf.h)
 
 AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE(GConf, 1.1.8)
+AM_INIT_AUTOMAKE(GConf, 1.1.9)
 
 AM_MAINTAINER_MODE
 
@@ -168,9 +168,9 @@ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
 
 
 
-PKGCONFIG_MODULES='gmodule-2.0 >= 1.3.5 gobject-2.0 >= 1.3.5 ORBit-2.0 >= 2.3.94'
+PKGCONFIG_MODULES='gmodule-2.0 >= 2.0.1 gobject-2.0 >= 2.0.1 ORBit-2.0 >= 2.3.106 linc >= 0.1.20'
 PKGCONFIG_MODULES_WITH_XML="$PKGCONFIG_MODULES libxml-2.0"
-PKGCONFIG_MODULES_WITH_GTK=" $PKGCONFIG_MODULES gtk+-2.0"
+PKGCONFIG_MODULES_WITH_GTK=" $PKGCONFIG_MODULES gtk+-2.0 >= 2.0.0"
 PKGCONFIG_MODULES_WITH_XML_AND_GTK=" $PKGCONFIG_MODULES gtk+-2.0 libxml-2.0"
 
 PKG_CHECK_MODULES(DEPENDENT, $PKGCONFIG_MODULES)
diff --git a/gconf/gconf-client.c b/gconf/gconf-client.c
index 25be2743..305c9e31 100644
--- a/gconf/gconf-client.c
+++ b/gconf/gconf-client.c
@@ -1421,7 +1421,6 @@ gchar*
 gconf_client_get_string(GConfClient* client, const gchar* key,
                         GError** err)
 {
-  static const gchar* def = NULL;
   GError* error = NULL;
   GConfValue* val;
 
@@ -1436,16 +1435,9 @@ gconf_client_get_string(GConfClient* client, const gchar* key,
       g_assert(error == NULL);
       
       if (check_type (key, val, GCONF_VALUE_STRING, &error))
-        /* we cheat here (look below) so we have to cast this */
-        retval = (gchar *)gconf_value_get_string (val);
+        retval = gconf_value_steal_string (val);
       else
         handle_error (client, error, err);
-
-      /* This is a cheat; don't copy */
-      if (retval != NULL)
-        val->d.string_data = NULL; /* don't delete the string we are returning */
-      else
-        retval = def ? g_strdup (def) : NULL;
       
       gconf_value_free (val);
 
@@ -1455,7 +1447,7 @@ gconf_client_get_string(GConfClient* client, const gchar* key,
     {
       if (error != NULL)
         handle_error (client, error, err);
-      return def ? g_strdup (def) : NULL;
+      return NULL;
     }
 }
 
@@ -1513,13 +1505,9 @@ gconf_client_get_schema  (GConfClient* client,
       g_assert(error == NULL);
       
       if (check_type (key, val, GCONF_VALUE_SCHEMA, &error))
-        retval = gconf_value_get_schema (val);
+        retval = gconf_value_steal_schema (val);
       else
         handle_error (client, error, err);
-
-      /* This is a cheat; don't copy */
-      if (retval != NULL)
-        val->d.schema_data = NULL; /* don't delete the schema */
       
       gconf_value_free (val);
 
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c
index eb38920c..edb5b69d 100644
--- a/gconf/gconf-internals.c
+++ b/gconf/gconf-internals.c
@@ -1362,13 +1362,9 @@ gconf_value_list_to_primitive_list_destructive(GConfValue* val,
 
   g_assert(gconf_value_get_list_type(val) == list_type);
       
-  retval = gconf_value_get_list(val);
-
-  /* Cheating the API to avoid a list copy; set this to NULL to
-         avoid destroying the list */
-  val->d.list_data.list = NULL;
+  retval = gconf_value_steal_list (val);
       
-  gconf_value_free(val);
+  gconf_value_free (val);
   val = NULL;
       
   {
@@ -1403,19 +1399,11 @@ gconf_value_list_to_primitive_list_destructive(GConfValue* val,
             break;
 
           case GCONF_VALUE_STRING:
-            {
-              /* Cheat again, and steal the string from the value */
-              tmp->data = elem->d.string_data;
-              elem->d.string_data = NULL;
-            }
+            tmp->data = gconf_value_steal_string (elem);
             break;
 
           case GCONF_VALUE_SCHEMA:
-            {
-              /* and also steal the schema... */
-              tmp->data = elem->d.schema_data;
-              elem->d.schema_data = NULL;
-            }
+            tmp->data = gconf_value_steal_schema (elem);
             break;
                 
           default:
@@ -1449,9 +1437,7 @@ primitive_value(gpointer retloc, GConfValue* val)
 
     case GCONF_VALUE_STRING:
       {
-        *((gchar**)retloc) = val->d.string_data;
-        /* cheat and steal the string to avoid a copy */
-        val->d.string_data = NULL;
+        *((gchar**)retloc) = gconf_value_steal_string (val);
       }
       break;
 
@@ -1460,7 +1446,7 @@ primitive_value(gpointer retloc, GConfValue* val)
       break;
 
     case GCONF_VALUE_SCHEMA:
-      *((GConfSchema**)retloc) = gconf_value_get_schema(val);
+      *((GConfSchema**)retloc) = gconf_value_steal_schema(val);
       break;
       
     default:
diff --git a/gconf/gconf-internals.h b/gconf/gconf-internals.h
index 2bef5360..70afca72 100644
--- a/gconf/gconf-internals.h
+++ b/gconf/gconf-internals.h
@@ -121,6 +121,10 @@ GConfValue* gconf_value_new_pair_from_string (GConfValueType car_type,
                                               const gchar* str,
 					      GError** err);
 
+GSList*      gconf_value_steal_list   (GConfValue *value);
+GConfSchema* gconf_value_steal_schema (GConfValue *value);
+char*        gconf_value_steal_string (GConfValue *value);
+
 /* These are a hack to encode values into strings and ship them over CORBA,
  * necessary for obscure reasons (ORBit doesn't like recursive datatypes yet)
  */
diff --git a/gconf/gconf-sources.c b/gconf/gconf-sources.c
index 1c4037ec..a3559a07 100644
--- a/gconf/gconf-sources.c
+++ b/gconf/gconf-sources.c
@@ -1511,10 +1511,8 @@ gconf_sources_query_default_value(GConfSources* sources,
 
       gconf_meta_info_free(mi);
 
-      schema = gconf_value_get_schema(val);
-      val->d.schema_data = NULL; /* cheat, steal schema from the GConfValue */
-      
-      gconf_value_free(val); /* schema not destroyed due to our cheat */
+      schema = gconf_value_steal_schema (val);
+      gconf_value_free (val);
       
       if (schema != NULL)
         {
diff --git a/gconf/gconf-value.c b/gconf/gconf-value.c
index bd1016d6..4bb0c2c5 100644
--- a/gconf/gconf-value.c
+++ b/gconf/gconf-value.c
@@ -25,6 +25,27 @@
 #include <string.h>
 #include <stdlib.h>
 
+typedef struct {
+  GConfValueType type;
+  union {
+    gchar* string_data;
+    gint int_data;
+    gboolean bool_data;
+    gdouble float_data;
+    GConfSchema* schema_data;
+    struct {
+      GConfValueType type;
+      GSList* list;
+    } list_data;
+    struct {
+      GConfValue* car;
+      GConfValue* cdr;
+    } pair_data;
+  } d;
+} GConfRealValue;
+
+#define REAL_VALUE(x) ((GConfRealValue*)(x))
+
 static void
 set_string(gchar** dest, const gchar* src)
 {
@@ -46,12 +67,13 @@ gconf_value_new(GConfValueType type)
   g_return_val_if_fail(GCONF_VALUE_TYPE_VALID(type), NULL);
   
   /* Probably want to use mem chunks here eventually. */
-  value = g_new0(GConfValue, 1);
+  value = (GConfValue*) g_new0 (GConfRealValue, 1);
 
   value->type = type;
 
   /* the g_new0() is important: sets list type to invalid, NULLs all
-     pointers */
+   * pointers
+   */
   
   return value;
 }
@@ -681,28 +703,30 @@ copy_value_list(GSList* list)
 }
 
 GConfValue* 
-gconf_value_copy(const GConfValue* src)
+gconf_value_copy (const GConfValue* src)
 {
-  GConfValue* dest;
-
+  GConfRealValue *dest;
+  GConfRealValue *real;
+  
   g_return_val_if_fail(src != NULL, NULL);
 
-  dest = gconf_value_new(src->type);
+  real = REAL_VALUE (src);
+  dest = REAL_VALUE (gconf_value_new (src->type));
 
-  switch (src->type)
+  switch (real->type)
     {
     case GCONF_VALUE_INT:
     case GCONF_VALUE_FLOAT:
     case GCONF_VALUE_BOOL:
     case GCONF_VALUE_INVALID:
-      dest->d = src->d;
+      dest->d = real->d;
       break;
     case GCONF_VALUE_STRING:
-      set_string(&dest->d.string_data, src->d.string_data);
+      set_string(&dest->d.string_data, real->d.string_data);
       break;
     case GCONF_VALUE_SCHEMA:
-      if (src->d.schema_data)
-        dest->d.schema_data = gconf_schema_copy(src->d.schema_data);
+      if (real->d.schema_data)
+        dest->d.schema_data = gconf_schema_copy(real->d.schema_data);
       else
         dest->d.schema_data = NULL;
       break;
@@ -711,22 +735,22 @@ gconf_value_copy(const GConfValue* src)
       {
         GSList* copy;
 
-        copy = copy_value_list(src->d.list_data.list);
+        copy = copy_value_list(real->d.list_data.list);
 
         dest->d.list_data.list = copy;
-        dest->d.list_data.type = src->d.list_data.type;
+        dest->d.list_data.type = real->d.list_data.type;
       }
       break;
       
     case GCONF_VALUE_PAIR:
 
-      if (src->d.pair_data.car)
-        dest->d.pair_data.car = gconf_value_copy(src->d.pair_data.car);
+      if (real->d.pair_data.car)
+        dest->d.pair_data.car = gconf_value_copy(real->d.pair_data.car);
       else
         dest->d.pair_data.car = NULL;
 
-      if (src->d.pair_data.cdr)
-        dest->d.pair_data.cdr = gconf_value_copy(src->d.pair_data.cdr);
+      if (real->d.pair_data.cdr)
+        dest->d.pair_data.cdr = gconf_value_copy(real->d.pair_data.cdr);
       else
         dest->d.pair_data.cdr = NULL;
 
@@ -736,17 +760,21 @@ gconf_value_copy(const GConfValue* src)
       g_assert_not_reached();
     }
   
-  return dest;
+  return (GConfValue*) dest;
 }
 
 static void
 gconf_value_free_list(GConfValue* value)
 {
   GSList* tmp;
+  GConfRealValue *real;
+  
   g_return_if_fail(value != NULL);
   g_return_if_fail(value->type == GCONF_VALUE_LIST);
+
+  real = REAL_VALUE (value);
   
-  tmp = value->d.list_data.list;
+  tmp = real->d.list_data.list;
 
   while (tmp != NULL)
     {
@@ -754,35 +782,39 @@ gconf_value_free_list(GConfValue* value)
       
       tmp = g_slist_next(tmp);
     }
-  g_slist_free(value->d.list_data.list);
+  g_slist_free(real->d.list_data.list);
 
-  value->d.list_data.list = NULL;
+  real->d.list_data.list = NULL;
 }
 
 void 
 gconf_value_free(GConfValue* value)
 {
+  GConfRealValue *real;
+  
   g_return_if_fail(value != NULL);
 
-  switch (value->type)
+  real = REAL_VALUE (value);
+  
+  switch (real->type)
     {
     case GCONF_VALUE_STRING:
-      if (value->d.string_data != NULL)
-        g_free(value->d.string_data);
+      if (real->d.string_data != NULL)
+        g_free(real->d.string_data);
       break;
     case GCONF_VALUE_SCHEMA:
-      if (value->d.schema_data != NULL)
-        gconf_schema_free(value->d.schema_data);
+      if (real->d.schema_data != NULL)
+        gconf_schema_free(real->d.schema_data);
       break;
     case GCONF_VALUE_LIST:
       gconf_value_free_list(value);
       break;
     case GCONF_VALUE_PAIR:
-      if (value->d.pair_data.car != NULL)
-        gconf_value_free(value->d.pair_data.car);
+      if (real->d.pair_data.car != NULL)
+        gconf_value_free(real->d.pair_data.car);
 
-      if (value->d.pair_data.cdr != NULL)
-        gconf_value_free(value->d.pair_data.cdr);
+      if (real->d.pair_data.cdr != NULL)
+        gconf_value_free(real->d.pair_data.cdr);
       break;
     default:
       break;
@@ -797,7 +829,24 @@ gconf_value_get_string (const GConfValue *value)
   g_return_val_if_fail (value != NULL, NULL);
   g_return_val_if_fail (value->type == GCONF_VALUE_STRING, NULL);
   
-  return value->d.string_data;
+  return REAL_VALUE (value)->d.string_data;
+}
+
+char*
+gconf_value_steal_string (GConfValue *value)
+{
+  char *string;
+  GConfRealValue *real;
+  
+  g_return_val_if_fail (value != NULL, NULL);
+  g_return_val_if_fail (value->type == GCONF_VALUE_STRING, NULL);
+
+  real = REAL_VALUE (value);
+
+  string = real->d.string_data;
+  real->d.string_data = NULL;
+
+  return string;
 }
 
 int
@@ -806,7 +855,7 @@ gconf_value_get_int (const GConfValue *value)
   g_return_val_if_fail (value != NULL, 0);
   g_return_val_if_fail (value->type == GCONF_VALUE_INT, 0);
   
-  return value->d.int_data;
+  return REAL_VALUE (value)->d.int_data;
 }
 
 double
@@ -815,7 +864,7 @@ gconf_value_get_float (const GConfValue *value)
   g_return_val_if_fail (value != NULL, 0.0);
   g_return_val_if_fail (value->type == GCONF_VALUE_FLOAT, 0.0);
   
-  return value->d.float_data;
+  return REAL_VALUE (value)->d.float_data;
 }
 
 GConfValueType
@@ -824,7 +873,7 @@ gconf_value_get_list_type (const GConfValue *value)
   g_return_val_if_fail (value != NULL, GCONF_VALUE_INVALID);
   g_return_val_if_fail (value->type == GCONF_VALUE_LIST, GCONF_VALUE_INVALID);
   
-  return value->d.list_data.type;
+  return REAL_VALUE (value)->d.list_data.type;
 }
 
 GSList*
@@ -833,9 +882,24 @@ gconf_value_get_list (const GConfValue *value)
   g_return_val_if_fail (value != NULL, NULL);
   g_return_val_if_fail (value->type == GCONF_VALUE_LIST, NULL);
 
-  return value->d.list_data.list;
+  return REAL_VALUE (value)->d.list_data.list;
 }
 
+GSList*
+gconf_value_steal_list (GConfValue *value)
+{
+  GSList *list;
+  GConfRealValue *real;
+  
+  g_return_val_if_fail (value != NULL, NULL);
+  g_return_val_if_fail (value->type == GCONF_VALUE_LIST, NULL);
+
+  real = REAL_VALUE (value);
+
+  list = real->d.list_data.list;
+  real->d.list_data.list = NULL;
+  return list;
+}
 
 GConfValue*
 gconf_value_get_car (const GConfValue *value)
@@ -843,7 +907,7 @@ gconf_value_get_car (const GConfValue *value)
   g_return_val_if_fail (value != NULL, NULL);
   g_return_val_if_fail (value->type == GCONF_VALUE_PAIR, NULL);
   
-  return value->d.pair_data.car;
+  return REAL_VALUE (value)->d.pair_data.car;
 }
 
 GConfValue*
@@ -852,7 +916,7 @@ gconf_value_get_cdr (const GConfValue *value)
   g_return_val_if_fail (value != NULL, NULL);
   g_return_val_if_fail (value->type == GCONF_VALUE_PAIR, NULL);
   
-  return value->d.pair_data.cdr;
+  return REAL_VALUE (value)->d.pair_data.cdr;
 }
 
 
@@ -862,7 +926,7 @@ gconf_value_get_bool (const GConfValue *value)
   g_return_val_if_fail (value != NULL, FALSE);
   g_return_val_if_fail (value->type == GCONF_VALUE_BOOL, FALSE);
   
-  return value->d.bool_data;
+  return REAL_VALUE (value)->d.bool_data;
 }
 
 GConfSchema*
@@ -871,7 +935,24 @@ gconf_value_get_schema (const GConfValue *value)
   g_return_val_if_fail (value != NULL, NULL);
   g_return_val_if_fail (value->type == GCONF_VALUE_SCHEMA, NULL);
   
-  return value->d.schema_data;
+  return REAL_VALUE (value)->d.schema_data;
+}
+
+GConfSchema*
+gconf_value_steal_schema (GConfValue *value)
+{
+  GConfSchema *schema;
+  GConfRealValue *real;
+  
+  g_return_val_if_fail (value != NULL, NULL);
+  g_return_val_if_fail (value->type == GCONF_VALUE_SCHEMA, NULL);
+
+  real = REAL_VALUE (value);
+
+  schema = real->d.schema_data;
+  real->d.schema_data = NULL;
+
+  return schema;
 }
 
 void        
@@ -880,16 +961,20 @@ gconf_value_set_int(GConfValue* value, gint the_int)
   g_return_if_fail(value != NULL);
   g_return_if_fail(value->type == GCONF_VALUE_INT);
 
-  value->d.int_data = the_int;
+  REAL_VALUE (value)->d.int_data = the_int;
 }
 
 void        
 gconf_value_set_string(GConfValue* value, const gchar* the_str)
 {
+  GConfRealValue *real;
+
   g_return_if_fail(value != NULL);
   g_return_if_fail(value->type == GCONF_VALUE_STRING);
 
-  set_string(&value->d.string_data, the_str);
+  real = REAL_VALUE (value);
+  
+  set_string(&real->d.string_data, the_str);
 }
 
 void        
@@ -898,7 +983,7 @@ gconf_value_set_float(GConfValue* value, gdouble the_float)
   g_return_if_fail(value != NULL);
   g_return_if_fail(value->type == GCONF_VALUE_FLOAT);
 
-  value->d.float_data = the_float;
+  REAL_VALUE (value)->d.float_data = the_float;
 }
 
 void        
@@ -907,32 +992,40 @@ gconf_value_set_bool(GConfValue* value, gboolean the_bool)
   g_return_if_fail(value != NULL);
   g_return_if_fail(value->type == GCONF_VALUE_BOOL);
 
-  value->d.bool_data = the_bool;
+  REAL_VALUE (value)->d.bool_data = the_bool;
 }
 
 void       
 gconf_value_set_schema(GConfValue* value, const GConfSchema* sc)
 {
+  GConfRealValue *real;
+  
   g_return_if_fail(value != NULL);
   g_return_if_fail(value->type == GCONF_VALUE_SCHEMA);
+
+  real = REAL_VALUE (value);
   
-  if (value->d.schema_data != NULL)
-    gconf_schema_free(value->d.schema_data);
+  if (real->d.schema_data != NULL)
+    gconf_schema_free (real->d.schema_data);
 
-  value->d.schema_data = gconf_schema_copy(sc);
+  real->d.schema_data = gconf_schema_copy (sc);
 }
 
 void        
 gconf_value_set_schema_nocopy(GConfValue* value, GConfSchema* sc)
 {
+  GConfRealValue *real;
+  
   g_return_if_fail(value != NULL);
   g_return_if_fail(value->type == GCONF_VALUE_SCHEMA);
   g_return_if_fail(sc != NULL);
+
+  real = REAL_VALUE (value);
   
-  if (value->d.schema_data != NULL)
-    gconf_schema_free(value->d.schema_data);
+  if (real->d.schema_data != NULL)
+    gconf_schema_free (real->d.schema_data);
 
-  value->d.schema_data = sc;
+  real->d.schema_data = sc;
 }
 
 void
@@ -944,13 +1037,17 @@ gconf_value_set_car(GConfValue* value, const GConfValue* car)
 void
 gconf_value_set_car_nocopy(GConfValue* value, GConfValue* car)
 {
+  GConfRealValue *real;
+  
   g_return_if_fail(value != NULL);
   g_return_if_fail(value->type == GCONF_VALUE_PAIR);
+
+  real = REAL_VALUE (value);
   
-  if (value->d.pair_data.car != NULL)
-    gconf_value_free(value->d.pair_data.car);
+  if (real->d.pair_data.car != NULL)
+    gconf_value_free (real->d.pair_data.car);
 
-  value->d.pair_data.car = car;
+  real->d.pair_data.car = car;
 }
 
 void
@@ -962,65 +1059,86 @@ gconf_value_set_cdr(GConfValue* value, const GConfValue* cdr)
 void
 gconf_value_set_cdr_nocopy(GConfValue* value, GConfValue* cdr)
 {
+  GConfRealValue *real;
+  
   g_return_if_fail(value != NULL);
   g_return_if_fail(value->type == GCONF_VALUE_PAIR);
+
+  real = REAL_VALUE (value);
   
-  if (value->d.pair_data.cdr != NULL)
-    gconf_value_free(value->d.pair_data.cdr);
+  if (real->d.pair_data.cdr != NULL)
+    gconf_value_free (real->d.pair_data.cdr);
 
-  value->d.pair_data.cdr = cdr;
+  real->d.pair_data.cdr = cdr;
 }
 
 void
-gconf_value_set_list_type(GConfValue* value,
+gconf_value_set_list_type (GConfValue    *value,
                            GConfValueType type)
 {
+  GConfRealValue *real;
+  
   g_return_if_fail(value != NULL);
   g_return_if_fail(value->type == GCONF_VALUE_LIST);
   g_return_if_fail(type != GCONF_VALUE_LIST);
   g_return_if_fail(type != GCONF_VALUE_PAIR);
+
+  real = REAL_VALUE (value);
+  
   /* If the list is non-NULL either we already have the right
-     type, or we shouldn't be changing it without deleting
-     the list first. */
-  g_return_if_fail(value->d.list_data.list == NULL);
+   * type, or we shouldn't be changing it without deleting
+   * the list first.
+   */
+  g_return_if_fail (real->d.list_data.list == NULL);
 
-  value->d.list_data.type = type;
+  real->d.list_data.type = type;
 }
 
 void
-gconf_value_set_list_nocopy(GConfValue* value,
+gconf_value_set_list_nocopy (GConfValue* value,
                              GSList* list)
 {
-  g_return_if_fail(value != NULL);
-  g_return_if_fail(value->type == GCONF_VALUE_LIST);
-  g_return_if_fail(value->d.list_data.type != GCONF_VALUE_INVALID);
+  GConfRealValue *real;
+  
+  g_return_if_fail (value != NULL);
+  g_return_if_fail (value->type == GCONF_VALUE_LIST);
+
+  real = REAL_VALUE (value);
+  
+  g_return_if_fail (real->d.list_data.type != GCONF_VALUE_INVALID);
   
-  if (value->d.list_data.list)
-    gconf_value_free_list(value);
+  if (real->d.list_data.list)
+    gconf_value_free_list (value);
 
-  value->d.list_data.list = list;
+  real->d.list_data.list = list;
 }
 
 void
 gconf_value_set_list       (GConfValue* value,
                             GSList* list)
 {
-  g_return_if_fail(value != NULL);
-  g_return_if_fail(value->type == GCONF_VALUE_LIST);
-  g_return_if_fail(value->d.list_data.type != GCONF_VALUE_INVALID);
-  g_return_if_fail((list == NULL) ||
-                   ((list->data != NULL) &&
-                    (((GConfValue*)list->data)->type == value->d.list_data.type)));
+  GConfRealValue *real;
   
-  if (value->d.list_data.list)
-    gconf_value_free_list(value);
+  g_return_if_fail (value != NULL);
+  g_return_if_fail (value->type == GCONF_VALUE_LIST);
 
-  value->d.list_data.list = copy_value_list(list);
+  real = REAL_VALUE (value);
+
+  g_return_if_fail (real->d.list_data.type != GCONF_VALUE_INVALID);
+  g_return_if_fail ((list == NULL) ||
+                    ((list->data != NULL) &&
+                     (((GConfValue*)list->data)->type == real->d.list_data.type)));
+  
+  if (real->d.list_data.list)
+    gconf_value_free_list (value);
+
+  real->d.list_data.list = copy_value_list (list);
 }
 
 
 static int
-null_safe_strcmp(const char* lhs, const char* rhs)
+null_safe_strcmp (const char *lhs,
+                  const char *rhs)
 {
   if (lhs == NULL && rhs == NULL)
     return 0;
@@ -1500,11 +1618,15 @@ gboolean
 gconf_value_validate (const GConfValue *value,
                       GError          **err)
 {
+  GConfRealValue *real;
+
+  real = REAL_VALUE (value);
+  
   switch (value->type)
     {
     case GCONF_VALUE_STRING:
-      if (value->d.string_data &&
-          !g_utf8_validate (value->d.string_data, -1, NULL))
+      if (real->d.string_data &&
+          !g_utf8_validate (real->d.string_data, -1, NULL))
         {
           g_set_error (err, GCONF_ERROR,
                        GCONF_ERROR_FAILED,
@@ -1514,8 +1636,8 @@ gconf_value_validate (const GConfValue *value,
       break;
 
     case GCONF_VALUE_SCHEMA:
-      if (value->d.schema_data)
-        return gconf_schema_validate (value->d.schema_data,
+      if (real->d.schema_data)
+        return gconf_schema_validate (real->d.schema_data,
                                       err);
       break;
 
diff --git a/gconf/gconf-value.h b/gconf/gconf-value.h
index 3077bb57..82644706 100644
--- a/gconf/gconf-value.h
+++ b/gconf/gconf-value.h
@@ -55,6 +55,7 @@ typedef struct _GConfValue GConfValue;
 
 struct _GConfValue {
   GConfValueType type;
+  /* this is all PRIVATE dangit */      
   union {
     gchar* string_data;
     gint int_data;
@@ -161,9 +162,9 @@ void           gconf_meta_info_set_mod_time (GConfMetaInfo *gcmi,
 typedef struct _GConfEntry GConfEntry;
 
 struct _GConfEntry {
-  gchar* key;
-  GConfValue* value;
-  gchar* schema_name;
+  char *key;
+  GConfValue *value;
+  char *schema_name;
   int pad1;
   gpointer pad2;
   gpointer pad3;
diff --git a/gconf/gconf.c b/gconf/gconf.c
index f2e4ab49..280630cb 100644
--- a/gconf/gconf.c
+++ b/gconf/gconf.c
@@ -3004,11 +3004,8 @@ gconf_engine_get_string(GConfEngine* conf, const gchar* key,
           return deflt ? g_strdup(deflt) : NULL;
         }
 
-      retval = val->d.string_data;
-      /* This is a cheat; don't copy */
-      val->d.string_data = NULL; /* don't delete the string */
-
-      gconf_value_free(val);
+      retval = gconf_value_steal_string (val);
+      gconf_value_free (val);
 
       return retval;
     }
@@ -3074,12 +3071,8 @@ gconf_engine_get_schema  (GConfEngine* conf, const gchar* key, GError** err)
           return NULL;
         }
 
-      retval = gconf_value_get_schema(val);
-
-      /* This is a cheat; don't copy */
-      val->d.schema_data = NULL; /* don't delete the schema */
-
-      gconf_value_free(val);
+      retval = gconf_value_steal_schema (val);
+      gconf_value_free (val);
 
       return retval;
     }
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a87b5ce7..bb51c567 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,7 +6,6 @@ backends/xml-backend.c
 backends/xml-cache.c
 backends/xml-dir.c
 backends/xml-entry.c
-gconf/GNOME_Config.server.in
 gconf/gconf-backend.c
 gconf/gconf-client.c
 gconf/gconf-database.c
@@ -18,5 +17,4 @@ gconf/gconf-sources.c
 gconf/gconf-value.c
 gconf/gconf.c
 gconf/gconfd.c
-gconf/gconfd.server.in
 gconf/gconftool.c
diff --git a/po/da.po b/po/da.po
index f0b90c55..4c1a09ee 100644
--- a/po/da.po
+++ b/po/da.po
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.0.4\n"
-"POT-Creation-Date: 2002-03-19 20:21+0100\n"
+"POT-Creation-Date: 2002-01-28 21:35-0500\n"
 "PO-Revision-Date: 2002-03-19 20:21+0100\n"
 "Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -74,12 +74,12 @@ msgstr "Kunne ikke læse fra eller skrive til XML-rodkatalog på adressen '%s'"
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Mappe-/filrettigheder for XML-kilde ved roden %s er %o/%o"
 
-#: backends/xml-backend.c:590
+#: backends/xml-backend.c:584
 #, c-format
 msgid "Error syncing the XML backend directory cache: %s"
 msgstr "Fejl ved synkronisering af XML-bagendens mappemellemlager: %s"
 
-#: backends/xml-backend.c:657
+#: backends/xml-backend.c:651
 msgid ""
 "Remove dir operation is no longer supported, just remove all the values in "
 "the directory"
@@ -87,11 +87,11 @@ msgstr ""
 "Fjernelse af mappe er ikke længere understøttet, fjern blot alle værdier i "
 "mappen"
 
-#: backends/xml-backend.c:724
+#: backends/xml-backend.c:718
 msgid "Initializing XML backend module"
 msgstr "Klargører XML-bagendemodul"
 
-#: backends/xml-backend.c:792
+#: backends/xml-backend.c:786
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Kunne ikke opgive lås på XML-katalog '%s': %s"
@@ -318,47 +318,51 @@ msgstr "Kunne ikke lukke bagende ned"
 msgid "GConf Error: %s\n"
 msgstr "GConf-fejl: %s\n"
 
-#: gconf/gconf-client.c:897
+#: gconf/gconf-client.c:899
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf-advarsel: fejl ved listning af par i '%s': %s"
 
-#: gconf/gconf-client.c:1162
+#: gconf/gconf-client.c:1165
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Forventede '%s', fik '%s' for nøglen %s"
 
-#: gconf/gconf-database.c:234
+#: gconf/gconf-database.c:233
 msgid "Received invalid value in set request"
 msgstr "Modtog ugyldig værdi i sæt-forespørgsel"
 
-#: gconf/gconf-database.c:242
+#: gconf/gconf-database.c:241
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Kunne ikke forstå CORBA-værdien modtaget i sæt-forespørgsel efter nøglen '%s'"
 
-#: gconf/gconf-database.c:523
+#: gconf/gconf-database.c:522
 msgid "Received request to drop all cached data"
 msgstr "Modtog forespørgsel om at droppe alle mellemlagrede data"
 
-#: gconf/gconf-database.c:540
+#: gconf/gconf-database.c:539
 msgid "Received request to sync synchronously"
 msgstr "Modtog forespørgsel om at udføre synkron synkronisering"
 
-#: gconf/gconf-database.c:824
+#: gconf/gconf-database.c:823
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Fatal fejl: kunne ikke hente objektreference for ConfigDatabase"
 
-#: gconf/gconf-database.c:986
+#: gconf/gconf-database.c:985
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Det mislykkedes at synkronise af en eller flere kilder: %s"
 
-#: gconf/gconf-database.c:1078
-#, c-format
+#. This error is not fatal; we basically ignore it.
+#. * Because it's likely the right thing for the client
+#. * app to simply continue.
+#.
+#: gconf/gconf-database.c:1076
+#, fuzzy, c-format
 msgid ""
-"Failed to log addition of listener %s (%s);will not be able to restore this "
+"Failed to log addition of listener %s (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
@@ -366,12 +370,12 @@ msgstr ""
 "denne lytter ved genstart af gconfd, noget som vil resultere i upålidelig "
 "underrettelse om konfigurationsændringer."
 
-#: gconf/gconf-database.c:1109
+#: gconf/gconf-database.c:1103
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Lytter-id %lu eksisterer ikke"
 
-#: gconf/gconf-database.c:1123
+#: gconf/gconf-database.c:1117
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -380,57 +384,57 @@ msgstr ""
 "Kunne ikke logge fjernelse af lytter til logfil (højst sandsynligt harmløst, "
 "kan resultere i at en ændringsunderrettelse genindtræffer på mystisk vis): %s"
 
-#: gconf/gconf-database.c:1241 gconf/gconf-sources.c:1540
+#: gconf/gconf-database.c:1235 gconf/gconf-sources.c:1540
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fejl ved forespørgsel af værdien af '%s': %s"
 
-#: gconf/gconf-database.c:1288
+#: gconf/gconf-database.c:1282
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Fejl ved tildeling af værdi til '%s': %s"
 
-#: gconf/gconf-database.c:1331
+#: gconf/gconf-database.c:1325
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Fejl ved nulstilling af '%s': %s"
 
-#: gconf/gconf-database.c:1360
+#: gconf/gconf-database.c:1354
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Fejl ved forespørgsel af standardværdi for '%s': %s"
 
-#: gconf/gconf-database.c:1411
+#: gconf/gconf-database.c:1405
 #, c-format
 msgid "Error unsetting \"%s\": %s"
 msgstr "Fejl ved nulstilling af \"%s\": %s"
 
-#: gconf/gconf-database.c:1443
+#: gconf/gconf-database.c:1437
 #, c-format
 msgid "Error getting new value for \"%s\": %s"
 msgstr "Fejl ved forespørgsel af ny værdi for \"%s\": %s"
 
-#: gconf/gconf-database.c:1491
+#: gconf/gconf-database.c:1485
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Fejl ved tjekning af eksisterende '%s': %s"
 
-#: gconf/gconf-database.c:1515
+#: gconf/gconf-database.c:1509
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Fejl ved fjernelse af katalog '%s': %s"
 
-#: gconf/gconf-database.c:1542
+#: gconf/gconf-database.c:1536
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Kunne ikke få alle indgange i '%s': %s"
 
-#: gconf/gconf-database.c:1568
+#: gconf/gconf-database.c:1562
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Fejl under listning af kataloger i `%s': %s"
 
-#: gconf/gconf-database.c:1589
+#: gconf/gconf-database.c:1583
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Fejl under opsætning af skema for `%s': %s"
@@ -559,7 +563,7 @@ msgstr "Læsefejl på fil '%s': %s\n"
 
 #: gconf/gconf-internals.c:1211 gconf/gconf-internals.c:1277
 #: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
-#: gconf/gconf-value.c:1363
+#: gconf/gconf-value.c:1341
 msgid "Text contains invalid UTF-8"
 msgstr "Tekst indeholder ugyldig UTF-8"
 
@@ -679,23 +683,23 @@ msgstr "Kunne ikke rense fil '%s': %s"
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "Kunne ikke frigive låsekatalog '%s': %s"
 
-#: gconf/gconf-internals.c:2846 gconf/gconfd.c:587
+#: gconf/gconf-internals.c:2842 gconf/gconfd.c:583
 #, c-format
 msgid "Failed to create %s: %s"
 msgstr "Kunne ikke oprette %s: %s"
 
-#: gconf/gconf-internals.c:2879
+#: gconf/gconf-internals.c:2875
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 "Kunne ikke oprette kommunikationskanal med opstartet gconfd-dæmon: %s\n"
 
-#: gconf/gconf-internals.c:2903
+#: gconf/gconf-internals.c:2899
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Kunne ikke opstarte konfigurationsserver: %s\n"
 
-#: gconf/gconf-internals.c:2927
+#: gconf/gconf-internals.c:2923
 msgid ""
 "Failed to contact configuration server; some possible causes are:\n"
 "a) you have an existing configuration server (gconfd) running, but it isn't "
@@ -716,79 +720,6 @@ msgstr ""
 "sikker på at ingen gconfd-processer kører på enhver maskine der måtte bruge "
 "din hjemmemappe"
 
-#: gconf/gconf-sanity-check.c:39 gconf/gconftool.c:72
-msgid "Help options"
-msgstr "Hjælpetilvalg"
-
-#: gconf/gconf-sanity-check.c:75 gconf/gconftool.c:411
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Fejl ved tilvalg %s: %s.\n"
-"Kør '%s --help' for at se en komplet liste over tilvalg.\n"
-
-#: gconf/gconf-sanity-check.c:132
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not open or create the file \"%s\"; this indicates that there may be a "
-"problem with your configuration, as many programs will need to create files "
-"in your home directory. The error was \"%s\" (errno = %d)."
-msgstr ""
-"Kontakt venligst systemadministratoren for at løse det følgende problem:\n"
-"Kunne ikke åbne eller oprette filen \"%s\"; dette indikerer at der kan være "
-"et problem med konfigurationen eftersom mange programmer har brug for at "
-"oprette filer i din hjemmemappe. Fejlen var \"%s\" (fejlkode = %d)."
-
-#: gconf/gconf-sanity-check.c:144
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not lock the file \"%s\"; this indicates that there may be a problem "
-"with your operating system configuration. If you have an NFS-mounted home "
-"directory, either the client or the server may be set up incorrectly. See "
-"the rpc.statd and rpc.lockd documentation. A common cause of this error is "
-"that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
-"%d)."
-msgstr ""
-"Kontakt venligst systemadministratoren for at løse det følgende problem:\n"
-"Kunne ikke skaffe en lås til filen \"%s\"; dette indikerer at der kan være "
-"et problem med konfigurationen af styresystemet. Hvis du har en NFS-monteret "
-"hjemmemappe, kan enten klienten eller serveren være sat forkert op. Se "
-"dokumentation til rpc.statd og rpc.lockd. Ofte skyldes fejlen at tjenesten "
-"\"nfslock\" er blev deaktiveret. Fejlen var \"%s\" (fejlkode = %d)."
-
-#: gconf/gconf-sanity-check.c:161
-#, c-format
-msgid "Can't remove file %s: %s\n"
-msgstr "Kan slette filen '%s': %s\n"
-
-#: gconf/gconf-sanity-check.c:199
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"No configuration sources in the configuration file \"%s\"; this means that "
-"preferences and other settings can't be saved. %s%s"
-msgstr ""
-"Kontakt venligst systemadministratoren for at løse det følgende problem:\n"
-"Ingen konfigurationskilder i konfigurationsfilen \"%s\"; dette betyder at "
-"indstillinger ikke kan gemmes. %s%s"
-
-#: gconf/gconf-sanity-check.c:202
-msgid "Error reading the file: "
-msgstr "Fejl ved læsning af filen: "
-
-#: gconf/gconf-sanity-check.c:224
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
-msgstr ""
-"Kontakt venligst systemadministratoren for at løse det følgende problem:\n"
-"Kunne ikke finde adressen \"%s\" i konfigurationsfilen \"%s\": %s"
-
 #: gconf/gconf-schema.c:190 gconf/gconf-schema.c:198 gconf/gconf-schema.c:206
 #: gconf/gconf-schema.c:214
 msgid "Schema contains invalid UTF-8"
@@ -958,97 +889,97 @@ msgstr "Forstod ikke '%s' (forkert antal elementer)"
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "Forstod ikke '%s' (ekstra ikke-undvegne ')' fundet inde i par)"
 
-#: gconf/gconf.c:55
+#: gconf/gconf.c:54
 #, c-format
 msgid "Key \"%s\" is NULL"
 msgstr "Nøglen \"%s\" er NULL"
 
-#: gconf/gconf.c:62
+#: gconf/gconf.c:61
 #, c-format
 msgid "\"%s\": %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:343
+#: gconf/gconf.c:333
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Serveren kunne ikke åbne adressen '%s'"
 
-#: gconf/gconf.c:634
+#: gconf/gconf.c:624
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 "Kan ikke tilføje ændringsunderrettelser til en lokal konfigurationskilde"
 
-#: gconf/gconf.c:2079
+#: gconf/gconf.c:2072
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Tilføjelse af klient til serverens liste mislykkedes, CORBA fejl: %s"
 
-#: gconf/gconf.c:2434
+#: gconf/gconf.c:2393
 msgid "Must begin with a slash (/)"
 msgstr "Skal begynde med en skråstreg (/)"
 
-#: gconf/gconf.c:2456
+#: gconf/gconf.c:2415
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan ikke have to skråstreger (/) efter hinanden"
 
-#: gconf/gconf.c:2458
+#: gconf/gconf.c:2417
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan ikke have et punktum (.) lige efter en skråstreg (/)"
 
-#: gconf/gconf.c:2477
+#: gconf/gconf.c:2436
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
 msgstr "'%c' er ikke et ASCII-tegn så det er ikke tilladt i nøglenavne"
 
-#: gconf/gconf.c:2487
+#: gconf/gconf.c:2446
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' er et ugyldigt tegn i nøgle-/katalognavne"
 
-#: gconf/gconf.c:2501
+#: gconf/gconf.c:2460
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Nøgle/katalog må ikke slutte med en skråstreg (/)"
 
-#: gconf/gconf.c:2870
+#: gconf/gconf.c:2829
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fejl ved nedlukning af konfigurationsserver: %s"
 
-#: gconf/gconf.c:2931
+#: gconf/gconf.c:2890
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Forventede kommatal, fik %s"
 
-#: gconf/gconf.c:2966
+#: gconf/gconf.c:2925
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Forventede heltal, fik %s"
 
-#: gconf/gconf.c:3001
+#: gconf/gconf.c:2960
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Forventede streng, fik %s"
 
-#: gconf/gconf.c:3038
+#: gconf/gconf.c:2997
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Forventede boolsk, fik %s"
 
-#: gconf/gconf.c:3071
+#: gconf/gconf.c:3030
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Forventede skema, fik %s"
 
-#: gconf/gconf.c:3432
+#: gconf/gconf.c:3391
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-fejl: %s"
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:246
 msgid "Shutdown request received"
 msgstr "Nedlukningsforespørgsel modtaget"
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:278
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -1056,7 +987,7 @@ msgstr ""
 "gconfd oversat med fejlanalyseinfo; forsøger at hente gconf.path fra "
 "kildekataloget"
 
-#: gconf/gconfd.c:294
+#: gconf/gconfd.c:292
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1067,7 +998,7 @@ msgstr ""
 #. We want to stay alive but do nothing, because otherwise every
 #. request would result in another failed gconfd being spawned.
 #.
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:300
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1075,16 +1006,16 @@ msgstr ""
 "Ingen konfigurationskilder i kildestien, konfigurationen vil ikke blive "
 "gemt; redigér"
 
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:300
 msgid "/path"
 msgstr "/sti"
 
-#: gconf/gconfd.c:315
+#: gconf/gconfd.c:313
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Fejl ved indlæsning af nogle konfigurationskilder: %s"
 
-#: gconf/gconfd.c:327
+#: gconf/gconfd.c:325
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1092,7 +1023,7 @@ msgstr ""
 "Kunne ikke slå nogen adresser op for konfigurationskilde, kan ikke hente "
 "eller gemme konfigurationsdata"
 
-#: gconf/gconfd.c:344
+#: gconf/gconfd.c:342
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1100,65 +1031,65 @@ msgstr ""
 "Ingen skrivbare konfigurationskilder fundet, kan ikke gemme dele af "
 "konfigurationsændringerne"
 
-#: gconf/gconfd.c:370
+#: gconf/gconfd.c:368
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 "Modtog signal %d, dumper hukommelsen. Rapportér venligst en GConf-fejl."
 
-#: gconf/gconfd.c:388
+#: gconf/gconfd.c:384
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 "Modtog signal %d, lukker unormalt ned. Rapportér venligst en GConf-fejl."
 
-#: gconf/gconfd.c:405
+#: gconf/gconfd.c:401
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Modtog signal %d, lukker pænt ned"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:535
+#: gconf/gconfd.c:531
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "starter (version %s), pid %u bruger '%s'"
 
-#: gconf/gconfd.c:574
+#: gconf/gconfd.c:570
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Kunne ikke hente objektreference til ConfigServer"
 
-#: gconf/gconfd.c:612
+#: gconf/gconfd.c:608
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 "Kunne ikke skrive byte til kanal-fd %d så klientprogram hænger muligvis: %s"
 
-#: gconf/gconfd.c:622
+#: gconf/gconfd.c:618
 #, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "Kunne ikke skaffe lås til dæmon, afslutter: %s"
 
-#: gconf/gconfd.c:660
+#: gconf/gconfd.c:656
 #, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "Fejl ved frigivelse af låsefil: %s"
 
-#: gconf/gconfd.c:668
+#: gconf/gconfd.c:664
 msgid "Exiting"
 msgstr "Afslutter"
 
-#: gconf/gconfd.c:694
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "GConf-server er ikke i brug, lukker ned."
 
-#: gconf/gconfd.c:1063
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Returnerede undtagelse: %s"
 
-#: gconf/gconfd.c:1163
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1167,38 +1098,38 @@ msgstr ""
 "Kunne ikke åbne gconfd-logfil; vil ikke kunne genoprette lyttere efter "
 "nedlukning af gconfd (%s)"
 
-#: gconf/gconfd.c:1198
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr "Kunne ikke lukke gconfd-logfil; data blev måske ikke gemt rigtigt (%s)"
 
-#: gconf/gconfd.c:1267
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Kunne ikke åbne tilstandsgemningsfilen '%s' til skrivning: %s"
 
-#: gconf/gconfd.c:1281
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Kunne ikke skrive tilstandsgemningsfilen '%s' fd: %d: %s"
 
-#: gconf/gconfd.c:1290
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Kunne ikke lukke ny tilstandsgemningsfil '%s': %s"
 
-#: gconf/gconfd.c:1304
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Kunne ikke flytte gammel tilstandsgemningsfil '%s': %s"
 
-#: gconf/gconfd.c:1314
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Kunne ikke flytte ny tilstandsgemningsfil på plads: %s"
 
-#: gconf/gconfd.c:1323
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1206,24 +1137,24 @@ msgstr ""
 "Kunne ikke genoprette oprindelig tilstandsgemningsfil som er blevet flyttet "
 "til '%s': %s"
 
-#: gconf/gconfd.c:1794
+#: gconf/gconfd.c:1790
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 "Kunne ikke genoprette en lytter på adressen '%s', kunne ikke finde databasen"
 
-#: gconf/gconfd.c:1840
+#: gconf/gconfd.c:1836
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Fejl ved læsning af tilstandsgemningsfil: %s"
 
-#: gconf/gconfd.c:1893
+#: gconf/gconfd.c:1889
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Kunne ikke åbne tilstandsgemningsfilen '%s': %s"
 
-#: gconf/gconfd.c:2010
+#: gconf/gconfd.c:2006
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1232,7 +1163,7 @@ msgstr ""
 "Kunne ikke logge tilføjelse af lytter til gconfd-logfilen; vil ikke kunne "
 "tilføje lytteren hvis gconfd afslutter eller lukker ned (%s)"
 
-#: gconf/gconfd.c:2015
+#: gconf/gconfd.c:2011
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1241,55 +1172,45 @@ msgstr ""
 "Kunne ikke logge fjernelse af lytter i gconfd-logfilen; kan medføre at "
 "lytter tilføjes igen hvis gconfd afsluttes eller maskinen lukkes ned (%s)."
 
-#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
+#: gconf/gconfd.c:2034 gconf/gconfd.c:2199
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Kunne ikke få IOR for klient: %s"
 
-#: gconf/gconfd.c:2053
+#: gconf/gconfd.c:2049
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Kunne ikke åbne tilstandsgemningsfil: %s"
 
-#: gconf/gconfd.c:2066
+#: gconf/gconfd.c:2062
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "Kunne ikke skrive tilføjelse af klient til tilstandsgemningsfil: %s"
 
-#: gconf/gconfd.c:2074
+#: gconf/gconfd.c:2070
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr "Kunne ikke afslutte tilføjelse af klient til tilstandsgemningsfil: %s"
 
-#: gconf/gconfd.c:2164
+#: gconf/gconfd.c:2160
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 "En klient fjernede sig selv fra GConf-serveren da den ikke blev tilføjet."
 
-#. dialog display isn't working out
-#: gconf/gconfd.c:2303
-msgid "Multiple segmentation faults occurred; can't display error dialog\n"
-msgstr "Der opstod mere end én hukommelsesfejl; kan ikke vise fejlvinduet\n"
-
-#. Eeeek! Can't show dialog
-#: gconf/gconfd.c:2312
-msgid ""
-"Segmentation fault!\n"
-"Cannot display crash dialog\n"
-msgstr ""
-"Hukommelsesfejl!\n"
-"Kan ikke vise nedbrudsvindet\n"
+#: gconf/gconftool.c:71
+msgid "Help options"
+msgstr "Hjælpetilvalg"
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Sæt en nøgle til en værdi og synkronisér. Benyttes med --type."
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid "Print the value of a key to standard output."
 msgstr "Udskriv værdien for en nøgle til standard-ud."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:98
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
@@ -1297,11 +1218,11 @@ msgstr ""
 "Sæt et skema og synkroniser. Benyttes med --short-desc, --long-desc, --"
 "owner, og --type."
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 msgid "Unset the keys on the command line"
 msgstr "Nulstil nøglerne fra kommandolinjen"
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
@@ -1309,32 +1230,32 @@ msgstr ""
 "Nulstil rekursivt alle nøgler ved eller under nøgle-/mappenavnene i "
 "kommandolinjen"
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all key/value pairs in a directory."
 msgstr "Udskriv alle nøgle/værdi-par i et katalog."
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Print all subdirectories in a directory."
 msgstr "Udskriv alle underkataloger i et katalog."
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Udskriv alle underunderkataloger og indgange under et katalog, rekursivt."
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Returnér 0 hvis kataloget eksisterer, 2 hvis ikke."
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Luk gconfd ned. BRUG IKKE DETTE TILVALG UDEN GOD GRUND."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Returnér 0 hvis gconfd kører, 2 hvis ikke."
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1342,7 +1263,7 @@ msgstr ""
 "Start konfigurationsserveren (gconfd) (sker normalt automatisk når det er "
 "nødvendigt)."
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1350,11 +1271,11 @@ msgstr ""
 "Angiv typen af værdien som sættes, eller typen af værdien som et skema "
 "beskriver. Unikke forkortelser er i orden."
 
-#: gconf/gconftool.c:191
+#: gconf/gconftool.c:190
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1362,11 +1283,11 @@ msgstr ""
 "Angiv typen af listeværdien som sættes, eller typen for værdien som et skema "
 "beskriver. Unikke forkortelser er i orden."
 
-#: gconf/gconftool.c:200 gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:199 gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1374,7 +1295,7 @@ msgstr ""
 "Angiv typen af car-værdien for som sættes, eller typen for værdien som et "
 "skema beskriver. Unikke forkortelser er i orden."
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1382,44 +1303,44 @@ msgstr ""
 "Angiv typen af cdr-værdien for par som sættes, eller typen for værdien som "
 "et skema beskriver. Unikke forkortelser er i orden."
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Angiv en kort halv-linjes beskrivelse som skal bruges i et skema."
 
-#: gconf/gconftool.c:227 gconf/gconftool.c:236
+#: gconf/gconftool.c:226 gconf/gconftool.c:235
 msgid "DESCRIPTION"
 msgstr "BESKRIVELSE"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a several-line description to go in a schema."
 msgstr "Angiv en flerlinjers beskrivelse som skal bruges i et skema."
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 msgid "Specify the owner of a schema"
 msgstr "Angiv ejeren af et skema"
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 msgid "OWNER"
 msgstr "EJER"
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid "Specify a schema file to be installed"
 msgstr "Angiv en skemafil som skal installeres"
 
-#: gconf/gconftool.c:254
+#: gconf/gconftool.c:253
 msgid "FILENAME"
 msgstr "FILNAVN"
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Angiv en konfigurationskilde som skal bruges i stedet for standard-stien"
 
-#: gconf/gconftool.c:263
+#: gconf/gconftool.c:262
 msgid "SOURCE"
 msgstr "KILDE"
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1427,7 +1348,7 @@ msgstr ""
 "Tilgå konfigurationsdatabasen direkte, uden om serveren. Kræver at gconfd "
 "ikke kører."
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1438,7 +1359,7 @@ msgstr ""
 "standardværdien for konfigurationskilde eller være tom for at "
 "standardværdien skal bruges."
 
-#: gconf/gconftool.c:289
+#: gconf/gconftool.c:288
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1446,7 +1367,7 @@ msgstr ""
 "Udfør en torturprøvning af et program ved at sætte og tømme en række værdier "
 "af forskellige typer for nøgler fra kommandolinjen."
 
-#: gconf/gconftool.c:298
+#: gconf/gconftool.c:297
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1454,48 +1375,57 @@ msgstr ""
 "Udfør en torturprøvning af et program ved at sætte og tømme en række nøgler "
 "inde i katalogerne fra kommandolinien."
 
-#: gconf/gconftool.c:307
+#: gconf/gconftool.c:306
 msgid "Get the short doc string for a key"
 msgstr "Hent den korte dokumentationstekst for en nøgle"
 
-#: gconf/gconftool.c:316
+#: gconf/gconftool.c:315
 msgid "Get the long doc string for a key"
 msgstr "Hent den lange dokumentationstekst for en nøgle"
 
-#: gconf/gconftool.c:325
+#: gconf/gconftool.c:324
 msgid "Get the name of the schema applied to this key"
 msgstr "Hent navnet på skemaet som er anvendt på denne nøgle"
 
-#: gconf/gconftool.c:334
+#: gconf/gconftool.c:333
 msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr ""
 "Angiv skemanavnet efterfulgt af nøglen som skemanavnet skal anvendes på"
 
-#: gconf/gconftool.c:343
+#: gconf/gconftool.c:342
 msgid "Remove any schema name applied to the given keys"
 msgstr "Fjern ethvert skemanavn som anvendes med de givne nøgler"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:351
 msgid "Get the name of the default source"
 msgstr "Hent navnet på standardkilden"
 
-#: gconf/gconftool.c:423
+#: gconf/gconftool.c:408
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Fejl ved tilvalg %s: %s.\n"
+"Kør '%s --help' for at se en komplet liste over tilvalg.\n"
+
+#: gconf/gconftool.c:420
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Kan ikke hente og sætte/nulstille samtidig\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:427
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Kan ikke sætte og hente/nulstille samtidig\n"
 
-#: gconf/gconftool.c:438
+#: gconf/gconftool.c:435
 msgid "Can't use --all-entries with --get or --set\n"
 msgstr "Kan ikke bruge --all-entries med --get eller --set\n"
 
-#: gconf/gconftool.c:446
+#: gconf/gconftool.c:443
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Kan ikke bruge --all-dirs med --get eller --set\n"
 
-#: gconf/gconftool.c:456
+#: gconf/gconftool.c:453
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-"
 "entries, or --all-dirs\n"
@@ -1503,7 +1433,7 @@ msgstr ""
 "--recursive-list kan ikke bruges med --get, --set, --unset, --all-entries "
 "eller --all-dirs\n"
 
-#: gconf/gconftool.c:466
+#: gconf/gconftool.c:463
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
@@ -1511,375 +1441,375 @@ msgstr ""
 "--set_schema kan ikke bruges med --get, --set, --unset, --all-entries, --all-"
 "dirs\n"
 
-#: gconf/gconftool.c:472
+#: gconf/gconftool.c:469
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Værditype er kun interessant når en værdi skal sættes\n"
 
-#: gconf/gconftool.c:478
+#: gconf/gconftool.c:475
 msgid "Must specify a type when setting a value\n"
 msgstr "En type skal angives hvis en værdi skal sættes\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:485
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping-tilvalget skal bruges alene.\n"
 
-#: gconf/gconftool.c:498
+#: gconf/gconftool.c:495
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists skal bruges alene.\n"
 
-#: gconf/gconftool.c:508
+#: gconf/gconftool.c:505
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file skal bruges alene.\n"
 
-#: gconf/gconftool.c:519
+#: gconf/gconftool.c:516
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule skal bruges alene.\n"
 
-#: gconf/gconftool.c:530
+#: gconf/gconftool.c:527
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key skal bruges alene.\n"
 
-#: gconf/gconftool.c:541
+#: gconf/gconftool.c:538
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory skal bruges alene.\n"
 
-#: gconf/gconftool.c:549
+#: gconf/gconftool.c:546
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "Du skal angive en konfigurationskilde med --config-source når du bruger --"
 "direct\n"
 
-#: gconf/gconftool.c:555
+#: gconf/gconftool.c:552
 msgid "You should use --direct when using a non-default configuration source\n"
 msgstr ""
 "Du bør benytte --direct ved brug af en ikke-standardkonfigurationskilde\n"
 
-#: gconf/gconftool.c:561
+#: gconf/gconftool.c:558
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Kunne ikke starte GConf: %s\n"
 
-#: gconf/gconftool.c:590
+#: gconf/gconftool.c:587
 msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
 msgstr ""
 "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL er sat, installerer ikke skemaer\n"
 
-#: gconf/gconftool.c:603
+#: gconf/gconftool.c:600
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Skal sætte GCONF_CONFIG_SOURCE-miljøvariablen\n"
 
-#: gconf/gconftool.c:632
+#: gconf/gconftool.c:629
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Kunne ikke få fat i konfigurationskilde(r): %s\n"
 
-#: gconf/gconftool.c:854
+#: gconf/gconftool.c:851
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Nedlukningsfejl: %s\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:894
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Du skal angive et eller flere kataloger til rekursiv fremvisning.\n"
 
-#: gconf/gconftool.c:931
+#: gconf/gconftool.c:928
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Fejl under listning af poster i '%s': %s\n"
 
-#: gconf/gconftool.c:949
+#: gconf/gconftool.c:946
 msgid "(no value set)"
 msgstr "(ingen værdi sat)"
 
-#: gconf/gconftool.c:1004
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Fejl under dannelse af konfigurationsserveren (gconfd): %s\n"
 
-#: gconf/gconftool.c:1018
+#: gconf/gconftool.c:1015
 msgid "Must specify a key or keys to get\n"
 msgstr "Skal angive nøgle eller nøgler for at få\n"
 
-#: gconf/gconftool.c:1053
+#: gconf/gconftool.c:1050
 #, c-format
 msgid "Type: %s\n"
 msgstr "Type: %s\n"
 
-#: gconf/gconftool.c:1054
+#: gconf/gconftool.c:1051
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listetype: %s\n"
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1052
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car-type: %s\n"
 
-#: gconf/gconftool.c:1056
+#: gconf/gconftool.c:1053
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr-type: %s\n"
 
-#: gconf/gconftool.c:1061
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Standardværdi: %s\n"
 
-#: gconf/gconftool.c:1061 gconf/gconftool.c:1063 gconf/gconftool.c:1064
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058 gconf/gconftool.c:1060 gconf/gconftool.c:1061
+#: gconf/gconftool.c:1062
 msgid "Unset"
 msgstr "Nulstil"
 
-#: gconf/gconftool.c:1063
+#: gconf/gconftool.c:1060
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Ejer: %s\n"
 
-#: gconf/gconftool.c:1064
+#: gconf/gconftool.c:1061
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kort beskriv.: %s\n"
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1062
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Lang beskriv.: %s\n"
 
-#: gconf/gconftool.c:1074 gconf/gconftool.c:1368
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1365
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Ingen værdi sat for '%s'\n"
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1372
+#: gconf/gconftool.c:1075 gconf/gconftool.c:1369
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Kunne ikke få værdi for '%s': %s\n"
 
-#: gconf/gconftool.c:1121 gconf/gconftool.c:1133
+#: gconf/gconftool.c:1118 gconf/gconftool.c:1130
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Forstår ikke typen '%s'\n"
 
-#: gconf/gconftool.c:1145
+#: gconf/gconftool.c:1142
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 "Nøgler/værdier skal angives skiftevis som parametre\n"
 "\n"
 
-#: gconf/gconftool.c:1165
+#: gconf/gconftool.c:1162
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Ingen værdi sat for nøgle: '%s'\n"
 
-#: gconf/gconftool.c:1193
+#: gconf/gconftool.c:1190
 msgid "Cannot set schema as value\n"
 msgstr "Kan ikke sætte skema som værdi\n"
 
-#: gconf/gconftool.c:1203
+#: gconf/gconftool.c:1200
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Når en liste sættes, skal du angive en primitiv listetype\n"
 
-#: gconf/gconftool.c:1217
+#: gconf/gconftool.c:1214
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "Når et par sættes skal du angive en primitiv car-type og cdr-type\n"
 
-#: gconf/gconftool.c:1232
+#: gconf/gconftool.c:1229
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fejl: %s\n"
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Fejl under sætning af værdi: %s\n"
 
-#: gconf/gconftool.c:1263
+#: gconf/gconftool.c:1260
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Fejl ved synkronisering: %s\n"
 
-#: gconf/gconftool.c:1286
+#: gconf/gconftool.c:1283
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Skal angive en eller flere nøgler ved kommandolinjen\n"
 
-#: gconf/gconftool.c:1306
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "Intet skema kendt for '%s'\n"
 
-#: gconf/gconftool.c:1339
+#: gconf/gconftool.c:1336
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "Ingen dokumentationstekst gemt i skemaet ved '%s'\n"
 
-#: gconf/gconftool.c:1344
+#: gconf/gconftool.c:1341
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Fejl under hentning af skema ved `%s': %s\n"
 
-#: gconf/gconftool.c:1351
+#: gconf/gconftool.c:1348
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "Intet skema gemt ved '%s'\n"
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1351
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "Værdien ved '%s' er ikke et skema\n"
 
-#: gconf/gconftool.c:1410 gconf/gconftool.c:1435
+#: gconf/gconftool.c:1407 gconf/gconftool.c:1432
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 "Et skemanavn efterfulgt af nøglenavnet som det skal anvendes på, skal "
 "angives\n"
 
-#: gconf/gconftool.c:1417
+#: gconf/gconftool.c:1414
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "Fejl ved associering af skemanavnet '%s' med nøglenavnet '%s': %s\n"
 
-#: gconf/gconftool.c:1445
+#: gconf/gconftool.c:1442
 #, c-format
 msgid "Error removing schema name from '%s': %s\n"
 msgstr "Fejl under fjernelse af skemanavn fra '%s': %s\n"
 
-#: gconf/gconftool.c:1470
+#: gconf/gconftool.c:1467
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Du skal angive nøgle (skemanavn) som eneste parameter\n"
 
-#: gconf/gconftool.c:1512
+#: gconf/gconftool.c:1509
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Listetype skal være en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1529
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Parrets car-type skal være en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1552
+#: gconf/gconftool.c:1549
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Parrets cdr-type skal være en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1564
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Fejl under sætning af værdi: %s"
 
-#: gconf/gconftool.c:1581
+#: gconf/gconftool.c:1578
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Fejl ved synkronisering: %s"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1593
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Der skal angives et eller flere kataloger der kan hentes nøgle/værdi-par "
 "fra.\n"
 
-#: gconf/gconftool.c:1610
+#: gconf/gconftool.c:1607
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Der skal angives en eller flere nøgler som skal nulstilles.\n"
 
-#: gconf/gconftool.c:1621
+#: gconf/gconftool.c:1618
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Fejl under nulstilling af '%s': %s\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1638
 msgid "Must specify one or more keys to recursively unset.\n"
 msgstr "Du skal angive en eller flere nøgler til rekursiv nulstilling.\n"
 
-#: gconf/gconftool.c:1655
+#: gconf/gconftool.c:1652
 #, c-format
 msgid "Failure during recursive unset of \"%s\": %s\n"
 msgstr "Fejl under rekursiv nulstilling af \"%s\": %s\n"
 
-#: gconf/gconftool.c:1673
+#: gconf/gconftool.c:1670
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Der skal angives et eller flere kataloger til at hente underkataloger fra.\n"
 
-#: gconf/gconftool.c:1707
+#: gconf/gconftool.c:1704
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Fejl ved visning af kataloger: %s\n"
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1746
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende type for skema (%s)\n"
 
-#: gconf/gconftool.c:1758
+#: gconf/gconftool.c:1755
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende list_type for skema (%s)\n"
 
-#: gconf/gconftool.c:1769 gconf/gconftool.c:1799 gconf/gconftool.c:1828
+#: gconf/gconftool.c:1766 gconf/gconftool.c:1796 gconf/gconftool.c:1825
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "ADVARSEL: Kunne ikke fortolke standardværdi '%s' for skema (%s)\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1784
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende car_type for skema (%s)\n"
 
-#: gconf/gconftool.c:1812
+#: gconf/gconftool.c:1809
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "ADVARSEL: Du kan ikke sætte en standardværdi for et skema\n"
 
-#: gconf/gconftool.c:1841
+#: gconf/gconftool.c:1838
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "ADVARSEL: gconftool, intern fejl, ukendt GConfValueType\n"
 
-#: gconf/gconftool.c:1888 gconf/gconftool.c:1909 gconf/gconftool.c:1930
-#: gconf/gconftool.c:1951
+#: gconf/gconftool.c:1885 gconf/gconftool.c:1906 gconf/gconftool.c:1927
+#: gconf/gconftool.c:1948
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ADVARSEL: kunne ikke fortolke typenavn '%s'\n"
 
-#: gconf/gconftool.c:1905
+#: gconf/gconftool.c:1902
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: list_type kan kun være int, float, string eller bool og ikke `%s'\n"
 
-#: gconf/gconftool.c:1926
+#: gconf/gconftool.c:1923
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: car_type kan kun være int, float, string eller bool og ikke `%s'\n"
 
-#: gconf/gconftool.c:1947
+#: gconf/gconftool.c:1944
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: cdr_type kan kun være int, float, string eller bool og ikke `%s'\n"
 
-#: gconf/gconftool.c:1975
+#: gconf/gconftool.c:1972
 msgid "WARNING: empty <applyto> node"
 msgstr "ADVARSEL: tomt <applyto> element"
 
-#: gconf/gconftool.c:1978 gconf/gconftool.c:2241
+#: gconf/gconftool.c:1975 gconf/gconftool.c:2238
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ADVARSEL: elementet <%s> ikke forstået under <skema>\n"
 
-#: gconf/gconftool.c:1988
+#: gconf/gconftool.c:1985
 msgid "WARNING: no key specified for schema\n"
 msgstr "ADVARSEL: ingen nøgle angivet for skema\n"
 
-#: gconf/gconftool.c:2021
+#: gconf/gconftool.c:2018
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "ADVARSEL: <locale>-elementet har ingen 'name=\"locale\"'-egenskab, "
 "ignorerer\n"
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2024
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1887,51 +1817,51 @@ msgstr ""
 "ADVARSEL: flere <locale>-elementer for lokalet '%s', ignorerer alle andre "
 "end den første\n"
 
-#: gconf/gconftool.c:2108
+#: gconf/gconftool.c:2105
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "ADVARSEL: Ugyldigt element <%s> i et <locale>-element\n"
 
-#: gconf/gconftool.c:2137
+#: gconf/gconftool.c:2134
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "ADVARSEL: Kunne ikke installere skema '%s' lokale '%s': %s\n"
 
-#: gconf/gconftool.c:2145
+#: gconf/gconftool.c:2142
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Installerede skema '%s' for lokale '%s'\n"
 
-#: gconf/gconftool.c:2167
+#: gconf/gconftool.c:2164
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "ADVARSEL: kunne ikke associere skema '%s' med nøglen '%s': %s\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2172
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Vedhæftede skema '%s' til nøglen '%s'\n"
 
-#: gconf/gconftool.c:2254
+#: gconf/gconftool.c:2251
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Du skal have mindst et <locale> i et <schema>\n"
 
-#: gconf/gconftool.c:2285
+#: gconf/gconftool.c:2282
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "ADVARSEL: elementet <%s> ikke forstået under <schemalist>\n"
 
-#: gconf/gconftool.c:2308
+#: gconf/gconftool.c:2305
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Kunne ikke åbne '%s': %s\n"
 
-#: gconf/gconftool.c:2315
+#: gconf/gconftool.c:2312
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokumentet '%s' er tomt?\n"
 
-#: gconf/gconftool.c:2327
+#: gconf/gconftool.c:2324
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1940,26 +1870,26 @@ msgstr ""
 "Dokumentet '%s' har forkert type rod-element (<%s>, skulle være "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:2340
+#: gconf/gconftool.c:2337
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokument `%s' har intet <gconfskemafil>-element på øverste niveau\n"
 
-#: gconf/gconftool.c:2354
+#: gconf/gconftool.c:2351
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ADVARSEL: node <%s> herunder <gconfskemafil> ikke forstået\n"
 
-#: gconf/gconftool.c:2365 gconf/gconftool.c:2397
+#: gconf/gconftool.c:2362 gconf/gconftool.c:2394
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Fejl ved synkronisering af konfigurationsdata: %s"
 
-#: gconf/gconftool.c:2381
+#: gconf/gconftool.c:2378
 msgid "Must specify some schema files to install\n"
 msgstr "Skal angive nogle skema-filer til installering\n"
 
-#: gconf/gconftool.c:2418
+#: gconf/gconftool.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -1968,16 +1898,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2438
+#: gconf/gconftool.c:2435
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Kunne ikke fjerne afbrydelsesnøgle %s: %s\n"
 
-#: gconf/gconftool.c:2564
+#: gconf/gconftool.c:2561
 msgid "Must specify some keys to break\n"
 msgstr "Skal angive en eller flere nøgler at ødelægge\n"
 
-#: gconf/gconftool.c:2570
+#: gconf/gconftool.c:2567
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1986,11 +1916,11 @@ msgstr ""
 "Forsøger at ødelægge din program ved at sætte forkerte værdier for nøgle:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2588
+#: gconf/gconftool.c:2585
 msgid "Must specify some directories to break\n"
 msgstr "Skal angive nogle kataloger som skal ødelægges\n"
 
-#: gconf/gconftool.c:2607
+#: gconf/gconftool.c:2604
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -2000,3 +1930,67 @@ msgstr ""
 "Forsøger at ødelægge dit program ved at sætte forkerte værdier til nøgler i "
 "katalog:\n"
 "  %s\n"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not open or create the file \"%s\"; this indicates that there may "
+#~ "be a problem with your configuration, as many programs will need to "
+#~ "create files in your home directory. The error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Kontakt venligst systemadministratoren for at løse det følgende problem:\n"
+#~ "Kunne ikke åbne eller oprette filen \"%s\"; dette indikerer at der kan "
+#~ "være et problem med konfigurationen eftersom mange programmer har brug "
+#~ "for at oprette filer i din hjemmemappe. Fejlen var \"%s\" (fejlkode = %d)."
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not lock the file \"%s\"; this indicates that there may be a "
+#~ "problem with your operating system configuration. If you have an NFS-"
+#~ "mounted home directory, either the client or the server may be set up "
+#~ "incorrectly. See the rpc.statd and rpc.lockd documentation. A common "
+#~ "cause of this error is that the \"nfslock\" service has been disabled.The "
+#~ "error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Kontakt venligst systemadministratoren for at løse det følgende problem:\n"
+#~ "Kunne ikke skaffe en lås til filen \"%s\"; dette indikerer at der kan "
+#~ "være et problem med konfigurationen af styresystemet. Hvis du har en NFS-"
+#~ "monteret hjemmemappe, kan enten klienten eller serveren være sat forkert "
+#~ "op. Se dokumentation til rpc.statd og rpc.lockd. Ofte skyldes fejlen at "
+#~ "tjenesten \"nfslock\" er blev deaktiveret. Fejlen var \"%s\" (fejlkode = %"
+#~ "d)."
+
+#~ msgid "Can't remove file %s: %s\n"
+#~ msgstr "Kan slette filen '%s': %s\n"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "No configuration sources in the configuration file \"%s\"; this means "
+#~ "that preferences and other settings can't be saved. %s%s"
+#~ msgstr ""
+#~ "Kontakt venligst systemadministratoren for at løse det følgende problem:\n"
+#~ "Ingen konfigurationskilder i konfigurationsfilen \"%s\"; dette betyder at "
+#~ "indstillinger ikke kan gemmes. %s%s"
+
+#~ msgid "Error reading the file: "
+#~ msgstr "Fejl ved læsning af filen: "
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
+#~ msgstr ""
+#~ "Kontakt venligst systemadministratoren for at løse det følgende problem:\n"
+#~ "Kunne ikke finde adressen \"%s\" i konfigurationsfilen \"%s\": %s"
+
+#~ msgid "Multiple segmentation faults occurred; can't display error dialog\n"
+#~ msgstr "Der opstod mere end én hukommelsesfejl; kan ikke vise fejlvinduet\n"
+
+#~ msgid ""
+#~ "Segmentation fault!\n"
+#~ "Cannot display crash dialog\n"
+#~ msgstr ""
+#~ "Hukommelsesfejl!\n"
+#~ "Kan ikke vise nedbrudsvindet\n"
diff --git a/po/de.po b/po/de.po
index 04ffd16f..52919dce 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.1.x\n"
-"POT-Creation-Date: 2002-03-16 17:40+0100\n"
+"POT-Creation-Date: 2002-01-28 21:35-0500\n"
 "PO-Revision-Date: 2002-03-11 23:57+0100\n"
 "Last-Translator: Christian Meyer <chrisime@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -69,12 +69,12 @@ msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "Verzeichnis-/Dateiberechtigungen für XML-Quelle bei Wurzel %s sind %o/%o"
 
-#: backends/xml-backend.c:590
+#: backends/xml-backend.c:584
 #, c-format
 msgid "Error syncing the XML backend directory cache: %s"
 msgstr "Fehler beim Synchronisieren des XML-Backend-Verzeichnis-Caches: %s"
 
-#: backends/xml-backend.c:657
+#: backends/xml-backend.c:651
 msgid ""
 "Remove dir operation is no longer supported, just remove all the values in "
 "the directory"
@@ -82,11 +82,11 @@ msgstr ""
 "Das Entfernen der dir-Operation wird nicht mehr unterstützt, entfernen Sie "
 "einfach alle Schlüssel in dem Verzeichnis"
 
-#: backends/xml-backend.c:724
+#: backends/xml-backend.c:718
 msgid "Initializing XML backend module"
 msgstr "XML-Backend-Modul wird initialisiert"
 
-#: backends/xml-backend.c:792
+#: backends/xml-backend.c:786
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Sperre auf XML-Verzeichnis »%s« konnte nicht gelöst werden: %s"
@@ -315,50 +315,54 @@ msgstr "Backend konnte nicht heruntergefahren werden"
 msgid "GConf Error: %s\n"
 msgstr "GConf-Fehler: %s\n"
 
-#: gconf/gconf-client.c:897
+#: gconf/gconf-client.c:899
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf-Warnung: Fehler beim Auflisten von Paaren in »%s«: %s"
 
-#: gconf/gconf-client.c:1162
+#: gconf/gconf-client.c:1165
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "»%s« erwartet, aber »%s« für den Schlüssel %s erhalten"
 
-#: gconf/gconf-database.c:234
+#: gconf/gconf-database.c:233
 msgid "Received invalid value in set request"
 msgstr "Ungültigen Wert in Zuweisungsanfrage erhalten"
 
-#: gconf/gconf-database.c:242
+#: gconf/gconf-database.c:241
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Sinn des CORBA-Wertes in Zuweisungsanfrage für Schlüssel »%s« konnte nicht "
 "ausgemacht werden"
 
-#: gconf/gconf-database.c:523
+#: gconf/gconf-database.c:522
 msgid "Received request to drop all cached data"
 msgstr "Anfrage zum Löschen aller Daten im Cache erhalten"
 
-#: gconf/gconf-database.c:540
+#: gconf/gconf-database.c:539
 msgid "Received request to sync synchronously"
 msgstr "Anfrage zum synchronen Synchronisieren erhalten"
 
-#: gconf/gconf-database.c:824
+#: gconf/gconf-database.c:823
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "Schwerer Fehler: Objektreferenz für ConfigDatabase konnte nicht erhalten "
 "werden"
 
-#: gconf/gconf-database.c:986
+#: gconf/gconf-database.c:985
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Eine oder mehrere Quellen konnten nicht synchronisiert werden: %s"
 
-#: gconf/gconf-database.c:1078
-#, c-format
+#. This error is not fatal; we basically ignore it.
+#. * Because it's likely the right thing for the client
+#. * app to simply continue.
+#.
+#: gconf/gconf-database.c:1076
+#, fuzzy, c-format
 msgid ""
-"Failed to log addition of listener %s (%s);will not be able to restore this "
+"Failed to log addition of listener %s (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
@@ -367,12 +371,12 @@ msgstr ""
 "werden können, was zu einer unzuverlässigen Benachrichtigung über "
 "Konfigurationsänderungen führen wird."
 
-#: gconf/gconf-database.c:1109
+#: gconf/gconf-database.c:1103
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Zuhörer-Kennung %lu existiert nicht"
 
-#: gconf/gconf-database.c:1123
+#: gconf/gconf-database.c:1117
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -382,57 +386,57 @@ msgstr ""
 "(wahrscheinlich harmlos, könnte zu einer neu erscheinenden Benachrichtung "
 "führen): %s"
 
-#: gconf/gconf-database.c:1241 gconf/gconf-sources.c:1540
+#: gconf/gconf-database.c:1235 gconf/gconf-sources.c:1540
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fehler beim Erhalten des Wertes für »%s«: %s"
 
-#: gconf/gconf-database.c:1288
+#: gconf/gconf-database.c:1282
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Fehler beim Zuweisen des Wertes für »%s«: %s"
 
-#: gconf/gconf-database.c:1331
+#: gconf/gconf-database.c:1325
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Fehler beim Zurücksetzen von »%s«: %s"
 
-#: gconf/gconf-database.c:1360
+#: gconf/gconf-database.c:1354
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Fehler beim Erhalten des voreingestellten Wertes für »%s«: %s"
 
-#: gconf/gconf-database.c:1411
+#: gconf/gconf-database.c:1405
 #, c-format
 msgid "Error unsetting \"%s\": %s"
 msgstr "Fehler beim Zurücksetzen von »%s«: %s"
 
-#: gconf/gconf-database.c:1443
+#: gconf/gconf-database.c:1437
 #, c-format
 msgid "Error getting new value for \"%s\": %s"
 msgstr "Fehler beim Erhalten des neuen Wertes für »%s«: %s"
 
-#: gconf/gconf-database.c:1491
+#: gconf/gconf-database.c:1485
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Fehler beim Prüfen der Existenz von »%s«: %s"
 
-#: gconf/gconf-database.c:1515
+#: gconf/gconf-database.c:1509
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Fehler beim Entfernen des Verzeichnisses »%s«: %s"
 
-#: gconf/gconf-database.c:1542
+#: gconf/gconf-database.c:1536
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Fehler beim Erhalten aller Einträge in »%s«: %s"
 
-#: gconf/gconf-database.c:1568
+#: gconf/gconf-database.c:1562
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Fehler beim Auflisten der Verzeichnisse in »%s«: %s"
 
-#: gconf/gconf-database.c:1589
+#: gconf/gconf-database.c:1583
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Fehler beim Zuweisen des Schemas für »%s«: %s"
@@ -561,7 +565,7 @@ msgstr "Lesefehler auf Datei »%s«: %s\n"
 
 #: gconf/gconf-internals.c:1211 gconf/gconf-internals.c:1277
 #: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
-#: gconf/gconf-value.c:1363
+#: gconf/gconf-value.c:1341
 msgid "Text contains invalid UTF-8"
 msgstr "Text enthält ungültiges UTF-8"
 
@@ -689,23 +693,23 @@ msgstr "Datei »%s« konnte nicht bereinigt werden: %s"
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "Sperrverzeichnis »%s« konnte nicht gelöscht werden: %s"
 
-#: gconf/gconf-internals.c:2846 gconf/gconfd.c:587
+#: gconf/gconf-internals.c:2842 gconf/gconfd.c:583
 #, c-format
 msgid "Failed to create %s: %s"
 msgstr "Erzeugen von %s fehlgeschlagen: %s"
 
-#: gconf/gconf-internals.c:2879
+#: gconf/gconf-internals.c:2875
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 "Erzeugen der Pipe zur Kommunikation mit dem gconf-Dämon fehlgeschlagen:  %s\n"
 
-#: gconf/gconf-internals.c:2903
+#: gconf/gconf-internals.c:2899
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Konfigurationsserver konnte nicht gestartet werden: %s\n"
 
-#: gconf/gconf-internals.c:2927
+#: gconf/gconf-internals.c:2923
 msgid ""
 "Failed to contact configuration server; some possible causes are:\n"
 "a) you have an existing configuration server (gconfd) running, but it isn't "
@@ -726,88 +730,6 @@ msgstr ""
 "*.lock und ~/.gconfd/lock zu löschen, wenn Sie sicher sind, dass keine gconf-"
 "Prozesse auf einem Rechner laufen, die das Heimverzeichnis verwenden"
 
-#: gconf/gconf-sanity-check.c:39 gconf/gconftool.c:72
-msgid "Help options"
-msgstr "Hilfeoptionen"
-
-#: gconf/gconf-sanity-check.c:75 gconf/gconftool.c:411
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Fehler bei Option %s: %s.\n"
-"`%s --help' ausführen, um eine vollständige Liste verfügbarer Prompt-"
-"Optionen anzuzeigen.\n"
-
-#: gconf/gconf-sanity-check.c:132
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not open or create the file \"%s\"; this indicates that there may be a "
-"problem with your configuration, as many programs will need to create files "
-"in your home directory. The error was \"%s\" (errno = %d)."
-msgstr ""
-"Bitte setzen Sie sich mit Ihrem Systemadministrator in Verbindung, um das "
-"folgende Problem zu lösen:\n"
-"Datei »%s« konnte nicht geöffnet oder erstellt werden. Dies deutet darauf "
-"hin, dass ein Problem in Ihrer Konfiguration vorliegen könnte, da viele "
-"Programme Dateien in Ihrem Heimverzeichnis anlegen müssen. Der Fehler war »%"
-"s« (errno = %d)."
-
-#: gconf/gconf-sanity-check.c:144
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not lock the file \"%s\"; this indicates that there may be a problem "
-"with your operating system configuration. If you have an NFS-mounted home "
-"directory, either the client or the server may be set up incorrectly. See "
-"the rpc.statd and rpc.lockd documentation. A common cause of this error is "
-"that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
-"%d)."
-msgstr ""
-"Bitte setzen Sie sich mit Ihrem Systemadministrator in Verbindung, um das "
-"folgende Problem zu lösen:\n"
-"Die Datei »%s« konnte nicht gesperrt werden. Dies deutet darauf hin, dass es "
-"ein Problem mit der Konfiguration Ihres Betriebssystems geben könnte. Wenn "
-"Ihr Heimverzeichnis per NFS eingehängt ist, kann es sein, dass entweder der "
-"Client oder der Server nicht richtig konfiguriert ist. Schauen Sie in der "
-"rpc.statd- und der rpc.lockd-Dokumentation nach. Ein Grund für diesen Fehler "
-"ist, dass der »nfslock«-Dienst deaktiviert wurde. Der Fehler war »%s« (errno "
-"= %d),"
-
-#: gconf/gconf-sanity-check.c:161
-#, c-format
-msgid "Can't remove file %s: %s\n"
-msgstr "In Datei %s konnte nicht entfernt werden: %s\n"
-
-#: gconf/gconf-sanity-check.c:199
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"No configuration sources in the configuration file \"%s\"; this means that "
-"preferences and other settings can't be saved. %s%s"
-msgstr ""
-"Bitte setzen Sie sich mit Ihrem Systemadministrator in Verbindung, um das "
-"folgende Problem zu lösen:\n"
-"Keine Konfigurationsquelle in der Konfigurationsdatei »%s«. Dies bedeutet, "
-"dass Vorlieben und andere Einstellungen nicht gespeichert werden können. %s%s"
-
-#: gconf/gconf-sanity-check.c:202
-msgid "Error reading the file: "
-msgstr "Fehler beim Lesen der Datei: "
-
-#: gconf/gconf-sanity-check.c:224
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
-msgstr ""
-"Bitte setzen Sie sich mit Ihrem Systemadministrator in Verbindung, um das "
-"folgende Problem zu lösen:\n"
-"Die Adresse »%s« in der Konfigurationsdatei »%s« konnte nicht aufgelöst "
-"werden; %s"
-
 #: gconf/gconf-schema.c:190 gconf/gconf-schema.c:198 gconf/gconf-schema.c:206
 #: gconf/gconf-schema.c:214
 msgid "Schema contains invalid UTF-8"
@@ -983,99 +905,99 @@ msgstr "%s nicht verstanden (falsch Anzahl von Elementen)"
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "»%s« nicht verstanden (nicht Escape-Sequenz »)« im Paar gefunden)"
 
-#: gconf/gconf.c:55
+#: gconf/gconf.c:54
 #, c-format
 msgid "Key \"%s\" is NULL"
 msgstr "Schlüssel »%s« ist NULL"
 
-#: gconf/gconf.c:62
+#: gconf/gconf.c:61
 #, c-format
 msgid "\"%s\": %s"
 msgstr "»%s«: %s"
 
-#: gconf/gconf.c:343
+#: gconf/gconf.c:333
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Server konnte Adresse »%s« nicht auflösen"
 
-#: gconf/gconf.c:634
+#: gconf/gconf.c:624
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 "Benachrichtigungen konnten nicht zu einer lokalen Konfigurationsquelle "
 "hinzugefügt werden"
 
-#: gconf/gconf.c:2079
+#: gconf/gconf.c:2072
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 "Hinzufügen des Clients zur Serverliste ist fehlgeschlagen. CORBA-Fehler: %s"
 
-#: gconf/gconf.c:2434
+#: gconf/gconf.c:2393
 msgid "Must begin with a slash (/)"
 msgstr "Muss mit einem Schrägstrich beginnen (/)"
 
-#: gconf/gconf.c:2456
+#: gconf/gconf.c:2415
 msgid "Can't have two slashes (/) in a row"
 msgstr "Zwei Schrägstriche (/) hintereinander in einer sind nicht erlaubt"
 
-#: gconf/gconf.c:2458
+#: gconf/gconf.c:2417
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Punkt (.) direkt hinter einem Schrägstrich (/) ist nicht erlaubt"
 
-#: gconf/gconf.c:2477
+#: gconf/gconf.c:2436
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
 msgstr "»%c« ist ein kein ASCII-Zeichen, daher in Schlüsselnamen nicht erlaubt"
 
-#: gconf/gconf.c:2487
+#: gconf/gconf.c:2446
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "»%c« ist ein unerlaubtes Zeichen in Schlüssel-/Verzeichnisnamen"
 
-#: gconf/gconf.c:2501
+#: gconf/gconf.c:2460
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Schlüssel/Verzeichnis darf nicht mit einem Schrägstrich (/) enden"
 
-#: gconf/gconf.c:2870
+#: gconf/gconf.c:2829
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fehler beim Herunterfahren des Konfigurationsservers: %s"
 
-#: gconf/gconf.c:2931
+#: gconf/gconf.c:2890
 #, c-format
 msgid "Expected float, got %s"
 msgstr "float erwartet, aber %s erhalten"
 
-#: gconf/gconf.c:2966
+#: gconf/gconf.c:2925
 #, c-format
 msgid "Expected int, got %s"
 msgstr "int erwartet, aber %s erhalten"
 
-#: gconf/gconf.c:3001
+#: gconf/gconf.c:2960
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Zeichenkette erwartet, aber %s erhalten"
 
-#: gconf/gconf.c:3038
+#: gconf/gconf.c:2997
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "bool erwartet, aber %s erhalten"
 
-#: gconf/gconf.c:3071
+#: gconf/gconf.c:3030
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Schema erwartet, aber %s erhalten"
 
-#: gconf/gconf.c:3432
+#: gconf/gconf.c:3391
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-Fehler: %s"
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:246
 msgid "Shutdown request received"
 msgstr "Anfrage zum Beenden empfangen"
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:278
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -1083,7 +1005,7 @@ msgstr ""
 "gconfd wurde mit Fehlerdiagnose compiliert; es wird versucht gconf.path aus "
 "dem Quellverzeichnis zu laden"
 
-#: gconf/gconfd.c:294
+#: gconf/gconfd.c:292
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1094,7 +1016,7 @@ msgstr ""
 #. We want to stay alive but do nothing, because otherwise every
 #. request would result in another failed gconfd being spawned.
 #.
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:300
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1102,16 +1024,16 @@ msgstr ""
 "Keine Konfigurationsquellen im Quellpfad, Konfiguration wird nicht "
 "gespeichert werden; bearbeiten Sie sie"
 
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:300
 msgid "/path"
 msgstr "/Pfad"
 
-#: gconf/gconfd.c:315
+#: gconf/gconfd.c:313
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Fehler beim Laden von Konfigurationsquellen: %s"
 
-#: gconf/gconfd.c:327
+#: gconf/gconfd.c:325
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1119,7 +1041,7 @@ msgstr ""
 "Es konnten keine Konfigurations-Quelladressen aufgelöst werden, "
 "Konfigurationsdaten können nicht geladen oder gespeichert werden"
 
-#: gconf/gconfd.c:344
+#: gconf/gconfd.c:342
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1127,65 +1049,65 @@ msgstr ""
 "Es konnten keine schreibbaren Konfigurationsquellen aufgelöst werden; einige "
 "Konfigurationsänderungen können nicht gespeichert werden"
 
-#: gconf/gconfd.c:370
+#: gconf/gconfd.c:368
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr "Signal %d erhalten, Absturz. Bitte melden Sie einen GConf-Bug."
 
-#: gconf/gconfd.c:388
+#: gconf/gconfd.c:384
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 "Signal %d erhalten, unplanmäßiges Beenden. Bitte melden Sie einen GConf-Bug."
 
-#: gconf/gconfd.c:405
+#: gconf/gconfd.c:401
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Signal %d erhalten, sauberes Herunterfahren"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:535
+#: gconf/gconfd.c:531
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "(Version %s) wird gestartet, PID %u, Benutzer »%s«"
 
-#: gconf/gconfd.c:574
+#: gconf/gconfd.c:570
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Objektreferenz für ConfigServer konnte nicht erhalten werden"
 
-#: gconf/gconfd.c:612
+#: gconf/gconfd.c:608
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 "Schreiben auf Pipe-FileDescriptor %d fehlgeschlagen; das Client-Programm "
 "könnte hängen: %s"
 
-#: gconf/gconfd.c:622
+#: gconf/gconfd.c:618
 #, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "Sperre für den Dämon konnte nicht erzeugt werden, beendet: %s"
 
-#: gconf/gconfd.c:660
+#: gconf/gconfd.c:656
 #, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "Fehler bei der Freigabe der Sperrdatei: %s"
 
-#: gconf/gconfd.c:668
+#: gconf/gconfd.c:664
 msgid "Exiting"
 msgstr "Beendet"
 
-#: gconf/gconfd.c:694
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "GConf-Server wird nicht verwendet, wird beendet."
 
-#: gconf/gconfd.c:1063
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Ausnahmefehler: %s"
 
-#: gconf/gconfd.c:1163
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1194,7 +1116,7 @@ msgstr ""
 "gconfd-Protkolldatei konnte nicht geöffnet werden; Zuhörer können nach "
 "Beenden von gconfd nicht wiederhergestellt werden (%s)"
 
-#: gconf/gconfd.c:1198
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1202,36 +1124,36 @@ msgstr ""
 "gconfd-Protokolldatei konnte nicht geschlossen werden; Daten können evtl. "
 "nicht ordnungsgemäß gespeichert worden sein (%s)"
 
-#: gconf/gconfd.c:1267
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 "Status-Speicherungsdatei »%s« konnte nicht zum Schreiben geöffnet werden: %s"
 
-#: gconf/gconfd.c:1281
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 "Status-Speicherungsdatei »%s«, FD %d, konnte nicht geschrieben werden: %s"
 
-#: gconf/gconfd.c:1290
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Neue Status-Speicherungsdatei »%s« konnet nicht geschlossen werden: %s"
 
-#: gconf/gconfd.c:1304
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Alte Status-Speicherungsdatei »%s« konnte verschoben werden: %s"
 
-#: gconf/gconfd.c:1314
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 "Neue Status-Speicherungsdatei konnte nicht an den richtigen Platz verschoben "
 "werden: %s"
 
-#: gconf/gconfd.c:1323
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1239,7 +1161,7 @@ msgstr ""
 "Ursprüngliche Status-Speicherungsdatei, nach »%s« verschoben wurde, konnte "
 "nicht wiederhergestellt werden: %s"
 
-#: gconf/gconfd.c:1794
+#: gconf/gconfd.c:1790
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1247,17 +1169,17 @@ msgstr ""
 "Zuhörer auf Adresse »%s« konnte nicht wiederhergestellt werden, Datenbank "
 "konnte nicht aufgelöst werden"
 
-#: gconf/gconfd.c:1840
+#: gconf/gconfd.c:1836
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Lesen der gespeicherten Statusdatei fehlgeschlagen: %s"
 
-#: gconf/gconfd.c:1893
+#: gconf/gconfd.c:1889
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Öffnen der gespeicherten Statusdatei »%s« nicht möglich: %s"
 
-#: gconf/gconfd.c:2010
+#: gconf/gconfd.c:2006
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1267,7 +1189,7 @@ msgstr ""
 "geschrieben werden; Zuhörer wird nicht wieder hinzugefügt werden können, "
 "wenn gconfd beendet wird (%s)"
 
-#: gconf/gconfd.c:2015
+#: gconf/gconfd.c:2011
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1277,64 +1199,52 @@ msgstr ""
 "geschrieben werden; Zuhörer wird vielleicht irrtümlich wieder hinzugefügt, "
 "wenn gconfd beendet wird (%s)"
 
-#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
+#: gconf/gconfd.c:2034 gconf/gconfd.c:2199
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Empfangen des IOR für Client fehlgeschlagen: %s"
 
-#: gconf/gconfd.c:2053
+#: gconf/gconfd.c:2049
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Öffnen der gespeicherten Statusdatei nicht möglich: %s"
 
-#: gconf/gconfd.c:2066
+#: gconf/gconfd.c:2062
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr ""
 "Schreiben des Clients, der zur gespeicherten Statusdatei hinzugefügt wurde, "
 "fehlgeschlagen: %s"
 
-#: gconf/gconfd.c:2074
+#: gconf/gconfd.c:2070
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr ""
 "Entfernen des Clients, der zur gespeicherten Statusdatei hinzugefügt wurde, "
 "fehlgeschlagen: %s"
 
-#: gconf/gconfd.c:2164
+#: gconf/gconfd.c:2160
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 "Einige Clients entfernten sich selbst aus dem GConf-Server, obwohl sie nicht "
 "hinzugefügt wurden."
 
-#. dialog display isn't working out
-#: gconf/gconfd.c:2303
-msgid "Multiple segmentation faults occurred; can't display error dialog\n"
-msgstr ""
-"Mehrere Speicherschutzfehler sind aufgetreten. Fehlerdialog kann nicht "
-"angezeigt werden\n"
-
-#. Eeeek! Can't show dialog
-#: gconf/gconfd.c:2312
-msgid ""
-"Segmentation fault!\n"
-"Cannot display crash dialog\n"
-msgstr ""
-"Speicherschutzfehler!\n"
-"Absturzdialog kann nicht angezeigt werden\n"
+#: gconf/gconftool.c:71
+msgid "Help options"
+msgstr "Hilfeoptionen"
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 "Einem Schlüssel einen Wert zuweisen und synchronisieren. Mit --type "
 "verwenden."
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid "Print the value of a key to standard output."
 msgstr "Den Wert eines Schlüssels auf der Standardausgabe ausgeben."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:98
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
@@ -1342,12 +1252,12 @@ msgstr ""
 "Ein Schema setzen und synchronisieren. Mit --short-desc, --long-desc, --"
 "owner und --type verwenden."
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 msgid "Unset the keys on the command line"
 msgstr "Die Schlüssel am Prompt zurücksetzten"
 
 # CHECK
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
@@ -1355,34 +1265,34 @@ msgstr ""
 "Rekursiv alle Schlüssel bei oder unterhalb der Schlüssel-/Verzeichnisnamen "
 "am Prompt zurücksetzen"
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all key/value pairs in a directory."
 msgstr "Alle Schlüssel/Wert-Paare aus einem Verzeichnis ausgeben."
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Print all subdirectories in a directory."
 msgstr "Alle Unterverzeichnisse aus einem Verzeichnis ausgeben."
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Alle Unterverzeichnisse und Einträge unterhalb eines Verzeichnisses rekursiv "
 "ausgeben."
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "0 zurückgeben, wenn das Verzeichnis existiert, andernfalls 2."
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 "gconfd herunterfahren. DIESE OPTION NICHT OHNE EINEN GUTEN GRUND VERWENDEN."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "0 zurückgeben, wenn gconfd läuft, andernfalls 2."
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1390,7 +1300,7 @@ msgstr ""
 "Den Konfigurationsserver (gconfd) starten. (Passiert normalerweise "
 "automatisch wenn nötig.)"
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1398,11 +1308,11 @@ msgstr ""
 "Geben Sie den Typ des zuzuweisenden Wertes an, oder aber den Typ eines "
 "Wertes, den ein Schema beschreibt. Eindeutige Abkürzungen werden akzeptiert."
 
-#: gconf/gconftool.c:191
+#: gconf/gconftool.c:190
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1410,11 +1320,11 @@ msgstr ""
 "Geben Sie den Typ des zuzuweisenden Listenwertes an, oder aber den Typ eines "
 "Wertes, den ein Schema beschreibt. Eindeutige Abkürzungen werden akzeptiert."
 
-#: gconf/gconftool.c:200 gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:199 gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1422,7 +1332,7 @@ msgstr ""
 "Geben Sie den Typ des car-Paar-Wertes an, oder aber den Typ eines Wertes, "
 "den ein Schema beschreibt. Eindeutige Abkürzungen werden akzeptiert."
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1430,48 +1340,48 @@ msgstr ""
 "Geben Sie den Typ des cdr-Paar-Wertes an, oder aber den Typ eines Wertes, "
 "den ein Schema beschreibt. Eindeutige Abkürzungen werden akzeptiert."
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "Geben Sie eine kurze, »half-line«-Beschreibung an, die in ein Schema "
 "einfließt."
 
-#: gconf/gconftool.c:227 gconf/gconftool.c:236
+#: gconf/gconftool.c:226 gconf/gconftool.c:235
 msgid "DESCRIPTION"
 msgstr "BESCHREIBUNG"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 "Geben Sie eine mehrzeilige Beschreibung an, die in ein Schema einfließt."
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 msgid "Specify the owner of a schema"
 msgstr "Geben Sie den Besitzer eines Schemas an"
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 msgid "OWNER"
 msgstr "BESITZER"
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid "Specify a schema file to be installed"
 msgstr "Geben Sie die zu installierende Schemadatei an"
 
-#: gconf/gconftool.c:254
+#: gconf/gconftool.c:253
 msgid "FILENAME"
 msgstr "DATEINAME"
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Geben Sie eine Konfigurationsquelle an, die statt des voreingestellten "
 "Pfades verwendet werden soll"
 
-#: gconf/gconftool.c:263
+#: gconf/gconftool.c:262
 msgid "SOURCE"
 msgstr "QUELLE"
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1479,7 +1389,7 @@ msgstr ""
 "Direkt auf die Konfigurationsdatenbank zugreifen, ohne den Server zu "
 "verwenden. Setzt voraus, dass gconfd nicht läuft."
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1490,7 +1400,7 @@ msgstr ""
 "Konfigurationsquelle als die voreingestellte zeigen oder zur Verwendung der "
 "Voreinstellung eine leere Zeichenkette enthalten."
 
-#: gconf/gconftool.c:289
+#: gconf/gconftool.c:288
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1498,7 +1408,7 @@ msgstr ""
 "Eine Anwendung foltern, indem ein Haufen Werte verschiedener Typen für die "
 "Schlüssel am Prompt gesetzt und zurückgesetzt werden."
 
-#: gconf/gconftool.c:298
+#: gconf/gconftool.c:297
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1506,52 +1416,62 @@ msgstr ""
 "Eine Anwendung foltern, indem ein Haufen Schlüssel in den am Prompt "
 "angegebenen Verzeichnissen gesetzt und zurückgesetzt werden."
 
-#: gconf/gconftool.c:307
+#: gconf/gconftool.c:306
 msgid "Get the short doc string for a key"
 msgstr "Kurze doc-Zeichenkette für einen Schlüssel anfordern"
 
-#: gconf/gconftool.c:316
+#: gconf/gconftool.c:315
 msgid "Get the long doc string for a key"
 msgstr "Lange doc-Zeichenkette für einen Schlüssel anfordern"
 
-#: gconf/gconftool.c:325
+#: gconf/gconftool.c:324
 msgid "Get the name of the schema applied to this key"
 msgstr "Name des Schemas, das auf diesen Schlüssel angewendet wurde, anfordern"
 
-#: gconf/gconftool.c:334
+#: gconf/gconftool.c:333
 msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr ""
 "Geben Sie den Namen des Schemas gefolgt vom Name des Schlüssels auf den der "
 "Name des Schemas angewendet werden soll an"
 
-#: gconf/gconftool.c:343
+#: gconf/gconftool.c:342
 msgid "Remove any schema name applied to the given keys"
 msgstr ""
 "Alle Schemanamen die auf die gegebenen Schlüssel angewendet wurden löschen"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:351
 msgid "Get the name of the default source"
 msgstr "Geben Sie den Namen der voreingestellten Quelle an"
 
-#: gconf/gconftool.c:423
+#: gconf/gconftool.c:408
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Fehler bei Option %s: %s.\n"
+"`%s --help' ausführen, um eine vollständige Liste verfügbarer Prompt-"
+"Optionen anzuzeigen.\n"
+
+#: gconf/gconftool.c:420
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 "Es konnte nicht gleichzeitig abgerufen und zugewiesen/zurückgesetzt werden\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:427
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 "Es konnte nicht gleichzeitig zugewiesen und abgerufen/zurückgesetzt werden\n"
 
-#: gconf/gconftool.c:438
+#: gconf/gconftool.c:435
 msgid "Can't use --all-entries with --get or --set\n"
 msgstr "--all-entries kann nicht mit --get oder --set verwendet werden\n"
 
-#: gconf/gconftool.c:446
+#: gconf/gconftool.c:443
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "--all-dirs kann nicht mit --get oder --set verwendet werden\n"
 
-#: gconf/gconftool.c:456
+#: gconf/gconftool.c:453
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-"
 "entries, or --all-dirs\n"
@@ -1559,7 +1479,7 @@ msgstr ""
 "--recursive-list sollte nicht mit --get, --set, --unset, --all-entries oder "
 "--all-dirs verwendet werden\n"
 
-#: gconf/gconftool.c:466
+#: gconf/gconftool.c:463
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
@@ -1567,349 +1487,349 @@ msgstr ""
 "--set_schema sollte nicht mit --get, --set, --unset, --all-entries oder --"
 "all-dirs verwendet werden\n"
 
-#: gconf/gconftool.c:472
+#: gconf/gconftool.c:469
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Werttyp ist nur beim Zuweisen eines Wertes von Belang\n"
 
-#: gconf/gconftool.c:478
+#: gconf/gconftool.c:475
 msgid "Must specify a type when setting a value\n"
 msgstr "Beim Zuweisen eines Wertes muss ein Typ angegeben werden\n"
 
 # # CONTINUE HERE ##
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:485
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping-Option muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:498
+#: gconf/gconftool.c:495
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "Option --dir-exists muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:508
+#: gconf/gconftool.c:505
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "Option --install-schema-file muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:519
+#: gconf/gconftool.c:516
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "Option --makefile-install-rule muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:530
+#: gconf/gconftool.c:527
 msgid "--break-key must be used by itself.\n"
 msgstr "Option --break-key muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:541
+#: gconf/gconftool.c:538
 msgid "--break-directory must be used by itself.\n"
 msgstr "Option --break-directory muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:549
+#: gconf/gconftool.c:546
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "Sie müssen eine Konfigurationsquelle mit --config-source angeben, wenn Sie --"
 "direct verwenden\n"
 
-#: gconf/gconftool.c:555
+#: gconf/gconftool.c:552
 msgid "You should use --direct when using a non-default configuration source\n"
 msgstr ""
 "Sie sollten --direct verwenden, wenn Sie eine nicht-standard "
 "Konfigurationsquelle verwenden\n"
 
-#: gconf/gconftool.c:561
+#: gconf/gconftool.c:558
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf konnte nicht initialisiert werden: %s\n"
 
-#: gconf/gconftool.c:590
+#: gconf/gconftool.c:587
 msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
 msgstr ""
 "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL ist gesetzt. Schemas werden nicht "
 "intalliert\n"
 
-#: gconf/gconftool.c:603
+#: gconf/gconftool.c:600
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Umgebungsvariable GCONF_CONFIG_SOURCE muss gesetzt sein\n"
 
-#: gconf/gconftool.c:632
+#: gconf/gconftool.c:629
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Es konnte nicht auf Konfigurationsquelle(n) zugegriffen werden: %s\n"
 
-#: gconf/gconftool.c:854
+#: gconf/gconftool.c:851
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Fehler beim Herunterfahren: %s\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:894
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "Sie müssen ein oder mehrere Verzeichnisse zum rekursiven Auflisten angeben.\n"
 
-#: gconf/gconftool.c:931
+#: gconf/gconftool.c:928
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Fehler beim Auflisten von Einträgen in »%s«: %s\n"
 
-#: gconf/gconftool.c:949
+#: gconf/gconftool.c:946
 msgid "(no value set)"
 msgstr "(kein Wert zugewiesen)"
 
-#: gconf/gconftool.c:1004
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Konfigurationsserver (gconfd) konnte nicht gestartet werden: %s\n"
 
-#: gconf/gconftool.c:1018
+#: gconf/gconftool.c:1015
 msgid "Must specify a key or keys to get\n"
 msgstr "Sie müssen ein oder mehrere Schlüssel zum Abrufen angeben\n"
 
-#: gconf/gconftool.c:1053
+#: gconf/gconftool.c:1050
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:1054
+#: gconf/gconftool.c:1051
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listentyp: %s\n"
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1052
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "car-Typ: %s\n"
 
-#: gconf/gconftool.c:1056
+#: gconf/gconftool.c:1053
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "cdr-Typ: %s\n"
 
-#: gconf/gconftool.c:1061
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Vorgabewert: %s\n"
 
-#: gconf/gconftool.c:1061 gconf/gconftool.c:1063 gconf/gconftool.c:1064
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058 gconf/gconftool.c:1060 gconf/gconftool.c:1061
+#: gconf/gconftool.c:1062
 msgid "Unset"
 msgstr "Nicht zugewiesen"
 
-#: gconf/gconftool.c:1063
+#: gconf/gconftool.c:1060
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Besitzer: %s\n"
 
-#: gconf/gconftool.c:1064
+#: gconf/gconftool.c:1061
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kurzbeschr.: %s\n"
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1062
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Lange Beschr.: %s\n"
 
-#: gconf/gconftool.c:1074 gconf/gconftool.c:1368
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1365
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "»%s« wurde kein Wert zugewiesen\n"
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1372
+#: gconf/gconftool.c:1075 gconf/gconftool.c:1369
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Wert für »%s« konnte nicht abgerufen werden: %s\n"
 
-#: gconf/gconftool.c:1121 gconf/gconftool.c:1133
+#: gconf/gconftool.c:1118 gconf/gconftool.c:1130
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Typ »%s« nicht verstanden\n"
 
-#: gconf/gconftool.c:1145
+#: gconf/gconftool.c:1142
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Sie müssen abwechselnd Schlüssel und Werte als Parameter angeben\n"
 
-#: gconf/gconftool.c:1165
+#: gconf/gconftool.c:1162
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Kein zuzuweisender Wert für Schlüssel »%s«\n"
 
-#: gconf/gconftool.c:1193
+#: gconf/gconftool.c:1190
 msgid "Cannot set schema as value\n"
 msgstr "Schema kann nicht als Wert zugewiesen werden\n"
 
-#: gconf/gconftool.c:1203
+#: gconf/gconftool.c:1200
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 "Wenn eine Liste zugewiesen wird, müssen einfache Liste angeben werden\n"
 
-#: gconf/gconftool.c:1217
+#: gconf/gconftool.c:1214
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Wenn ein Paar zugewiesen wird, müssen einfache car- und cdr-Typen angeben "
 "werden\n"
 
-#: gconf/gconftool.c:1232
+#: gconf/gconftool.c:1229
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fehler: %s\n"
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Fehler beim Zugewiesen des Wertes: %s\n"
 
-#: gconf/gconftool.c:1263
+#: gconf/gconftool.c:1260
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Fehler beim Synchronisieren: %s\n"
 
-#: gconf/gconftool.c:1286
+#: gconf/gconftool.c:1283
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Sie müssen ein oder mehrere Schlüssel am Prompt angeben\n"
 
-#: gconf/gconftool.c:1306
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "Keine Schema für »%s« bekannt\n"
 
-#: gconf/gconftool.c:1339
+#: gconf/gconftool.c:1336
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "Keine doc-Zeichenkette im Schema in »%s« gespeichert\n"
 
-#: gconf/gconftool.c:1344
+#: gconf/gconftool.c:1341
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Fehler beim Erhalten des Schemas in »%s«: %s\n"
 
-#: gconf/gconftool.c:1351
+#: gconf/gconftool.c:1348
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "Keine Schema in »%s« gespeichert\n"
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1351
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "Wert in »%s« ist kein Schema\n"
 
-#: gconf/gconftool.c:1410 gconf/gconftool.c:1435
+#: gconf/gconftool.c:1407 gconf/gconftool.c:1432
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 "Sie müssen den Name des Schemas gefolgt vom Name des Schlüssels auf den es "
 "angewendet werden soll angeben\n"
 
-#: gconf/gconftool.c:1417
+#: gconf/gconftool.c:1414
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr ""
 "Fehler beim Verknüpfen des Schemanamens »%s« mit dem Schlüsselname »%s«: %s\n"
 
-#: gconf/gconftool.c:1445
+#: gconf/gconftool.c:1442
 #, c-format
 msgid "Error removing schema name from '%s': %s\n"
 msgstr "Fehler beim Löschen des Schemanamens von »%s«: %s\n"
 
-#: gconf/gconftool.c:1470
+#: gconf/gconftool.c:1467
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 "Sie müssen einen Schlüssel (Schemaname) als einziges Argument angeben\n"
 
-#: gconf/gconftool.c:1512
+#: gconf/gconftool.c:1509
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Listentyp muss ein einfacher Typ sein: string, int, float oder bool\n"
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1529
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Paar car-Typ muss ein einfacher Typ sein: string, int, float oder bool\n"
 
-#: gconf/gconftool.c:1552
+#: gconf/gconftool.c:1549
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Paar cdr-Typ muss ein einfacher Typ sein: string, int, float oder bool\n"
 
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1564
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Fehler beim Zuweisen des Wertes: %s"
 
-#: gconf/gconftool.c:1581
+#: gconf/gconftool.c:1578
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Fehler beim Synchronisieren: %s"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1593
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Sie müssen ein oder mehrere Verzeichnisse zum Abrufen der Schlüssel-/"
 "Wertpaare angeben.\n"
 
-#: gconf/gconftool.c:1610
+#: gconf/gconftool.c:1607
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Sie müssen ein oder mehrere rückzusetzende Schlüssel angeben.\n"
 
-#: gconf/gconftool.c:1621
+#: gconf/gconftool.c:1618
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Fehler beim Zurücksetzen von »%s«: %s\n"
 
 # CHECK
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1638
 msgid "Must specify one or more keys to recursively unset.\n"
 msgstr ""
 "Sie müssen ein oder mehrere Schlüssel zum rekursiven Zurücksetzen angeben.\n"
 
-#: gconf/gconftool.c:1655
+#: gconf/gconftool.c:1652
 #, c-format
 msgid "Failure during recursive unset of \"%s\": %s\n"
 msgstr "Fehler beim rekursiven Zurücksetzen von »%s«: %s\n"
 
-#: gconf/gconftool.c:1673
+#: gconf/gconftool.c:1670
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Sie müssen ein oder mehrere Verzeichnisse zum Auflisten der "
 "Unterverzeichnisse angeben.\n"
 
-#: gconf/gconftool.c:1707
+#: gconf/gconftool.c:1704
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Fehler beim Auflisten der Verzeichnisse: %s\n"
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1746
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "WARNUNG: ungültiger oder fehlender Typ für Schema (%s)\n"
 
-#: gconf/gconftool.c:1758
+#: gconf/gconftool.c:1755
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "WARNUNG: ungültiger oder fehlender list_type für Schema (%s)\n"
 
-#: gconf/gconftool.c:1769 gconf/gconftool.c:1799 gconf/gconftool.c:1828
+#: gconf/gconftool.c:1766 gconf/gconftool.c:1796 gconf/gconftool.c:1825
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "WARNUNG: Voreingestellten Wert »%s« für Schema (%s) konnte nicht geparst "
 "werden\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1784
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "WARNUNG: ungültiger oder fehlender car- oder cdr-Typ für Schema (%s)\n"
 
-#: gconf/gconftool.c:1812
+#: gconf/gconftool.c:1809
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "WARNUNG: Sie können keinen Vorgabewert für ein Schema angeben\n"
 
-#: gconf/gconftool.c:1841
+#: gconf/gconftool.c:1838
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "WARNUNG: interner »gconftool«-Fehler, unbekannter GConfValueType\n"
 
-#: gconf/gconftool.c:1888 gconf/gconftool.c:1909 gconf/gconftool.c:1930
-#: gconf/gconftool.c:1951
+#: gconf/gconftool.c:1885 gconf/gconftool.c:1906 gconf/gconftool.c:1927
+#: gconf/gconftool.c:1948
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "WARNUNG: Typname »%s« konnte nicht geparst werden\n"
 
-#: gconf/gconftool.c:1905
+#: gconf/gconftool.c:1902
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1917,39 +1837,39 @@ msgstr ""
 "WARNUNG: list_type kann nur int, float, string oder bool sein, aber nicht »%"
 "s«\n"
 
-#: gconf/gconftool.c:1926
+#: gconf/gconftool.c:1923
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "WARNUNG: car_type kann nur int, float, string oder bool sein, aber nicht »%"
 "s«\n"
 
-#: gconf/gconftool.c:1947
+#: gconf/gconftool.c:1944
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "WARNUNG: cdr_type kann nur int, float, string oder bool sein, aber nicht »%"
 "s«\n"
 
-#: gconf/gconftool.c:1975
+#: gconf/gconftool.c:1972
 msgid "WARNING: empty <applyto> node"
 msgstr "WARNUNG: leerer <applyto>-Knoten"
 
-#: gconf/gconftool.c:1978 gconf/gconftool.c:2241
+#: gconf/gconftool.c:1975 gconf/gconftool.c:2238
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "WARNUNG: Knoten <%s> unter <schema> ist nicht verständlich\n"
 
-#: gconf/gconftool.c:1988
+#: gconf/gconftool.c:1985
 msgid "WARNING: no key specified for schema\n"
 msgstr "WARNUNG: kein Schlüssel für Schema angegeben\n"
 
-#: gconf/gconftool.c:2021
+#: gconf/gconftool.c:2018
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "WARNUNG: Knoten <locale> hat kein Attribut »name='locale'«, wird ignoriert\n"
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2024
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1957,53 +1877,53 @@ msgstr ""
 "WARNUNG: Mehrere <locale>-Knoten für Locale »%s«, alle hinter dem ersten "
 "werden ignoriert\n"
 
-#: gconf/gconftool.c:2108
+#: gconf/gconftool.c:2105
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "WARNUNG: Ungültiger Knoten <%s> in einem <locale>-Knoten\n"
 
-#: gconf/gconftool.c:2137
+#: gconf/gconftool.c:2134
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 "WARNUNG: Schema »%s«, Locale »%s« konnte nicht installiert werden: %s\n"
 
-#: gconf/gconftool.c:2145
+#: gconf/gconftool.c:2142
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Schema »%s« für Locale »%s« wurde installiert\n"
 
-#: gconf/gconftool.c:2167
+#: gconf/gconftool.c:2164
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 "WARNUNG: Schema »%s« konnte nicht mit Schlüssel »%s« verknüpft werden: %s\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2172
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Schema »%s« wurde an Schlüssel »%s« angehängt\n"
 
-#: gconf/gconftool.c:2254
+#: gconf/gconftool.c:2251
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Sie müssen in einem <schema> mindestens einen <locale>-Eintrag haben\n"
 
-#: gconf/gconftool.c:2285
+#: gconf/gconftool.c:2282
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "WARNUNG: Knoten <%s> ist innerhalb von <schemalist> unverständlich\n"
 
-#: gconf/gconftool.c:2308
+#: gconf/gconftool.c:2305
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "»%s« konnte nicht geöffnet werden: %s\n"
 
-#: gconf/gconftool.c:2315
+#: gconf/gconftool.c:2312
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Ist Dokument »%s« leer?\n"
 
-#: gconf/gconftool.c:2327
+#: gconf/gconftool.c:2324
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -2012,27 +1932,27 @@ msgstr ""
 "Dokument »%s« hat den falschen Typ von Wurzelknoten (<%s>, sollte "
 "<gconfschemafile> sein)\n"
 
-#: gconf/gconftool.c:2340
+#: gconf/gconftool.c:2337
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokument »%s« hat keinen Knoten <gconfschemafile> in oberster Ebene\n"
 
-#: gconf/gconftool.c:2354
+#: gconf/gconftool.c:2351
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 "WARNUNG: Knoten <%s> ist unverständlich innerhalb von <gconfschemafile>\n"
 
-#: gconf/gconftool.c:2365 gconf/gconftool.c:2397
+#: gconf/gconftool.c:2362 gconf/gconftool.c:2394
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Fehler beim Synchronisieren von Konfigurationsdaten: %s"
 
-#: gconf/gconftool.c:2381
+#: gconf/gconftool.c:2378
 msgid "Must specify some schema files to install\n"
 msgstr "Sie müssen Schemadateien zum Installieren angeben\n"
 
-#: gconf/gconftool.c:2418
+#: gconf/gconftool.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -2041,16 +1961,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2438
+#: gconf/gconftool.c:2435
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Breakage-Schlüssel %s konnte nicht zurückgesetzt werden: %s\n"
 
-#: gconf/gconftool.c:2564
+#: gconf/gconftool.c:2561
 msgid "Must specify some keys to break\n"
 msgstr "Sie müssen zu beschädigende Schlüssel angeben\n"
 
-#: gconf/gconftool.c:2570
+#: gconf/gconftool.c:2567
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -2060,11 +1980,11 @@ msgstr ""
 "beschädigen:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2588
+#: gconf/gconftool.c:2585
 msgid "Must specify some directories to break\n"
 msgstr "Sie müssen zu beschädigende Verzeichnisse angeben\n"
 
-#: gconf/gconftool.c:2607
+#: gconf/gconftool.c:2604
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -2074,3 +1994,77 @@ msgstr ""
 "Ihre Anwendung wird versucht durch Zuweisen falscher Werte für Schlüssel in "
 "einem Verzeichnis zu beschädigen:\n"
 "  %s\n"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not open or create the file \"%s\"; this indicates that there may "
+#~ "be a problem with your configuration, as many programs will need to "
+#~ "create files in your home directory. The error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Bitte setzen Sie sich mit Ihrem Systemadministrator in Verbindung, um das "
+#~ "folgende Problem zu lösen:\n"
+#~ "Datei »%s« konnte nicht geöffnet oder erstellt werden. Dies deutet darauf "
+#~ "hin, dass ein Problem in Ihrer Konfiguration vorliegen könnte, da viele "
+#~ "Programme Dateien in Ihrem Heimverzeichnis anlegen müssen. Der Fehler war "
+#~ "»%s« (errno = %d)."
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not lock the file \"%s\"; this indicates that there may be a "
+#~ "problem with your operating system configuration. If you have an NFS-"
+#~ "mounted home directory, either the client or the server may be set up "
+#~ "incorrectly. See the rpc.statd and rpc.lockd documentation. A common "
+#~ "cause of this error is that the \"nfslock\" service has been disabled.The "
+#~ "error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Bitte setzen Sie sich mit Ihrem Systemadministrator in Verbindung, um das "
+#~ "folgende Problem zu lösen:\n"
+#~ "Die Datei »%s« konnte nicht gesperrt werden. Dies deutet darauf hin, dass "
+#~ "es ein Problem mit der Konfiguration Ihres Betriebssystems geben könnte. "
+#~ "Wenn Ihr Heimverzeichnis per NFS eingehängt ist, kann es sein, dass "
+#~ "entweder der Client oder der Server nicht richtig konfiguriert ist. "
+#~ "Schauen Sie in der rpc.statd- und der rpc.lockd-Dokumentation nach. Ein "
+#~ "Grund für diesen Fehler ist, dass der »nfslock«-Dienst deaktiviert wurde. "
+#~ "Der Fehler war »%s« (errno = %d),"
+
+#~ msgid "Can't remove file %s: %s\n"
+#~ msgstr "In Datei %s konnte nicht entfernt werden: %s\n"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "No configuration sources in the configuration file \"%s\"; this means "
+#~ "that preferences and other settings can't be saved. %s%s"
+#~ msgstr ""
+#~ "Bitte setzen Sie sich mit Ihrem Systemadministrator in Verbindung, um das "
+#~ "folgende Problem zu lösen:\n"
+#~ "Keine Konfigurationsquelle in der Konfigurationsdatei »%s«. Dies "
+#~ "bedeutet, dass Vorlieben und andere Einstellungen nicht gespeichert "
+#~ "werden können. %s%s"
+
+#~ msgid "Error reading the file: "
+#~ msgstr "Fehler beim Lesen der Datei: "
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
+#~ msgstr ""
+#~ "Bitte setzen Sie sich mit Ihrem Systemadministrator in Verbindung, um das "
+#~ "folgende Problem zu lösen:\n"
+#~ "Die Adresse »%s« in der Konfigurationsdatei »%s« konnte nicht aufgelöst "
+#~ "werden; %s"
+
+#~ msgid "Multiple segmentation faults occurred; can't display error dialog\n"
+#~ msgstr ""
+#~ "Mehrere Speicherschutzfehler sind aufgetreten. Fehlerdialog kann nicht "
+#~ "angezeigt werden\n"
+
+#~ msgid ""
+#~ "Segmentation fault!\n"
+#~ "Cannot display crash dialog\n"
+#~ msgstr ""
+#~ "Speicherschutzfehler!\n"
+#~ "Absturzdialog kann nicht angezeigt werden\n"
diff --git a/po/es.po b/po/es.po
index 406e3801..f0d96d5e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -61,6 +61,7 @@ msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Los permisos del archivo/directorio de la fuente XML en %s son: %o/%o"
 
 #: backends/xml-backend.c:584
+#, c-format
 msgid "Error syncing the XML backend directory cache: %s"
 msgstr "Error sincronizando la cache del directorio en XML: %s"
 
@@ -114,6 +115,7 @@ msgid "XML filename `%s' is a directory"
 msgstr "El archivo XML `%s' es un directorio"
 
 #: backends/xml-dir.c:369 backends/xml-dir.c:376
+#, c-format
 msgid "Failed to delete \"%s\": %s"
 msgstr "Error al borrar \"%s\": %s"
 
@@ -346,14 +348,15 @@ msgstr "Error al sincronizar uno o m�s recursos: %s"
 #. * app to simply continue.
 #.
 #: gconf/gconf-database.c:1076
+#, c-format
 msgid ""
 "Failed to log addition of listener %s (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
-"Fallo al registrar la adici�n del control %s (%s); no ser� capaz de restaurar "
-"este control al reiniciar gconfd, resultando en una mala notificaci�n de los "
-"cambios de configuraci�n."
+"Fallo al registrar la adici�n del control %s (%s); no ser� capaz de "
+"restaurar este control al reiniciar gconfd, resultando en una mala "
+"notificaci�n de los cambios de configuraci�n."
 
 #: gconf/gconf-database.c:1103
 #, c-format
@@ -391,10 +394,12 @@ msgid "Error getting default value for `%s': %s"
 msgstr "Error al obtener el valor por defecto para `%s': %s"
 
 #: gconf/gconf-database.c:1405
+#, c-format
 msgid "Error unsetting \"%s\": %s"
 msgstr "Error eliminando \"%s\": %s"
 
 #: gconf/gconf-database.c:1437
+#, c-format
 msgid "Error getting new value for \"%s\": %s"
 msgstr "Error al obtener un nuevo valor para \"%s\": %s"
 
@@ -488,6 +493,7 @@ msgid "No database available to save your configuration"
 msgstr "No hay bases de datos disponibles para guardar su configuraci�n"
 
 #: gconf/gconf-internals.c:86
+#, c-format
 msgid "No '/' in key \"%s\""
 msgstr "No hay '/' en la clave \"%s\""
 
@@ -603,12 +609,13 @@ msgid "Failed to create or open '%s'"
 msgstr "Error al crear o abrir '%s'"
 
 #: gconf/gconf-internals.c:2397
+#, c-format
 msgid ""
 "Failed to lock '%s': probably another process has the lock, or your "
 "operating system has NFS file locking misconfigured (%s)"
 msgstr ""
-"Error al bloquear '%s': probablemente otro proceso tiene el bloqueo, "
-"o el sistema operativo tine el bloqueo por NFS mal configurado (%s)"
+"Error al bloquear '%s': probablemente otro proceso tiene el bloqueo, o el "
+"sistema operativo tine el bloqueo por NFS mal configurado (%s)"
 
 #: gconf/gconf-internals.c:2425
 #, c-format
@@ -699,12 +706,12 @@ msgstr ""
 "Error al contactar con el servidor de configuraciones. Algunas causas "
 "probables son:\n"
 "a) hay un servidor de configuraciones ejecutandose (gconfd), pero no es "
-"accesible desde aqui - si est� conectado desde dos m�quinas a la vez, "
-"puede que necesite habilitar el soporte TCP en ORBIT poniendo la l�nea "
+"accesible desde aqui - si est� conectado desde dos m�quinas a la vez, puede "
+"que necesite habilitar el soporte TCP en ORBIT poniendo la l�nea "
 "\"ORBIIOPIPv4=1\" in /etc/orbitrc\n"
-"b) tiene locks antiguos en su directorio ra�z montado por NFS debido a "
-"una caida del sistema, pruebe eliminando ~/.gconf/*.lock y ~/.gconfd/lock "
-"si est� seguro que no hay ning�n proceso gconfd ejecutandose usando su "
+"b) tiene locks antiguos en su directorio ra�z montado por NFS debido a una "
+"caida del sistema, pruebe eliminando ~/.gconf/*.lock y ~/.gconfd/lock si "
+"est� seguro que no hay ning�n proceso gconfd ejecutandose usando su "
 "directorio ra�z"
 
 #: gconf/gconf-schema.c:190 gconf/gconf-schema.c:198 gconf/gconf-schema.c:206
@@ -713,6 +720,7 @@ msgid "Schema contains invalid UTF-8"
 msgstr "El schema contiene UTF-8 inv�lido"
 
 #: gconf/gconf-sources.c:319
+#, c-format
 msgid "Failed to load source \"%s\": %s"
 msgstr "Error al cargar la fuente \"%s\": %s"
 
@@ -738,8 +746,8 @@ msgid ""
 "None of the resolved addresses are writable; saving configuration settings "
 "will not be possible"
 msgstr ""
-"Ninguna de las direcciones resueltas son de escritura. No ser� posible guardar "
-"la configuraci�n"
+"Ninguna de las direcciones resueltas son de escritura. No ser� posible "
+"guardar la configuraci�n"
 
 #: gconf/gconf-sources.c:584
 #, c-format
@@ -751,6 +759,7 @@ msgid "The '/' name can only be a directory, not a key"
 msgstr "El nombre '/' solo puede ser un directorio, no una clave"
 
 #: gconf/gconf-sources.c:679
+#, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path"
@@ -759,6 +768,7 @@ msgstr ""
 "configuraci�n"
 
 #: gconf/gconf-sources.c:691
+#, c-format
 msgid ""
 "Unable to store a value at key '%s', as the configuration server has no "
 "writable databases. There are some common causes of this problem: 1) your "
@@ -781,20 +791,20 @@ msgstr ""
 "configuraciones no tiene ninguna base de datos escribible. Hay dos causas "
 "comunes para este problema: 1) su ruta de configuraci�n %s/path no contiene "
 "ninguna base de datos o no ha sido encontrada o 2) de alguna manera hemos "
-"creado erroneamente dos procesos gconfd 3) el sistema est� mal configurado "
-"y el bloqueo de NFS no funciona en su directorio ra�z o 4) la m�quina NFS "
-"cliente muri� y no notific� correctamente al servidor al reiniciarse que "
-"se deberian eliminar los bloqueos de archivo. Si tiene dos procesos "
-"gconfd (o tenia dos en el momento en el que el segundo fue lanzado), salga, "
-"mate todas las copias de gconfd, y vuelva a entrar, esto puede solucionar el "
-"problema. Si tiene bloqueos antiguos, elimine ~/.gconf*/*lock. Quiza el "
-"problema est� en que intento usar GConf desde dos maquinas al mismo "
-"tiempo, y ORBit todav�a tiene la configuraci�n por defecto que previene las "
-"conexiones remotas de CORBAi - ponga \"ORBIIOPIPv4=1\" en /etc/orbitrc. Como "
-"siempre, compruebe los logs user.* para obtener m�s detalles acerca de los "
-"problemas encontrados por gconfd. Solo puede haber un gconfd por directorio "
-"ra�z, y debe tener un archivo de bloqueo en ~/.gconfd y tambi�n archivos de "
-"bloqueo en los sitios de almacenamiento locales como ~/.gconf"
+"creado erroneamente dos procesos gconfd 3) el sistema est� mal configurado y "
+"el bloqueo de NFS no funciona en su directorio ra�z o 4) la m�quina NFS "
+"cliente muri� y no notific� correctamente al servidor al reiniciarse que se "
+"deberian eliminar los bloqueos de archivo. Si tiene dos procesos gconfd (o "
+"tenia dos en el momento en el que el segundo fue lanzado), salga, mate todas "
+"las copias de gconfd, y vuelva a entrar, esto puede solucionar el problema. "
+"Si tiene bloqueos antiguos, elimine ~/.gconf*/*lock. Quiza el problema est� "
+"en que intento usar GConf desde dos maquinas al mismo tiempo, y ORBit "
+"todav�a tiene la configuraci�n por defecto que previene las conexiones "
+"remotas de CORBAi - ponga \"ORBIIOPIPv4=1\" en /etc/orbitrc. Como siempre, "
+"compruebe los logs user.* para obtener m�s detalles acerca de los problemas "
+"encontrados por gconfd. Solo puede haber un gconfd por directorio ra�z, y "
+"debe tener un archivo de bloqueo en ~/.gconfd y tambi�n archivos de bloqueo "
+"en los sitios de almacenamiento locales como ~/.gconf"
 
 #: gconf/gconf-sources.c:1410
 #, c-format
@@ -877,6 +887,7 @@ msgid "Key \"%s\" is NULL"
 msgstr "La clave \"%s\" es NULL"
 
 #: gconf/gconf.c:61
+#, c-format
 msgid "\"%s\": %s"
 msgstr "\"%s\": %s"
 
@@ -1470,7 +1481,8 @@ msgstr ""
 
 #: gconf/gconftool.c:552
 msgid "You should use --direct when using a non-default configuration source\n"
-msgstr "Debe usar --direct cuando use una fuente de configuraci�n no predefinida\n"
+msgstr ""
+"Debe usar --direct cuando use una fuente de configuraci�n no predefinida\n"
 
 #: gconf/gconftool.c:558
 #, c-format
@@ -1658,6 +1670,7 @@ msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "Error al asociar el esquema `%s' con la clave `%s': %s\n"
 
 #: gconf/gconftool.c:1442
+#, c-format
 msgid "Error removing schema name from '%s': %s\n"
 msgstr "Error al eliminar nombre de esquema para '%s': %s\n"
 
@@ -1706,6 +1719,7 @@ msgid "Must specify one or more keys to recursively unset.\n"
 msgstr "Debe especificar uno o mas claves para desasignar recursivamente.\n"
 
 #: gconf/gconftool.c:1652
+#, c-format
 msgid "Failure during recursive unset of \"%s\": %s\n"
 msgstr "Error al eliminar recursivamente \"%s\": %s\n"
 
diff --git a/po/fi.po b/po/fi.po
index 718153e5..ca697448 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 1.1.6\n"
-"POT-Creation-Date: 2002-03-20 14:57+0200\n"
+"POT-Creation-Date: 2002-01-28 21:35-0500\n"
 "PO-Revision-Date: 2002-03-19 23:49+0200\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "XML-lähteen hakemiston tai tiedoston oikeudet juuressa %s ovat: %o/%o"
 
-#: backends/xml-backend.c:590
+#: backends/xml-backend.c:584
 #, c-format
 msgid "Error syncing the XML backend directory cache: %s"
 msgstr "Virhe synkronoidessa XML-taustamoduulin hakemistovälimuistia: %s"
 
-#: backends/xml-backend.c:657
+#: backends/xml-backend.c:651
 msgid ""
 "Remove dir operation is no longer supported, just remove all the values in "
 "the directory"
@@ -85,20 +85,20 @@ msgstr ""
 "Hakemiston poistotoiminto ei ole enää tuettu: poista vain kaikki hakemiston "
 "sisältämät avaimet"
 
-#: backends/xml-backend.c:724
+#: backends/xml-backend.c:718
 msgid "Initializing XML backend module"
 msgstr "XML-taustamoduuli käynnistyy"
 
-#: backends/xml-backend.c:792
+#: backends/xml-backend.c:786
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "XML-hakemiston '%s' lukituksen luovutus epäonnistui: %s"
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:248
 msgid "Failed to sync XML cache contents to disk"
 msgstr "XML-välimuistin sisällön synkronointi levylle epäonnistui"
 
-#: backends/xml-cache.c:273
+#: backends/xml-cache.c:278
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -107,7 +107,7 @@ msgstr ""
 "Hakemiston '%s' poistaminen XML-taustamoduulin välimuistista ei onnistu, "
 "koska se ei ole onnistuneesti synkronoitunut levylle"
 
-#: backends/xml-cache.c:300
+#: backends/xml-cache.c:305
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than %"
@@ -318,46 +318,50 @@ msgstr "Taustamoduulin sammutus epäonnistui"
 msgid "GConf Error: %s\n"
 msgstr "GConf-virhe: %s\n"
 
-#: gconf/gconf-client.c:897
+#: gconf/gconf-client.c:899
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf-varoitus: Hakemiston '%s' parien luetteloiminen epäonnistui: %s"
 
-#: gconf/gconf-client.c:1162
+#: gconf/gconf-client.c:1165
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Odotettiin tyyppiä '%s', saatiin tyyppi '%s' avaimelle %s"
 
-#: gconf/gconf-database.c:234
+#: gconf/gconf-database.c:233
 msgid "Received invalid value in set request"
 msgstr "Vastaanotti asetuspyynnössä virheellisen arvon"
 
-#: gconf/gconf-database.c:242
+#: gconf/gconf-database.c:241
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr "Avaimen '%s' asetuspyynnöstä saatu CORBA-arvo ei ole järkevä"
 
-#: gconf/gconf-database.c:523
+#: gconf/gconf-database.c:522
 msgid "Received request to drop all cached data"
 msgstr "Vastaanotti kaiken välivarastoidun tiedon hylkäämispyynnön"
 
-#: gconf/gconf-database.c:540
+#: gconf/gconf-database.c:539
 msgid "Received request to sync synchronously"
 msgstr "Vastaanotti synkronointipyynnön"
 
-#: gconf/gconf-database.c:824
+#: gconf/gconf-database.c:823
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Vakava virhe: objektiin ConfigDatabase ei saatu viittausta"
 
-#: gconf/gconf-database.c:986
+#: gconf/gconf-database.c:985
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Yhden tai useamman lähteen synkronointi epäonnistui: %s"
 
-#: gconf/gconf-database.c:1078
-#, c-format
+#. This error is not fatal; we basically ignore it.
+#. * Because it's likely the right thing for the client
+#. * app to simply continue.
+#.
+#: gconf/gconf-database.c:1076
+#, fuzzy, c-format
 msgid ""
-"Failed to log addition of listener %s (%s);will not be able to restore this "
+"Failed to log addition of listener %s (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
@@ -365,12 +369,12 @@ msgstr ""
 "voi palauttaa gconfd:n käynnistyessä uudestaan, mikä johtaa epäluotettavaan "
 "asetusten muutosten ilmoittamiseen."
 
-#: gconf/gconf-database.c:1109
+#: gconf/gconf-database.c:1103
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Kuuntelija ID %lu ei ole olemassa"
 
-#: gconf/gconf-database.c:1123
+#: gconf/gconf-database.c:1117
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -380,57 +384,57 @@ msgstr ""
 "harmitonta, mutta saattaa johtaa ilmoituksen kummalliseen uudelleen "
 "ilmaantumiseen): %s"
 
-#: gconf/gconf-database.c:1241 gconf/gconf-sources.c:1540
+#: gconf/gconf-database.c:1235 gconf/gconf-sources.c:1540
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Virhe avaimen '%s' arvoa hakiessa: %s"
 
-#: gconf/gconf-database.c:1288
+#: gconf/gconf-database.c:1282
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Virhe avaimen '%s' arvoa asettaessa: %s"
 
-#: gconf/gconf-database.c:1331
+#: gconf/gconf-database.c:1325
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Virhe avainta '%s' poistaessa: %s"
 
-#: gconf/gconf-database.c:1360
+#: gconf/gconf-database.c:1354
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Virhe avaimen '%s' oletusarvoa hakiessa: %s"
 
-#: gconf/gconf-database.c:1411
+#: gconf/gconf-database.c:1405
 #, c-format
 msgid "Error unsetting \"%s\": %s"
 msgstr "Virhe avainta \"%s\" poistaessa: %s"
 
-#: gconf/gconf-database.c:1443
+#: gconf/gconf-database.c:1437
 #, c-format
 msgid "Error getting new value for \"%s\": %s"
 msgstr "Virhe avaimen \"%s\" uutta arvoa hakiessa: %s"
 
-#: gconf/gconf-database.c:1491
+#: gconf/gconf-database.c:1485
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Virhe hakemiston '%s' olemassaoloa tarkistaessa: %s"
 
-#: gconf/gconf-database.c:1515
+#: gconf/gconf-database.c:1509
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Virhe hakemistoa '%s' poistaessa: %s"
 
-#: gconf/gconf-database.c:1542
+#: gconf/gconf-database.c:1536
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Kaikkien hakemiston '%s' merkintöjen saaminen epäonnistui: %s"
 
-#: gconf/gconf-database.c:1568
+#: gconf/gconf-database.c:1562
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Virhe hakemiston '%s' hakemistoja luetteloidessa: %s"
 
-#: gconf/gconf-database.c:1589
+#: gconf/gconf-database.c:1583
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Virhe avaimen '%s' kaavainta asettaessa: %s"
@@ -559,7 +563,7 @@ msgstr "Virhe luettaessa tiedostoa '%s': %s\n"
 
 #: gconf/gconf-internals.c:1211 gconf/gconf-internals.c:1277
 #: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
-#: gconf/gconf-value.c:1363
+#: gconf/gconf-value.c:1341
 msgid "Text contains invalid UTF-8"
 msgstr "Teksti sisältää virheellistä UTF-8:aa"
 
@@ -684,24 +688,24 @@ msgstr "Tiedoston \"%s\" siivous epäonnistui: %s"
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "Lukitushakemiston \"%s\" poisto epäonnistui: %s"
 
-#: gconf/gconf-internals.c:2846 gconf/gconfd.c:587
+#: gconf/gconf-internals.c:2842 gconf/gconfd.c:583
 #, c-format
 msgid "Failed to create %s: %s"
 msgstr "Hakemiston '%s' luominen epäonnistui: %s"
 
-#: gconf/gconf-internals.c:2879
+#: gconf/gconf-internals.c:2875
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 "Putken luonti käynnistyneen gconfd-daemonin kanssa viestimiseksi "
 "epäonnistui: %s\n"
 
-#: gconf/gconf-internals.c:2903
+#: gconf/gconf-internals.c:2899
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Asetuspalvelimen käynnistys epäonnistui: %s\n"
 
-#: gconf/gconf-internals.c:2927
+#: gconf/gconf-internals.c:2923
 msgid ""
 "Failed to contact configuration server; some possible causes are:\n"
 "a) you have an existing configuration server (gconfd) running, but it isn't "
@@ -723,80 +727,6 @@ msgstr ""
 "gconfd/lock poistamista, jos olet varma ettei gconfd-prosesseja ole "
 "käynnissä millään kotihakemistoasi käyttävällä koneella."
 
-#: gconf/gconf-sanity-check.c:39 gconf/gconftool.c:72
-msgid "Help options"
-msgstr "Ohjevalitsimet"
-
-#: gconf/gconf-sanity-check.c:75 gconf/gconftool.c:411
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Virhe valitsimessa %s: %s.\n"
-"Aja '%s --help' nähdäksesi täydellisen luettelon käytettävissä olevista\n"
-"valitsimista.\n"
-
-#: gconf/gconf-sanity-check.c:132
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not open or create the file \"%s\"; this indicates that there may be a "
-"problem with your configuration, as many programs will need to create files "
-"in your home directory. The error was \"%s\" (errno = %d)."
-msgstr ""
-"Ota yhteyttä järjestelmäsi ylläpitäjään seuraavan ongelman ratkaisemiseksi:\n"
-"Ei voinut avata tai luoda tiedostoa \"%s\", mikä merkitsee, että "
-"asetuksissasi voi olla vikaa. Monet ohjelmat luovat yleensä tiedostoja "
-"kotihakemistoosi. Virhe oli \"%s\" (errno = %d)."
-
-#: gconf/gconf-sanity-check.c:144
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not lock the file \"%s\"; this indicates that there may be a problem "
-"with your operating system configuration. If you have an NFS-mounted home "
-"directory, either the client or the server may be set up incorrectly. See "
-"the rpc.statd and rpc.lockd documentation. A common cause of this error is "
-"that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
-"%d)."
-msgstr ""
-"Ota yhteyttä järjestelmäsi ylläpitäjään seuraavan ongelman ratkaisemiseksi:\n"
-"Ei voinut lukita tiedostoa \"%s\", mikä merkitsee että järjestelmän "
-"asetuksissa voi olla vikaa. Jos sinulla on NFS-liitetty kotihakemisto, niin "
-"joko asiakkan tai palvelimen on asetuksissa on vikaa. Katso lisätietoja rpc."
-"statd:n ja rpc.lockd:n ohjeista. Yleinen tämän virheen syy on, että \"nfslock"
-"\"-palvelu ei ole käytössä. Virhe oli \"%s\" (errno = %d)."
-
-#: gconf/gconf-sanity-check.c:161
-#, c-format
-msgid "Can't remove file %s: %s\n"
-msgstr "Ei voi poistaa tiedostoa %s: %s\n"
-
-#: gconf/gconf-sanity-check.c:199
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"No configuration sources in the configuration file \"%s\"; this means that "
-"preferences and other settings can't be saved. %s%s"
-msgstr ""
-"Ota yhteyttä järjestelmäsi ylläpitäjään seuraavan ongelman ratkaisemiseksi:\n"
-"Asetustiedostossa \"%s\" ei ollut asetuslähteitä, mikä merkitsee ettei "
-"asetuksia ja muita valintoja voi tallentaa. %s%s"
-
-#: gconf/gconf-sanity-check.c:202
-msgid "Error reading the file: "
-msgstr "Virhe lukiessa tiedostoa: "
-
-#: gconf/gconf-sanity-check.c:224
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
-msgstr ""
-"Ota yhteyttä järjestelmäsi ylläpitäjään seuraavan ongelman ratkaisemiseksi:\n"
-"Ei voinut selvittää osoitetta \"%s\" asetustiedostossa \"%s\": %s"
-
 #: gconf/gconf-schema.c:190 gconf/gconf-schema.c:198 gconf/gconf-schema.c:206
 #: gconf/gconf-schema.c:214
 msgid "Schema contains invalid UTF-8"
@@ -968,97 +898,97 @@ msgstr "En ymmärtänyt arvoa '%s' (väärä määrä osia)"
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "En ymmärtänyt arvoa '%s' (ylimääräinen lainaamaton ')' parin sisällä)"
 
-#: gconf/gconf.c:55
+#: gconf/gconf.c:54
 #, c-format
 msgid "Key \"%s\" is NULL"
 msgstr "Avain \"%s\" on NULL"
 
-#: gconf/gconf.c:62
+#: gconf/gconf.c:61
 #, c-format
 msgid "\"%s\": %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:343
+#: gconf/gconf.c:333
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Palvelin ei voinut selvittää osoitetta '%s'"
 
-#: gconf/gconf.c:634
+#: gconf/gconf.c:624
 msgid "Can't add notifications to a local configuration source"
 msgstr "Paikalliseen asetuslähteeseen ei voi lisätä huomautuksia"
 
-#: gconf/gconf.c:2079
+#: gconf/gconf.c:2072
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 "Asiakkaan lisääminen palvelimen luetteloon epäonnistui, CORBA-virhe: %s"
 
-#: gconf/gconf.c:2434
+#: gconf/gconf.c:2393
 msgid "Must begin with a slash (/)"
 msgstr "Täytyy alkaa kauttaviivalla (/)"
 
-#: gconf/gconf.c:2456
+#: gconf/gconf.c:2415
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kahta kauttaviivaa (/) ei voi olla peräkkäin"
 
-#: gconf/gconf.c:2458
+#: gconf/gconf.c:2417
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Pistettä (.) ei voi olla heti kauttaviivan (/) jälkeen"
 
-#: gconf/gconf.c:2477
+#: gconf/gconf.c:2436
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
 msgstr "'%c' ei ole ASCII-merkki, joten se ei ole mahdollinen avaimien nimissä"
 
-#: gconf/gconf.c:2487
+#: gconf/gconf.c:2446
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' on virheellinen merkki avaimien ja hakemistojen nimissä"
 
-#: gconf/gconf.c:2501
+#: gconf/gconf.c:2460
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Avaimen tai hakemiston nimi ei voi päättyä kauttaviivaan (/)"
 
-#: gconf/gconf.c:2870
+#: gconf/gconf.c:2829
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Asetuspalvelimen sammutus epäonnistui: %s"
 
-#: gconf/gconf.c:2931
+#: gconf/gconf.c:2890
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Odotettiin liukulukua, saatiin %s"
 
-#: gconf/gconf.c:2966
+#: gconf/gconf.c:2925
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Odotettiin kokonaislukua, mutta saatiin %s"
 
-#: gconf/gconf.c:3001
+#: gconf/gconf.c:2960
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Odotettiin merkkijonoa, mutta saatiin %s"
 
-#: gconf/gconf.c:3038
+#: gconf/gconf.c:2997
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Odotettiin totuusarvoa, mutta saatiin %s"
 
-#: gconf/gconf.c:3071
+#: gconf/gconf.c:3030
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Odotettiin kaavainta, mutta saatiin %s"
 
-#: gconf/gconf.c:3432
+#: gconf/gconf.c:3391
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-virhe: %s"
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:246
 msgid "Shutdown request received"
 msgstr "Vastaanotti sammutuspyynnön"
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:278
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -1066,7 +996,7 @@ msgstr ""
 "gconfd käännetty debug-tietojen kanssa. Yritetään ladata gconf.path "
 "lähdekoodihakemistosta"
 
-#: gconf/gconfd.c:294
+#: gconf/gconfd.c:292
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1076,22 +1006,22 @@ msgstr ""
 #. We want to stay alive but do nothing, because otherwise every
 #. request would result in another failed gconfd being spawned.
 #.
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:300
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr "Ei asetuslähteitä lähdehakemistossa: asetuksia ei tallenneta. Muokkaa "
 
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:300
 msgid "/path"
 msgstr "/polku"
 
-#: gconf/gconfd.c:315
+#: gconf/gconfd.c:313
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Virhe joitakin asetuslähteitä ladatessa: %s"
 
-#: gconf/gconfd.c:327
+#: gconf/gconfd.c:325
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1099,7 +1029,7 @@ msgstr ""
 "Ei saanut lähdehakemistoja selville: asetustietoja ei voi ladata eikä "
 "tallentaa "
 
-#: gconf/gconfd.c:344
+#: gconf/gconfd.c:342
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1107,14 +1037,14 @@ msgstr ""
 "Kirjoitettavissa olevia asetuslähteitä ei saatu selville: joitakin asetusten "
 "muutoksia ei välttämättä voi tallentaa "
 
-#: gconf/gconfd.c:370
+#: gconf/gconfd.c:368
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 "Vastaanotti signaalin %d, kirjoittaa core-tiedoston. Tee ilmoitus GConfin "
 "virheestä."
 
-#: gconf/gconfd.c:388
+#: gconf/gconfd.c:384
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
@@ -1122,53 +1052,53 @@ msgstr ""
 "Vastaanotti signaalin %d: sammuu epänormaalisti. Tee ilmoitus GConfin "
 "virheestä."
 
-#: gconf/gconfd.c:405
+#: gconf/gconfd.c:401
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Vastaanotti signaalin %d: sammuu siististi"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:535
+#: gconf/gconfd.c:531
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "käynnistyy (versio %s), pid %u, käyttäjä '%s'"
 
-#: gconf/gconfd.c:574
+#: gconf/gconfd.c:570
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Olioon ConfigServer ei saatu viittausta"
 
-#: gconf/gconfd.c:612
+#: gconf/gconfd.c:608
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 "Tavun kirjoitus putkeen (fd %d) epäonnistui, joten asiakasohjelma saattaa "
 "pysähtyä: %s"
 
-#: gconf/gconfd.c:622
+#: gconf/gconfd.c:618
 #, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "Daemonin lukon saaminen epäonnistui, poistuu: %s"
 
-#: gconf/gconfd.c:660
+#: gconf/gconfd.c:656
 #, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "Virhe vapauttaessa lukitustiedostoa: %s"
 
-#: gconf/gconfd.c:668
+#: gconf/gconfd.c:664
 msgid "Exiting"
 msgstr "Poistuu"
 
-#: gconf/gconfd.c:694
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "GConf-palvelin ei ole käytössä: sammuu"
 
-#: gconf/gconfd.c:1063
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Palauttaa poikkeuksen: %s"
 
-#: gconf/gconfd.c:1163
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1177,7 +1107,7 @@ msgstr ""
 "gconfd:n lokitiedoston avaaminen epäonnistui: kuuntelijoita ei voi palauttaa "
 "gconfd:n sammutuksen jälkeen (%s)"
 
-#: gconf/gconfd.c:1198
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1185,32 +1115,32 @@ msgstr ""
 "gconfd:n lokitiedoston sulkeminen epäonnistui: tietoja saattaa olla hävinnyt "
 "(%s)"
 
-#: gconf/gconfd.c:1267
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Tilatiedostoa '%s' ei voitu avata kirjoittamista varten: %s"
 
-#: gconf/gconfd.c:1281
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Tilatiedostoa '%s', fd: %d, ei voitu kirjoittaa: %s"
 
-#: gconf/gconfd.c:1290
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Uuden tilatiedoston '%s' sulkeminen epäonnistui: %s"
 
-#: gconf/gconfd.c:1304
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Vanhaa tilatiedostoa '%s' ei voitu siirtää syrjään: %s"
 
-#: gconf/gconfd.c:1314
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Uuden tilatiedoston siirtäminen paikalleen epäonnistui: %s"
 
-#: gconf/gconfd.c:1323
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1218,7 +1148,7 @@ msgstr ""
 "Alkuperäisen tilatiedoston, joka on nimetty tiedostoksi '%s', palauttaminen "
 "epäonnistui: %s"
 
-#: gconf/gconfd.c:1794
+#: gconf/gconfd.c:1790
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1226,17 +1156,17 @@ msgstr ""
 "Kuuntelijan, osoitteessa '%s', palauttaminen ei onnistu: tietokannan "
 "selvittäminen ei onnistunut"
 
-#: gconf/gconfd.c:1840
+#: gconf/gconfd.c:1836
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Virhe tilatiedostoa lukiessa: %s"
 
-#: gconf/gconfd.c:1893
+#: gconf/gconfd.c:1889
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Tilatiedoston '%s' avaaminen ei onnistu: %s"
 
-#: gconf/gconfd.c:2010
+#: gconf/gconfd.c:2006
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1245,7 +1175,7 @@ msgstr ""
 "Kuuntelijan lisäämisen kirjaaminen gconfd:n lokitiedostoon epäonnistui: sitä "
 "ei voi lisätä uudestaan, kun gconfd lopetetaan tai sammuu (%s)"
 
-#: gconf/gconfd.c:2015
+#: gconf/gconfd.c:2011
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1255,56 +1185,45 @@ msgstr ""
 "saattaa virheellisesti tulla lisätyksi uudestaan, kun gconfd lopetetaan tai "
 "sammuu (%s)"
 
-#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
+#: gconf/gconfd.c:2034 gconf/gconfd.c:2199
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Asiakkaan IOR:n saaminen epäonnistui: '%s'"
 
-#: gconf/gconfd.c:2053
+#: gconf/gconfd.c:2049
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Tilatiedoston avaaminen epäonnistui: %s"
 
-#: gconf/gconfd.c:2066
+#: gconf/gconfd.c:2062
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "Asiakkaan lisäämisen kirjoittaminen tilatiedostoon epäonnistui: %s"
 
-#: gconf/gconfd.c:2074
+#: gconf/gconfd.c:2070
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr "Asiakkaan lisäämisen fflush() tilatiedostoon epäonnistui: '%s'"
 
-#: gconf/gconfd.c:2164
+#: gconf/gconfd.c:2160
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 "Jokin asiakas poisti itsensä GConf-palvelimesta, kun sitä ei oltu lisätty."
 
-#. dialog display isn't working out
-#: gconf/gconfd.c:2303
-msgid "Multiple segmentation faults occurred; can't display error dialog\n"
-msgstr ""
-"Useita muistinkäsittelyvirheitä tapahtui: ei voi näyttää virheikkunaa\n"
-
-#. Eeeek! Can't show dialog
-#: gconf/gconfd.c:2312
-msgid ""
-"Segmentation fault!\n"
-"Cannot display crash dialog\n"
-msgstr ""
-"Muistinkäsittelyvirhe!\n"
-"Ei voi näyttää virheikkunaa\n"
+#: gconf/gconftool.c:71
+msgid "Help options"
+msgstr "Ohjevalitsimet"
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Aseta avain arvolle ja synkronoi. Käytä --type :n kanssa."
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid "Print the value of a key to standard output."
 msgstr "Tulosta avaimen arvo stdout:iin"
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:98
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
@@ -1312,11 +1231,11 @@ msgstr ""
 "Aseta kaavain ja synkronoi. Käytä asetusten --short-desc, --long-desc, --"
 "owner ja --type kanssa."
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 msgid "Unset the keys on the command line"
 msgstr "Poista annetut avaimet."
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
@@ -1324,31 +1243,31 @@ msgstr ""
 "Poista rekursiivisesti kaikki avaimet, jotka ovat komentorivillä annettujen "
 "avaimien tai hakemistojen kohdalla tai alla"
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all key/value pairs in a directory."
 msgstr "Tulosta hakemiston kaikki avain+arvo -parit."
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Print all subdirectories in a directory."
 msgstr "Tulosta hakemiston kaikki alihakemistot."
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "Tulosta hakemiston kaikki alihakemistot ja tiedot rekursiivisesti."
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Palauta 0 jos hakemisto on olemassa, 2 jos ei."
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Sammuta gconfd. ÄLÄ KÄYTÄ TÄTÄ VALITSINTA ILMAN HYVÄÄ SYYTÄ."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Palauta 0, jos gconfd on käynnissä, ja 2 jos ei."
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1356,7 +1275,7 @@ msgstr ""
 "Käynnistä asetuspalvelin (gconfd). (Mikä yleensä tehdään tarvittaessa "
 "automaattisesti.)"
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1364,11 +1283,11 @@ msgstr ""
 "Määritä asetettavan arvon, tai kaavaimen arvon, tyyppi. Yksiselitteiset "
 "lyhenteet kelpaavat."
 
-#: gconf/gconftool.c:191
+#: gconf/gconftool.c:190
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1376,11 +1295,11 @@ msgstr ""
 "Määritä kaavaimen tai asetettavan luettelon arvon tyyppi. Yksiselitteiset "
 "lyhenteet kelpaavat."
 
-#: gconf/gconftool.c:200 gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:199 gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1388,7 +1307,7 @@ msgstr ""
 "Määritä kaavaimen tai parin car:n arvon tyyppi. Yksiselitteiset lyhenteet "
 "kelpaavat."
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1396,43 +1315,43 @@ msgstr ""
 "Määritä kaavaimen tai parin cdr:n arvon tyyppi. Yksiselitteiset lyhenteet "
 "kelpaavat."
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Kirjoita lyhyt puolen rivin selostus kaavaimeen laitettavaksi"
 
-#: gconf/gconftool.c:227 gconf/gconftool.c:236
+#: gconf/gconftool.c:226 gconf/gconftool.c:235
 msgid "DESCRIPTION"
 msgstr "SELOSTUS"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a several-line description to go in a schema."
 msgstr "Kirjoita useamman rivin selostus kaavaimeen laitettavaksi"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 msgid "Specify the owner of a schema"
 msgstr "Määritä kaavaimen omistaja"
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 msgid "OWNER"
 msgstr "OMISTAJA"
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid "Specify a schema file to be installed"
 msgstr "Määritä asennettava kaavaintiedosto"
 
-#: gconf/gconftool.c:254
+#: gconf/gconftool.c:253
 msgid "FILENAME"
 msgstr "TIEDOSTO"
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "Määritä oletuksen sijaan käytettävä oletuslähde"
 
-#: gconf/gconftool.c:263
+#: gconf/gconftool.c:262
 msgid "SOURCE"
 msgstr "LÄHDE"
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1440,7 +1359,7 @@ msgstr ""
 "Käytä asetustietokantaa suoraan, ei palvelimen kautta. Tämä vaatii, että "
 "gconfd ei ole käynnissä."
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1451,7 +1370,7 @@ msgstr ""
 "osoittamaan ei-oletusasetuslähteeseen, tai, jos halutaan käyttää oletusta, "
 "tyhjäksi."
 
-#: gconf/gconftool.c:289
+#: gconf/gconftool.c:288
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1459,7 +1378,7 @@ msgstr ""
 "Rasitustestaa sovellusta asettamalla ja poistamalla joukkoa erityyppisiä "
 "komentorivillä määriteltyjä arvoja."
 
-#: gconf/gconftool.c:298
+#: gconf/gconftool.c:297
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1467,51 +1386,61 @@ msgstr ""
 "Rasitustestaa sovellusta asettamalla ja poistamalla joukkoa avaimia "
 "komentorivillä määritellyissä hakemistoissa."
 
-#: gconf/gconftool.c:307
+#: gconf/gconftool.c:306
 msgid "Get the short doc string for a key"
 msgstr "Hae lyhyt avaimen dokumenttimerkkijono"
 
-#: gconf/gconftool.c:316
+#: gconf/gconftool.c:315
 msgid "Get the long doc string for a key"
 msgstr "Hae pitkä avaimen dokumenttimerkkijono"
 
-#: gconf/gconftool.c:325
+#: gconf/gconftool.c:324
 msgid "Get the name of the schema applied to this key"
 msgstr "Hae tähän avaimeen sovelletun kaavaimen nimi"
 
-#: gconf/gconftool.c:334
+#: gconf/gconftool.c:333
 msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr ""
 "Anna kaavaimen ja sen jälkeen sen avaimen nimi, johon kaavain sovelletaan"
 
-#: gconf/gconftool.c:343
+#: gconf/gconftool.c:342
 msgid "Remove any schema name applied to the given keys"
 msgstr "Poista kaikki annettuihin avaimiin sovelletut kaavaimet"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:351
 msgid "Get the name of the default source"
 msgstr "Hae oletuslähteen nimi"
 
-#: gconf/gconftool.c:423
+#: gconf/gconftool.c:408
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Virhe valitsimessa %s: %s.\n"
+"Aja '%s --help' nähdäksesi täydellisen luettelon käytettävissä olevista\n"
+"valitsimista.\n"
+
+#: gconf/gconftool.c:420
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Ei voi hakea ja poistaa tai asettaa samanaikaisesti\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:427
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Ei voi asettaa ja hakea tai poistaa samanaikaisesti\n"
 
-#: gconf/gconftool.c:438
+#: gconf/gconftool.c:435
 msgid "Can't use --all-entries with --get or --set\n"
 msgstr ""
 "--all-entries -valitsinta ei voi käyttää --get tai --set -valitsinten "
 "kanssa\n"
 
-#: gconf/gconftool.c:446
+#: gconf/gconftool.c:443
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 "--all-dirs -valitsinta ei voi käyttää --get tai --set -valitsinten kanssa\n"
 
-#: gconf/gconftool.c:456
+#: gconf/gconftool.c:453
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-"
 "entries, or --all-dirs\n"
@@ -1519,7 +1448,7 @@ msgstr ""
 "--recursive-list valitsinta ei pitäisi käyttää --get, --set, --unset,\n"
 "--all-entries tai --all-dirs valitsinten kanssa\n"
 
-#: gconf/gconftool.c:466
+#: gconf/gconftool.c:463
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
@@ -1528,371 +1457,371 @@ msgstr ""
 "entries\n"
 "tai --all-dirs asetusten kanssa\n"
 
-#: gconf/gconftool.c:472
+#: gconf/gconftool.c:469
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Arvotyypillä on merkitystä vain arvoa asetettaessa\n"
 
-#: gconf/gconftool.c:478
+#: gconf/gconftool.c:475
 msgid "Must specify a type when setting a value\n"
 msgstr "Arvoa asetettaessa sen tyyppi täytyy määritellä\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:485
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping-valitsimen kanssa ei voi käyttää muita valitsimia.\n"
 
-#: gconf/gconftool.c:498
+#: gconf/gconftool.c:495
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "Valitsimen --dir-exist kanssa ei voi käyttää muita valitsimia.\n"
 
-#: gconf/gconftool.c:508
+#: gconf/gconftool.c:505
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 "Valitsimen --install-schema-file kanssa ei voi käyttää muita valitsimia.\n"
 
-#: gconf/gconftool.c:519
+#: gconf/gconftool.c:516
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 "Valitsimen --makefile-install-rule kanssa ei voi käyttää muita valitsimia.\n"
 
-#: gconf/gconftool.c:530
+#: gconf/gconftool.c:527
 msgid "--break-key must be used by itself.\n"
 msgstr "Valitsimen --break-key kanssa ei voi käyttää muita valitsimia.\n"
 
-#: gconf/gconftool.c:541
+#: gconf/gconftool.c:538
 msgid "--break-directory must be used by itself.\n"
 msgstr "Valitsimen --break-directory kanssa ei voi käyttää muita valitsimia.\n"
 
-#: gconf/gconftool.c:549
+#: gconf/gconftool.c:546
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "Valitsinta --direct käytettäessä täytyy määritellä asetuslähde valitsimella "
 "--config-source\n"
 
-#: gconf/gconftool.c:555
+#: gconf/gconftool.c:552
 msgid "You should use --direct when using a non-default configuration source\n"
 msgstr ""
 "Valitsinta --direct pitäisi käyttää, kun asetuslähde ei ole oletuslähde\n"
 
-#: gconf/gconftool.c:561
+#: gconf/gconftool.c:558
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConfin käynnistys epäonnistui: %s\n"
 
-#: gconf/gconftool.c:590
+#: gconf/gconftool.c:587
 msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
 msgstr ""
 "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL on asetettu: ei asenna kaavaimia\n"
 
-#: gconf/gconftool.c:603
+#: gconf/gconftool.c:600
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE ympäristömuuttuja täytyy asettaa\n"
 
-#: gconf/gconftool.c:632
+#: gconf/gconftool.c:629
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Asetuslähteen tai lähteiden käyttäminen epäonnistui: %s\n"
 
-#: gconf/gconftool.c:854
+#: gconf/gconftool.c:851
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Sammutusvirhe: %s\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:894
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "Yksi tai useampi hakemisto täytyy määritellä luetteloitaessa "
 "rekursiivisesti.\n"
 
-#: gconf/gconftool.c:931
+#: gconf/gconftool.c:928
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Hakemiston '%s' kohtien luettelointi epäonnistui: %s\n"
 
-#: gconf/gconftool.c:949
+#: gconf/gconftool.c:946
 msgid "(no value set)"
 msgstr "(ei arvoa)"
 
-#: gconf/gconftool.c:1004
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Asetuspalvelimen (gconfd) käynnistys epäonnistui: %s\n"
 
-#: gconf/gconftool.c:1018
+#: gconf/gconftool.c:1015
 msgid "Must specify a key or keys to get\n"
 msgstr "Täytyy määritellä haettavat avaimet\n"
 
-#: gconf/gconftool.c:1053
+#: gconf/gconftool.c:1050
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tyyppi: %s\n"
 
-#: gconf/gconftool.c:1054
+#: gconf/gconftool.c:1051
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Luettelon tyyppi: %s\n"
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1052
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car:n tyyppi: %s\n"
 
-#: gconf/gconftool.c:1056
+#: gconf/gconftool.c:1053
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr:n tyyppi: %s\n"
 
-#: gconf/gconftool.c:1061
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Oletusarvo: %s\n"
 
-#: gconf/gconftool.c:1061 gconf/gconftool.c:1063 gconf/gconftool.c:1064
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058 gconf/gconftool.c:1060 gconf/gconftool.c:1061
+#: gconf/gconftool.c:1062
 msgid "Unset"
 msgstr "Poista"
 
-#: gconf/gconftool.c:1063
+#: gconf/gconftool.c:1060
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Omistaja: %s\n"
 
-#: gconf/gconftool.c:1064
+#: gconf/gconftool.c:1061
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Lyhyt seloste: %s\n"
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1062
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Pitkä seloste: %s\n"
 
-#: gconf/gconftool.c:1074 gconf/gconftool.c:1368
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1365
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Avaimella '%s' ei ole arvoa\n"
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1372
+#: gconf/gconftool.c:1075 gconf/gconftool.c:1369
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Avaimen '%s' arvon hakeminen epäonnistui: %s\n"
 
-#: gconf/gconftool.c:1121 gconf/gconftool.c:1133
+#: gconf/gconftool.c:1118 gconf/gconftool.c:1130
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Tyyppi '%s' ei ole tuettu\n"
 
-#: gconf/gconftool.c:1145
+#: gconf/gconftool.c:1142
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Täytyy määritellä avain+arvo -pari parametreina\n"
 
-#: gconf/gconftool.c:1165
+#: gconf/gconftool.c:1162
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Avaimella '%s' ei arvoa\n"
 
-#: gconf/gconftool.c:1193
+#: gconf/gconftool.c:1190
 msgid "Cannot set schema as value\n"
 msgstr "Kaavainta ei voi asettaa arvoksi\n"
 
-#: gconf/gconftool.c:1203
+#: gconf/gconftool.c:1200
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 "Luetteloa asettaessasi täytyy sinun määritellä luettelo perustyyppiseksi.\n"
 
-#: gconf/gconftool.c:1217
+#: gconf/gconftool.c:1214
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Paria asettaessasi täytyy sinun määritellä car-type sekä cdr-type "
 "perustyypeiksi.\n"
 
-#: gconf/gconftool.c:1232
+#: gconf/gconftool.c:1229
 #, c-format
 msgid "Error: %s\n"
 msgstr "Virhe: %s\n"
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Virhe asettaessa arvoa: %s\n"
 
-#: gconf/gconftool.c:1263
+#: gconf/gconftool.c:1260
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Virhe synkronoidessa: %s\n"
 
-#: gconf/gconftool.c:1286
+#: gconf/gconftool.c:1283
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Avain tai avaimet täytyy määritellä komentorivillä\n"
 
-#: gconf/gconftool.c:1306
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "Kohdalla '%s' ei ole kaavainta\n"
 
-#: gconf/gconftool.c:1339
+#: gconf/gconftool.c:1336
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "Kohdan '%s' kaavaimessa ei ole dokumenttimerkkijonoa\n"
 
-#: gconf/gconftool.c:1344
+#: gconf/gconftool.c:1341
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Virhe kaavaimen haussa kohdasta '%s': %s\n"
 
-#: gconf/gconftool.c:1351
+#: gconf/gconftool.c:1348
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "Kaavainta ei ole kohdassa '%s'\n"
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1351
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "Arvo kohdassa '%s' ei ole kaavain\n"
 
-#: gconf/gconftool.c:1410 gconf/gconftool.c:1435
+#: gconf/gconftool.c:1407 gconf/gconftool.c:1432
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr "Kaavaimen ja sen jälkeen sitä soveltavan avaimen nimi täytyy antaa\n"
 
-#: gconf/gconftool.c:1417
+#: gconf/gconftool.c:1414
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "Virhe kytkiessä kaavaimen nimeä '%s' avaimen nimeen '%s': %s\n"
 
-#: gconf/gconftool.c:1445
+#: gconf/gconftool.c:1442
 #, c-format
 msgid "Error removing schema name from '%s': %s\n"
 msgstr "Virhe poistaessa kaavainta avaimesta '%s': %s\n"
 
-#: gconf/gconftool.c:1470
+#: gconf/gconftool.c:1467
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Arvo (kaavaimen nimi) täytyy olla ainoa parametri\n"
 
-#: gconf/gconftool.c:1512
+#: gconf/gconftool.c:1509
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Luettelon täytyy olla perustyyppinen: string, int, float tai bool\n"
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1529
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr "Parin car:n täytyy olla perustyyppinen: string, int, float tai bool\n"
 
-#: gconf/gconftool.c:1552
+#: gconf/gconftool.c:1549
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr "Parin cdr:n täytyy olla perustyyppinen: string, int, float tai bool\n"
 
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1564
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Virhe arvoa asettaessa: %s"
 
-#: gconf/gconftool.c:1581
+#: gconf/gconftool.c:1578
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Virhe synkronoidessa: %s"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1593
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr "Hakemistot, joista avain+arvo -parit haetaan, täytyy määritellä.\n"
 
-#: gconf/gconftool.c:1610
+#: gconf/gconftool.c:1607
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Poistettavat avaimet täytyy määritellä.\n"
 
-#: gconf/gconftool.c:1621
+#: gconf/gconftool.c:1618
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Virhe avainta '%s' poistaessa: %s\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1638
 msgid "Must specify one or more keys to recursively unset.\n"
 msgstr "Yksi tai useampi avain täytyy antaa poistettavaksi rekursiivisesti.\n"
 
-#: gconf/gconftool.c:1655
+#: gconf/gconftool.c:1652
 #, c-format
 msgid "Failure during recursive unset of \"%s\": %s\n"
 msgstr "\"%s\":n avainten rekursiivinen poistaminen epäonnistui: %s\n"
 
-#: gconf/gconftool.c:1673
+#: gconf/gconftool.c:1670
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr "Hakemistoja, joiden alihakemistot saadaan, täytyy määritellä.\n"
 
-#: gconf/gconftool.c:1707
+#: gconf/gconftool.c:1704
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Virhe hakemistoja luetteloidessa: %s\n"
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1746
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "VAROITUS: kaavaimen (%s) tyyppi on virheellinen tai puuttuu\n"
 
-#: gconf/gconftool.c:1758
+#: gconf/gconftool.c:1755
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "VAROITUS: kaavaimen (%s) list_type puuttuu tai on virheellinen\n"
 
-#: gconf/gconftool.c:1769 gconf/gconftool.c:1799 gconf/gconftool.c:1828
+#: gconf/gconftool.c:1766 gconf/gconftool.c:1796 gconf/gconftool.c:1825
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "VAROITUS: Kaavaimen (%s) oletusarvon '%s' tulkinta epäonnistui\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1784
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "VAROITUS: parin (%s) car_type tai cdr_type puuttuu tai on virheellinen\n"
 
-#: gconf/gconftool.c:1812
+#: gconf/gconftool.c:1809
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "VAROITUS: Et voi asettaa kaavaimen oletusarvoa\n"
 
-#: gconf/gconftool.c:1841
+#: gconf/gconftool.c:1838
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "VAROITUS: gconftool:in sisäinen virhe: tuntematon GConfValueType\n"
 
-#: gconf/gconftool.c:1888 gconf/gconftool.c:1909 gconf/gconftool.c:1930
-#: gconf/gconftool.c:1951
+#: gconf/gconftool.c:1885 gconf/gconftool.c:1906 gconf/gconftool.c:1927
+#: gconf/gconftool.c:1948
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "VAROITUS: tyypin '%s' nimen jäsennys epäonnistui\n"
 
-#: gconf/gconftool.c:1905
+#: gconf/gconftool.c:1902
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr "VAROITUS: list_type voi olla int, float, string tai bool eikä \"%s\"\n"
 
-#: gconf/gconftool.c:1926
+#: gconf/gconftool.c:1923
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr "VAROITUS: car_type voi olla int, float, string tai bool eikä \"%s\"\n"
 
-#: gconf/gconftool.c:1947
+#: gconf/gconftool.c:1944
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr "VAROITUS: cdr_type voi olla int, float, string tai bool eikä \"%s\"\n"
 
-#: gconf/gconftool.c:1975
+#: gconf/gconftool.c:1972
 msgid "WARNING: empty <applyto> node"
 msgstr "VAROITUS: tyhjä <applyto>-solmu"
 
-#: gconf/gconftool.c:1978 gconf/gconftool.c:2241
+#: gconf/gconftool.c:1975 gconf/gconftool.c:2238
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "VAROITUS: solmu <%s> ei ole ymmärrettävissä <schema>:n jälkeen\n"
 
-#: gconf/gconftool.c:1988
+#: gconf/gconftool.c:1985
 msgid "WARNING: no key specified for schema\n"
 msgstr "VAROITUS: kaavaimelle ei ole määritelty avainta\n"
 
-#: gconf/gconftool.c:2021
+#: gconf/gconftool.c:2018
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "VAROITUS: <locale>-solmulla ei ole 'name=\"locale\"'-ominaisuutta: jää "
 "huomiotta\n"
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2024
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1900,51 +1829,51 @@ msgstr ""
 "VAROITUS: useita <locale> solmuja localelle '%s': vain ensimmäinen otetaan "
 "huomioon\n"
 
-#: gconf/gconftool.c:2108
+#: gconf/gconftool.c:2105
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "VAROITUS: Virheellinen solmu <%s> solmussa <locale>\n"
 
-#: gconf/gconftool.c:2137
+#: gconf/gconftool.c:2134
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "VAROITUS: kaavaimen '%s' (locale '%s') asennus epäonnistui: %s\n"
 
-#: gconf/gconftool.c:2145
+#: gconf/gconftool.c:2142
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Kaavain '%s' asentui localeen '%s'\n"
 
-#: gconf/gconftool.c:2167
+#: gconf/gconftool.c:2164
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "VAROITUS: kaavaimen '%s' kytkentä avaimeen '%s' epäonnistui: %s\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2172
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Kaavain '%s' kytkeytyi avaimeen '%s'\n"
 
-#: gconf/gconftool.c:2254
+#: gconf/gconftool.c:2251
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Jokaisessa <schema>:ssa täytyy olla vähintään yksi <locale>-merkintä\n"
 
-#: gconf/gconftool.c:2285
+#: gconf/gconftool.c:2282
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "VAROITUS: solmu <%s> ei ole ymmärrettävissä <schemalist>:in alla\n"
 
-#: gconf/gconftool.c:2308
+#: gconf/gconftool.c:2305
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Tiedoston '%s' avaaminen epäonnistui: %s\n"
 
-#: gconf/gconftool.c:2315
+#: gconf/gconftool.c:2312
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Asiakirja '%s' on tyhjä?\n"
 
-#: gconf/gconftool.c:2327
+#: gconf/gconftool.c:2324
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1953,28 +1882,28 @@ msgstr ""
 "Asiakirjalla '%s' on vääräntyyppinen juurisolmu (<%s>, pitäisi olla "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:2340
+#: gconf/gconftool.c:2337
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Asiakirjalla '%s' ei ole päätason <gconschemafile> -solmua\n"
 
-#: gconf/gconftool.c:2354
+#: gconf/gconftool.c:2351
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 "VAROITUS: solmu <%s> solmun <gconfschemafile> jälkeen ei ole "
 "ymmärrettävissä\n"
 
-#: gconf/gconftool.c:2365 gconf/gconftool.c:2397
+#: gconf/gconftool.c:2362 gconf/gconftool.c:2394
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Virhe asetustietoja synkronoidessa: %s"
 
-#: gconf/gconftool.c:2381
+#: gconf/gconftool.c:2378
 msgid "Must specify some schema files to install\n"
 msgstr "Asennettavat kaavaintiedostot pitää määritellä\n"
 
-#: gconf/gconftool.c:2418
+#: gconf/gconftool.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -1983,16 +1912,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2438
+#: gconf/gconftool.c:2435
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Rikkomisavaimen %s poisto epäonnistui: %s\n"
 
-#: gconf/gconftool.c:2564
+#: gconf/gconftool.c:2561
 msgid "Must specify some keys to break\n"
 msgstr "Rikottavat avaimet täytyy määritellä\n"
 
-#: gconf/gconftool.c:2570
+#: gconf/gconftool.c:2567
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -2001,11 +1930,11 @@ msgstr ""
 "Yritetään rikkoa sovellus asettamalla virheellisiä arvoja avaimelle:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2588
+#: gconf/gconftool.c:2585
 msgid "Must specify some directories to break\n"
 msgstr "Täytyy määritellä rikottavat hakemistot\n"
 
-#: gconf/gconftool.c:2607
+#: gconf/gconftool.c:2604
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -2016,6 +1945,75 @@ msgstr ""
 "hakemistossa:\n"
 "  %s\n"
 
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not open or create the file \"%s\"; this indicates that there may "
+#~ "be a problem with your configuration, as many programs will need to "
+#~ "create files in your home directory. The error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Ota yhteyttä järjestelmäsi ylläpitäjään seuraavan ongelman "
+#~ "ratkaisemiseksi:\n"
+#~ "Ei voinut avata tai luoda tiedostoa \"%s\", mikä merkitsee, että "
+#~ "asetuksissasi voi olla vikaa. Monet ohjelmat luovat yleensä tiedostoja "
+#~ "kotihakemistoosi. Virhe oli \"%s\" (errno = %d)."
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not lock the file \"%s\"; this indicates that there may be a "
+#~ "problem with your operating system configuration. If you have an NFS-"
+#~ "mounted home directory, either the client or the server may be set up "
+#~ "incorrectly. See the rpc.statd and rpc.lockd documentation. A common "
+#~ "cause of this error is that the \"nfslock\" service has been disabled.The "
+#~ "error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Ota yhteyttä järjestelmäsi ylläpitäjään seuraavan ongelman "
+#~ "ratkaisemiseksi:\n"
+#~ "Ei voinut lukita tiedostoa \"%s\", mikä merkitsee että järjestelmän "
+#~ "asetuksissa voi olla vikaa. Jos sinulla on NFS-liitetty kotihakemisto, "
+#~ "niin joko asiakkan tai palvelimen on asetuksissa on vikaa. Katso "
+#~ "lisätietoja rpc.statd:n ja rpc.lockd:n ohjeista. Yleinen tämän virheen "
+#~ "syy on, että \"nfslock\"-palvelu ei ole käytössä. Virhe oli \"%s\" (errno "
+#~ "= %d)."
+
+#~ msgid "Can't remove file %s: %s\n"
+#~ msgstr "Ei voi poistaa tiedostoa %s: %s\n"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "No configuration sources in the configuration file \"%s\"; this means "
+#~ "that preferences and other settings can't be saved. %s%s"
+#~ msgstr ""
+#~ "Ota yhteyttä järjestelmäsi ylläpitäjään seuraavan ongelman "
+#~ "ratkaisemiseksi:\n"
+#~ "Asetustiedostossa \"%s\" ei ollut asetuslähteitä, mikä merkitsee ettei "
+#~ "asetuksia ja muita valintoja voi tallentaa. %s%s"
+
+#~ msgid "Error reading the file: "
+#~ msgstr "Virhe lukiessa tiedostoa: "
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
+#~ msgstr ""
+#~ "Ota yhteyttä järjestelmäsi ylläpitäjään seuraavan ongelman "
+#~ "ratkaisemiseksi:\n"
+#~ "Ei voinut selvittää osoitetta \"%s\" asetustiedostossa \"%s\": %s"
+
+#~ msgid "Multiple segmentation faults occurred; can't display error dialog\n"
+#~ msgstr ""
+#~ "Useita muistinkäsittelyvirheitä tapahtui: ei voi näyttää virheikkunaa\n"
+
+#~ msgid ""
+#~ "Segmentation fault!\n"
+#~ "Cannot display crash dialog\n"
+#~ msgstr ""
+#~ "Muistinkäsittelyvirhe!\n"
+#~ "Ei voi näyttää virheikkunaa\n"
+
 #~ msgid "Unsynced directory deletions when shutting down XML backend"
 #~ msgstr ""
 #~ "Synkronoimattomia hakemistoja poistui XML-taustamoduulia sammuttaessa"
diff --git a/po/ko.po b/po/ko.po
index 264b72a2..facac6b6 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf CVS-20000906\n"
-"POT-Creation-Date: 2002-03-28 22:46+0900\n"
+"POT-Creation-Date: 2002-01-28 21:35-0500\n"
 "PO-Revision-Date: 2002-03-28 22:33+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -32,7 +32,7 @@ msgstr "BDB 백엔드 모듈을 초기화중입니다"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "주소 `%2$s'에서 %1$s 루트 디렉토리를 찾을 수 없습니다"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1209
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1176
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "`%s'디렉토리를 만들수가 없습니다: %s"
@@ -62,12 +62,12 @@ msgstr "주소 `%s'의 XML 루트 디렉토리에서 읽거나 이 디렉토리�
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "루트 디렉토리 %s에 있는 XML 소스의 디렉토리/파일 허가권이: %o/%o"
 
-#: backends/xml-backend.c:590
+#: backends/xml-backend.c:584
 #, c-format
 msgid "Error syncing the XML backend directory cache: %s"
 msgstr "XML 백엔드 디렉토리 캐쉬를 동기화하는 데 오류가 발생했습니다: %s"
 
-#: backends/xml-backend.c:655
+#: backends/xml-backend.c:651
 msgid ""
 "Remove dir operation is no longer supported, just remove all the values in "
 "the directory"
@@ -75,20 +75,20 @@ msgstr ""
 "디렉토리 지우기 작업은 더 이상 지원되지 않습니다. 디렉토리 내의 모든 값을 지"
 "우면 됩니다"
 
-#: backends/xml-backend.c:722
+#: backends/xml-backend.c:718
 msgid "Initializing XML backend module"
 msgstr "XML 백엔드 모듈을 초기화합니다"
 
-#: backends/xml-backend.c:790
+#: backends/xml-backend.c:786
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "XML 디렉토리 `%s'에 잠금을 포기하는 데 실패했습니다: %s"
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:248
 msgid "Failed to sync XML cache contents to disk"
 msgstr "XML 캐쉬의 내용을 디스크에 쓰는 데 실패했습니다"
 
-#: backends/xml-cache.c:273
+#: backends/xml-cache.c:278
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -97,7 +97,7 @@ msgstr ""
 "XML 백엔드 캐쉬에서 %s 디렉토리를 지울 수 없습니다. 그 내용이 디스크에 올바르"
 "게 쓰여지지 않았기 때문입니다"
 
-#: backends/xml-cache.c:300
+#: backends/xml-cache.c:305
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than %"
@@ -106,178 +106,168 @@ msgstr ""
 "%u개의 항목이 캐쉬에 남아 있습니다.  이 때 %u초 보다 오래된 항목 중 이미 쓰여"
 "진 항목들을 지웠습니다"
 
-#: backends/xml-dir.c:171
+#: backends/xml-dir.c:168
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "`%s'의 정보를 얻어낼수가 없습니다: %s"
 
-#: backends/xml-dir.c:181
+#: backends/xml-dir.c:178
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "XML 파일이름 `%s`가 디렉토리입니다"
 
-#: backends/xml-dir.c:372 backends/xml-dir.c:379
+#: backends/xml-dir.c:369 backends/xml-dir.c:376
 #, c-format
 msgid "Failed to delete \"%s\": %s"
 msgstr "\"%s\"을(를) 지우는 데 실패했습니다: %s"
 
-#: backends/xml-dir.c:424
+#: backends/xml-dir.c:421
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "`%s`파일 쓰기가 실패했습니다: %s"
 
-#: backends/xml-dir.c:437
+#: backends/xml-dir.c:434
 #, c-format
 msgid "Failed to set mode on `%s': %s"
 msgstr "`%s'의 허가권을 설정하는 데 실패: %s"
 
-#: backends/xml-dir.c:447
+#: backends/xml-dir.c:444
 #, c-format
 msgid "Failed to write XML data to `%s': %s"
 msgstr "XMl 데이타를 %s에 쓰는 데 실패: %s"
 
-#: backends/xml-dir.c:457 backends/xml-dir.c:1233
+#: backends/xml-dir.c:454 backends/xml-dir.c:1200
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "`%s'파일을 닫는 데 실패했습니다: %s"
 
-#: backends/xml-dir.c:473 backends/xml-dir.c:483
+#: backends/xml-dir.c:470 backends/xml-dir.c:480
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "`%s'을(를) `%s'(으)로 이름을 바꾸는 데 실패했습니다: %s"
 
-#: backends/xml-dir.c:489
+#: backends/xml-dir.c:486
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "`%s'을(를) `%s'에서 복구하는 데 실패했습니다: %s"
 
-#: backends/xml-dir.c:501
+#: backends/xml-dir.c:498
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "기존 파일 `%s` 지우기가 실패했습니다: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:929
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "`%s'의 정보를 얻을수가 없습니다: %s"
 
-#: backends/xml-dir.c:956
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: backends/xml-dir.c:1106
+#: backends/xml-dir.c:1073
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "엔트리 `%s'가 `%s'에서 중복되어있습니다. 무시"
 
-#: backends/xml-dir.c:1128
+#: backends/xml-dir.c:1095
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "`%s' XML 파일에 이름이 없는 엔트리가 있어서 무시합니다"
 
-#: backends/xml-dir.c:1136
+#: backends/xml-dir.c:1103
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr "XML 파일 `%s'의 맨 위 노드가 <entry>가 아니라 <%s>입니다.  무시합니다"
 
-#: backends/xml-dir.c:1225
+#: backends/xml-dir.c:1192
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "`%s'파일을 생성하는 데 실패했습니다: %s"
 
-#: backends/xml-dir.c:1324
-#, c-format
-msgid "Failed to parse XML file \"%s\""
-msgstr "XML 파일 \"%s\"의 구문 분석이 실패했습니다"
-
 #. There was an error
-#: backends/xml-entry.c:154
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "`%s'라는 이름을 가진 XML 노드를 무시합니다: %s"
 
-#: backends/xml-entry.c:332
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "스키마 이름 `%s'을(를) 무시합니다.  잘못되었습니다: %s"
 
-#: backends/xml-entry.c:380
+#: backends/xml-entry.c:376
 #, c-format
 msgid "Ignoring XML node `%s': %s"
 msgstr "`%s' XML 노드를 무시합니다: %s"
 
-#: backends/xml-entry.c:732
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "스키마에대한 기본값을 읽는 데 실패했습니다: %s"
 
-#: backends/xml-entry.c:952
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "<%s>노드에 \"type\"속성값이 없습니다"
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "노드의 \"type\" 속성이 알 수 없는 `%s'입니다. 무시합니다"
 
-#: backends/xml-entry.c:981
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "노드에 \"value\"속성값이 없습니다"
 
-#: backends/xml-entry.c:1029 backends/xml-entry.c:1105
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "XML 리스트 노드 내의 XML 노드 <%s>을(를) 이해할 수 없습니다"
 
-#: backends/xml-entry.c:1063
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "잘못된 타입(리스트, 쌍, 혹은 알 수 없음)이 리스트 노드 안에 있습니다"
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "틀린 XML 노드: %s"
 
-#: backends/xml-entry.c:1094
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "리스트에 틀린 종류의 노드가 들어 있습니다 (%s, %s이(가) 되어야 합니다)"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "XML 쌍에서 잘못된 car 무시: %s"
 
-#: backends/xml-entry.c:1155 backends/xml-entry.c:1178
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "XML 파일 구문 분석: 리스트와 쌍은 쌍 안에 놓일 수 없습니다"
 
-#: backends/xml-entry.c:1168
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "XML 쌍에서 잘못된 cdr 무시: %s"
 
-#: backends/xml-entry.c:1187
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "XML 쌍 노드 내의 XML 노드 <%s>을(를) 이해할 수 없습니다"
 
-#: backends/xml-entry.c:1205
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "XML 쌍 노드에 대한 car와 cdr를 찾을 수 없습니다"
 
-#: backends/xml-entry.c:1211
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "XML 파일의 값 쌍에서 cdr가 없습니다"
 
-#: backends/xml-entry.c:1218
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "XML 파일의 값 쌍에서 car가 없습니다"
 
-#: backends/xml-entry.c:1223
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "XML 파일의 값 쌍에서 car가 없습니다"
 
@@ -315,59 +305,63 @@ msgstr "백엔드를 끝내는 데 실패했습니다"
 msgid "GConf Error: %s\n"
 msgstr "GConf 오류: %s\n"
 
-#: gconf/gconf-client.c:881
+#: gconf/gconf-client.c:899
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf 경고: `%s' 내의 쌍들을 열거하는 데 실패했습니다: %s"
 
-#: gconf/gconf-client.c:1146
+#: gconf/gconf-client.c:1165
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "%3$s 키에 대해 `%1$s'이(가) 나와야 하는 데 `%2$s'이(가) 나타났습니다"
 
-#: gconf/gconf-database.c:234
+#: gconf/gconf-database.c:233
 msgid "Received invalid value in set request"
 msgstr "set 요청에서 잘못된 값을 받았습니다"
 
-#: gconf/gconf-database.c:242
+#: gconf/gconf-database.c:241
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr "`%s' 키에 대한 set 요청에서 받은 코바 값이 올바른 값이 아닙니다"
 
-#: gconf/gconf-database.c:523
+#: gconf/gconf-database.c:522
 msgid "Received request to drop all cached data"
 msgstr "모든 캐쉬된 데이타를 버리는 요청을 받았습니다"
 
-#: gconf/gconf-database.c:540
+#: gconf/gconf-database.c:539
 msgid "Received request to sync synchronously"
 msgstr "동기적으로 캐쉬를 쓰라는 요청을 받았습니다"
 
-#: gconf/gconf-database.c:824
+#: gconf/gconf-database.c:823
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "치명적 오류: ConfigDatabase에 대한 오브젝트 참조를 얻는 데 실패했습니다"
 
-#: gconf/gconf-database.c:986
+#: gconf/gconf-database.c:985
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "한 개 이상의 소스를 쓰는 데 실패했습니다: %s"
 
-#: gconf/gconf-database.c:1078
-#, c-format
+#. This error is not fatal; we basically ignore it.
+#. * Because it's likely the right thing for the client
+#. * app to simply continue.
+#.
+#: gconf/gconf-database.c:1076
+#, fuzzy, c-format
 msgid ""
-"Failed to log addition of listener %s (%s);will not be able to restore this "
+"Failed to log addition of listener %s (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
 "리스너 %s(%s)의 추가를 기록하는 데 실패했습니다:gconf가 재시작할 때 이 리스너"
 "를 복구하지 못할 것이므로, 설정 변화에 대해 안정적으로 통고할 수 없습니다."
 
-#: gconf/gconf-database.c:1109
+#: gconf/gconf-database.c:1103
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "리스너 ID %lu이(가) 존재하지 않습니다"
 
-#: gconf/gconf-database.c:1123
+#: gconf/gconf-database.c:1117
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -376,57 +370,57 @@ msgstr ""
 "리스너의 제거를 로그파일에 기록하는 데 실패했습니다 (대부분 해가 될 것은 없으"
 "나, 통고가 이상하게 다시 나타날 수도 있습니다): %s"
 
-#: gconf/gconf-database.c:1241 gconf/gconf-sources.c:1540
+#: gconf/gconf-database.c:1235 gconf/gconf-sources.c:1540
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "`%s'에 대한 값을 얻는 데 오류가 발생했습니다: %s"
 
-#: gconf/gconf-database.c:1288
+#: gconf/gconf-database.c:1282
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "`%s'에 대한 값을 정하는 데 오류가 발생했습니다: %s"
 
-#: gconf/gconf-database.c:1331
+#: gconf/gconf-database.c:1325
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "`%s'의 값을 해제하는 데 오류가 발생했습니다: %s"
 
-#: gconf/gconf-database.c:1360
+#: gconf/gconf-database.c:1354
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "`%s'의 기본값을 얻는 데 오류가 발생했습니다: %s"
 
-#: gconf/gconf-database.c:1411
+#: gconf/gconf-database.c:1405
 #, c-format
 msgid "Error unsetting \"%s\": %s"
 msgstr "\"%s\"의 값을 해제하는 데 오류가 발생했습니다: %s"
 
-#: gconf/gconf-database.c:1443
+#: gconf/gconf-database.c:1437
 #, c-format
 msgid "Error getting new value for \"%s\": %s"
 msgstr "\"%s\"에 대한 새로운 값을 얻는 데 오류 발생했습니다: %s"
 
-#: gconf/gconf-database.c:1491
+#: gconf/gconf-database.c:1485
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "`%s'의 존재유무를 검사하는 데 오류가 발생했습니다: %s"
 
-#: gconf/gconf-database.c:1515
+#: gconf/gconf-database.c:1509
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "`%s' 디렉토리를 지우는 데 오류가 발생했습니다: %s"
 
-#: gconf/gconf-database.c:1542
+#: gconf/gconf-database.c:1536
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "`%s'에 있는 모든 엔트리를 얻는 데 실패했습니다: %s"
 
-#: gconf/gconf-database.c:1568
+#: gconf/gconf-database.c:1562
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "`%s' 내의 디렉토리를 나열하는 데 오류: %s"
 
-#: gconf/gconf-database.c:1589
+#: gconf/gconf-database.c:1583
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "`%s'을 위한 스키마 설정에 오류: %s"
@@ -553,68 +547,68 @@ msgstr "소스 `%s'을(를) 추가합니다\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "`%s'파일을 읽는 데 오류가 발생했습니다: %s\n"
 
-#: gconf/gconf-internals.c:1195 gconf/gconf-internals.c:1261
+#: gconf/gconf-internals.c:1211 gconf/gconf-internals.c:1277
 #: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
-#: gconf/gconf-value.c:1511
+#: gconf/gconf-value.c:1341
 msgid "Text contains invalid UTF-8"
 msgstr "텍스트에 잘못된 UTF-8이 들어 있습니다"
 
-#: gconf/gconf-internals.c:1346
+#: gconf/gconf-internals.c:1362
 #, c-format
 msgid "Expected list, got %s"
 msgstr "예상되는 리스트 대신 %s를 얻었습니다"
 
-#: gconf/gconf-internals.c:1356
+#: gconf/gconf-internals.c:1372
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "예상되는 %s의 리스트대신 %s의 리스트를 얻었습니다"
 
-#: gconf/gconf-internals.c:1498
+#: gconf/gconf-internals.c:1511
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "예상되는 pair대신에 %s을 얻었습니다"
 
-#: gconf/gconf-internals.c:1512
+#: gconf/gconf-internals.c:1525
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "(%s,%s) 쌍이 나와야 하는 데, 그 중에 한 개 혹은 두 모두의 값이 없는 채로 나타"
 "났습니다"
 
-#: gconf/gconf-internals.c:1528
+#: gconf/gconf-internals.c:1541
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "예상되는 (%s, %s)타입의 pair 대신에 (%s, %s)을 얻었습니다"
 
-#: gconf/gconf-internals.c:1644
+#: gconf/gconf-internals.c:1657
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "따옴표된 문자열이 따옴표로 시작하지 않습니다"
 
-#: gconf/gconf-internals.c:1706
+#: gconf/gconf-internals.c:1719
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "따옴표된 문자열이 따옴표로 끝나지 않습니다"
 
-#: gconf/gconf-internals.c:1842
+#: gconf/gconf-internals.c:1855
 msgid "Encoded value is not valid UTF-8"
 msgstr "인코딩된 값이 올바른 UTF-8이 아닙니다"
 
-#: gconf/gconf-internals.c:2301
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Could not lock temporary file '%s': %s"
 msgstr "'%s' 임시 파일에 잠금을 걸 수 없습니다: %s"
 
-#: gconf/gconf-internals.c:2328
+#: gconf/gconf-internals.c:2341
 #, c-format
 msgid "Could not create file '%s', probably because it already exists"
 msgstr ""
 "'%s' 파일을 만들 수 없습니다. 아마도 이미 존재하는 파일이기 때문일 것입니다"
 
-#: gconf/gconf-internals.c:2374
+#: gconf/gconf-internals.c:2387
 #, c-format
 msgid "Failed to create or open '%s'"
 msgstr "`%s' 파일을 만들거나 여는 데 실패했습니다"
 
-#: gconf/gconf-internals.c:2384
+#: gconf/gconf-internals.c:2397
 #, c-format
 msgid ""
 "Failed to lock '%s': probably another process has the lock, or your "
@@ -624,173 +618,90 @@ msgstr ""
 "던지, 아니면 이 운영 체제에서 NFS 파일 잠금이 잘못 설정되엉 있기 때문일 것입"
 "니다 (%s)"
 
-#: gconf/gconf-internals.c:2413
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr ""
 "IOR 파일 '%s'을(를) 성공적으로 열지 못했습니다. gconfd를 찾을 수 없습니다: %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2455
 #, c-format
 msgid "gconftool or other non-gconfd process has the lock file '%s'"
 msgstr ""
 "gconftool 혹은 다른 gconfd와 관계없는 프로세스가 '%s' 잠금 파일을 갖고 있습니"
 "다"
 
-#: gconf/gconf-internals.c:2460
+#: gconf/gconf-internals.c:2472
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
 msgstr "실행 중인 gconfd 오브젝트 참조를 확인하는 데 ORB에 접근할 수 없습니다"
 
-#: gconf/gconf-internals.c:2470
+#: gconf/gconf-internals.c:2482
 #, c-format
 msgid "Failed to convert IOR '%s' to an object reference"
 msgstr "IOR '%s'을(를) 오브젝트 참조로 변환할 수 없습니다"
 
-#: gconf/gconf-internals.c:2520
+#: gconf/gconf-internals.c:2510
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "`%s'디렉토리를 만들 수가 없습니다: %s"
 
-#: gconf/gconf-internals.c:2579
+#: gconf/gconf-internals.c:2569
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "`%s'파일에 쓸수가 없습니다: %s"
 
-#: gconf/gconf-internals.c:2620
+#: gconf/gconf-internals.c:2610
 #, c-format
 msgid "We didn't have the lock on file `%s', but we should have"
 msgstr "파일 `%s'에 대해 잠금을 가지고 있지 않지만, 잠금을 가져야 합니다"
 
-#: gconf/gconf-internals.c:2641
+#: gconf/gconf-internals.c:2631
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
 msgstr "`%s'을(를) '%s'(으)로 링크를 만들 수 없습니다: %s"
 
-#: gconf/gconf-internals.c:2653
+#: gconf/gconf-internals.c:2643
 #, c-format
 msgid "Failed to remove lock file `%s': %s"
 msgstr "`%s' 잠금 파일을 지우는 데 실패했습니다: %s"
 
-#: gconf/gconf-internals.c:2672
+#: gconf/gconf-internals.c:2662
 #, c-format
 msgid "Failed to clean up file '%s': %s"
 msgstr "'%s' 파일을 지우는 데 실패했습니다: %s"
 
-#: gconf/gconf-internals.c:2686
+#: gconf/gconf-internals.c:2676
 #, c-format
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "`%s' 잠금 디렉토리를 지우는 데 실패했습니다: %s"
 
-#: gconf/gconf-internals.c:2860 gconf/gconfd.c:591
+#: gconf/gconf-internals.c:2842 gconf/gconfd.c:583
 #, c-format
 msgid "Failed to create %s: %s"
 msgstr "`%s' 파일을 만드는 데 실패했습니다: %s"
 
-#: gconf/gconf-internals.c:2882
-#, c-format
-msgid "Server ping error: %s"
-msgstr "서버 ping 오류: %s"
-
-#: gconf/gconf-internals.c:2903
+#: gconf/gconf-internals.c:2875
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 "실행한 gconf 데몬과 통신하기 위한 파이프를 만드는 데 실패했습니다: %s\n"
 
-#: gconf/gconf-internals.c:2927
+#: gconf/gconf-internals.c:2899
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "설정 서버를 실행할 수 없습니다: %s\n"
 
-#: gconf/gconf-internals.c:2952
-#, c-format
-msgid ""
-"Failed to contact configuration server; some possible causes are that you "
-"need to enable TCP/IP networking for ORBit, or you have stale NFS locks due "
-"to a system crash. See http://www.gnome.org/projects/gconf/ for information. "
-"(Details - %s)"
-msgstr ""
-"설정 서버에 접촉하는 데 실패했습니다: 가능한 원인은 ORBit에 TCP/IP 네트워크"
-"를 사용하는 것, 혹은 시스템의 이상 종료로 인해 NFS 잠금이 동작하지 않게 되었"
-"을 경우입니다.  자세한 정보는 <http://www.gnome.org/projects/gconf/>를 참조하"
-"십시오.  (자세한 정보 - %s)"
-
-#: gconf/gconf-internals.c:2953
-msgid "none"
-msgstr "없음"
-
-#: gconf/gconf-sanity-check.c:39 gconf/gconftool.c:72
-msgid "Help options"
-msgstr "도움말 옵션"
-
-#: gconf/gconf-sanity-check.c:74 gconf/gconftool.c:411
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"옵션 %s에 오류: %s.\n"
-"가능한 명령행 옵션을 모두 보려면 '%s --help'라고 실행하십시오.\n"
-
-#: gconf/gconf-sanity-check.c:131
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not open or create the file \"%s\"; this indicates that there may be a "
-"problem with your configuration, as many programs will need to create files "
-"in your home directory. The error was \"%s\" (errno = %d)."
-msgstr ""
-"시스템 관리자에게 접촉해 다음 문제를 해결하십시오: \n"
-"\"%s' 파일을 열거나 만들 수 없습니다; 설정 사항에 문제가 있다는 뜻일 수 있습"
-"니다. 많은 프로그램이 홈 디렉토리 내에 파일을 만들어야 합니다. 오류는 \"%s"
-"\" (errno = %d)."
-
-#: gconf/gconf-sanity-check.c:143
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not lock the file \"%s\"; this indicates that there may be a problem "
-"with your operating system configuration. If you have an NFS-mounted home "
-"directory, either the client or the server may be set up incorrectly. See "
-"the rpc.statd and rpc.lockd documentation. A common cause of this error is "
-"that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
-"%d)."
-msgstr ""
-"시스템 관리자에게 접촉해 다음 문제를 해결하십시오: \n"
-"\"%s' 파일을 잠글 수 없습니다; 운영 체제의 설정 사항에 문제가 있을 수 있습니"
-"다. 홈 디렉토리가 NFS에 마운트되어 있다면, 클라이언트 혹은 서버가 잘못 설정되"
-"어 있을 것입니다. rpc.statd와 rpc.lockd 문서를 참조하십시오. 이 오류의 대부분"
-"의 원인은 \"nfslock\" 서비스를 사용하지 않았기 때문입니다.  오류는 \"%s"
-"\" (errno = %d)."
-
-#: gconf/gconf-sanity-check.c:160
-#, c-format
-msgid "Can't remove file %s: %s\n"
-msgstr "`%s' 파일을 지울 수 없습니다: %s\n"
-
-#: gconf/gconf-sanity-check.c:195
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"No configuration sources in the configuration file \"%s\"; this means that "
-"preferences and other settings can't be saved. %s%s"
-msgstr ""
-"시스템 관리자에게 접촉해 다음 문제를 해결하십시오: \n"
-"설정 파일 \"%s\"에 설정 소스가 없습니다; 기본 설정과 그 외의 설정 사항을 저장"
-"할 수 없다는 뜻입니다. %s%s"
-
-#: gconf/gconf-sanity-check.c:198
-msgid "Error reading the file: "
-msgstr "파일을 읽는 데 오류가 발생했습니다: "
-
-#: gconf/gconf-sanity-check.c:220
-#, c-format
+#: gconf/gconf-internals.c:2923
 msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
+"Failed to contact configuration server; some possible causes are:\n"
+"a) you have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit by putting the line \"ORBIIOPIPv4=1"
+"\" in /etc/orbitrc\n"
+"b) you have stale locks in your NFS-mounted home directory due to a system "
+"crash, try removing ~/.gconf/*.lock and ~/.gconfd/lock if you are sure no "
+"gconfd processes are running on any machine using your home dir"
 msgstr ""
-"시스템 관리자에게 접촉해 다음 문제를 해결하십시오: \n"
-"설정 파일 \"%2$s\"의 주소 \"%1$s\"를 확인(resolve)할 수 없습니다: %3$s"
 
 #: gconf/gconf-schema.c:190 gconf/gconf-schema.c:198 gconf/gconf-schema.c:206
 #: gconf/gconf-schema.c:214
@@ -959,96 +870,96 @@ msgstr "`%s'을(를) 이해할 수 없습니다 (원소의 개수가 틀렸습�
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "`%s'을(를) 이해할 수 없습니다 (쌍 안에 ')'가 추가로 발견되었습니다)"
 
-#: gconf/gconf.c:55
+#: gconf/gconf.c:54
 #, c-format
 msgid "Key \"%s\" is NULL"
 msgstr "키 \"%s\"이(가) NULL입니다"
 
-#: gconf/gconf.c:62
+#: gconf/gconf.c:61
 #, c-format
 msgid "\"%s\": %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:343
+#: gconf/gconf.c:333
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "서버가 `%s'주소를 해석할수가 없습니다"
 
-#: gconf/gconf.c:634
+#: gconf/gconf.c:624
 msgid "Can't add notifications to a local configuration source"
 msgstr "로칼 설정 서버에 통보를 추가할 수 없습니다"
 
-#: gconf/gconf.c:2079
+#: gconf/gconf.c:2072
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "클라이언트를 서버의 목록에 추가하는 데 실패했습니다. 코바 오류: %s"
 
-#: gconf/gconf.c:2434
+#: gconf/gconf.c:2393
 msgid "Must begin with a slash (/)"
 msgstr "슬래쉬(/)로 시작해야합니다"
 
-#: gconf/gconf.c:2456
+#: gconf/gconf.c:2415
 msgid "Can't have two slashes (/) in a row"
 msgstr "한 행에 슬래쉬(/)가 두 개 있을 수 없습니다"
 
-#: gconf/gconf.c:2458
+#: gconf/gconf.c:2417
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "슬래쉬(/) 바로 다음에는 점(.)을 쓸 수 없습니다"
 
-#: gconf/gconf.c:2477
+#: gconf/gconf.c:2436
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
 msgstr "'%c'은(는) ASCII 문자가 아니므로, 키 이름으로 허용되지 않습니다"
 
-#: gconf/gconf.c:2487
+#: gconf/gconf.c:2446
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c'은(는) 키/디렉토리 이름에 쓸 수 있는 문자가 아닙니다"
 
-#: gconf/gconf.c:2501
+#: gconf/gconf.c:2460
 msgid "Key/directory may not end with a slash (/)"
 msgstr "키/디렉토리는 슬래쉬(/)로 끝나면 안 됩니다"
 
-#: gconf/gconf.c:2870
+#: gconf/gconf.c:2829
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "설정 서버를 끝내는 데 실패했습니다: %s"
 
-#: gconf/gconf.c:2931
+#: gconf/gconf.c:2890
 #, c-format
 msgid "Expected float, got %s"
 msgstr "실수값이 와야하나 대신에 %s을 얻었습니다."
 
-#: gconf/gconf.c:2966
+#: gconf/gconf.c:2925
 #, c-format
 msgid "Expected int, got %s"
 msgstr "정수값이 와야하나 대신에 %s을 얻었습니다."
 
-#: gconf/gconf.c:3001
+#: gconf/gconf.c:2960
 #, c-format
 msgid "Expected string, got %s"
 msgstr "문자열이 와야하나 대신에 %s을 얻었습니다."
 
-#: gconf/gconf.c:3038
+#: gconf/gconf.c:2997
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "bool값이 와야하나 대신에 %s을 얻었습니다."
 
-#: gconf/gconf.c:3071
+#: gconf/gconf.c:3030
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "스키마가 와야하나 대신에 %s를 얻었습니다"
 
-#: gconf/gconf.c:3432
+#: gconf/gconf.c:3391
 #, c-format
 msgid "CORBA error: %s"
 msgstr "코바 오류: %s"
 
-#: gconf/gconfd.c:249
+#: gconf/gconfd.c:246
 msgid "Shutdown request received"
 msgstr "끝내라는 요청을 받았습니다"
 
-#: gconf/gconfd.c:281
+#: gconf/gconfd.c:278
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -1056,7 +967,7 @@ msgstr ""
 "gconfd가 디버깅 용으로 컴파일되었습니다; 소스 디렉토리에서 gconf.path를 읽어"
 "들이도록 시도합니다"
 
-#: gconf/gconfd.c:295
+#: gconf/gconfd.c:292
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1065,22 +976,22 @@ msgstr "설정 파일을 찾을 수 ㅇ벗습니다. 기본 설정 소스 `%s'�
 #. We want to stay alive but do nothing, because otherwise every
 #. request would result in another failed gconfd being spawned.
 #.
-#: gconf/gconfd.c:303
+#: gconf/gconfd.c:300
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr "소스 경로에 설정 소스가 없습니다. 설정을 저장할 수 없습니다; "
 
-#: gconf/gconfd.c:303
+#: gconf/gconfd.c:300
 msgid "/path"
 msgstr "/path를 편집하십시오"
 
-#: gconf/gconfd.c:316
+#: gconf/gconfd.c:313
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "설정 파일을 불러들이는 데 오류가 발생했습니다: %s"
 
-#: gconf/gconfd.c:328
+#: gconf/gconfd.c:325
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1088,7 +999,7 @@ msgstr ""
 "설정 소스 주소를 확인하는 데 실패했습니다. 설정 데이타를 읽어들이거나 저장할 "
 "수 없습니다"
 
-#: gconf/gconfd.c:345
+#: gconf/gconfd.c:342
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1096,65 +1007,65 @@ msgstr ""
 "쓰기 가능한 설정 소스를 확인할 수 없습니다. 설정 사항의 변화를 저장하지 못할 "
 "것입니다"
 
-#: gconf/gconfd.c:371
+#: gconf/gconfd.c:368
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr "시그날 %d을 받아서 메모리를 덤프합니다. GConf 버그를 알려 주십시오."
 
-#: gconf/gconfd.c:389
+#: gconf/gconfd.c:384
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 "시그날 %d을(를) 받아서 비정상적으로 끝마칩니다. GConf 버그를 보고해 주십시오."
 
-#: gconf/gconfd.c:406
+#: gconf/gconfd.c:401
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "시그날 %d을 받아서, 올바르게 끝마칩니다"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:538
+#: gconf/gconfd.c:531
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "시작 (버전 %s), pid %u 사용자 '%s'"
 
-#: gconf/gconfd.c:578
+#: gconf/gconfd.c:570
 msgid "Failed to get object reference for ConfigServer"
 msgstr "ConfigServer에 대한 오브젝트 참조를 얻지 못했습니다"
 
-#: gconf/gconfd.c:616
+#: gconf/gconfd.c:608
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 "바이트를 파이프 fd %d에 쓰는 데 실패하여 클라이언트 프로그램이 이상 종료할 "
 "수 있습니다: %s"
 
-#: gconf/gconfd.c:626
+#: gconf/gconfd.c:618
 #, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "데몬에 대한 잠금을 얻는 데 실패했습니다. 끝냅니다: %s"
 
-#: gconf/gconfd.c:664
+#: gconf/gconfd.c:656
 #, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "잠금 파일을 해제하는 데 실패했습니다: %s"
 
-#: gconf/gconfd.c:672
+#: gconf/gconfd.c:664
 msgid "Exiting"
 msgstr "끝냄"
 
-#: gconf/gconfd.c:698
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "GConf 서버가 사용중이 아니라, 끝마칩니다"
 
-#: gconf/gconfd.c:1063
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "예외가 발생했습니다: %s"
 
-#: gconf/gconfd.c:1163
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1163,7 +1074,7 @@ msgstr ""
 "gconfd 로그파일을 여는 데 실패했습니다; gconfd 셧다운 후에 리스너를 복구하지 "
 "못할 것입니다 (%s)"
 
-#: gconf/gconfd.c:1198
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1171,38 +1082,38 @@ msgstr ""
 "gconfd 로그파일을 닫는 데 실패했습니다; 데이타를 올바르게 저장하지 못할 수도 "
 "있습니다 (%s)"
 
-#: gconf/gconfd.c:1267
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "저장된 상태 파일 '%s'을(를) 쓰기로 열 수 없습니다: %s"
 
-#: gconf/gconfd.c:1281
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "`%s' 파일에 저장된 상태를 쓸 수 없습니다. fd: %d: %s"
 
-#: gconf/gconfd.c:1290
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "새로 저장된 상태 파일 '%s'을(를) 닫는 데 실패했습니다: %s"
 
-#: gconf/gconfd.c:1304
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "과거에 저장된 상태 파일 `%s'을 옮겨 놓을 수 없습니다: %s"
 
-#: gconf/gconfd.c:1314
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "새로 저장된 상태 파일을 제 위치에 놓을 수 없습니다: %s"
 
-#: gconf/gconfd.c:1323
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr "'%s'(으)로 옮겨진 원래 저장된 상태 파일을 복구하는 데 실패했습니다: %s"
 
-#: gconf/gconfd.c:1794
+#: gconf/gconfd.c:1790
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1210,17 +1121,17 @@ msgstr ""
 "주소 '%s'의 리스너를 복구하는 데 실패했습니다. 데이타베이스를 확인할 수 없습"
 "니다"
 
-#: gconf/gconfd.c:1840
+#: gconf/gconfd.c:1836
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "저장된 상태 파일을 읽는 데 오류가 있습니다: %s"
 
-#: gconf/gconfd.c:1893
+#: gconf/gconfd.c:1889
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "저장된 상태 파일 '%s'을(를) 열 수 없습니다: %s"
 
-#: gconf/gconfd.c:2010
+#: gconf/gconfd.c:2006
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1229,7 +1140,7 @@ msgstr ""
 "리스너의 추가를 gconfd 로그파일에 기록하는 데 실패했습니다; gconfd나 끝나거"
 "나 셧다운할 때 리스너를 다시 추가할 수 없을 것입니다 (%s)"
 
-#: gconf/gconfd.c:2015
+#: gconf/gconfd.c:2011
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1238,59 +1149,46 @@ msgstr ""
 "리스너의 제거를 gconfd 로그파일에 기록하는 데 실패했습니다; gconfd나 끝나거"
 "나 셧다운할 때 리스너를 다시 추가할 수 없을 것입니다 (%s)"
 
-#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
+#: gconf/gconfd.c:2034 gconf/gconfd.c:2199
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "클라이언트에 대한 IOR을 얻는 데 실패했습니다: %s"
 
-#: gconf/gconfd.c:2053
+#: gconf/gconfd.c:2049
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "저장된 상태 파일을 닫는 데 실패했습니다: %s"
 
-#: gconf/gconfd.c:2066
+#: gconf/gconfd.c:2062
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "클라이언트에 저장된 상태 파일에 추가하도록 쓰는 데 실패했습니다: %s"
 
-#: gconf/gconfd.c:2074
+#: gconf/gconfd.c:2070
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr ""
 "클라이언트에 저장된 상태 파일에 추가하도록 쓰기 실행하는 데 실패했습니다: %s"
 
-#: gconf/gconfd.c:2164
+#: gconf/gconfd.c:2160
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 "어떤 클라이언트가 추가도 되기 전에 자기 자신을 GConf 서버에서 지웠습니다."
 
-#. dialog display isn't working out
-#: gconf/gconfd.c:2303
-msgid "Multiple segmentation faults occurred; can't display error dialog\n"
-msgstr ""
-"여러 개의 세그멘테이션 오류가 발생했습니다; 오류 대화 상자를 표시할 수 없습니"
-"다\n"
-
-#. Eeeek! Can't show dialog
-#: gconf/gconfd.c:2312
-#, c-format
-msgid ""
-"Segmentation fault!\n"
-"Cannot display crash dialog: %s\n"
-msgstr ""
-"세그멘테이션 오류!\n"
-"이상 종료 대화 상자를 표시할 수 없습니다: %s\n"
+#: gconf/gconftool.c:71
+msgid "Help options"
+msgstr "도움말 옵션"
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "어떤 키에 대해 값을 설정하고 동기화합니다. --type과 함께 씁니다."
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid "Print the value of a key to standard output."
 msgstr "어떤 키의 값을 표준 출력으로 표시합니다."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:98
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
@@ -1298,50 +1196,50 @@ msgstr ""
 "스키마를 설정하고 동기화합니다. --short-desc, --long-desc, --owner, --type과 "
 "함께 씁니다."
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 msgid "Unset the keys on the command line"
 msgstr "명령행에서 키를 지웁니다"
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
 msgstr ""
 "명령행에서 모든 키와 그 아래의 키/디렉토리 이름을 재귀적으로 모두 지웁니다"
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all key/value pairs in a directory."
 msgstr "디렉토리 내의 모든 키/값 쌍을 표시합니다."
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Print all subdirectories in a directory."
 msgstr "디렉토리 내의 모든 하위 디렉토리를 표시합니다."
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "디렉토리 아래의 모든 하위 디렉토리와 항목들을 재귀적으로 표시합니다."
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "디렉토리가 있으면 0 아니면 2를 돌려줍니다"
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 "gconfd를 셧다운합니다. 그럴만한 이유가 없다면 이 옵션을 사용하지 마십시오."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "gconfd가 돌아가고 있으면 0 아니면 2를 돌려줍니다"
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 "설정 서버(gconfd)를 실행합니다. (보통의 경우 필요할 때 자동으로 실행됩니다)"
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1349,11 +1247,11 @@ msgstr ""
 "설정할 값의 타입, 혹은 스키마가 설명하는 값의 타입을 지정합니다. 유일하다면 "
 "줄여서 써도 상관없습니다."
 
-#: gconf/gconftool.c:191
+#: gconf/gconftool.c:190
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1361,11 +1259,11 @@ msgstr ""
 "설정할 리스트 값의 타입, 혹은 스키마가 설명하는 값의 타입을 지정합니다. 유일"
 "하다면 줄여서 써도 상관없습니다."
 
-#: gconf/gconftool.c:200 gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:199 gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1373,7 +1271,7 @@ msgstr ""
 "설정할 car 쌍의 값의 타입, 혹은 스키마가 설명하는 값의 타입을 지정합니다. 유"
 "일하다면 줄여서 써도 상관없습니다."
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1381,43 +1279,43 @@ msgstr ""
 "설정할 cdr 쌍의 값의 타입, 혹은 스키마가 설명하는 값의 타입을 지정합니다. 유"
 "일하다면 줄여서 써도 상관없습니다."
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 msgid "Specify a short half-line description to go in a schema."
 msgstr "스키마에 들어갈 짤막한 설명을 지정합니다."
 
-#: gconf/gconftool.c:227 gconf/gconftool.c:236
+#: gconf/gconftool.c:226 gconf/gconftool.c:235
 msgid "DESCRIPTION"
 msgstr "<설명>"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a several-line description to go in a schema."
 msgstr "스키마에 들어갈 여러 줄에 걸쳐 들어갈 설명을 지정합니다."
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 msgid "Specify the owner of a schema"
 msgstr "스키마의 소유자를 지정합니다"
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 msgid "OWNER"
 msgstr "<소유자>"
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid "Specify a schema file to be installed"
 msgstr "설치할 스키마 파일을 지정합니다"
 
-#: gconf/gconftool.c:254
+#: gconf/gconftool.c:253
 msgid "FILENAME"
 msgstr "<파일이름>"
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "기본 경로가 아닌 설정 소스를 지정합니다"
 
-#: gconf/gconftool.c:263
+#: gconf/gconftool.c:262
 msgid "SOURCE"
 msgstr "<소스>"
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1425,7 +1323,7 @@ msgstr ""
 "서버를 무시하고, 설정 데이타베이스를 직접 접근합니다. gconfd가 실행되면 안 됩"
 "니다."
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1435,7 +1333,7 @@ msgstr ""
 "변수가 기본값이 아닌 설정 소스로 설정되어 있거나, 기본값을 사용하려면 빈 문자"
 "열로 설정되어 있어야 합니다."
 
-#: gconf/gconftool.c:289
+#: gconf/gconftool.c:288
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1443,7 +1341,7 @@ msgstr ""
 "명령행에서 여러가지 타입의 많은 값들의 설정 및 설정 해제를 반복하는 테스트를 "
 "수행합니다."
 
-#: gconf/gconftool.c:298
+#: gconf/gconftool.c:297
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1451,47 +1349,56 @@ msgstr ""
 "명령행에서 디렉토리 내의 많은 값들의 설정 및 설정 해제를 반복하는 테스트를 수"
 "행합니다."
 
-#: gconf/gconftool.c:307
+#: gconf/gconftool.c:306
 msgid "Get the short doc string for a key"
 msgstr "키의 짤막한 문서화 문자열을 얻습니다"
 
-#: gconf/gconftool.c:316
+#: gconf/gconftool.c:315
 msgid "Get the long doc string for a key"
 msgstr "키의 긴 문서화 문자열을 얻습니다"
 
-#: gconf/gconftool.c:325
+#: gconf/gconftool.c:324
 msgid "Get the name of the schema applied to this key"
 msgstr "이 키에 적용된 스키마의 이름을 얻습니다"
 
-#: gconf/gconftool.c:334
+#: gconf/gconftool.c:333
 msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr "스키마 이름을 적용한 키 다음에 오는 스키마의 이름을 얻습니다"
 
-#: gconf/gconftool.c:343
+#: gconf/gconftool.c:342
 msgid "Remove any schema name applied to the given keys"
 msgstr "주어진 키에 적용된 모든 스키마 이름을 지웁니다"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:351
 msgid "Get the name of the default source"
 msgstr "기본 소스의 이름을 얻습니다"
 
-#: gconf/gconftool.c:423
+#: gconf/gconftool.c:408
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"옵션 %s에 오류: %s.\n"
+"가능한 명령행 옵션을 모두 보려면 '%s --help'라고 실행하십시오.\n"
+
+#: gconf/gconftool.c:420
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "읽기와 설정/설정 해제를 동시에 할 수 없습니다\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:427
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "설정과 읽기/설정 해제를 동시에 할 수 없습니다\n"
 
-#: gconf/gconftool.c:438
+#: gconf/gconftool.c:435
 msgid "Can't use --all-entries with --get or --set\n"
 msgstr "--get 혹은 --set에서 --all-entries를 쓸 수 없습니다\n"
 
-#: gconf/gconftool.c:446
+#: gconf/gconftool.c:443
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "--get 혹은 --set에서 --all-dirs를 쓸 수 없습니다\n"
 
-#: gconf/gconftool.c:456
+#: gconf/gconftool.c:453
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-"
 "entries, or --all-dirs\n"
@@ -1499,7 +1406,7 @@ msgstr ""
 "--recursive-list는 --get, --set, --unset, --all-entries, 혹은 --all-dirs와 함"
 "께 쓸 수 없습니다\n"
 
-#: gconf/gconftool.c:466
+#: gconf/gconftool.c:463
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
@@ -1507,334 +1414,334 @@ msgstr ""
 "--set-schema는 --get, --set, --unset, --all-entries, 혹은 --all-dirs와 함께 "
 "쓸 수 없습니다\n"
 
-#: gconf/gconftool.c:472
+#: gconf/gconftool.c:469
 msgid "Value type is only relevant when setting a value\n"
 msgstr "값 타입은 값을 설정할 경우에만 유효합니다\n"
 
-#: gconf/gconftool.c:478
+#: gconf/gconftool.c:475
 msgid "Must specify a type when setting a value\n"
 msgstr "값을 설정할 때 타입을 지정해야 합니다\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:485
 msgid "Ping option must be used by itself.\n"
 msgstr "ping 옵션은 이 옵션 단독으로 써야 합니다.\n"
 
-#: gconf/gconftool.c:498
+#: gconf/gconftool.c:495
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists 옵션은 이 옵션 단독으로 써야 합니다.\n"
 
-#: gconf/gconftool.c:508
+#: gconf/gconftool.c:505
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file 옵션은 이 옵션 단독으로 써야 합니다.\n"
 
-#: gconf/gconftool.c:519
+#: gconf/gconftool.c:516
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule 옵션은 이 옵션 단독으로 써야 합니다.\n"
 
-#: gconf/gconftool.c:530
+#: gconf/gconftool.c:527
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key 옵션은 이 옵션 단독으로 써야 합니다.\n"
 
-#: gconf/gconftool.c:541
+#: gconf/gconftool.c:538
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory 옵션은 이 옵션 단독으로 써야 합니다.\n"
 
-#: gconf/gconftool.c:549
+#: gconf/gconftool.c:546
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "--direct 옵션을 사용할 때는 --config-source로 설정 소스를 지정해야 합니다\n"
 
-#: gconf/gconftool.c:555
+#: gconf/gconftool.c:552
 msgid "You should use --direct when using a non-default configuration source\n"
 msgstr ""
 "기본값이 아닌 설정 소스를 사용할 경우에는 --direct 옵션을 써야 합니다\n"
 
-#: gconf/gconftool.c:561
+#: gconf/gconftool.c:558
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf를 초기화하는 데 실패했습니다: %s\n"
 
-#: gconf/gconftool.c:590
+#: gconf/gconftool.c:587
 msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
 msgstr ""
 "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL이 설정되었으므로, 스키마를 설치하지 않"
 "습니다\n"
 
-#: gconf/gconftool.c:603
+#: gconf/gconftool.c:600
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE 환경변수의 값을 설정하세요\n"
 
-#: gconf/gconftool.c:632
+#: gconf/gconftool.c:629
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "설정 소스에 접근하는 데 실패했습니다: %s\n"
 
-#: gconf/gconftool.c:854
+#: gconf/gconftool.c:851
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "끝마치는 데 오류가 발생했습니다: %s\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:894
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "재귀적으로 열거하려면 한 개 이상의 디렉토리를 지정해야 합니다.\n"
 
-#: gconf/gconftool.c:931
+#: gconf/gconftool.c:928
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "`%s' 내의 항목들을 나열하는 데 실패했습니다: %s\n"
 
-#: gconf/gconftool.c:949
+#: gconf/gconftool.c:946
 msgid "(no value set)"
 msgstr "(값이 없습니다)"
 
-#: gconf/gconftool.c:1004
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "설정 서버(gconfd)를 생성할수가 없습니다: %s\n"
 
-#: gconf/gconftool.c:1018
+#: gconf/gconftool.c:1015
 msgid "Must specify a key or keys to get\n"
 msgstr "얻어낼 키나 키들을 지정하여야합니다\n"
 
-#: gconf/gconftool.c:1053
+#: gconf/gconftool.c:1050
 #, c-format
 msgid "Type: %s\n"
 msgstr "타입: %s\n"
 
-#: gconf/gconftool.c:1054
+#: gconf/gconftool.c:1051
 #, c-format
 msgid "List Type: %s\n"
 msgstr "List 타입: %s\n"
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1052
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car 타입: %s\n"
 
-#: gconf/gconftool.c:1056
+#: gconf/gconftool.c:1053
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr 타입: %s\n"
 
-#: gconf/gconftool.c:1061
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "기본 값: %s\n"
 
-#: gconf/gconftool.c:1061 gconf/gconftool.c:1063 gconf/gconftool.c:1064
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058 gconf/gconftool.c:1060 gconf/gconftool.c:1061
+#: gconf/gconftool.c:1062
 msgid "Unset"
 msgstr "설정 해제"
 
-#: gconf/gconftool.c:1063
+#: gconf/gconftool.c:1060
 #, c-format
 msgid "Owner: %s\n"
 msgstr "소유자: %s\n"
 
-#: gconf/gconftool.c:1064
+#: gconf/gconftool.c:1061
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "간단한 설명: %s\n"
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1062
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "상세한 설명: %s\n"
 
-#: gconf/gconftool.c:1074 gconf/gconftool.c:1368
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1365
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "`%s'에 대한 값이 설정되지 않았습니다\n"
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1372
+#: gconf/gconftool.c:1075 gconf/gconftool.c:1369
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "`%s'에대한 값을 얻는 데 실패했습니다: %s\n"
 
-#: gconf/gconftool.c:1121 gconf/gconftool.c:1133
+#: gconf/gconftool.c:1118 gconf/gconftool.c:1130
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "`%s'타입을 인식할수가 없습니다\n"
 
-#: gconf/gconftool.c:1145
+#: gconf/gconftool.c:1142
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "바꿀 키/값을 인자로 지정해야 합니다\n"
 
-#: gconf/gconftool.c:1165
+#: gconf/gconftool.c:1162
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "키에 대한 값이 설정되지 않았습니다: `%s'\n"
 
-#: gconf/gconftool.c:1193
+#: gconf/gconftool.c:1190
 msgid "Cannot set schema as value\n"
 msgstr "값으로서 스키마를 사용할수는 없습니다\n"
 
-#: gconf/gconftool.c:1203
+#: gconf/gconftool.c:1200
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "리스트 값을 설정할 때 내장된 리스트타입을 지정해야 합니다\n"
 
-#: gconf/gconftool.c:1217
+#: gconf/gconftool.c:1214
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "쌍의 값을 설정할 때 내장된 car-타입과 cdr-타입을 지정해야 합니다\n"
 
-#: gconf/gconftool.c:1232
+#: gconf/gconftool.c:1229
 #, c-format
 msgid "Error: %s\n"
 msgstr "오류: %s\n"
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "값을 설정하는 데 오류가 발생했습니다: %s\n"
 
-#: gconf/gconftool.c:1263
+#: gconf/gconftool.c:1260
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "동기화에 실패했습니다: %s\n"
 
-#: gconf/gconftool.c:1286
+#: gconf/gconftool.c:1283
 msgid "Must specify a key or keys on the command line\n"
 msgstr "명령행에 키나 키들을 지정하여야 합니다\n"
 
-#: gconf/gconftool.c:1306
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "`%s'에 대한 스키마가 없습니다\n"
 
-#: gconf/gconftool.c:1339
+#: gconf/gconftool.c:1336
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "'%s'에 있는 스키마에 문서화 문자열이 저장되어 있지 않습니다\n"
 
-#: gconf/gconftool.c:1344
+#: gconf/gconftool.c:1341
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "`%s'에서 스키마를 얻는 데 오류: %s\n"
 
-#: gconf/gconftool.c:1351
+#: gconf/gconftool.c:1348
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "'%s'에 저장되어 있는 스키마가 없습니다\n"
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1351
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "'%s'에 있는 값이 스키마가 아닙니다\n"
 
-#: gconf/gconftool.c:1410 gconf/gconftool.c:1435
+#: gconf/gconftool.c:1407 gconf/gconftool.c:1432
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 "스키마에 적용할 키의 이름을 지정하기 바로 전에 스키마 이름을 지정해야 합니"
 "다.\n"
 
-#: gconf/gconftool.c:1417
+#: gconf/gconftool.c:1414
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr ""
 "스키마 이름 '%s'을(를) 키 이름 '%s'과(와) 연결하는 데 오류가 발생했습니다: %"
 "s\n"
 
-#: gconf/gconftool.c:1445
+#: gconf/gconftool.c:1442
 #, c-format
 msgid "Error removing schema name from '%s': %s\n"
 msgstr "'%s'에서 스키마 이름을 지우는 데 오류: %s\n"
 
-#: gconf/gconftool.c:1470
+#: gconf/gconftool.c:1467
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "키(스키마 이름)를 유일한 인자로 지정해야 합니다\n"
 
-#: gconf/gconftool.c:1512
+#: gconf/gconftool.c:1509
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "List 타입은 기본타입(문자열, 정수, 실수, 참/거짓)이어야합니다\n"
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1529
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr "Pair car 타입은 기본타입(문자열, 정수, 실수, 참/거짓)이어야합니다\n"
 
-#: gconf/gconftool.c:1552
+#: gconf/gconftool.c:1549
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr "Pair cdr 타입은 기본타입(문자열, 정수, 실수, 참/거짓)이어야합니다\n"
 
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1564
 #, c-format
 msgid "Error setting value: %s"
 msgstr "값을 설정하는 데 오류가 발생했습니다: %s"
 
-#: gconf/gconftool.c:1581
+#: gconf/gconftool.c:1578
 #, c-format
 msgid "Error syncing: %s"
 msgstr "동기화에 실패했습니다: %s"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1593
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr "키/값 쌍을 얻어낼 한 개 이상의 디렉토리를 지정해야 합니다.\n"
 
-#: gconf/gconftool.c:1610
+#: gconf/gconftool.c:1607
 msgid "Must specify one or more keys to unset.\n"
 msgstr "설정 해제할 한 개 이상의 키를 지정해야 합니다.\n"
 
-#: gconf/gconftool.c:1621
+#: gconf/gconftool.c:1618
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "`%s'을(를) 설정 해제하는 데 오류: %s\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1638
 msgid "Must specify one or more keys to recursively unset.\n"
 msgstr "\"%s\"의 재귀적으로 값 해제할 때 한 개 이상의 키를 지정해야 합니다.\n"
 
-#: gconf/gconftool.c:1655
+#: gconf/gconftool.c:1652
 #, c-format
 msgid "Failure during recursive unset of \"%s\": %s\n"
 msgstr "\"%s\"의 재귀적으로 값 해제하는 중에 실패: %s\n"
 
-#: gconf/gconftool.c:1673
+#: gconf/gconftool.c:1670
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr "하위 디렉토리를 얻어낼 한 개 이상의 디렉토리를 지정해야 합니다.\n"
 
-#: gconf/gconftool.c:1707
+#: gconf/gconftool.c:1704
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "디렉토리들를 읽어오는 데 실패: %s\n"
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1746
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "경고: 스키마(%s)에 부적절하거나 빠진 타입이 있습니다\n"
 
-#: gconf/gconftool.c:1758
+#: gconf/gconftool.c:1755
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "경고: 스키마(%s)에 부적절하거나 빠진 list_type이 있습니다\n"
 
-#: gconf/gconftool.c:1769 gconf/gconftool.c:1799 gconf/gconftool.c:1828
+#: gconf/gconftool.c:1766 gconf/gconftool.c:1796 gconf/gconftool.c:1825
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "경고: 스키마에 대한 기본값 `%s'을(를) 구문 분석하는 데 실패했습니다 (%s)\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1784
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "경고: 스키마에 대한 car_type 혹은 cdr_type이 잘못되었거나 빠졌습니다 (%s)\n"
 
-#: gconf/gconftool.c:1812
+#: gconf/gconftool.c:1809
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "경고: 스키마에대한 기본값을 설정할 수는 없습니다\n"
 
-#: gconf/gconftool.c:1841
+#: gconf/gconftool.c:1838
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "경고: gconftool 내부 오류, 인식할수없는 GConfValueType\n"
 
-#: gconf/gconftool.c:1888 gconf/gconftool.c:1909 gconf/gconftool.c:1930
-#: gconf/gconftool.c:1951
+#: gconf/gconftool.c:1885 gconf/gconftool.c:1906 gconf/gconftool.c:1927
+#: gconf/gconftool.c:1948
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "경고: 타입 이름 `%s'을 파싱하는 데 실패했습니다\n"
 
-#: gconf/gconftool.c:1905
+#: gconf/gconftool.c:1902
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1842,38 +1749,38 @@ msgstr ""
 "경고: list_type은 정수,실수, 문자열 또는 bool일수가 있습니다. `%s'은 안됩니"
 "다.\n"
 
-#: gconf/gconftool.c:1926
+#: gconf/gconftool.c:1923
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "경고: car_type은 정수,실수, 문자열 또는 bool일수가 있습니다. `%s'은 안됩니"
 "다.\n"
 
-#: gconf/gconftool.c:1947
+#: gconf/gconftool.c:1944
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "경고: cdr_type은 정수,실수, 문자열 또는 bool일수가 있습니다. `%s'은 안됩니"
 "다.\n"
 
-#: gconf/gconftool.c:1975
+#: gconf/gconftool.c:1972
 msgid "WARNING: empty <applyto> node"
 msgstr "경고: <applyto>노드가 비여있습니다"
 
-#: gconf/gconftool.c:1978 gconf/gconftool.c:2241
+#: gconf/gconftool.c:1975 gconf/gconftool.c:2238
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "경고: <schema>아래에서 <%s>노드는 부적절합니다\n"
 
-#: gconf/gconftool.c:1988
+#: gconf/gconftool.c:1985
 msgid "WARNING: no key specified for schema\n"
 msgstr "경고: 스키마에 대한 키가 정의되지 않았습니다\n"
 
-#: gconf/gconftool.c:2021
+#: gconf/gconftool.c:2018
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr "경고: <locale> 노드에 `name=\"locale\"' 속성이 없습니다.  무시합니다\n"
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2024
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1881,51 +1788,51 @@ msgstr ""
 "경고: 로케일 `%s'에 대하여 <locale> 노드가 여러 개 있습니다, 맨 처음을 제외하"
 "고 무시합니다\n"
 
-#: gconf/gconftool.c:2108
+#: gconf/gconftool.c:2105
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "경고: <locale>노드속에 적합하지않는 <%s>노드가 있습니다\n"
 
-#: gconf/gconftool.c:2137
+#: gconf/gconftool.c:2134
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "경고: 스키마 `%s' 로케일 `%s' 설치 실패했습니다: %s\n"
 
-#: gconf/gconftool.c:2145
+#: gconf/gconftool.c:2142
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "`%s' 스키마를 `%s' 로케일을 위해 설치했습니다\n"
 
-#: gconf/gconftool.c:2167
+#: gconf/gconftool.c:2164
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "경고: 스키마 `%s'에 키 `%s'를 할당하는 데 오류가 생겼습니다: %s\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2172
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "스키마 `%s'에 키 `%s'를 할당합니다\n"
 
-#: gconf/gconftool.c:2254
+#: gconf/gconftool.c:2251
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "한 <schema>안에는 오직 한개의 <locale>엔트리만을 가지고 있어야합니다\n"
 
-#: gconf/gconftool.c:2285
+#: gconf/gconftool.c:2282
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "경고: <schemalist>아래서 <%s>노드는 적합하지않습니다\n"
 
-#: gconf/gconftool.c:2308
+#: gconf/gconftool.c:2305
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "`%s'를 여는 데 실패했습니다: %s\n"
 
-#: gconf/gconftool.c:2315
+#: gconf/gconftool.c:2312
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "`%s' 문서가 비어있지않나요?\n"
 
-#: gconf/gconftool.c:2327
+#: gconf/gconftool.c:2324
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1934,26 +1841,26 @@ msgstr ""
 "`%s'문서는 부적절한 최상위 노드(<%s>)를 가지고 있습니다(반드시"
 "<gconfschemafile>이어야합니다\n"
 
-#: gconf/gconftool.c:2340
+#: gconf/gconftool.c:2337
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "문서 `%s'에 최상위 단계 <gconfschemafile> 노드가 없습니다\n"
 
-#: gconf/gconftool.c:2354
+#: gconf/gconftool.c:2351
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "경고: <gconfschemafile>아래에 있는 노드 <%s>는 적합하지않습니다\n"
 
-#: gconf/gconftool.c:2365 gconf/gconftool.c:2397
+#: gconf/gconftool.c:2362 gconf/gconftool.c:2394
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "설정 데이타를 동기화하는 데 에러가 발생했습니다: %s"
 
-#: gconf/gconftool.c:2381
+#: gconf/gconftool.c:2378
 msgid "Must specify some schema files to install\n"
 msgstr "설치할 스키마 파일들을 설정하셔야합니다\n"
 
-#: gconf/gconftool.c:2418
+#: gconf/gconftool.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -1962,16 +1869,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2438
+#: gconf/gconftool.c:2435
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "중단 키 %s을(를) 설정 해제하는 데 실패했습니다: %s\n"
 
-#: gconf/gconftool.c:2564
+#: gconf/gconftool.c:2561
 msgid "Must specify some keys to break\n"
 msgstr "중단할 키를 지정해야 합니다\n"
 
-#: gconf/gconftool.c:2570
+#: gconf/gconftool.c:2567
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1980,11 +1887,11 @@ msgstr ""
 "키에 잘못된 값을 설정하여 응용 프로그램을 중단하도록 시도합니다:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2588
+#: gconf/gconftool.c:2585
 msgid "Must specify some directories to break\n"
 msgstr "중단할 디렉토리를 지정해야 합니다\n"
 
-#: gconf/gconftool.c:2607
+#: gconf/gconftool.c:2604
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1993,3 +1900,91 @@ msgid ""
 msgstr ""
 "디렉토리의 키에 잘못된 값을 설정하여 응용 프로그램을 중단하도록 시도합니다:\n"
 "  %s\n"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "Failed to parse XML file \"%s\""
+#~ msgstr "XML 파일 \"%s\"의 구문 분석이 실패했습니다"
+
+#~ msgid "Server ping error: %s"
+#~ msgstr "서버 ping 오류: %s"
+
+#~ msgid ""
+#~ "Failed to contact configuration server; some possible causes are that you "
+#~ "need to enable TCP/IP networking for ORBit, or you have stale NFS locks "
+#~ "due to a system crash. See http://www.gnome.org/projects/gconf/ for "
+#~ "information. (Details - %s)"
+#~ msgstr ""
+#~ "설정 서버에 접촉하는 데 실패했습니다: 가능한 원인은 ORBit에 TCP/IP 네트워"
+#~ "크를 사용하는 것, 혹은 시스템의 이상 종료로 인해 NFS 잠금이 동작하지 않게 "
+#~ "되었을 경우입니다.  자세한 정보는 <http://www.gnome.org/projects/gconf/>"
+#~ "를 참조하십시오.  (자세한 정보 - %s)"
+
+#~ msgid "none"
+#~ msgstr "없음"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not open or create the file \"%s\"; this indicates that there may "
+#~ "be a problem with your configuration, as many programs will need to "
+#~ "create files in your home directory. The error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "시스템 관리자에게 접촉해 다음 문제를 해결하십시오: \n"
+#~ "\"%s' 파일을 열거나 만들 수 없습니다; 설정 사항에 문제가 있다는 뜻일 수 있"
+#~ "습니다. 많은 프로그램이 홈 디렉토리 내에 파일을 만들어야 합니다. 오류는 "
+#~ "\"%s\" (errno = %d)."
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not lock the file \"%s\"; this indicates that there may be a "
+#~ "problem with your operating system configuration. If you have an NFS-"
+#~ "mounted home directory, either the client or the server may be set up "
+#~ "incorrectly. See the rpc.statd and rpc.lockd documentation. A common "
+#~ "cause of this error is that the \"nfslock\" service has been disabled.The "
+#~ "error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "시스템 관리자에게 접촉해 다음 문제를 해결하십시오: \n"
+#~ "\"%s' 파일을 잠글 수 없습니다; 운영 체제의 설정 사항에 문제가 있을 수 있습"
+#~ "니다. 홈 디렉토리가 NFS에 마운트되어 있다면, 클라이언트 혹은 서버가 잘못 "
+#~ "설정되어 있을 것입니다. rpc.statd와 rpc.lockd 문서를 참조하십시오. 이 오류"
+#~ "의 대부분의 원인은 \"nfslock\" 서비스를 사용하지 않았기 때문입니다.  오류"
+#~ "는 \"%s\" (errno = %d)."
+
+#~ msgid "Can't remove file %s: %s\n"
+#~ msgstr "`%s' 파일을 지울 수 없습니다: %s\n"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "No configuration sources in the configuration file \"%s\"; this means "
+#~ "that preferences and other settings can't be saved. %s%s"
+#~ msgstr ""
+#~ "시스템 관리자에게 접촉해 다음 문제를 해결하십시오: \n"
+#~ "설정 파일 \"%s\"에 설정 소스가 없습니다; 기본 설정과 그 외의 설정 사항을 "
+#~ "저장할 수 없다는 뜻입니다. %s%s"
+
+#~ msgid "Error reading the file: "
+#~ msgstr "파일을 읽는 데 오류가 발생했습니다: "
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
+#~ msgstr ""
+#~ "시스템 관리자에게 접촉해 다음 문제를 해결하십시오: \n"
+#~ "설정 파일 \"%2$s\"의 주소 \"%1$s\"를 확인(resolve)할 수 없습니다: %3$s"
+
+#~ msgid "Multiple segmentation faults occurred; can't display error dialog\n"
+#~ msgstr ""
+#~ "여러 개의 세그멘테이션 오류가 발생했습니다; 오류 대화 상자를 표시할 수 없"
+#~ "습니다\n"
+
+#~ msgid ""
+#~ "Segmentation fault!\n"
+#~ "Cannot display crash dialog: %s\n"
+#~ msgstr ""
+#~ "세그멘테이션 오류!\n"
+#~ "이상 종료 대화 상자를 표시할 수 없습니다: %s\n"
diff --git a/po/nl.po b/po/nl.po
index 61edc825..6d5aee96 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf cvs\n"
-"POT-Creation-Date: 2002-03-07 19:23-0500\n"
+"POT-Creation-Date: 2002-01-28 21:35-0500\n"
 "PO-Revision-Date: 2002-03-08 19:55+0100\n"
 "Last-Translator: Ronald Hummelink <ronald@hummelink.xs4all.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -102,8 +102,8 @@ msgstr ""
 #: backends/xml-cache.c:305
 #, c-format
 msgid ""
-"%u items remain in the cache after cleaning already-synced items older than "
-"%u seconds"
+"%u items remain in the cache after cleaning already-synced items older than %"
+"u seconds"
 msgstr ""
 "%u items achtergebleven in de cache na het schoonmaken van de al "
 "gesynchronizeerde items ouder dan %u seconden"
@@ -311,50 +311,53 @@ msgstr "Fout bij stoppen van backend"
 msgid "GConf Error: %s\n"
 msgstr "GConf Fout: %s\n"
 
-#: gconf/gconf-client.c:897
+#: gconf/gconf-client.c:899
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf waarschuwing: fout bij het weergeven van paren in `%s': %s"
 
-#: gconf/gconf-client.c:1162
+#: gconf/gconf-client.c:1165
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Verwachte `%s' kreeg `%s' voor sleutel %s"
 
-#: gconf/gconf-database.c:234
+#: gconf/gconf-database.c:233
 msgid "Received invalid value in set request"
 msgstr "Ongeldige waarde ontvangen in instel verzoek"
 
-#: gconf/gconf-database.c:242
+#: gconf/gconf-database.c:241
 #, c-format
-msgid ""
-"Couldn't make sense of CORBA value received in set request for key `%s'"
+msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Kon geen wijs maken uit de CORBA waarde die ontvangen werd in een instel "
 "verzoek voor sleutel `%s'"
 
-#: gconf/gconf-database.c:523
+#: gconf/gconf-database.c:522
 msgid "Received request to drop all cached data"
 msgstr "Verzoek om alle gecachede gegevens te laten vallen"
 
-#: gconf/gconf-database.c:540
+#: gconf/gconf-database.c:539
 msgid "Received request to sync synchronously"
 msgstr "Verzoek ontvangen om synchroon te synchronizeren"
 
-#: gconf/gconf-database.c:824
+#: gconf/gconf-database.c:823
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "Fatale fout: fout bij het vergaren van object referentie naar ConfigDatabase"
 
-#: gconf/gconf-database.c:986
+#: gconf/gconf-database.c:985
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Fout bij synchronizeren van een of meer bronnen: %s"
 
-#: gconf/gconf-database.c:1078
-#, c-format
+#. This error is not fatal; we basically ignore it.
+#. * Because it's likely the right thing for the client
+#. * app to simply continue.
+#.
+#: gconf/gconf-database.c:1076
+#, fuzzy, c-format
 msgid ""
-"Failed to log addition of listener %s (%s);will not be able to restore this "
+"Failed to log addition of listener %s (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
@@ -362,12 +365,12 @@ msgstr ""
 "worden hersteld als gconfd word herstart, dit resulteert in onbetrouwbare "
 "notificatie van configuratie wijzingen."
 
-#: gconf/gconf-database.c:1109
+#: gconf/gconf-database.c:1103
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Luisteraar ID %lu bestaat niet"
 
-#: gconf/gconf-database.c:1123
+#: gconf/gconf-database.c:1117
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -377,57 +380,57 @@ msgstr ""
 "(waarschijnlijk niet gevaarlijk, kan resulteren in een notificatie die "
 "opnieuw weer verschijnt): %s"
 
-#: gconf/gconf-database.c:1241 gconf/gconf-sources.c:1540
+#: gconf/gconf-database.c:1235 gconf/gconf-sources.c:1540
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fout bij het vergaren van waarde voor `%s': %s"
 
-#: gconf/gconf-database.c:1288
+#: gconf/gconf-database.c:1282
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Fout bij het instellen van waarde voor `%s': %s"
 
-#: gconf/gconf-database.c:1331
+#: gconf/gconf-database.c:1325
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Fout bij het ontzetten `%s': %s"
 
-#: gconf/gconf-database.c:1360
+#: gconf/gconf-database.c:1354
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Fout bij het vergaren van de standaardwaarde voor `%s': %s"
 
-#: gconf/gconf-database.c:1411
+#: gconf/gconf-database.c:1405
 #, c-format
 msgid "Error unsetting \"%s\": %s"
 msgstr "Fout bij het ontzetten `%s': %s"
 
-#: gconf/gconf-database.c:1443
+#: gconf/gconf-database.c:1437
 #, c-format
 msgid "Error getting new value for \"%s\": %s"
 msgstr "Fout bij het vergaren van nieuwe waarde voor `%s': %s"
 
-#: gconf/gconf-database.c:1491
+#: gconf/gconf-database.c:1485
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Fout bij het controleren van bestaan van `%s': %s"
 
-#: gconf/gconf-database.c:1515
+#: gconf/gconf-database.c:1509
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Fout bij het verwijderen van directory `%s': %s"
 
-#: gconf/gconf-database.c:1542
+#: gconf/gconf-database.c:1536
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Fout bij het vergaren van alle \"entries\" in `%s': %s"
 
-#: gconf/gconf-database.c:1568
+#: gconf/gconf-database.c:1562
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Fout bij het vergaren van directorylijst in `%s': %s"
 
-#: gconf/gconf-database.c:1589
+#: gconf/gconf-database.c:1583
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Fout bij het instellen van schema voor `%s': %s"
@@ -556,7 +559,7 @@ msgstr "Leesfout op bestand `%s': %s\n"
 
 #: gconf/gconf-internals.c:1211 gconf/gconf-internals.c:1277
 #: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
-#: gconf/gconf-value.c:1363
+#: gconf/gconf-value.c:1341
 msgid "Text contains invalid UTF-8"
 msgstr "Tekst bevat ongeldige UTF-8"
 
@@ -616,8 +619,8 @@ msgstr "Fout bij maken of openen van bestand `%s'"
 #: gconf/gconf-internals.c:2397
 #, c-format
 msgid ""
-"Failed to lock '%s': probably another process has the lock, or your operating "
-"system has NFS file locking misconfigured (%s)"
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr ""
 "Niet gelukt om '%s' te blokeren. Waarschijnlijk heeft een ander proces de "
 "blokering, of heeft je operating systeem NFS bestands blokering niet goed "
@@ -681,30 +684,30 @@ msgstr "Fout bij opschonen van bestand '%s': %s"
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "Fout bij het vrijgegeven van vergrendelings directory `%s': %s"
 
-#: gconf/gconf-internals.c:2846 gconf/gconfd.c:587
+#: gconf/gconf-internals.c:2842 gconf/gconfd.c:583
 #, c-format
 msgid "Failed to create %s: %s"
 msgstr "Fout bij maken bestand `%s': %s"
 
-#: gconf/gconf-internals.c:2879
+#: gconf/gconf-internals.c:2875
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
-"Niet gelukt om pipe te maken om te communiceren met gestartte gconf daemon: "
-"%s\n"
+"Niet gelukt om pipe te maken om te communiceren met gestartte gconf daemon: %"
+"s\n"
 
-#: gconf/gconf-internals.c:2903
+#: gconf/gconf-internals.c:2899
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Fout bij benaderen configuratie bron(nen): %s\n"
 
-#: gconf/gconf-internals.c:2927
+#: gconf/gconf-internals.c:2923
 msgid ""
 "Failed to contact configuration server; some possible causes are:\n"
 "a) you have an existing configuration server (gconfd) running, but it isn't "
 "reachable from here - if you're logged in from two machines at once, you may "
-"need to enable TCP networking for ORBit by putting the line \"ORBIIOPIPv4=1\" "
-"in /etc/orbitrc\n"
+"need to enable TCP networking for ORBit by putting the line \"ORBIIOPIPv4=1"
+"\" in /etc/orbitrc\n"
 "b) you have stale locks in your NFS-mounted home directory due to a system "
 "crash, try removing ~/.gconf/*.lock and ~/.gconfd/lock if you are sure no "
 "gconfd processes are running on any machine using your home dir"
@@ -720,54 +723,6 @@ msgstr ""
 "je zeker bent dat er geen gconfd processes draaien op een machine die jouw "
 "thuismap gebruikt"
 
-#: gconf/gconf-sanity-check.c:38 gconf/gconftool.c:71
-msgid "Help options"
-msgstr "Help opties"
-
-#: gconf/gconf-sanity-check.c:74 gconf/gconftool.c:408
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Fout bij optie %s: %s.\n"
-"Start '%s --help' om een volledige lijst van beschikbare opdrachtregel opties "
-"te zien.\n"
-
-#: gconf/gconf-sanity-check.c:131
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not open or create the file \"%s\"; this indicates that there may be a "
-"problem with your configuration, as many programs will need to create files "
-"in your home directory. The error was \"%s\" (errno = %d)."
-msgstr ""
-"Vraag je systeem administrateur om het volgende probleem op te "
-"lossen:\nKon niet maken of openen het bestand \"%s\"; dit betekend dat er een "
-"probleem kan zijn met de configuratie, omdat veel programmas bestanden moeten "
-"kunnen maken in je thuismap. De fout was \"%s\" (foutnummer = %d)."
-
-#: gconf/gconf-sanity-check.c:143
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not lock the file \"%s\"; this indicates that there may be a problem "
-"with your operating system configuration. If you have an NFS-mounted home "
-"directory, either the client or the server may be set up incorrectly. See the "
-"rpc.statd and rpc.lockd documentation. The error was \"%s\" (errno = %d)."
-msgstr ""
-"Vraag je systeem administrateur om het volgende probleem op te "
-"lossen:\nKon bestand \"%s\" niet blokeren; dit betekend dat er een probleem "
-"kan zijn met de configuratie van het operating systeem. Als je een NFS "
-"gemounte thuismap hebt, zowel de client als de server kan hierbij verkeerd "
-"ingesteld zijn. Bekijk de rpc.statd en rpc.lockd documentatie. De fout was "
-"\"%s\" (foutnummer = %d)."
-
-#: gconf/gconf-sanity-check.c:159
-#, c-format
-msgid "Can't remove file %s: %s\n"
-msgstr "Kon bestand %s niet verwijderen: %s\n"
-
 #: gconf/gconf-schema.c:190 gconf/gconf-schema.c:198 gconf/gconf-schema.c:206
 #: gconf/gconf-schema.c:214
 msgid "Schema contains invalid UTF-8"
@@ -829,20 +784,20 @@ msgstr ""
 msgid ""
 "Unable to store a value at key '%s', as the configuration server has no "
 "writable databases. There are some common causes of this problem: 1) your "
-"configuration path file %s/path doesn't contain any databases or wasn't found "
-"2) somehow we mistakenly created two gconfd processes 3) your operating "
-"system is misconfigured so NFS file locking doesn't work in your home "
-"directory or 4) your NFS client machine crashed and didn't properly notify "
-"the server on reboot that file locks should be dropped. If you have two "
-"gconfd processes (or had two at the time the second was launched), logging "
-"out, killing all copies of gconfd, and logging back in may help. If you have "
-"stale locks, remove ~/.gconf*/*lock. Perhaps the problem is that you "
-"attempted to use GConf from two machines at once, and ORBit still has its "
-"default configuration that prevents remote CORBA connections - put "
+"configuration path file %s/path doesn't contain any databases or wasn't "
+"found 2) somehow we mistakenly created two gconfd processes 3) your "
+"operating system is misconfigured so NFS file locking doesn't work in your "
+"home directory or 4) your NFS client machine crashed and didn't properly "
+"notify the server on reboot that file locks should be dropped. If you have "
+"two gconfd processes (or had two at the time the second was launched), "
+"logging out, killing all copies of gconfd, and logging back in may help. If "
+"you have stale locks, remove ~/.gconf*/*lock. Perhaps the problem is that "
+"you attempted to use GConf from two machines at once, and ORBit still has "
+"its default configuration that prevents remote CORBA connections - put "
 "\"ORBIIOPIPv4=1\" in /etc/orbitrc. As always, check the user.* syslog for "
-"details on problems gconfd encountered. There can only be one gconfd per home "
-"directory, and it must own a lockfile in ~/.gconfd and also lockfiles in "
-"individual storage locations such as ~/.gconf"
+"details on problems gconfd encountered. There can only be one gconfd per "
+"home directory, and it must own a lockfile in ~/.gconfd and also lockfiles "
+"in individual storage locations such as ~/.gconf"
 msgstr ""
 "Niet mogelijk om de waarde van sleutel '%s\" op te slaan, omdat de "
 "configuratie server geen schrijfbare databases heeft. Er zijn een aantal "
@@ -851,16 +806,17 @@ msgstr ""
 "ongelijk 2 gconfd processen gestart. 3) Je operating systeem is verkeerd "
 "geconfigureerd waardoor NFS bestands blokering niet werkt op je thuismap. 4) "
 "JE NFS machine is gecrashed en heeft de server niet juist laten weten op "
-"reboot dat de bestands blokkeringen opgeheven moesten worden. Als je 2 gconfd "
-"processen hebt (of 2 had op het moment dat de tweede werd gestart), kan "
-"uitloggen en alle kopieen van gconfd killen helpen. Als je verouderde "
-"blokkeringen hebt, verwijder ~/.gconf*/*lock. Mischien is het probleem dat je "
-"GConf vanaf 2 machines tegelijk probeerd te gebruiken en ORBit nog zijn "
+"reboot dat de bestands blokkeringen opgeheven moesten worden. Als je 2 "
+"gconfd processen hebt (of 2 had op het moment dat de tweede werd gestart), "
+"kan uitloggen en alle kopieen van gconfd killen helpen. Als je verouderde "
+"blokkeringen hebt, verwijder ~/.gconf*/*lock. Mischien is het probleem dat "
+"je GConf vanaf 2 machines tegelijk probeerd te gebruiken en ORBit nog zijn "
 "standaard configuratie heeft dat CORBA verbindingen tegenhoudt - zet "
-"\"ORBIIOPIPv4=1\" in /etc/orbitrc. Zoals gewoonlijk, bekijk de user.* syslogs "
-"voor details over problemen die gconfd tegenkwam. Er kan maar een gconfd zijn "
-"per thuismap en het moet zijn eigen blokeringsbestand in ~/.gconfd plaatsen "
-"en ook blokeringsbestanden voor individuele opslag locaties zoals ~/.gconf"
+"\"ORBIIOPIPv4=1\" in /etc/orbitrc. Zoals gewoonlijk, bekijk de user.* "
+"syslogs voor details over problemen die gconfd tegenkwam. Er kan maar een "
+"gconfd zijn per thuismap en het moet zijn eigen blokeringsbestand in ~/."
+"gconfd plaatsen en ook blokeringsbestanden voor individuele opslag locaties "
+"zoals ~/.gconf"
 
 #: gconf/gconf-sources.c:1410
 #, c-format
@@ -939,116 +895,116 @@ msgstr "`%s' niet begrepen (verkeerd aantal elementen)"
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "`%s' niet begrepen (extra ')' gevonden binnen paar)"
 
-#: gconf/gconf.c:55
+#: gconf/gconf.c:54
 #, c-format
 msgid "Key \"%s\" is NULL"
 msgstr "Sleutel \"%s\" is NULL"
 
-#: gconf/gconf.c:62
+#: gconf/gconf.c:61
 #, c-format
 msgid "\"%s\": %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:343
+#: gconf/gconf.c:333
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Server kon adres `%s' niet vinden"
 
-#: gconf/gconf.c:634
+#: gconf/gconf.c:624
 msgid "Can't add notifications to a local configuration source"
 msgstr "Kan notificaties niet toevoegen aan lokale configuratie bron"
 
-#: gconf/gconf.c:2079
+#: gconf/gconf.c:2072
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 "Toevoegen van client aan de lijst van de server mislukt, CORBA fout: %s"
 
-#: gconf/gconf.c:2434
+#: gconf/gconf.c:2393
 msgid "Must begin with a slash (/)"
 msgstr "Moet beginnen met een schuine streep (/)"
 
-#: gconf/gconf.c:2456
+#: gconf/gconf.c:2415
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan geen twee schuine strepen (/) achter elkaar hebben"
 
-#: gconf/gconf.c:2458
+#: gconf/gconf.c:2417
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan geen punt (.) na een schuine streep (/) hebben"
 
-#: gconf/gconf.c:2477
+#: gconf/gconf.c:2436
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
 msgstr "`%c' is een ongeldig karakter in sleutel/directory namen"
 
-#: gconf/gconf.c:2487
+#: gconf/gconf.c:2446
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' is een ongeldig karakter in sleutel/directory namen"
 
-#: gconf/gconf.c:2501
+#: gconf/gconf.c:2460
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Sleutel/directory mag niet eindigen op een schuine streep (/)"
 
-#: gconf/gconf.c:2870
+#: gconf/gconf.c:2829
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fout bij sluiten configuratie server: %s"
 
-#: gconf/gconf.c:2931
+#: gconf/gconf.c:2890
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Verwachte 'float', kreeg %s"
 
-#: gconf/gconf.c:2966
+#: gconf/gconf.c:2925
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Verwachte 'int', kreeg %s"
 
-#: gconf/gconf.c:3001
+#: gconf/gconf.c:2960
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Verwachte 'string', kreeg %s"
 
-#: gconf/gconf.c:3038
+#: gconf/gconf.c:2997
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Verwachte 'bool', kreeg %s"
 
-#: gconf/gconf.c:3071
+#: gconf/gconf.c:3030
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Verwachte 'schema', kreeg %s"
 
-#: gconf/gconf.c:3432
+#: gconf/gconf.c:3391
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA fout: %s"
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:246
 msgid "Shutdown request received"
 msgstr "Afsluitings verzoek ontvangen"
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:278
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
-"gconfd gecompileerd met debug informatie; bezig met proberen laden van "
-"gconf.path uit de broncode directory"
+"gconfd gecompileerd met debug informatie; bezig met proberen laden van gconf."
+"path uit de broncode directory"
 
-#: gconf/gconfd.c:294
+#: gconf/gconfd.c:292
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
-"Geen configuratie bestanden gevonden, terugval op standaard configuratie bron "
-"`%s'"
+"Geen configuratie bestanden gevonden, terugval op standaard configuratie "
+"bron `%s'"
 
 #. We want to stay alive but do nothing, because otherwise every
 #. request would result in another failed gconfd being spawned.
 #.
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:300
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1057,92 +1013,93 @@ msgstr ""
 "opgeslagen;\n"
 "bewerken "
 
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:300
 msgid "/path"
 msgstr "/path"
 
-#: gconf/gconfd.c:315
+#: gconf/gconfd.c:313
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Fout bij het laden van enkele configuratie bronnen: %s"
 
-#: gconf/gconfd.c:327
+#: gconf/gconfd.c:325
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
-"Geen configuratie bron adressen konden worden gevonden, kan configuratie data "
-"niet\n"
+"Geen configuratie bron adressen konden worden gevonden, kan configuratie "
+"data niet\n"
 "laden en opslaan"
 
-#: gconf/gconfd.c:344
+#: gconf/gconfd.c:342
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
-"Geen schrijfbare configuratie bronnen konden worden gevonden, misschien niet\n"
+"Geen schrijfbare configuratie bronnen konden worden gevonden, misschien "
+"niet\n"
 "in staat om sommige wijzingen op te slaan"
 
-#: gconf/gconfd.c:370
+#: gconf/gconfd.c:368
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 "Signaal %d ontvangen, kern word gedumpt. Rapporteer a.u.b. een GConf bug."
 
-#: gconf/gconfd.c:388
+#: gconf/gconfd.c:384
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 "Signaal %d ontvangen, abnormale afsluiting. Rapporteer a.u.b. een GConf bug."
 
-#: gconf/gconfd.c:405
+#: gconf/gconfd.c:401
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Signaal %d ontvangen, normale afsluiting"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:535
+#: gconf/gconfd.c:531
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "(versie %s) gestart, pid %u gebruiker '%s'"
 
-#: gconf/gconfd.c:574
+#: gconf/gconfd.c:570
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Fout bij het verkrijgen van object referentie voor ConfigServer"
 
-#: gconf/gconfd.c:612
+#: gconf/gconfd.c:608
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 "Niet gelukt om byte te schrijven naar pipe fd %d dus de client kan hangen: %s"
 
-#: gconf/gconfd.c:622
+#: gconf/gconfd.c:618
 #, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
 msgstr ""
 "Niet mogelijk vergrendeling te krijgen voor daemon, beig af te sluiten: %s"
 
-#: gconf/gconfd.c:660
+#: gconf/gconfd.c:656
 #, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "Fout bij vrijgeven vergrendelings bestand: %s"
 
-#: gconf/gconfd.c:668
+#: gconf/gconfd.c:664
 msgid "Exiting"
 msgstr "Gestopt"
 
-#: gconf/gconfd.c:694
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "GConf server word niet gebruikt, bezig met afsluiten."
 
-#: gconf/gconfd.c:1063
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Uitzondering: %s"
 
-#: gconf/gconfd.c:1163
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1151,7 +1108,7 @@ msgstr ""
 "Fout bij het openen van gconfd log bestand; kan luisteraars naar gconfd "
 "afsluiting niet herstarten (%s)"
 
-#: gconf/gconfd.c:1198
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1159,34 +1116,34 @@ msgstr ""
 "Fout bij sluiten van gconfd log bestand; gegevens zijn misschien niet goed "
 "opgeslagen (%s)"
 
-#: gconf/gconfd.c:1267
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Kon opslag status bestand '%s' niet openen voor schrijven: %s"
 
-#: gconf/gconfd.c:1281
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 "Kon de opslag status bestand '%s' niet wegschrijven bestands-descriptor: %d: "
 "%s"
 
-#: gconf/gconfd.c:1290
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Fout bij sluiten van nieuw opslag status bestand '%s': %s"
 
-#: gconf/gconfd.c:1304
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Kon oud opslag status bestand niet verplaatsen '%s': %s"
 
-#: gconf/gconfd.c:1314
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Fout bij verplaatsen van nieuw opslag status bestand: %s"
 
-#: gconf/gconfd.c:1323
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1194,7 +1151,7 @@ msgstr ""
 "Fout bij het herstellen van origineel opslag status bestand dat was "
 "verplaatst naar '%s': %s"
 
-#: gconf/gconfd.c:1794
+#: gconf/gconfd.c:1790
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1202,77 +1159,67 @@ msgstr ""
 "Fout bij het herstellen van luisteraar op adres '%s', kon de databank niet "
 "vinden"
 
-#: gconf/gconfd.c:1840
+#: gconf/gconfd.c:1836
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Fout bij lezen opslag status bestand: %s"
 
-#: gconf/gconfd.c:1893
+#: gconf/gconfd.c:1889
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Fout bij openen opslag status bestand '%s': %s"
 
-#: gconf/gconfd.c:2010
+#: gconf/gconfd.c:2006
 #, c-format
 msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to re-add "
-"the listener if gconfd exits or shuts down (%s)"
+"Failed to log addition of listener to gconfd logfile; won't be able to re-"
+"add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 "Fout bij het loggen van toevoeging van luisteraars aan het gconfd log "
 "bestand; kan luisteraar niet opnieuw toevoegen als gconfd stopt (%s)"
 
-#: gconf/gconfd.c:2015
+#: gconf/gconfd.c:2011
 #, c-format
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously re-add "
-"the listener if gconfd exits or shuts down (%s)"
+"Failed to log removal of listener to gconfd logfile; might erroneously re-"
+"add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 "Fout bij het loggen van het verwijderen van de luisteraar naar gconfd log "
 "bestand; misschien word de luisteraar foutief opnieuw toegevoegd als gconfd "
 "stopt (%s)"
 
-#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
+#: gconf/gconfd.c:2034 gconf/gconfd.c:2199
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Fout bij vergaren van IOR voor client: %s"
 
-#: gconf/gconfd.c:2053
+#: gconf/gconfd.c:2049
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Fout bij openen opslag status bestand: %s"
 
-#: gconf/gconfd.c:2066
+#: gconf/gconfd.c:2062
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr ""
 "Fout bij het schrijven van client add naar het opslag status bestand: %s"
 
-#: gconf/gconfd.c:2074
+#: gconf/gconfd.c:2070
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr ""
 "Fout bij spoelen van toevoeging van client aan het opslag status bestand: %s"
 
-#: gconf/gconfd.c:2164
+#: gconf/gconfd.c:2160
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 "Enkele clienten verwijderden zichzelf van de GConf server terwijl ze niet "
 "waren toegevoegd."
 
-#. dialog display isn't working out
-#: gconf/gconfd.c:2303
-msgid "Multiple segmentation faults occurred; can't display error dialog\n"
-msgstr "Meerdere segmentatie fouten gebeurden; kan fout dialoog niet tonen\n"
-
-#. Eeeek! Can't show dialog
-#: gconf/gconfd.c:2312
-msgid ""
-"Segmentation fault!\n"
-"Cannot display crash dialog\n"
-msgstr ""
-"Segmentatie fout!\n"
-"Kan crash dialoog niet weergeven\n"
+#: gconf/gconftool.c:71
+msgid "Help options"
+msgstr "Help opties"
 
 #: gconf/gconftool.c:80
 msgid "Set a key to a value and sync. Use with --type."
@@ -1284,8 +1231,8 @@ msgstr "Druk de waarde van een sleutel af op de standaard uitvoer."
 
 #: gconf/gconftool.c:98
 msgid ""
-"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
-"--type."
+"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
+"type."
 msgstr ""
 "Stel een schema in en synchronizeer. Gebruik met --short-desc, --long-desc, "
 "--owner, en --type."
@@ -1296,8 +1243,8 @@ msgstr "De sleutels op de opdrachtregel uitzetten"
 
 #: gconf/gconftool.c:117
 msgid ""
-"Recursively unset all keys at or below the key/directory names on the command "
-"line"
+"Recursively unset all keys at or below the key/directory names on the "
+"command line"
 msgstr ""
 "Maak ecursief alle sleutels op of beneden  de sleutel/folder namen op de "
 "commandoregel"
@@ -1420,8 +1367,8 @@ msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
-"Benader de configuratie databank direct, de server omzeilend. Gconfd mag niet "
-"draaien."
+"Benader de configuratie databank direct, de server omzeilend. Gconfd mag "
+"niet draaien."
 
 #: gconf/gconftool.c:279
 msgid ""
@@ -1430,8 +1377,8 @@ msgid ""
 "config source or set to the empty string to use the default."
 msgstr ""
 "Installeert schema bestanden op de opdrachtregel in de databank. De "
-"GCONF_CONFIG_SOURCE omgevingsvariabele moet ingesteld staan op een "
-"niet-standaard configuratie bron of naar een lege tekenreeks om de "
+"GCONF_CONFIG_SOURCE omgevingsvariabele moet ingesteld staan op een niet-"
+"standaard configuratie bron of naar een lege tekenreeks om de "
 "standaardwaarde te gebruiken."
 
 #: gconf/gconftool.c:288
@@ -1447,8 +1394,8 @@ msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
-"Martelings-test voor een applicatie d.m.v. het instellen en uitzetten van een "
-"groep sleutels binnen de directories op de opdrachtregel."
+"Martelings-test voor een applicatie d.m.v. het instellen en uitzetten van "
+"een groep sleutels binnen de directories op de opdrachtregel."
 
 #: gconf/gconftool.c:306
 msgid "Get the short doc string for a key"
@@ -1463,8 +1410,7 @@ msgid "Get the name of the schema applied to this key"
 msgstr "Haal de naam op van het schema toegepast op deze sleutel"
 
 #: gconf/gconftool.c:333
-msgid ""
-"Specify the schema name followed by the key to apply the schema name to"
+msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr ""
 "Specificeer de schema naam gevolgt door de sleutel om de schema naam op toe "
 "te passen"
@@ -1477,6 +1423,16 @@ msgstr "Verwijder elke schema naam toegepast op de gegeven sleutels"
 msgid "Get the name of the default source"
 msgstr "Vind de naam van de standaard bron"
 
+#: gconf/gconftool.c:408
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Fout bij optie %s: %s.\n"
+"Start '%s --help' om een volledige lijst van beschikbare opdrachtregel "
+"opties te zien.\n"
+
 #: gconf/gconftool.c:420
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Kan niet vergaren en tegelijkertijd instellen/uitzetten\n"
@@ -1495,19 +1451,19 @@ msgstr "Kan --all-dirs niet met --get of --set gebruiken\n"
 
 #: gconf/gconftool.c:453
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, "
-"--all-entries, or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
-"--recursive-list moet niet gebruikt worden met --get, --set, --unset, "
-"--all-pairs of --all-dirs\n"
+"--recursive-list moet niet gebruikt worden met --get, --set, --unset, --all-"
+"pairs of --all-dirs\n"
 
 #: gconf/gconftool.c:463
 msgid ""
-"--set_schema should not be used with --get, --set, --unset, --all-entries, "
-"--all-dirs\n"
+"--set_schema should not be used with --get, --set, --unset, --all-entries, --"
+"all-dirs\n"
 msgstr ""
-"--set_schema moet niet gebruikt worden met --get, --set, --unset, --all-pairs "
-"of --all-dirs\n"
+"--set_schema moet niet gebruikt worden met --get, --set, --unset, --all-"
+"pairs of --all-dirs\n"
 
 #: gconf/gconftool.c:469
 msgid "Value type is only relevant when setting a value\n"
@@ -1545,8 +1501,8 @@ msgstr "--break-directory moet gebruikt worden door zichzelf.\n"
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
-"Je moet een configuratie bron specificeren met --config-source als je "
-"--direct gebruikt\n"
+"Je moet een configuratie bron specificeren met --config-source als je --"
+"direct gebruikt\n"
 
 #: gconf/gconftool.c:552
 msgid "You should use --direct when using a non-default configuration source\n"
@@ -1790,7 +1746,8 @@ msgstr "Fout bij uitzetten `%s': %s\n"
 
 #: gconf/gconftool.c:1638
 msgid "Must specify one or more keys to recursively unset.\n"
-msgstr "Moet een of meerdere sleutels specificeren om recursief leeg te maken\n"
+msgstr ""
+"Moet een of meerdere sleutels specificeren om recursief leeg te maken\n"
 
 #: gconf/gconftool.c:1652
 #, c-format
@@ -1849,22 +1806,22 @@ msgstr "WAARSCHUWING: fout bij ontleden type naam `%s'\n"
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"WAARSCHUWING: list_type kan alleen int, float, string of bool zijn en niet "
-"`%s'\n"
+"WAARSCHUWING: list_type kan alleen int, float, string of bool zijn en niet `%"
+"s'\n"
 
 #: gconf/gconftool.c:1923
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"WAARSCHUWING: car_type kan alleen int, float, string of bool zijn en niet "
-"`%s'\n"
+"WAARSCHUWING: car_type kan alleen int, float, string of bool zijn en niet `%"
+"s'\n"
 
 #: gconf/gconftool.c:1944
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"WAARSCHUWING: cdr_type kan alleen int, float, string of bool zijn en niet "
-"`%s'\n"
+"WAARSCHUWING: cdr_type kan alleen int, float, string of bool zijn en niet `%"
+"s'\n"
 
 #: gconf/gconftool.c:1972
 msgid "WARNING: empty <applyto> node"
@@ -1989,8 +1946,8 @@ msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
-"Probeer je applicatie te breken d.m.v. het instellen van slechte waarden voor "
-"een sleutel:\n"
+"Probeer je applicatie te breken d.m.v. het instellen van slechte waarden "
+"voor een sleutel:\n"
 "  %s\n"
 
 #: gconf/gconftool.c:2585
@@ -2001,9 +1958,51 @@ msgstr "Moet enkele te breken directories specificeren\n"
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
-"directory:\n  %s\n"
+"directory:\n"
+"  %s\n"
 msgstr ""
-"Probeer je applicatie te breken d.m.v. het instellen van slechte waarden voor "
-"sleutels in directory:\n"
+"Probeer je applicatie te breken d.m.v. het instellen van slechte waarden "
+"voor sleutels in directory:\n"
 "  %s\n"
 
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not open or create the file \"%s\"; this indicates that there may "
+#~ "be a problem with your configuration, as many programs will need to "
+#~ "create files in your home directory. The error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Vraag je systeem administrateur om het volgende probleem op te lossen:\n"
+#~ "Kon niet maken of openen het bestand \"%s\"; dit betekend dat er een "
+#~ "probleem kan zijn met de configuratie, omdat veel programmas bestanden "
+#~ "moeten kunnen maken in je thuismap. De fout was \"%s\" (foutnummer = %d)."
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not lock the file \"%s\"; this indicates that there may be a "
+#~ "problem with your operating system configuration. If you have an NFS-"
+#~ "mounted home directory, either the client or the server may be set up "
+#~ "incorrectly. See the rpc.statd and rpc.lockd documentation. The error was "
+#~ "\"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Vraag je systeem administrateur om het volgende probleem op te lossen:\n"
+#~ "Kon bestand \"%s\" niet blokeren; dit betekend dat er een probleem kan "
+#~ "zijn met de configuratie van het operating systeem. Als je een NFS "
+#~ "gemounte thuismap hebt, zowel de client als de server kan hierbij "
+#~ "verkeerd ingesteld zijn. Bekijk de rpc.statd en rpc.lockd documentatie. "
+#~ "De fout was \"%s\" (foutnummer = %d)."
+
+#~ msgid "Can't remove file %s: %s\n"
+#~ msgstr "Kon bestand %s niet verwijderen: %s\n"
+
+#~ msgid "Multiple segmentation faults occurred; can't display error dialog\n"
+#~ msgstr ""
+#~ "Meerdere segmentatie fouten gebeurden; kan fout dialoog niet tonen\n"
+
+#~ msgid ""
+#~ "Segmentation fault!\n"
+#~ "Cannot display crash dialog\n"
+#~ msgstr ""
+#~ "Segmentatie fout!\n"
+#~ "Kan crash dialoog niet weergeven\n"
diff --git a/po/no.po b/po/no.po
index 999ae98f..d0731daf 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 0.6\n"
-"POT-Creation-Date: 2002-03-26 09:24+0100\n"
+"POT-Creation-Date: 2002-01-28 21:35-0500\n"
 "PO-Revision-Date: 2002-03-26 09:27+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -31,7 +31,7 @@ msgstr "Initialiserer BDB-backend modul"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "Kunne ikke finne %s-rotkatalogen i adressen «%s»"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1209
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1176
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kunne ikke opprette katalogen «%s»: %s"
@@ -60,12 +60,12 @@ msgstr "Kunne ikke lese fra eller skrive til XML-rotkatalogen i adressen «%s»"
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Katalog/fil rettigheter for XML kildekode ved rot %s er: %o/%o"
 
-#: backends/xml-backend.c:590
+#: backends/xml-backend.c:584
 #, c-format
 msgid "Error syncing the XML backend directory cache: %s"
 msgstr "Feil under synkronisering av katalogbuffer for XML-motor: %s"
 
-#: backends/xml-backend.c:655
+#: backends/xml-backend.c:651
 msgid ""
 "Remove dir operation is no longer supported, just remove all the values in "
 "the directory"
@@ -73,20 +73,20 @@ msgstr ""
 "Operasjonen fjern katalog er ikke støttet lengre, bare fjern alle verdiene i "
 "katalogen"
 
-#: backends/xml-backend.c:722
+#: backends/xml-backend.c:718
 msgid "Initializing XML backend module"
 msgstr "Initialiserer XML-backend modulen"
 
-#: backends/xml-backend.c:790
+#: backends/xml-backend.c:786
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Kunne ikke gi opp lås på XML-katalog «%s»: %s"
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:248
 msgid "Failed to sync XML cache contents to disk"
 msgstr "Feil under synkronisering av innhold i XML-buffer til disk"
 
-#: backends/xml-cache.c:273
+#: backends/xml-cache.c:278
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -95,7 +95,7 @@ msgstr ""
 "Kunne ikke fjerne katalog «%s» fra XML-backend bufferen, fordi den ikke er "
 "synkronisert til disk"
 
-#: backends/xml-cache.c:300
+#: backends/xml-cache.c:305
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than %"
@@ -104,179 +104,169 @@ msgstr ""
 "%u oppføringer er i bufferen etter fjerning av allerede-synkroniserte "
 "oppføringer eldre enn %u sekunder"
 
-#: backends/xml-dir.c:171
+#: backends/xml-dir.c:168
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "Kunne ikke kjøre stat på «%s»: %s"
 
-#: backends/xml-dir.c:181
+#: backends/xml-dir.c:178
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "XML-filnavn «%s» er en katalog"
 
-#: backends/xml-dir.c:372 backends/xml-dir.c:379
+#: backends/xml-dir.c:369 backends/xml-dir.c:376
 #, c-format
 msgid "Failed to delete \"%s\": %s"
 msgstr "Klarte ikke å slette «%s»: %s"
 
-#: backends/xml-dir.c:424
+#: backends/xml-dir.c:421
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Kunne ikke skrive fil «%s»: %s"
 
-#: backends/xml-dir.c:437
+#: backends/xml-dir.c:434
 #, c-format
 msgid "Failed to set mode on `%s': %s"
 msgstr "Kunne ikke sette modus på «%s»: %s"
 
-#: backends/xml-dir.c:447
+#: backends/xml-dir.c:444
 #, c-format
 msgid "Failed to write XML data to `%s': %s"
 msgstr "Feil under skriving av XML-data til «%s»: %s"
 
-#: backends/xml-dir.c:457 backends/xml-dir.c:1233
+#: backends/xml-dir.c:454 backends/xml-dir.c:1200
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Kunne ikke lukke filen «%s»: %s"
 
-#: backends/xml-dir.c:473 backends/xml-dir.c:483
+#: backends/xml-dir.c:470 backends/xml-dir.c:480
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Kunne ikke endre navn «%s» til «%s»: %s"
 
-#: backends/xml-dir.c:489
+#: backends/xml-dir.c:486
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Kunne ikke gjenopprette «%s» fra «%s»: %s"
 
-#: backends/xml-dir.c:501
+#: backends/xml-dir.c:498
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Kunne ikke slette gammel fil «%s»: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:929
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Kunne ikke kjøre stat på «%s»: %s"
 
-#: backends/xml-dir.c:956
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: backends/xml-dir.c:1106
+#: backends/xml-dir.c:1073
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Duplisert oppføring «%s» i «%s», ignorerer"
 
-#: backends/xml-dir.c:1128
+#: backends/xml-dir.c:1095
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Oppføring uten navn i XML-fil «%s», ignorerer"
 
-#: backends/xml-dir.c:1136
+#: backends/xml-dir.c:1103
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 "En toppnivå-node i XML-fil «%s» er <%s> i stedet for <oppføring>, ignorerer"
 
-#: backends/xml-dir.c:1225
+#: backends/xml-dir.c:1192
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Kunne ikke opprette fil «%s»: %s"
 
-#: backends/xml-dir.c:1324
-#, c-format
-msgid "Failed to parse XML file \"%s\""
-msgstr "Klarte ikke å lese XMLfil «%s»"
-
 #. There was an error
-#: backends/xml-entry.c:154
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorerer XML-node med navn «%s»: %s"
 
-#: backends/xml-entry.c:332
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignorerer schema-navn «%s», ugyldig: %s"
 
-#: backends/xml-entry.c:380
+#: backends/xml-entry.c:376
 #, c-format
 msgid "Ignoring XML node `%s': %s"
 msgstr "Ignorerer XML-node «%s»: %s"
 
-#: backends/xml-entry.c:732
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Kunne ikke lese standardverdi for schema: %s"
 
-#: backends/xml-entry.c:952
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Ingen \"type\" attributt for <%s> node"
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "En node har ukjent \"type\" attributt «%s», ignorerer"
 
-#: backends/xml-entry.c:981
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "Ingen \"verdi\" attributt for node"
 
-#: backends/xml-entry.c:1029 backends/xml-entry.c:1105
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Forsto ikke XML-node <%s> inne i en XML listenode"
 
-#: backends/xml-entry.c:1063
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Ugyldig type (liste, par, eller ukjent) i en listenode"
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Ugyldig XML-node: %s"
 
-#: backends/xml-entry.c:1094
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Listen inneholder en feilskrevet node (%s, skulle vært %s)"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorerer ugyldig car fra XML-par: %s"
 
-#: backends/xml-entry.c:1155 backends/xml-entry.c:1178
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "tolker XML-fil: lister og par kan ikke plasseres inne i et par"
 
-#: backends/xml-entry.c:1168
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorerer ugyldig cdr fra XML-par: %s"
 
-#: backends/xml-entry.c:1187
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Forsto ikke XML-node <%s> inne i en XML-parnode"
 
-#: backends/xml-entry.c:1205
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Fant ikke car og cdr for XML-parnode"
 
-#: backends/xml-entry.c:1211
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Manglende cdr fra verdipar i XML-fil"
 
-#: backends/xml-entry.c:1218
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "Manglende car fra verdipar i XML-fil"
 
-#: backends/xml-entry.c:1223
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Mangler både car og cdr verdier fra par i XML-fil"
 
@@ -314,47 +304,51 @@ msgstr "Kunne ikke stenge ned motoren"
 msgid "GConf Error: %s\n"
 msgstr "GConf Feil: %s\n"
 
-#: gconf/gconf-client.c:881
+#: gconf/gconf-client.c:899
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf advarsel: feil under listing av par i «%s»: %s"
 
-#: gconf/gconf-client.c:1146
+#: gconf/gconf-client.c:1165
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Forventet «%s», mottok «%s» for nøkkel %s"
 
-#: gconf/gconf-database.c:234
+#: gconf/gconf-database.c:233
 msgid "Received invalid value in set request"
 msgstr "Mottok ugyldig verdi i sett-forespørsel"
 
-#: gconf/gconf-database.c:242
+#: gconf/gconf-database.c:241
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Kunne ikke forstå CORBA-verdien mottatt i sett-forespørsel etter nøkkel «%s»"
 
-#: gconf/gconf-database.c:523
+#: gconf/gconf-database.c:522
 msgid "Received request to drop all cached data"
 msgstr "Mottok forespørsel om å slippe alle mellomlagrede data"
 
-#: gconf/gconf-database.c:540
+#: gconf/gconf-database.c:539
 msgid "Received request to sync synchronously"
 msgstr "Mottok forespørsel om å utføre synkron synkronisering"
 
-#: gconf/gconf-database.c:824
+#: gconf/gconf-database.c:823
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Fatal feil: kunne ikke hente objektreferanse for ConfigDatabase"
 
-#: gconf/gconf-database.c:986
+#: gconf/gconf-database.c:985
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Kunne ikke synkronisere en eller flere kilder: %s"
 
-#: gconf/gconf-database.c:1078
-#, c-format
+#. This error is not fatal; we basically ignore it.
+#. * Because it's likely the right thing for the client
+#. * app to simply continue.
+#.
+#: gconf/gconf-database.c:1076
+#, fuzzy, c-format
 msgid ""
-"Failed to log addition of listener %s (%s);will not be able to restore this "
+"Failed to log addition of listener %s (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
@@ -362,12 +356,12 @@ msgstr ""
 "lytteren ved gjenstart av gconfd, noe som vil resultere i upålitelig "
 "notifikasjon av konfigurasjonsendringer."
 
-#: gconf/gconf-database.c:1109
+#: gconf/gconf-database.c:1103
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Lytter-ID %lu eksisterer ikke"
 
-#: gconf/gconf-database.c:1123
+#: gconf/gconf-database.c:1117
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -377,57 +371,57 @@ msgstr ""
 "harmløst, kan resultere i at notifikasjon gjenintreffer på uforklarlig vis): "
 "%s"
 
-#: gconf/gconf-database.c:1241 gconf/gconf-sources.c:1540
+#: gconf/gconf-database.c:1235 gconf/gconf-sources.c:1540
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Feil under henting av verdi for «%s»: %s"
 
-#: gconf/gconf-database.c:1288
+#: gconf/gconf-database.c:1282
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Feil under setting av verdi for «%s»: %s"
 
-#: gconf/gconf-database.c:1331
+#: gconf/gconf-database.c:1325
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Feil under nullstilling av «%s»: %s"
 
-#: gconf/gconf-database.c:1360
+#: gconf/gconf-database.c:1354
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Feil under henting av standardverdi for «%s»: %s"
 
-#: gconf/gconf-database.c:1411
+#: gconf/gconf-database.c:1405
 #, c-format
 msgid "Error unsetting \"%s\": %s"
 msgstr "Feil under fjerning av verdi for «%s»: %s"
 
-#: gconf/gconf-database.c:1443
+#: gconf/gconf-database.c:1437
 #, c-format
 msgid "Error getting new value for \"%s\": %s"
 msgstr "Feil under henting av ny verdi for «%s»: %s"
 
-#: gconf/gconf-database.c:1491
+#: gconf/gconf-database.c:1485
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Feil ved sjekking av eksisterende «%s»: %s"
 
-#: gconf/gconf-database.c:1515
+#: gconf/gconf-database.c:1509
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Feil under fjerning av katalog «%s»: %s"
 
-#: gconf/gconf-database.c:1542
+#: gconf/gconf-database.c:1536
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Fikk ikke alle oppføringene i «%s»: %s"
 
-#: gconf/gconf-database.c:1568
+#: gconf/gconf-database.c:1562
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Feil under listing av kataloger i «%s»: %s"
 
-#: gconf/gconf-database.c:1589
+#: gconf/gconf-database.c:1583
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Feil under setting av schema for «%s»: %s"
@@ -554,67 +548,67 @@ msgstr "Legger til kilde «%s»\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "Lesefeil på fil «%s»: %s\n"
 
-#: gconf/gconf-internals.c:1195 gconf/gconf-internals.c:1261
+#: gconf/gconf-internals.c:1211 gconf/gconf-internals.c:1277
 #: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
-#: gconf/gconf-value.c:1511
+#: gconf/gconf-value.c:1341
 msgid "Text contains invalid UTF-8"
 msgstr "Tekst inneholder ugyldig UTF-8"
 
-#: gconf/gconf-internals.c:1346
+#: gconf/gconf-internals.c:1362
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Forventet liste, mottok %s"
 
-#: gconf/gconf-internals.c:1356
+#: gconf/gconf-internals.c:1372
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Forventet liste av %s, mottok liste av %s"
 
-#: gconf/gconf-internals.c:1498
+#: gconf/gconf-internals.c:1511
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Forventet par, mottok %s"
 
-#: gconf/gconf-internals.c:1512
+#: gconf/gconf-internals.c:1525
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Forventet (%s,%s) par, mottok et par hvor en eller begge verdiene mangler"
 
-#: gconf/gconf-internals.c:1528
+#: gconf/gconf-internals.c:1541
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Forventet par av type (%s,%s) mottok type (%s,%s)"
 
-#: gconf/gconf-internals.c:1644
+#: gconf/gconf-internals.c:1657
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Streng i sitattegn begynner ikke med et sitattegn"
 
-#: gconf/gconf-internals.c:1706
+#: gconf/gconf-internals.c:1719
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Streng i anførselstegn slutter ikke med et sitattegn"
 
-#: gconf/gconf-internals.c:1842
+#: gconf/gconf-internals.c:1855
 msgid "Encoded value is not valid UTF-8"
 msgstr "Kodet verdi er ikke gyldig UTF-8"
 
-#: gconf/gconf-internals.c:2301
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Could not lock temporary file '%s': %s"
 msgstr "Kunne ikke låse midlertidig fil «%s»: %s"
 
-#: gconf/gconf-internals.c:2328
+#: gconf/gconf-internals.c:2341
 #, c-format
 msgid "Could not create file '%s', probably because it already exists"
 msgstr ""
 "Kunne ikke opprette fil «%s», sannsynligvis fordi den eksisterer allerede"
 
-#: gconf/gconf-internals.c:2374
+#: gconf/gconf-internals.c:2387
 #, c-format
 msgid "Failed to create or open '%s'"
 msgstr "Kunne ikke opprette eller åpne «%s»"
 
-#: gconf/gconf-internals.c:2384
+#: gconf/gconf-internals.c:2397
 #, c-format
 msgid ""
 "Failed to lock '%s': probably another process has the lock, or your "
@@ -624,168 +618,88 @@ msgstr ""
 "ellers så har operativsystemet problemer med konfigurasjon av NFS-fillåsing "
 "(%s)"
 
-#: gconf/gconf-internals.c:2413
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr "Åpning av IOR-fil '%s' ble ikke fullført, ingen gconfd funnet: %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2455
 #, c-format
 msgid "gconftool or other non-gconfd process has the lock file '%s'"
 msgstr "gconftool eller en annen prosess utenfor gconfd har låsfilen «%s»"
 
-#: gconf/gconf-internals.c:2460
+#: gconf/gconf-internals.c:2472
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
 msgstr "kunne ikke kontakte ORB for å finne eksisterende gconfd-referanse"
 
-#: gconf/gconf-internals.c:2470
+#: gconf/gconf-internals.c:2482
 #, c-format
 msgid "Failed to convert IOR '%s' to an object reference"
 msgstr "Feil under konvertering av IOR '%s' til en objektreferanse"
 
-#: gconf/gconf-internals.c:2520
+#: gconf/gconf-internals.c:2510
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "kunne ikke opprette katalogen «%s»: %s"
 
-#: gconf/gconf-internals.c:2579
+#: gconf/gconf-internals.c:2569
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kunne ikke skrive til fil «%s»: %s"
 
-#: gconf/gconf-internals.c:2620
+#: gconf/gconf-internals.c:2610
 #, c-format
 msgid "We didn't have the lock on file `%s', but we should have"
 msgstr "Har ikke låsen på filen «%s», men burde hatt den"
 
-#: gconf/gconf-internals.c:2641
+#: gconf/gconf-internals.c:2631
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
 msgstr "Feil under lenking av «%s» til «%s»: %s"
 
-#: gconf/gconf-internals.c:2653
+#: gconf/gconf-internals.c:2643
 #, c-format
 msgid "Failed to remove lock file `%s': %s"
 msgstr "Feil under fjerning av låsfil «%s»: %s"
 
-#: gconf/gconf-internals.c:2672
+#: gconf/gconf-internals.c:2662
 #, c-format
 msgid "Failed to clean up file '%s': %s"
 msgstr "Feil under opprydding av fil «%s»: %s"
 
-#: gconf/gconf-internals.c:2686
+#: gconf/gconf-internals.c:2676
 #, c-format
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "Kunne ikke fjerne låskatalogen «%s»: %s"
 
-#: gconf/gconf-internals.c:2860 gconf/gconfd.c:591
+#: gconf/gconf-internals.c:2842 gconf/gconfd.c:583
 #, c-format
 msgid "Failed to create %s: %s"
 msgstr "Kunne ikke opprette %s : %s"
 
-#: gconf/gconf-internals.c:2882
-#, c-format
-msgid "Server ping error: %s"
-msgstr "Feil under ping til tjener: %s"
-
-#: gconf/gconf-internals.c:2903
+#: gconf/gconf-internals.c:2875
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 "Feil under oppretting av rør for kommunikasjon med nystartet gconf daemon: %"
 "s\n"
 
-#: gconf/gconf-internals.c:2927
+#: gconf/gconf-internals.c:2899
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Feil under starting av konfigurasjonstjeneren: %s\n"
 
-#: gconf/gconf-internals.c:2952
-#, c-format
-msgid ""
-"Failed to contact configuration server; some possible causes are that you "
-"need to enable TCP/IP networking for ORBit, or you have stale NFS locks due "
-"to a system crash. See http://www.gnome.org/projects/gconf/ for information. "
-"(Details - %s)"
-msgstr "Feil ved forsøk på å kontakte konfigurasjonstjeneren; noen mulige årsaker er at du må aktivere TCP/IP for ORBit, eller at du har gamle NFS-låsfiler pga et systemkrasj. Se http://www.gnome.org/projects/gconf/ for informasjon. (Detaljer - %s)"
-
-#: gconf/gconf-internals.c:2953
-msgid "none"
-msgstr "ingen"
-
-#: gconf/gconf-sanity-check.c:39 gconf/gconftool.c:72
-msgid "Help options"
-msgstr "Alternativer for hjelp"
-
-#: gconf/gconf-sanity-check.c:74 gconf/gconftool.c:411
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Feil ved flagg %s: %s.\n"
-"Kjør «%s --help» for å se en full liste over tilgjengelige "
-"kommandolinjeflagg.\n"
-
-#: gconf/gconf-sanity-check.c:131
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not open or create the file \"%s\"; this indicates that there may be a "
-"problem with your configuration, as many programs will need to create files "
-"in your home directory. The error was \"%s\" (errno = %d)."
-msgstr ""
-"Vennligst kontakt din systemadministrator for å løse følgende problem:\n"
-"Kunne ikke åpne eller opprette filen «%s»; dette indikerer at du har "
-"problemer med din konfigurasjon, siden mange programmer trenger å kunne "
-"opprette filer i din hjemmekatalog. Feilen var «%s» (errno = %d)."
-
-#: gconf/gconf-sanity-check.c:143
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not lock the file \"%s\"; this indicates that there may be a problem "
-"with your operating system configuration. If you have an NFS-mounted home "
-"directory, either the client or the server may be set up incorrectly. See "
-"the rpc.statd and rpc.lockd documentation. A common cause of this error is "
-"that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
-"%d)."
-msgstr ""
-"Vennligst kontakt din systemadministrator for å løse følgende problem:\n"
-"Kunne ikke låse filen «%s»; dette indikerer at du har problemer med "
-"konfigurasjonen av ditt operativsystem. Hvis du har montert hjemmekatalogen "
-"via NFS kan det være at klienten eller tjeneren er satt opp feil. Se "
-"dokumentasjonen for rpc.statd og rpc.lockd. En vanlig årsak til dette er at "
-"«nfslock»-tjenesten er deaktivert. Feilen var «%s» (errno = %d)."
-
-#: gconf/gconf-sanity-check.c:160
-#, c-format
-msgid "Can't remove file %s: %s\n"
-msgstr "Kunne ikke fjerne fil %s: %s\n"
-
-#: gconf/gconf-sanity-check.c:195
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"No configuration sources in the configuration file \"%s\"; this means that "
-"preferences and other settings can't be saved. %s%s"
-msgstr ""
-"Vennligst kontakt din systemadministrator for å løse følgende problem:\n"
-"Ingen konfigurasjonskilder i konfigurasjonsfil «%s»; dette betyr at "
-"brukervalg og andre innstillinger ikke kan lagres. %s%s"
-
-#: gconf/gconf-sanity-check.c:198
-msgid "Error reading the file: "
-msgstr "Feil under lesing av fil: "
-
-#: gconf/gconf-sanity-check.c:220
-#, c-format
+#: gconf/gconf-internals.c:2923
 msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
+"Failed to contact configuration server; some possible causes are:\n"
+"a) you have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit by putting the line \"ORBIIOPIPv4=1"
+"\" in /etc/orbitrc\n"
+"b) you have stale locks in your NFS-mounted home directory due to a system "
+"crash, try removing ~/.gconf/*.lock and ~/.gconfd/lock if you are sure no "
+"gconfd processes are running on any machine using your home dir"
 msgstr ""
-"Vennligst kontakt din systemadministrator for å løse følgende problem:\n"
-"Kunne ikke slå opp adresse «%s» i konfigurasjonsfil «%s»: %s"
 
 #: gconf/gconf-schema.c:190 gconf/gconf-schema.c:198 gconf/gconf-schema.c:206
 #: gconf/gconf-schema.c:214
@@ -954,103 +868,103 @@ msgstr "Forsto ikke «%s» (feil antall elementer)"
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "Forsto ikke «%s» (ekstra «unescaped» «)» funnet inne i par)"
 
-#: gconf/gconf.c:55
+#: gconf/gconf.c:54
 #, c-format
 msgid "Key \"%s\" is NULL"
 msgstr "Nøkkel «%s» er NULL"
 
-#: gconf/gconf.c:62
+#: gconf/gconf.c:61
 #, c-format
 msgid "\"%s\": %s"
 msgstr "«%s»: %s"
 
-#: gconf/gconf.c:343
+#: gconf/gconf.c:333
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Tjener kunne ikke finne adressen `%s'"
 
-#: gconf/gconf.c:634
+#: gconf/gconf.c:624
 msgid "Can't add notifications to a local configuration source"
 msgstr "Kan ikke legge til meldinger til en lokal konfigurasjonskilde"
 
-#: gconf/gconf.c:2079
+#: gconf/gconf.c:2072
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Feil under innlegging av klient i tjenerlisten, CORBA-feil: %s"
 
-#: gconf/gconf.c:2434
+#: gconf/gconf.c:2393
 msgid "Must begin with a slash (/)"
 msgstr "Må begynne med en skråstrek (/)"
 
-#: gconf/gconf.c:2456
+#: gconf/gconf.c:2415
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan ikke ha to skråstreker (/) på rad"
 
-#: gconf/gconf.c:2458
+#: gconf/gconf.c:2417
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan ikke ha punktum (.) rett etter en skråstrek (/)"
 
-#: gconf/gconf.c:2477
+#: gconf/gconf.c:2436
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
 msgstr "«%c» er ikke et ASCII-tegn, og er derfor ikke tillatt i nøkkelnavn"
 
-#: gconf/gconf.c:2487
+#: gconf/gconf.c:2446
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "«%c» er et ugyldig tegn i nøkkel/katalog navn"
 
-#: gconf/gconf.c:2501
+#: gconf/gconf.c:2460
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Nøkkel/katalog kan ikke slutte med en skråstrek (/)"
 
-#: gconf/gconf.c:2870
+#: gconf/gconf.c:2829
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Feil under nedstenging av konfigurasjonstjeneren: %s"
 
-#: gconf/gconf.c:2931
+#: gconf/gconf.c:2890
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Forventet flyttall, mottok %s"
 
-#: gconf/gconf.c:2966
+#: gconf/gconf.c:2925
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Forventet heltall, mottok %s"
 
-#: gconf/gconf.c:3001
+#: gconf/gconf.c:2960
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Forventet streng, mottok %s"
 
-#: gconf/gconf.c:3038
+#: gconf/gconf.c:2997
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Forventet boolsk verdi, mottok %s"
 
-#: gconf/gconf.c:3071
+#: gconf/gconf.c:3030
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Forventet schema, mottok %s"
 
-#: gconf/gconf.c:3432
+#: gconf/gconf.c:3391
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA feil: %s"
 
-#: gconf/gconfd.c:249
+#: gconf/gconfd.c:246
 msgid "Shutdown request received"
 msgstr "Anmodning om nedstenging mottatt"
 
-#: gconf/gconfd.c:281
+#: gconf/gconfd.c:278
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 "gconfd kompilert med debugging; forsøker å laste gconf.sh fra kildekatalogen"
 
-#: gconf/gconfd.c:295
+#: gconf/gconfd.c:292
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1061,7 +975,7 @@ msgstr ""
 #. We want to stay alive but do nothing, because otherwise every
 #. request would result in another failed gconfd being spawned.
 #.
-#: gconf/gconfd.c:303
+#: gconf/gconfd.c:300
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1069,16 +983,16 @@ msgstr ""
 "Ingen konfigurasjonskilder i kildestien, konfigurasjonen vil ikke bli "
 "lagret; edit"
 
-#: gconf/gconfd.c:303
+#: gconf/gconfd.c:300
 msgid "/path"
 msgstr "/path"
 
-#: gconf/gconfd.c:316
+#: gconf/gconfd.c:313
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Feil under lasting av noen konfigurasjonskilder: %s"
 
-#: gconf/gconfd.c:328
+#: gconf/gconfd.c:325
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1086,7 +1000,7 @@ msgstr ""
 "Kunne ikke slå opp noen adresser for konfigurasjonskilde, kan ikke laste "
 "eller lagre konfigurasjonsdata"
 
-#: gconf/gconfd.c:345
+#: gconf/gconfd.c:342
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1094,13 +1008,13 @@ msgstr ""
 "Ingen skrivbare konfigurasjonskilder funnet, kan ikke lagre deler av "
 "konfigurasjonsendringene"
 
-#: gconf/gconfd.c:371
+#: gconf/gconfd.c:368
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 "Mottok signal %d, dumper minne. Vennligst send inn en feilrapport for GConf."
 
-#: gconf/gconfd.c:389
+#: gconf/gconfd.c:384
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
@@ -1108,53 +1022,53 @@ msgstr ""
 "Mottok signal %d, kjører usikker nedstenging. Vennligst send inn en "
 "feilrapport for GConf."
 
-#: gconf/gconfd.c:406
+#: gconf/gconfd.c:401
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Mottok signal %d, stenger ned på riktig måte"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:538
+#: gconf/gconfd.c:531
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "starter (versjon %s), pid %u bruker «%s»"
 
-#: gconf/gconfd.c:578
+#: gconf/gconfd.c:570
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Kunne ikke hente objektreferanse for ConfigServer"
 
-#: gconf/gconfd.c:616
+#: gconf/gconfd.c:608
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 "Feil under skriving av byte til rør fd %d. Klientprogrammer vil kunne henge: "
 "%s"
 
-#: gconf/gconfd.c:626
+#: gconf/gconfd.c:618
 #, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "Kunne ikke hente lås for daemon, avslutter: %s"
 
-#: gconf/gconfd.c:664
+#: gconf/gconfd.c:656
 #, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "Feil under løslating av låsfil: %s"
 
-#: gconf/gconfd.c:672
+#: gconf/gconfd.c:664
 msgid "Exiting"
 msgstr "Avslutter"
 
-#: gconf/gconfd.c:698
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "GConf-tjeneren er ikke i bruk, stenger ned."
 
-#: gconf/gconfd.c:1063
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Returnerer unntak: %s"
 
-#: gconf/gconfd.c:1163
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1163,39 +1077,39 @@ msgstr ""
 "Klarte ikke å åpne gconfd loggfil; vil ikke kunne gjenopprette lyttere etter "
 "nedkjøring av gconfd (%s)"
 
-#: gconf/gconfd.c:1198
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 "Klarte ikke å lukke gconfd loggfil; data ble kanskje ikke lagret riktig (%s)"
 
-#: gconf/gconfd.c:1267
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Kunne ikke åpne lagret tilstandsfil «%s» for skriving: %s"
 
-#: gconf/gconfd.c:1281
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Kunne ikke skrive lagret tilstandsfil «%s» fd: %d: %s"
 
-#: gconf/gconfd.c:1290
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Kunne ikke lukke ny lagret tilstandsfil «%s»: %s"
 
-#: gconf/gconfd.c:1304
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Kunne ikke flytte gammel lagret tilstandsfil «%s»: %s"
 
-#: gconf/gconfd.c:1314
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Kunne ikke flytte ny lagret tilstandsfil på plass: %s"
 
-#: gconf/gconfd.c:1323
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1203,7 +1117,7 @@ msgstr ""
 "Kunne ikke gjenopprette opprinnelig lagret tilstandsfil som har blitt "
 "flyttet til «%s»: %s"
 
-#: gconf/gconfd.c:1794
+#: gconf/gconfd.c:1790
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1211,17 +1125,17 @@ msgstr ""
 "Kunne ikke gjenopprette en lytter på adresse «%s», kunne ikke gjøre "
 "databaseoppslag"
 
-#: gconf/gconfd.c:1840
+#: gconf/gconfd.c:1836
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Feil under lesing av lagret tilstandsfil: %s"
 
-#: gconf/gconfd.c:1893
+#: gconf/gconfd.c:1889
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Kunne ikke åpne lagret tilstandsfil «%s»: %s"
 
-#: gconf/gconfd.c:2010
+#: gconf/gconfd.c:2006
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1230,7 +1144,7 @@ msgstr ""
 "Klarte ikke å logge tillegg av lytter til gconfd loggfilen; vil ikke kunne "
 "legge til lytteren hvis gconfd avslutter eller stenger ned (%s)"
 
-#: gconf/gconfd.c:2015
+#: gconf/gconfd.c:2011
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1239,56 +1153,45 @@ msgstr ""
 "Klarte ikke å logge fjerning av lytter i gconfd-loggfilen; kan medføre at "
 "lytter legges inn igjen hvis gconfd avsluttes eller maskinen stenges av (%s)."
 
-#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
+#: gconf/gconfd.c:2034 gconf/gconfd.c:2199
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Kunne ikke hente IOR for klient: %s"
 
-#: gconf/gconfd.c:2053
+#: gconf/gconfd.c:2049
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Kunne ikke åpne lagret tilstandsfil: %s"
 
-#: gconf/gconfd.c:2066
+#: gconf/gconfd.c:2062
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "Kunne ikke skrive tillegg av klient til lagret tilstandsfil: %s"
 
-#: gconf/gconfd.c:2074
+#: gconf/gconfd.c:2070
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr "Kunne ikke synkronisere tillegg av klient til lagret tilstandsfil: %s"
 
-#: gconf/gconfd.c:2164
+#: gconf/gconfd.c:2160
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 "En klient fjernet seg selv fra GConf-tjeneren uten at den var lagt til."
 
-#. dialog display isn't working out
-#: gconf/gconfd.c:2303
-msgid "Multiple segmentation faults occurred; can't display error dialog\n"
-msgstr "Flere segmenteringsfeil oppsto; kan ikke vise feilmelding\n"
-
-#. Eeeek! Can't show dialog
-#: gconf/gconfd.c:2312
-#, c-format
-msgid ""
-"Segmentation fault!\n"
-"Cannot display crash dialog: %s\n"
-msgstr ""
-"Segmenteringsfeil!\n"
-"Kan ikke vise krasjdialog: %s\n"
+#: gconf/gconftool.c:71
+msgid "Help options"
+msgstr "Alternativer for hjelp"
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Sett en nøkkel til en verdi ok synkroniser. Bruk med --type."
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid "Print the value of a key to standard output."
 msgstr "Skriv ut verdien for en nøkkel til standard ut."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:98
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
@@ -1296,11 +1199,11 @@ msgstr ""
 "Sett et schema og synkroniser. Bruk med --short-desc, --long-desc, --owner, "
 "og --type."
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 msgid "Unset the keys on the command line"
 msgstr "Nullstill nøklene fra kommandolinjen"
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
@@ -1308,32 +1211,32 @@ msgstr ""
 "Nullstill alle nøkler rekursivt ved eller under nøkkel/katalognavn på "
 "kommandolinjen"
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all key/value pairs in a directory."
 msgstr "Skriv ut alle nøkkel/verdi par i en  katalog."
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Print all subdirectories in a directory."
 msgstr "Skriv ut alle underkataloger i en katalog."
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Skriv ut alle underkataloger og oppføringer under en katalog, rekursivt."
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Returner 0 hvis katalogen eksisterer, 2 hvis ikke."
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Steng ned gconfd. IKKE BRUK DETTE VALGET UTEN GOD GRUNN."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Returner 0 hvis gconfd kjører, 2 hvis ikke."
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1341,7 +1244,7 @@ msgstr ""
 "Start konfigurasjonstjeneren (gconfd). (Skjer normalt automatisk når det er "
 "nødvendig.)"
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1349,11 +1252,11 @@ msgstr ""
 "Spesifiser typen verdi som settes, eller typen for verdien et schema "
 "beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:191
+#: gconf/gconftool.c:190
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|liste|par"
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1361,11 +1264,11 @@ msgstr ""
 "Spesifiser type listeverdi som settes, eller typen for verdien et schema "
 "beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:200 gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:199 gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1373,7 +1276,7 @@ msgstr ""
 "Spesifiser car-type verdi som settes, eller typen for verdien et schema "
 "beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1381,45 +1284,45 @@ msgstr ""
 "Spesifiser type verdi for cdr-par som settes, eller typen for verdien et "
 "schema beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "Spesifiser en kort beskrivelse på en halv linje som skal brukes i et schema."
 
-#: gconf/gconftool.c:227 gconf/gconftool.c:236
+#: gconf/gconftool.c:226 gconf/gconftool.c:235
 msgid "DESCRIPTION"
 msgstr "BESKRIVELSE"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a several-line description to go in a schema."
 msgstr "Spesifiser en beskrivelse på flere linjer som skal brukes i et schema."
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 msgid "Specify the owner of a schema"
 msgstr "Spesifiser eieren av et schema"
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 msgid "OWNER"
 msgstr "EIER"
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid "Specify a schema file to be installed"
 msgstr "Spesifiser en schema fil som skal installeres"
 
-#: gconf/gconftool.c:254
+#: gconf/gconftool.c:253
 msgid "FILENAME"
 msgstr "FILNAVN"
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Spesifiser en konfigurasjonskilde som skal brukes i stedet for standard sti"
 
-#: gconf/gconftool.c:263
+#: gconf/gconftool.c:262
 msgid "SOURCE"
 msgstr "KILDE"
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1427,7 +1330,7 @@ msgstr ""
 "Aksepter konfigurasjonsdatabasen direkte, går utenom tjeneren. Det kreves at "
 "gconfd ikke kjører."
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1438,7 +1341,7 @@ msgstr ""
 "standardverdien for konfigurasjonskilde eller være tom for at "
 "standardverdien skal brukes."
 
-#: gconf/gconftool.c:289
+#: gconf/gconftool.c:288
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1446,7 +1349,7 @@ msgstr ""
 "Utfør en torturtest av en applikasjon ved å sette og tømme en rekke verdier "
 "av forskjellige typer for nøkler fra kommandolinjen."
 
-#: gconf/gconftool.c:298
+#: gconf/gconftool.c:297
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1454,47 +1357,57 @@ msgstr ""
 "Utfør en torturtest av en applikasjon ved å sette og tømme en rekke nøkler "
 "inne i katalogene fra kommandolinjen."
 
-#: gconf/gconftool.c:307
+#: gconf/gconftool.c:306
 msgid "Get the short doc string for a key"
 msgstr "Hent kort dokumentstreng for en nøkkel"
 
-#: gconf/gconftool.c:316
+#: gconf/gconftool.c:315
 msgid "Get the long doc string for a key"
 msgstr "Hent lang dokumentstreng for en nøkkel"
 
-#: gconf/gconftool.c:325
+#: gconf/gconftool.c:324
 msgid "Get the name of the schema applied to this key"
 msgstr "Hent navn på skjema som brukes på denne nøkkelen"
 
-#: gconf/gconftool.c:334
+#: gconf/gconftool.c:333
 msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr "Spesifiser skjemanavn fulgt av nøkkel som skal bruke skjemanavnet"
 
-#: gconf/gconftool.c:343
+#: gconf/gconftool.c:342
 msgid "Remove any schema name applied to the given keys"
 msgstr "Fjern ethvert skjemanavn som brukes på disse nøklene"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:351
 msgid "Get the name of the default source"
 msgstr "Hent navn på forvalgt kilde"
 
-#: gconf/gconftool.c:423
+#: gconf/gconftool.c:408
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Feil ved flagg %s: %s.\n"
+"Kjør «%s --help» for å se en full liste over tilgjengelige "
+"kommandolinjeflagg.\n"
+
+#: gconf/gconftool.c:420
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Kan ikke hente og sette/nullstille samtidig\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:427
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Kan ikke sette og hente/nullstille samtidig\n"
 
-#: gconf/gconftool.c:438
+#: gconf/gconftool.c:435
 msgid "Can't use --all-entries with --get or --set\n"
 msgstr "Kan ikke bruke --all-entries sammen med --get eller --set\n"
 
-#: gconf/gconftool.c:446
+#: gconf/gconftool.c:443
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Kan ikke bruke --all-dirs sammen med --get eller --set\n"
 
-#: gconf/gconftool.c:456
+#: gconf/gconftool.c:453
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-"
 "entries, or --all-dirs\n"
@@ -1502,7 +1415,7 @@ msgstr ""
 "--recursive-list bør ikke brukes sammen med --get, --set, --unset, --all-"
 "entries, eller --all-dirs\n"
 
-#: gconf/gconftool.c:466
+#: gconf/gconftool.c:463
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
@@ -1510,371 +1423,371 @@ msgstr ""
 "--set_schema bør ikke brukes sammen med --get, --set, --unset, --all-"
 "entries, eller --all-dirs\n"
 
-#: gconf/gconftool.c:472
+#: gconf/gconftool.c:469
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Verditypen er kun relevant når en verdi settes\n"
 
-#: gconf/gconftool.c:478
+#: gconf/gconftool.c:475
 msgid "Must specify a type when setting a value\n"
 msgstr "Må spesifisere en type når en verdi settes\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:485
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping flagget må brukes alene.\n"
 
-#: gconf/gconftool.c:498
+#: gconf/gconftool.c:495
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists flagget må brukes alene.\n"
 
-#: gconf/gconftool.c:508
+#: gconf/gconftool.c:505
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file må brukes alene.\n"
 
-#: gconf/gconftool.c:519
+#: gconf/gconftool.c:516
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule må brukes alene.\n"
 
-#: gconf/gconftool.c:530
+#: gconf/gconftool.c:527
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key må brukes alene.\n"
 
-#: gconf/gconftool.c:541
+#: gconf/gconftool.c:538
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory må brukes alene.\n"
 
-#: gconf/gconftool.c:549
+#: gconf/gconftool.c:546
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "Du må spesifisere en konfigurasjonskilde med --config-source når du bruker --"
 "direct\n"
 
-#: gconf/gconftool.c:555
+#: gconf/gconftool.c:552
 msgid "You should use --direct when using a non-default configuration source\n"
 msgstr ""
 "Du bør bruke --direct når du bruker en konfigurasjonskilde som ikke er "
 "forvalgt\n"
 
-#: gconf/gconftool.c:561
+#: gconf/gconftool.c:558
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Kunne ikke initialisere GConf: %s\n"
 
-#: gconf/gconftool.c:590
+#: gconf/gconftool.c:587
 msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
 msgstr ""
 "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL er satt, installerer ikke schema\n"
 
-#: gconf/gconftool.c:603
+#: gconf/gconftool.c:600
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE miljøvariabelen må være satt\n"
 
-#: gconf/gconftool.c:632
+#: gconf/gconftool.c:629
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Kunne ikke aksessere konfigurasjonskilden(e): %s\n"
 
-#: gconf/gconftool.c:854
+#: gconf/gconftool.c:851
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Feil ved nedstenging: %s\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:894
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Må spesifisere en eller flere kataloger som skal vises rekursivt.\n"
 
-#: gconf/gconftool.c:931
+#: gconf/gconftool.c:928
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Feil under listing av oppføringer i «%s»: %s\n"
 
-#: gconf/gconftool.c:949
+#: gconf/gconftool.c:946
 msgid "(no value set)"
 msgstr "(ingen verdi satt)"
 
-#: gconf/gconftool.c:1004
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Feil under splitting av konfigurasjonstjeneren (gconfd): %s\n"
 
-#: gconf/gconftool.c:1018
+#: gconf/gconftool.c:1015
 msgid "Must specify a key or keys to get\n"
 msgstr "Må spesifisere en eller flere nøkler som skal hentes\n"
 
-#: gconf/gconftool.c:1053
+#: gconf/gconftool.c:1050
 #, c-format
 msgid "Type: %s\n"
 msgstr "Type: %s\n"
 
-#: gconf/gconftool.c:1054
+#: gconf/gconftool.c:1051
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listetype: %s\n"
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1052
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car-type: %s\n"
 
-#: gconf/gconftool.c:1056
+#: gconf/gconftool.c:1053
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr-type: %s\n"
 
-#: gconf/gconftool.c:1061
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Standardverdi: %s\n"
 
-#: gconf/gconftool.c:1061 gconf/gconftool.c:1063 gconf/gconftool.c:1064
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058 gconf/gconftool.c:1060 gconf/gconftool.c:1061
+#: gconf/gconftool.c:1062
 msgid "Unset"
 msgstr "Nullstill"
 
-#: gconf/gconftool.c:1063
+#: gconf/gconftool.c:1060
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Eier: %s\n"
 
-#: gconf/gconftool.c:1064
+#: gconf/gconftool.c:1061
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kort beskrivelse: %s\n"
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1062
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Lang beskrivelse: %s\n"
 
-#: gconf/gconftool.c:1074 gconf/gconftool.c:1368
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1365
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Ingen verdi satt for «%s»\n"
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1372
+#: gconf/gconftool.c:1075 gconf/gconftool.c:1369
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Kunne ikke hente verdi for «%s»: %s\n"
 
-#: gconf/gconftool.c:1121 gconf/gconftool.c:1133
+#: gconf/gconftool.c:1118 gconf/gconftool.c:1130
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Forstår ikke type «%s»\n"
 
-#: gconf/gconftool.c:1145
+#: gconf/gconftool.c:1142
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Må spesifisere vekselvis nøkler/verdier som argumenter\n"
 
-#: gconf/gconftool.c:1165
+#: gconf/gconftool.c:1162
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Ingen verdi satt for nøkkel: «%s»\n"
 
-#: gconf/gconftool.c:1193
+#: gconf/gconftool.c:1190
 msgid "Cannot set schema as value\n"
 msgstr "Kan ikke sette schema som verdi\n"
 
-#: gconf/gconftool.c:1203
+#: gconf/gconftool.c:1200
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Når en liste settes må du spesifisere en primitiv liste-type\n"
 
-#: gconf/gconftool.c:1217
+#: gconf/gconftool.c:1214
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "Når et par settes må du spesifisere en primitiv car-type og cdr-type\n"
 
-#: gconf/gconftool.c:1232
+#: gconf/gconftool.c:1229
 #, c-format
 msgid "Error: %s\n"
 msgstr "Feil: %s\n"
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Feil under setting av verdi: %s\n"
 
-#: gconf/gconftool.c:1263
+#: gconf/gconftool.c:1260
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Feil under synkronisering: %s\n"
 
-#: gconf/gconftool.c:1286
+#: gconf/gconftool.c:1283
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Må spesifisere en eller flere nøkler på kommandolinjen\n"
 
-#: gconf/gconftool.c:1306
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "Ingen kjente skjema for «%s»\n"
 
-#: gconf/gconftool.c:1339
+#: gconf/gconftool.c:1336
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "Ingen doc-streng lagret i skjema i «%s»\n"
 
-#: gconf/gconftool.c:1344
+#: gconf/gconftool.c:1341
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Feil under henting av schema i «%s»: %s\n"
 
-#: gconf/gconftool.c:1351
+#: gconf/gconftool.c:1348
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "Ingen skjema lagret i «%s»\n"
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1351
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "Verdi i «%s» er ikke et skjema\n"
 
-#: gconf/gconftool.c:1410 gconf/gconftool.c:1435
+#: gconf/gconftool.c:1407 gconf/gconftool.c:1432
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr "Må spesifisere skjemanavn fulgt av nanv på nøkkel det skal brukes på\n"
 
-#: gconf/gconftool.c:1417
+#: gconf/gconftool.c:1414
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "Feil under assosiering av skjemanavn «%s» med nøkkelnavn «%s»: %s\n"
 
-#: gconf/gconftool.c:1445
+#: gconf/gconftool.c:1442
 #, c-format
 msgid "Error removing schema name from '%s': %s\n"
 msgstr "Feil under fjerning av schemanavn fra «%s»: %s\n"
 
-#: gconf/gconftool.c:1470
+#: gconf/gconftool.c:1467
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Må spesifisere nøkkel (schema navn) som eneste argument\n"
 
-#: gconf/gconftool.c:1512
+#: gconf/gconftool.c:1509
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Listetyp må være en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1529
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Parets car-type må være en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1552
+#: gconf/gconftool.c:1549
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Parets cdr-type må være en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1564
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Feil under setting av verdi: %s"
 
-#: gconf/gconftool.c:1581
+#: gconf/gconftool.c:1578
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Feil under synkronisering: %s"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1593
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Det må spesifiseres en eller flere kataloger å hente nøkkel/verdi par fra.\n"
 
-#: gconf/gconftool.c:1610
+#: gconf/gconftool.c:1607
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Det må spesifiseres en eller flere nøkler som skal nullstilles.\n"
 
-#: gconf/gconftool.c:1621
+#: gconf/gconftool.c:1618
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Feil under nullstilling av «%s»: %s\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1638
 msgid "Must specify one or more keys to recursively unset.\n"
 msgstr "Må spesifisere en eller flere nøkler som skal nullstilles rekursivt.\n"
 
-#: gconf/gconftool.c:1655
+#: gconf/gconftool.c:1652
 #, c-format
 msgid "Failure during recursive unset of \"%s\": %s\n"
 msgstr "Feil under rekursiv fjerning av verdier i «%s»: %s\n"
 
-#: gconf/gconftool.c:1673
+#: gconf/gconftool.c:1670
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Det må spesifiseres en eller flere kataloger som det skal hentes "
 "underkataloger fra.\n"
 
-#: gconf/gconftool.c:1707
+#: gconf/gconftool.c:1704
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Feil ved vising av kataloger: %s\n"
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1746
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende type for schema (%s)\n"
 
-#: gconf/gconftool.c:1758
+#: gconf/gconftool.c:1755
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende list_type for schema (%s)\n"
 
-#: gconf/gconftool.c:1769 gconf/gconftool.c:1799 gconf/gconftool.c:1828
+#: gconf/gconftool.c:1766 gconf/gconftool.c:1796 gconf/gconftool.c:1825
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "ADVARSEL: Kunne ikke fortolke standardverdi «%s» for schema (%s)\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1784
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende car_type for schema (%s)\n"
 
-#: gconf/gconftool.c:1812
+#: gconf/gconftool.c:1809
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "ADVARSEL: Du kan ikke sette en standardverdi for et schema\n"
 
-#: gconf/gconftool.c:1841
+#: gconf/gconftool.c:1838
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "ADVARSEL: gconftool, intern feil, ukjent GConfValueType\n"
 
-#: gconf/gconftool.c:1888 gconf/gconftool.c:1909 gconf/gconftool.c:1930
-#: gconf/gconftool.c:1951
+#: gconf/gconftool.c:1885 gconf/gconftool.c:1906 gconf/gconftool.c:1927
+#: gconf/gconftool.c:1948
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ADVARSEL: kunne ikke forstå typenavnet «%s»\n"
 
-#: gconf/gconftool.c:1905
+#: gconf/gconftool.c:1902
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: list_type kan kun være int, float, string eller bool og ikke «%s»\n"
 
-#: gconf/gconftool.c:1926
+#: gconf/gconftool.c:1923
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: car_type kan kun være int, float, string eller bool og ikke «%s»\n"
 
-#: gconf/gconftool.c:1947
+#: gconf/gconftool.c:1944
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: cdr_type kan kun være int, float, string eller bool og ikke «%s»\n"
 
-#: gconf/gconftool.c:1975
+#: gconf/gconftool.c:1972
 msgid "WARNING: empty <applyto> node"
 msgstr "ADVARSEL: tom <applyto> node"
 
-#: gconf/gconftool.c:1978 gconf/gconftool.c:2241
+#: gconf/gconftool.c:1975 gconf/gconftool.c:2238
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ADVARSEL: node <%s> ikke forstått under <schema>\n"
 
-#: gconf/gconftool.c:1988
+#: gconf/gconftool.c:1985
 msgid "WARNING: no key specified for schema\n"
 msgstr "ADVARSEL: ingen nøkkel spesifisert for schema\n"
 
-#: gconf/gconftool.c:2021
+#: gconf/gconftool.c:2018
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "ADVARSEL: <locale> node har ingen `navn=\"locale\"' attributt, ignorerer\n"
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2024
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1882,51 +1795,51 @@ msgstr ""
 "ADVARSEL: flere <locale> noder for locale `%s', ignorerer alle etter den "
 "første\n"
 
-#: gconf/gconftool.c:2108
+#: gconf/gconftool.c:2105
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "ADVARSEL: Ugyldig node <%s> i en <locale> node\n"
 
-#: gconf/gconftool.c:2137
+#: gconf/gconftool.c:2134
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "ADVARSEL: kunne ikke installere schema «%s» locale «%s»: %s\n"
 
-#: gconf/gconftool.c:2145
+#: gconf/gconftool.c:2142
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Installert schema «%s» for locale «%s»\n"
 
-#: gconf/gconftool.c:2167
+#: gconf/gconftool.c:2164
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "ADVARSEL: kunne ikke assosiere schema «%s» med nøkkel «%s»: %s\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2172
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Lagt ved schema «%s» til nøkkel «%s»\n"
 
-#: gconf/gconftool.c:2254
+#: gconf/gconftool.c:2251
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Du må ha minst en <locale> oppføring i et <schema>\n"
 
-#: gconf/gconftool.c:2285
+#: gconf/gconftool.c:2282
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "ADVARSEL: node <%s> ikke forstått under <schemaliste>\n"
 
-#: gconf/gconftool.c:2308
+#: gconf/gconftool.c:2305
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Kunne ikke åpne «%s»: %s\n"
 
-#: gconf/gconftool.c:2315
+#: gconf/gconftool.c:2312
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument «%s» er tomt?\n"
 
-#: gconf/gconftool.c:2327
+#: gconf/gconftool.c:2324
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1935,26 +1848,26 @@ msgstr ""
 "Dokumentet «%s» har feil type rot-node (<%s>, skulle vært "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:2340
+#: gconf/gconftool.c:2337
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokumentet «%s» har ingen topp-nivå <gconfschemafile> node\n"
 
-#: gconf/gconftool.c:2354
+#: gconf/gconftool.c:2351
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ADVARSEL: node <%s> under <gconfschemafile> ikke forstått\n"
 
-#: gconf/gconftool.c:2365 gconf/gconftool.c:2397
+#: gconf/gconftool.c:2362 gconf/gconftool.c:2394
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Feil under synkronisering av konfigurasjonsdata: %s"
 
-#: gconf/gconftool.c:2381
+#: gconf/gconftool.c:2378
 msgid "Must specify some schema files to install\n"
 msgstr "Spesifiser schema filer som skal installeres\n"
 
-#: gconf/gconftool.c:2418
+#: gconf/gconftool.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -1963,16 +1876,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2438
+#: gconf/gconftool.c:2435
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Kunne ikke nullstille brytningsnøkkel %s: %s\n"
 
-#: gconf/gconftool.c:2564
+#: gconf/gconftool.c:2561
 msgid "Must specify some keys to break\n"
 msgstr "Må spesifisere nøkler som skal brytes\n"
 
-#: gconf/gconftool.c:2570
+#: gconf/gconftool.c:2567
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1981,11 +1894,11 @@ msgstr ""
 "Prøver å knekke din applikasjon ved å sette ugyldige verdier for nøkkel:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2588
+#: gconf/gconftool.c:2585
 msgid "Must specify some directories to break\n"
 msgstr "Må spesifisere kataloger som skal brytes\n"
 
-#: gconf/gconftool.c:2607
+#: gconf/gconftool.c:2604
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1995,3 +1908,90 @@ msgstr ""
 "Prøver å knekke din applikasjon ved å sette ugyldige verdier for nøkler i "
 "katalogen:\n"
 "  %s\n"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "Failed to parse XML file \"%s\""
+#~ msgstr "Klarte ikke å lese XMLfil «%s»"
+
+#~ msgid "Server ping error: %s"
+#~ msgstr "Feil under ping til tjener: %s"
+
+#~ msgid ""
+#~ "Failed to contact configuration server; some possible causes are that you "
+#~ "need to enable TCP/IP networking for ORBit, or you have stale NFS locks "
+#~ "due to a system crash. See http://www.gnome.org/projects/gconf/ for "
+#~ "information. (Details - %s)"
+#~ msgstr ""
+#~ "Feil ved forsøk på å kontakte konfigurasjonstjeneren; noen mulige årsaker "
+#~ "er at du må aktivere TCP/IP for ORBit, eller at du har gamle NFS-låsfiler "
+#~ "pga et systemkrasj. Se http://www.gnome.org/projects/gconf/ for "
+#~ "informasjon. (Detaljer - %s)"
+
+#~ msgid "none"
+#~ msgstr "ingen"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not open or create the file \"%s\"; this indicates that there may "
+#~ "be a problem with your configuration, as many programs will need to "
+#~ "create files in your home directory. The error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Vennligst kontakt din systemadministrator for å løse følgende problem:\n"
+#~ "Kunne ikke åpne eller opprette filen «%s»; dette indikerer at du har "
+#~ "problemer med din konfigurasjon, siden mange programmer trenger å kunne "
+#~ "opprette filer i din hjemmekatalog. Feilen var «%s» (errno = %d)."
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not lock the file \"%s\"; this indicates that there may be a "
+#~ "problem with your operating system configuration. If you have an NFS-"
+#~ "mounted home directory, either the client or the server may be set up "
+#~ "incorrectly. See the rpc.statd and rpc.lockd documentation. A common "
+#~ "cause of this error is that the \"nfslock\" service has been disabled.The "
+#~ "error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Vennligst kontakt din systemadministrator for å løse følgende problem:\n"
+#~ "Kunne ikke låse filen «%s»; dette indikerer at du har problemer med "
+#~ "konfigurasjonen av ditt operativsystem. Hvis du har montert "
+#~ "hjemmekatalogen via NFS kan det være at klienten eller tjeneren er satt "
+#~ "opp feil. Se dokumentasjonen for rpc.statd og rpc.lockd. En vanlig årsak "
+#~ "til dette er at «nfslock»-tjenesten er deaktivert. Feilen var «%s» (errno "
+#~ "= %d)."
+
+#~ msgid "Can't remove file %s: %s\n"
+#~ msgstr "Kunne ikke fjerne fil %s: %s\n"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "No configuration sources in the configuration file \"%s\"; this means "
+#~ "that preferences and other settings can't be saved. %s%s"
+#~ msgstr ""
+#~ "Vennligst kontakt din systemadministrator for å løse følgende problem:\n"
+#~ "Ingen konfigurasjonskilder i konfigurasjonsfil «%s»; dette betyr at "
+#~ "brukervalg og andre innstillinger ikke kan lagres. %s%s"
+
+#~ msgid "Error reading the file: "
+#~ msgstr "Feil under lesing av fil: "
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
+#~ msgstr ""
+#~ "Vennligst kontakt din systemadministrator for å løse følgende problem:\n"
+#~ "Kunne ikke slå opp adresse «%s» i konfigurasjonsfil «%s»: %s"
+
+#~ msgid "Multiple segmentation faults occurred; can't display error dialog\n"
+#~ msgstr "Flere segmenteringsfeil oppsto; kan ikke vise feilmelding\n"
+
+#~ msgid ""
+#~ "Segmentation fault!\n"
+#~ "Cannot display crash dialog: %s\n"
+#~ msgstr ""
+#~ "Segmenteringsfeil!\n"
+#~ "Kan ikke vise krasjdialog: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 0dfafd75..9fd8ca05 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2002-03-28 20:05+0100\n"
+"POT-Creation-Date: 2002-01-28 21:35-0500\n"
 "PO-Revision-Date: 2002-03-28 20:16+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -17,62 +17,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:1
+#: backends/bdb-backend.c:215
 msgid "Unloading BerkeleyDB (BDB) backend module."
 msgstr "Usuwanie modułu przetwarzającego BerkeleyDB (BDB)."
 
-#: backends/bdb-backend.c:1
+#: backends/bdb-backend.c:238
 #, c-format
 msgid "Opened BerkeleyDB source at root %s"
 msgstr "Otwarto źródło BerkeleyDB głównym katalogiem %s"
 
-#: backends/bdb-backend.c:1
+#: backends/bdb-backend.c:578
 msgid "Initializing BDB backend module"
 msgstr "Inicjowanie modułu przetwarzającego BerkeleyDB (BDB)"
 
-#: backends/dir-utils.c:1
+#: backends/dir-utils.c:108
 #, c-format
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "Nie można odnaleźć głównego katalogu %s pod adresem \"%s\""
 
-#: backends/dir-utils.c:1 backends/xml-backend.c:1 backends/xml-dir.c:1
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1176
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nie można stworzyć katalogu \"%s\": %s"
 
-#: backends/dir-utils.c:1
+#: backends/dir-utils.c:212
 #, c-format
 msgid "Can't read from or write to the %s root directory in the address `%s'"
 msgstr ""
 "Nie można odczytać lub zapisać do głównego katalogu %sv pod adresem \"%s\""
 
-#: backends/xml-backend.c:1
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Usuwanie z pamięci modułu XML."
 
-#: backends/xml-backend.c:1
+#: backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nie można znaleźć katalogu głównego XML pod adresem \"%s\""
 
-#: backends/xml-backend.c:1
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
-"Nie można odczytać lub zapisywać do katalogu głównego XML-a pod adresem "
-"\"%s\""
+"Nie można odczytać lub zapisywać do katalogu głównego XML-a pod adresem \"%s"
+"\""
 
-#: backends/xml-backend.c:1
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Uprawnienia do katalogu/pliku dla źródła XML dla roota %s są: %o/%o"
 
-#: backends/xml-backend.c:1
+#: backends/xml-backend.c:584
 #, c-format
 msgid "Error syncing the XML backend directory cache: %s"
 msgstr "Błąd przy synchronizacji cache katalogów modułu XML: %s"
 
-#: backends/xml-backend.c:1
+#: backends/xml-backend.c:651
 msgid ""
 "Remove dir operation is no longer supported, just remove all the values in "
 "the directory"
@@ -80,21 +80,21 @@ msgstr ""
 "Operacja usunięcia katalogu nie jest już obsługiwana, należy po prostu "
 "usunąć wszystkie wartości z katalogu"
 
-#: backends/xml-backend.c:1
+#: backends/xml-backend.c:718
 msgid "Initializing XML backend module"
 msgstr "Inicjowanie modułu XML"
 
-#: backends/xml-backend.c:1
+#: backends/xml-backend.c:786
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Nieudana próba usunięcia blokady na katalog XML \"%s\": %s"
 
-#: backends/xml-cache.c:1
+#: backends/xml-cache.c:248
 msgid "Failed to sync XML cache contents to disk"
 msgstr ""
 "Synchronizacja zawartości cache XML-a z kopią na dysku nie powiodła się"
 
-#: backends/xml-cache.c:1
+#: backends/xml-cache.c:278
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -103,268 +103,262 @@ msgstr ""
 "Nie można usunąć katalogu \"%s\" z cache modułu operującego na XML-u, "
 "ponieważ nie został on pomyślnie zsynchronizowany z dyskiem"
 
-#: backends/xml-cache.c:1
+#: backends/xml-cache.c:305
 #, c-format
 msgid ""
-"%u items remain in the cache after cleaning already-synced items older than "
-"%u seconds"
+"%u items remain in the cache after cleaning already-synced items older than %"
+"u seconds"
 msgstr ""
 "W cache pozostało %u elementów po wyczyszczeniu elementów starszych niż %u "
 "sekund"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:168
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "Nie można odczytać \"%s\": %s"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:178
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "Plik XML \"%s\" jest katalogiem"
 
-#: backends/xml-dir.c:1 backends/xml-dir.c:1
+#: backends/xml-dir.c:369 backends/xml-dir.c:376
 #, c-format
 msgid "Failed to delete \"%s\": %s"
 msgstr "Nie można usunąć \"%s\": %s"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:421
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Nie można zapisać do pliku \"%s\": %s"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:434
 #, c-format
 msgid "Failed to set mode on `%s': %s"
 msgstr "Nie można ustawić uprawnień pliku \"%s\": %s"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:444
 #, c-format
 msgid "Failed to write XML data to `%s': %s"
 msgstr "Nie można zapisać danych w XML-u do pliku \"%s\": %s"
 
-#: backends/xml-dir.c:1 backends/xml-dir.c:1
+#: backends/xml-dir.c:454 backends/xml-dir.c:1200
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Nie można zamknąć pliku \"%s\": %s"
 
-#: backends/xml-dir.c:1 backends/xml-dir.c:1
+#: backends/xml-dir.c:470 backends/xml-dir.c:480
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Nie można zmienić nazwy \"%s\" na \"%s\": %s"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:486
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Nie można odtworzyć \"%s\" z \"%s\": %s"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:498
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Nie można usunąć starego pliku \"%s\": %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:929
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Nie można uzyskać informacji o \"%s\" : %s"
 
-#: backends/xml-dir.c:1
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:1073
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Zduplikowane wpisy \"%s\" w \"%s\", zignorowano"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:1095
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Wpis bez nazwy w pliku XML \"%s\", zignorowano"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:1103
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 "Głównym węzłem w pliku XML \"%s\" jest <%s> zamiast <entry>, zignorowano"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:1192
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Nie można stworzyć pliku \"%s\": %s"
 
-#: backends/xml-dir.c:1
-#, c-format
-msgid "Failed to parse XML file \"%s\""
-msgstr "Przy analizie pliku XML \"%s\" wystąpił błąd"
-
 #. There was an error
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Zignorowano węzeł XML o nazwie \"%s\": %s"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Zignorowano nazwę schematu \"%s\", niewłaściwy: %s"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:376
 #, c-format
 msgid "Ignoring XML node `%s': %s"
 msgstr "Zignorowano wezeł XML-a \"%s\": %s"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Błąd odczytu domyślnej wartości dla schematu: %s"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Brak atrybutu \"type\" dla węzła <%s>"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Węzeł posiada nieznany atrybut \"type\" \"%s\", zignorowano"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "Brak atrybutu \"value\" dla węzła"
 
-#: backends/xml-entry.c:1 backends/xml-entry.c:1
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Niezrozumiały węzeł XML-a <%s> wewnątrz węzła listy"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Niewłaściwy typ (lista, para, lub coś innego) w liście węzłów"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Niepoprawny węzeł XML-a: %s"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Lista zawiera węzeł niewłaściwego typu (%s, powinno być %s)"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Zignorowano niepoprawny pierwszy element pary w XML-u: %s"
 
-#: backends/xml-entry.c:1 backends/xml-entry.c:1
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "analiza pliku XML: listy oraz pary nie mogą być umieszczane wewnątrz par"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Zignorowano niepoprawny drugi element pary w XML-u: %s"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Niezrozumiały węzeł XML-a <%s> wewnątrz węzła pary"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Nie odnaleziono w XML-u części car i cdr wewnątrz węzła pary"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Brak drugiego elementu pary wartości w XML-u"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "Brak pierwszego elementu pary wartości w XML-u"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Brak pierwszego i drugiego elementu pary wartości w XML-u"
 
 #. -- end debug only
-#: gconf/gconf-backend.c:1
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "Plik \"%s\" nie istnieje\n"
 
-#: gconf/gconf-backend.c:1
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "Niepoprawny adres \"%s\""
 
-#: gconf/gconf-backend.c:1
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr "GConf nie może działać bez obsługi dynamicznych modułów (gmodule)"
 
-#: gconf/gconf-backend.c:1
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr "Błąd przy otwieraniu modułu \"%s\": %s\n"
 
-#: gconf/gconf-backend.c:1
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr "Nie można odnaleźć modułu obsługującego \"%s\""
 
-#: gconf/gconf-backend.c:1
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr "Błąd przy zamykaniu modułu przechowującego"
 
-#: gconf/gconf-client.c:1 gconf/gconf-client.c:1
+#: gconf/gconf-client.c:342 gconf/gconf-client.c:360
 #, c-format
 msgid "GConf Error: %s\n"
 msgstr "Błąd GConfa: %s\n"
 
-#: gconf/gconf-client.c:1
+#: gconf/gconf-client.c:899
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Ostrzeżenie GConfa: błąd przy wypisywaniu par w \"%s\": %s"
 
-#: gconf/gconf-client.c:1
+#: gconf/gconf-client.c:1165
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Oczekiwano \"%s\", otrzymano \"%s\" dla klucza %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:233
 msgid "Received invalid value in set request"
 msgstr "Otrzymano niewłaściwą wartość w zbiorze żądania"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:241
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Nie można zinterpretować wartości Corby otrzymanej z żądaniem przypisania do "
 "klucza \"%s\""
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:522
 msgid "Received request to drop all cached data"
 msgstr "Otrzymano żądanie aby odrzucić wszystkie cache'owane dane"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:539
 msgid "Received request to sync synchronously"
 msgstr "Otrzymano żądanie synchronicznej synchronizacji"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:823
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Poważny błąd: nie można uzyskać referencji obiektu ConfigDatabase"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:985
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Błąd przy synchronizowaniu jednego lub więcej źródeł: %s"
 
-#: gconf/gconf-database.c:1
-#, c-format
+#. This error is not fatal; we basically ignore it.
+#. * Because it's likely the right thing for the client
+#. * app to simply continue.
+#.
+#: gconf/gconf-database.c:1076
+#, fuzzy, c-format
 msgid ""
-"Failed to log addition of listener %s (%s);will not be able to restore this "
+"Failed to log addition of listener %s (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
@@ -372,12 +366,12 @@ msgstr ""
 "uruchomieniu gconfd nie będzie można go przywrócić, co spowoduje niewłaściwe "
 "funkcjonowanie powiadamiania o zmianach w konfiguracji."
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1103
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "ID nasłuchiwacza %lu nie istnieje"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1117
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -386,244 +380,244 @@ msgstr ""
 "Nie można zapisać w dzienniku usunięcia nasłuchiwacza (może to spowodować "
 "dziwne ponawianie powiadomień): %s"
 
-#: gconf/gconf-database.c:1 gconf/gconf-sources.c:1
+#: gconf/gconf-database.c:1235 gconf/gconf-sources.c:1540
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Błąd przy pobieraniu wartości dla \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1282
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Błąd przy ustawianiu wartości dla \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1325
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Błąd przy czyszczeniu \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1354
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Błąd przy pobieraniu domyślnej wartości \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1405
 #, c-format
 msgid "Error unsetting \"%s\": %s"
 msgstr "Błąd przy czyszczeniu \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1437
 #, c-format
 msgid "Error getting new value for \"%s\": %s"
 msgstr "Błąd przy pobieraniu powej wartości dla \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1485
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Błąd przy sprawdzaniu istnienia \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1509
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Błąd przy usuwaniu katalogu \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1536
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Nie można pobrać wszystkich elementów z \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1562
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Błąd przy pobieraniu zawartości katalogów w \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1583
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Błąd przy ustawianiu schematu dla \"%s\": %s"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr "Sukces"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr "Niepowodzenie"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr "Nie można nawiązać połączenia z serwerem konfiguracji"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr "Brak dostępu"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
 msgstr "Nie można uzyskać adresu źródła konfiguracji"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr "Niepoprawna nazwa klucz lub katalogu"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:31
 msgid "Parse error"
 msgstr "Błąd składniowy"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr "Uszkodzone dane w bazie danych źródła konfiguracji"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr "Niezgodność typów"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr "Operacja dotycząca klucza na katalogu"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr "Operacja dotycząca katalogu na kluczu"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr "Nie można nadpisać istniejącej wartości przeznaczonej tylko do odczytu"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr "Błąd systemu aktywacji objektów (OAF)"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr "Operacja nie jest dozwolona bez serwera konfiguracji"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:39
 msgid "Failed to get a lock"
 msgstr "Nie można uzyskać blokady"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:40
 msgid "No database available to save your configuration"
 msgstr "Brak dostępnej bazy danych do zapisu konfiguracji"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key \"%s\""
 msgstr "Brak znaku \"/\" w kluczu \"%s\""
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:199
 #, c-format
 msgid "Invalid UTF-8 in string value in '%s'"
 msgstr "Niepoprawny UTF-8 w wartości napisu w \"%s\""
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:258
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Nie można zinterpretować wartości Corby elementu listy"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:260
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Niepoprawny typ elementu listy w %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:273
 msgid "Received list from gconfd with a bad list type"
 msgstr "Otrzymano od procesu gconfd listę niewłaściwego typu"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:454
 msgid "Failed to convert object to IOR"
 msgstr "Nie można przekonwertować obiektu na IOR"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:591
 msgid "Invalid UTF-8 in locale for schema"
 msgstr "Niepoprawny napis UTF-8 jako kod języka schematu"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:599
 msgid "Invalid UTF-8 in short description for schema"
 msgstr "Niepoprawny UTF-8 w krótkim opisie schematu"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:607
 msgid "Invalid UTF-8 in long description for schema"
 msgstr "Niepoprawny UTF-8 w długim opisie schematu"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:615
 msgid "Invalid UTF-8 in owner for schema"
 msgstr "Niepoprawny UTF-8 w nazwie właściciela schematu"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:838
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Nie można otworzyć pliku \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:887
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Dodanie źródła \"%s\"\n"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:899
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Błąd przy odczycie pliku \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:1 gconf/gconf-internals.c:1
-#: gconf/gconf-value.c:1 gconf/gconf-value.c:1 gconf/gconf-value.c:1
-#: gconf/gconf-value.c:1
+#: gconf/gconf-internals.c:1211 gconf/gconf-internals.c:1277
+#: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
+#: gconf/gconf-value.c:1341
 msgid "Text contains invalid UTF-8"
 msgstr "Tekst zawiera niepoprawną sekwencję UTF-8"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1362
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Oczekiwano listy, otrzymano %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1372
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Oczekiwano listy %s, otrzymano listę %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1511
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Oczekiwano pary, otrzymano %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1525
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Oczekiwano pary (%s,%s), otrzymano parę z brakującą jedną lub obiema "
 "wartościami"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1541
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Oczekiwano pary (%s,%s), otrzymano parę (%s,%s)"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1657
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Zacytowany napis nie rozpoczyna się znakiem cytowania"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1719
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Zacytowany napis nie kończy się znakiem cytowania"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1855
 msgid "Encoded value is not valid UTF-8"
 msgstr "Zakodowana wartość nie jest poprawnym napisem UTF-8"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Could not lock temporary file '%s': %s"
 msgstr "Nie można zablokować tymczasowego pliku \"%s\": %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2341
 #, c-format
 msgid "Could not create file '%s', probably because it already exists"
 msgstr "Nie można stworzyć pliku \"%s\", prawdopodobnie już on istnieje"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2387
 #, c-format
 msgid "Failed to create or open '%s'"
 msgstr "Nie można stworzyć lub otworzyć \"%s\""
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2397
 #, c-format
 msgid ""
 "Failed to lock '%s': probably another process has the lock, or your "
@@ -632,204 +626,113 @@ msgstr ""
 "Nie można zablokować \"%s\": prawdopodobnie blokadę przetrzymuje inny proces "
 "lub w systemie zostało niepoprawnie skonfigurowane blokowanie po NFS-ie (%s)"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr "nie udało się otworzyć pliku \"%s\" z IOR, nie odnaleziono gconfd: %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2455
 #, c-format
 msgid "gconftool or other non-gconfd process has the lock file '%s'"
 msgstr ""
 "plik blokady \"%s\" jest przetrzymywany przez gconftol lub inny proces (nie "
 "gconfd)"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2472
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
 msgstr "nie można uzyskać od ORB-a odwołania do istniejącego obiektu gconfd"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2482
 #, c-format
 msgid "Failed to convert IOR '%s' to an object reference"
 msgstr "Nie można przekonwertować IOR-a \"%s\" na odwołanie do obiektu"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2510
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "Nie można stworzyć katalogu \"%s\": %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2569
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Nie można zapisać do pliku \"%s\": %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2610
 #, c-format
 msgid "We didn't have the lock on file `%s', but we should have"
 msgstr "Program nie posiada blokady na plik \"%s\", choć powinien"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2631
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
 msgstr "Nie można dowiązać \"%s\" do \"%s\": %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2643
 #, c-format
 msgid "Failed to remove lock file `%s': %s"
 msgstr "Nie można usunąć pliku blokady \"%s\": %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2662
 #, c-format
 msgid "Failed to clean up file '%s': %s"
 msgstr "Nie można wyczyścić pliku \"%s\": %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2676
 #, c-format
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "Nie można usunąć katalogu blokady \"%s\": %s"
 
-#: gconf/gconf-internals.c:1 gconf/gconfd.c:1
+#: gconf/gconf-internals.c:2842 gconf/gconfd.c:583
 #, c-format
 msgid "Failed to create %s: %s"
 msgstr "Nie można stworzyć %s: %s"
 
-#: gconf/gconf-internals.c:1
-#, c-format
-msgid "Server ping error: %s"
-msgstr "Brak odpowiedzi serwera przy sprawdzeniu aktywności: %s"
-
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2875
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 "Nie można stworzyć potoku do komunikacji z uruchomionym demonem gconf: %s\n"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2899
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Nie można uruchomić serwera konfiguracji: %s\n"
 
-#: gconf/gconf-internals.c:1
-#, c-format
-msgid ""
-"Failed to contact configuration server; some possible causes are that you "
-"need to enable TCP/IP networking for ORBit, or you have stale NFS locks due "
-"to a system crash. See http://www.gnome.org/projects/gconf/ for information. "
-"(Details - %s)"
-msgstr ""
-"Nie można nawiązać połączenia z serwerem konfiguracji. Możliwe, że konieczne "
-"będzie uaktywnienie obsługi TCP/IP w konfiguracji ORBita. Może to też być "
-"spowodowane blokadami pozostałymi po awarii systemu. Aby uzyskać więcej "
-"informacji, odwiedź stronę http://www.gnome.org/projects/gconf/ (szczegóły - "
-"%s)."
-
-#: gconf/gconf-internals.c:1
-msgid "none"
-msgstr "brak"
-
-#: gconf/gconf-sanity-check.c:1 gconf/gconftool.c:1
-msgid "Help options"
-msgstr "Opcje pomocy"
-
-#: gconf/gconf-sanity-check.c:1 gconf/gconftool.c:1
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Błąd przy opcji %s: %s.\n"
-"Uruchom \"%s --help\", aby wypisać pełną listę opcji dostępnych z wiersza "
-"poleceń.\n"
-
-#: gconf/gconf-sanity-check.c:1
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not open or create the file \"%s\"; this indicates that there may be a "
-"problem with your configuration, as many programs will need to create files "
-"in your home directory. The error was \"%s\" (errno = %d)."
-msgstr ""
-"Skontaktuj się z administratorem systemu, aby rozwiązać następujący "
-"problem:\n"
-"Nie można otworzyć lub stworzyć pliku \"%s\"; wskazuje to, że może istnieć "
-"problem z konfiguracją, gdyż wiele programów wymaga tworzenia w katalogu "
-"domowym pewnych plików. Błąd, który wystąpił: \"%s\" (errno = %d)."
-
-#: gconf/gconf-sanity-check.c:1
-#, c-format
+#: gconf/gconf-internals.c:2923
 msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not lock the file \"%s\"; this indicates that there may be a problem "
-"with your operating system configuration. If you have an NFS-mounted home "
-"directory, either the client or the server may be set up incorrectly. See "
-"the rpc.statd and rpc.lockd documentation. A common cause of this error is "
-"that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
-"%d)."
-msgstr ""
-"Skontaktuj się z administratorem systemu, aby rozwiązać następujący "
-"problem:\n"
-"Nie można zablokować pliku \"%s\"; wskazuje to, że może istnieć problem z "
-"konfiguracją systemu operacyjnego. Jeśli katalog domowy jest udostępniany "
-"poprzez NFS, może to być spowodowane niewłaściwymi ustawieniami klienta lub "
-"serwera. Zajrzyj do dokumentacji rpc.statd i rpc.lockd. Częstą przyczyną "
-"tego błędu jest zablokowana usługa \"nfslock\". Błąd, który wystąpił: \"%s\" "
-"(errno = %d)."
-
-#: gconf/gconf-sanity-check.c:1
-#, c-format
-msgid "Can't remove file %s: %s\n"
-msgstr "Nie można usunąć pliku \"%s\": %s\n"
-
-#: gconf/gconf-sanity-check.c:1
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"No configuration sources in the configuration file \"%s\"; this means that "
-"preferences and other settings can't be saved. %s%s"
-msgstr ""
-"Skontaktuj się z administratorem systemu, aby rozwiązać następujący "
-"problem:\n"
-"W pliku konfiguracyjnym \"%s\" nie ma żadnych źródeł konfiguracji; oznacza "
-"to, że nie jest możliwy zapis preferencji i innych ustawień. %s%s"
-
-#: gconf/gconf-sanity-check.c:1
-msgid "Error reading the file: "
-msgstr "Błąd przy odczycie pliku: "
-
-#: gconf/gconf-sanity-check.c:1
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
-msgstr ""
-"Skontaktuj się z administratorem systemu, aby rozwiązać następujący "
-"problem:\n"
-"Nie można odnaleźć adresu \"%s\", występującego w pliku konfiguracyjnym "
-"\"%s\": %s"
-
-#: gconf/gconf-schema.c:1 gconf/gconf-schema.c:1 gconf/gconf-schema.c:1
-#: gconf/gconf-schema.c:1
+"Failed to contact configuration server; some possible causes are:\n"
+"a) you have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit by putting the line \"ORBIIOPIPv4=1"
+"\" in /etc/orbitrc\n"
+"b) you have stale locks in your NFS-mounted home directory due to a system "
+"crash, try removing ~/.gconf/*.lock and ~/.gconfd/lock if you are sure no "
+"gconfd processes are running on any machine using your home dir"
+msgstr ""
+
+#: gconf/gconf-schema.c:190 gconf/gconf-schema.c:198 gconf/gconf-schema.c:206
+#: gconf/gconf-schema.c:214
 msgid "Schema contains invalid UTF-8"
 msgstr "Schemat zawiera niepoprawną sekwencję UTF-8"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:319
 #, c-format
 msgid "Failed to load source \"%s\": %s"
 msgstr "Nie można wczytać źródła \"%s\": %s"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:346
 #, c-format
 msgid "Resolved address \"%s\" to a writable config source at position %d"
 msgstr ""
 "Uzyskano adres \"%s\" do zapisywalnego źródła konfiguracji na pozycji %d"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:352
 #, c-format
 msgid "Resolved address \"%s\" to a read-only config source at position %d"
 msgstr ""
 "Uzyskano adres \"%s\" do źródła konfiguracji tylko do odczytu na pozycji %d"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:359
 #, c-format
 msgid ""
 "Resolved address \"%s\" to a partially writable config source at position %d"
@@ -837,7 +740,7 @@ msgstr ""
 "Uzyskano adres \"%s\" do częściowo zapisywalnego źródła konfiguracji na "
 "pozycji %d"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:368
 msgid ""
 "None of the resolved addresses are writable; saving configuration settings "
 "will not be possible"
@@ -845,17 +748,17 @@ msgstr ""
 "Żaden z uzyskanych adresów nie jest zapisywalny; zapisywanie zmian w "
 "konfiguracji nie będzie możliwe"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:584
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 "Schemat \"%s\" podany dla \"%s\" przechowuje wartość nie należącą do schematu"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:641
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Nazwa \"/\" może dotyczyć tylko katalogu, nie klucza"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:679
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -864,7 +767,7 @@ msgstr ""
 "Wartość \"%s\" jest ustawiona w źródle tylko od odczytu na początku ścieżki "
 "konfiguracji."
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:691
 #, c-format
 msgid ""
 "Unable to store a value at key '%s', as the configuration server has no "
@@ -898,190 +801,190 @@ msgstr ""
 "usuń ~/.gconf*/*lock. Być może problem pojawił się z powodu próby "
 "jednoczesnego użycia GConfd z dwóch maszyn, podczas gdy domyślna "
 "konfiguracja ORBita nie zezwala na zdalne połączenia Corby - konieczne może "
-"być uaktywnienie obsługi TCP w serwerze ORBit poprzez umieszczenie w pliku "
-"/etc/orbitrc wiersza \"ORBIIOPIPv4=1\". Aby poznać szczegóły na temat "
+"być uaktywnienie obsługi TCP w serwerze ORBit poprzez umieszczenie w pliku /"
+"etc/orbitrc wiersza \"ORBIIOPIPv4=1\". Aby poznać szczegóły na temat "
 "powstałego problemu, przejrzyj user.* w syslogu. Z każdym katalogiem domowym "
-"może być związany tylko jeden proces gconfd i musi on posiadać blokadę w "
-"~/.gconfd oraz pliki blokad powiązane z miejscami przechowywania "
-"konfiguracji, np. ~/.gconf."
+"może być związany tylko jeden proces gconfd i musi on posiadać blokadę w ~/."
+"gconfd oraz pliki blokad powiązane z miejscami przechowywania konfiguracji, "
+"np. ~/.gconf."
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:1410
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Błąd przy wyszukiwaniu metainformacji: %s"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:1479
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Błąd przy pobieraniu metainformacji: %s"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:1503
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 "Klucz \"%s\" określiny jako schemat dla klucza \"%s\" przechowuje wartość "
 "typu \"%s\""
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:81
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Niezrozumiała wartość \"%s\" (oczekiwano liczby całkowitej)"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:91
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Wartość całkowita \"%s\" jest zbyt duża lub zbyt mała"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:112
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Niezrozumiała wartość \"%s\" (oczekiwano liczby rzeczywistej)"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:156
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Niezrozumiała wartość \"%s\" (oczekiwano wartości logicznej)"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:232
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr ""
 "Niezrozumiała wartość \"%s\" (lista musi się rozpoczynać znakiem \"[\")"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:245
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "Niezrozumiała wartość \"%s\" (lista musi się kończyć znakiem \"]\")"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:296
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "Niezrozumiała wartość \"%s\" (dodatkowy znak \"%]\" wewnątrz listy)"
 
-#: gconf/gconf-value.c:1 gconf/gconf-value.c:1
+#: gconf/gconf-value.c:327 gconf/gconf-value.c:488
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "Nie zrozumiano \"%s\" (dodatkowe znaki na końcu)"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:374
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "Niezrozumiała wartość \"%s\" (para musi się zaczynać znakiem \"(\")"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:387
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "Niezrozumiała wartość \"%s\" (para musi się kończyć znakiem \")\")"
 
-#: gconf/gconf-value.c:1 gconf/gconf-value.c:1
+#: gconf/gconf-value.c:417 gconf/gconf-value.c:503
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "Niezrozumiała wartość \"%s\" (niewłaściwa liczba elementół)"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:457
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "Nie zrozumiano \"%s\" (dodatkowy \")\" wewnątrz pary)"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:54
 #, c-format
 msgid "Key \"%s\" is NULL"
 msgstr "Klucz \"%s\" jest pusty"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:61
 #, c-format
 msgid "\"%s\": %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:333
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Serwer nie może odnaleźć adresu \"%s\""
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:624
 msgid "Can't add notifications to a local configuration source"
 msgstr "Nie można dodać powiadomień do lokalnego źródła konfiguracji"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2072
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Nie można dodać klienta do listy na serwerze. Błąd Corby: %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2393
 msgid "Must begin with a slash (/)"
 msgstr "Musi się rozpoczynać ukośnikiem (/)"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2415
 msgid "Can't have two slashes (/) in a row"
 msgstr "Dwa ukośniki nie mogą występować bezpośrednio po sobie (/)"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2417
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kropka (.) nie może być umieszczona bezpośrednio po ukośniku (/)"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2436
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
 msgstr ""
 "Znak \"%c\" nie jest znakiem ASCII, więc nie jest dozwolony w nazwach kluczy"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2446
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "Znak \"%c\" jest niedozwolony w nazwach kluczy lub katalogów"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2460
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Klucz lub katalog nie może kończyć się ukośnikiem (/)"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2829
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Błąd przy kończeniu pracy serwera konfiguracji: %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2890
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Oczekiwano liczby zmiennoprzecinkowej, otrzymano %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2925
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Oczekiwano liczby całkowitej, otrzymano %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2960
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Oczekiwano napisu, otrzymano %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2997
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Oczekiwano wartości logicznej, otrzymano %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:3030
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Oczekiwano schematu, otrzymano %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:3391
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Błąd Corby: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:246
 msgid "Shutdown request received"
 msgstr "Otrzymano żądanie zakończenia"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:278
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
-"Demon gconfd został skompilowany z obsługą debugowania; próba odczytu "
-"gconf.path z katalogu źródłowego"
+"Demon gconfd został skompilowany z obsługą debugowania; próba odczytu gconf."
+"path z katalogu źródłowego"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:292
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1092,7 +995,7 @@ msgstr ""
 #. We want to stay alive but do nothing, because otherwise every
 #. request would result in another failed gconfd being spawned.
 #.
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:300
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1100,16 +1003,16 @@ msgstr ""
 "Brak źródeł konfiguracji na ścieżce źródłowej; konfiguracja nie zostanie "
 "zapisana. Zmodyfikuj plik "
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:300
 msgid "/path"
 msgstr "/ścieżka"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:313
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Błąd przy wczytywaniu pewnych źródeł konfiguracji: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:325
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1117,7 +1020,7 @@ msgstr ""
 "Nie uzyskano żadnego źródła konfiguracji, nie można więc odczytać ani "
 "zapisać danych konfiguracyjnych"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:342
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1125,12 +1028,12 @@ msgstr ""
 "Nie uzyskano żadnego zapisywalnego źródła konfiguracji, zapis zmian w "
 "konfiguracji może więc nie być możliwy"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:368
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr "Otrzymano sygnał %d, zapis pliku core. Zgłoś błąd GConfa."
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:384
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
@@ -1138,53 +1041,53 @@ msgstr ""
 "Otrzymano sygnał %d, przeprowadzono awaryjne zakończenie. Powiadom o błędzie "
 "w GConfie."
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:401
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Otrzymano sygnał %d, poprawne zakończenie"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:531
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "uruchamianie (wersja %s), pid %u, użytkownik \"%s\""
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:570
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Nie można uzyskać referencji obiektu ConfigServer"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:608
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 "Nie można zapisać bajtu do potoku poprzez deskryptor %d, co może zawiesić "
 "klienta: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:618
 #, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "Nie można uzyskać blokady od demona, zakończenie: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:656
 #, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "Błąd przy zwalnianiu pliku blokady: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:664
 msgid "Exiting"
 msgstr "Zakończenie"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "Serwer GConf nie jest używany, zakończenie."
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Zwracanie wyjątku: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1193,7 +1096,7 @@ msgstr ""
 "Nie można otworzyć pliku dziennika gconfd; po zakońzceniu gconfd nie będzie "
 "możliwe przywrócenie nasłuchiwaczy (%s)"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1201,40 +1104,40 @@ msgstr ""
 "Nie można zamknąć pliku dziennika gconfd, dane mogły nie zostać poprawnie "
 "zapisane (%s)"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Nie można otworzyć pliku \"%s\" z zapisem stanu do zapisu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Nie można zapisać do pliku \"%s\" (fd: %d) z zapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Nie można zamknąć nowego pliku \"%s\" z zapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Nie można przenieść starego pliku \"%s\" z zapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Nie można przenieść nowego pliku z zapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
-"Nie można przywrócić oryginalnego pliku z zapisem stanu przeniesionego do "
-"\"%s\": %s"
+"Nie można przywrócić oryginalnego pliku z zapisem stanu przeniesionego do \"%"
+"s\": %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1790
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1242,131 +1145,118 @@ msgstr ""
 "Nie można przywrócić nasłuchiwacza spod adresu \"%s\" - nie można odnaleźć "
 "bazy danych"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1836
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Błąd przy odczycie pliku z zapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1889
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Nie można otworzyć pliku \"%s\" z zapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:2006
 #, c-format
 msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Failed to log addition of listener to gconfd logfile; won't be able to re-"
+"add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 "Nie można zapisać dodania nasłuchiwacza w pliku dziennika gconfd; po "
 "zakońzceniu gconfd nie będzie możliwe jego ponowne dodanie (%s)"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:2011
 #, c-format
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Failed to log removal of listener to gconfd logfile; might erroneously re-"
+"add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 "Nie można zapisać usunięcia nasłuchiwacza w pliku dziennika gconfd; po "
 "zakończeniu gconfd może to spowodować błędne ponowne jego dodanie (%s)"
 
-#: gconf/gconfd.c:1 gconf/gconfd.c:1
+#: gconf/gconfd.c:2034 gconf/gconfd.c:2199
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Nie można pobrać wartości IOR dla klienta: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:2049
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Odczytanie zapisanego stanu z pliku nie powiodło się: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:2062
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "Nie można zapisać dodania klienta w pliku z zapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:2070
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr "Nie można zrzucić dodania klienta do pliku z zapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:2160
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr "Klient, który nie był dodany, usunął się z serwera."
 
-#. dialog display isn't working out
-#: gconf/gconfd.c:1
-msgid "Multiple segmentation faults occurred; can't display error dialog\n"
-msgstr ""
-"Wystąpiło wielokrotne naruszenie segmentacji, nie można wyświetlić okna z "
-"informacją o błędzie\n"
-
-#. Eeeek! Can't show dialog
-#: gconf/gconfd.c:1
-#, c-format
-msgid ""
-"Segmentation fault!\n"
-"Cannot display crash dialog: %s\n"
-msgstr ""
-"Naruszenie segmentacji!\n"
-"Nie można wyświetlić okna z informacją o błędzie: %s\n"
+#: gconf/gconftool.c:71
+msgid "Help options"
+msgstr "Opcje pomocy"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:80
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Ustawia klucz na wartość i synchronizuje. Użycie z parametrem --type."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:89
 msgid "Print the value of a key to standard output."
 msgstr "Wypisuje na standardowe wyjście wartość klucza."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:98
 msgid ""
-"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
-"--type."
+"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
+"type."
 msgstr ""
-"Ustawia schemat i synchronizuje. Używane z parametrami --short-desc, "
-"--long-desc, --owner oraz --type."
+"Ustawia schemat i synchronizuje. Używane z parametrami --short-desc, --long-"
+"desc, --owner oraz --type."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:108
 msgid "Unset the keys on the command line"
 msgstr "Czyści klucze z wiersza poleceń"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:117
 msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
 msgstr ""
 "Rekurencyjnie czyści wszystkie klucze i katalogi podane w wierszu polecenia"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:126
 msgid "Print all key/value pairs in a directory."
 msgstr "Wypisuje wszystkie pary klucz/wartość z katalogu"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:135
 msgid "Print all subdirectories in a directory."
 msgstr "Wypisuje wszystkie podkatalogi danego katalogu."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:144
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Wypisuje rekurencyjnie wszystkie podkatalogi i elementy spod podanego "
 "katalogu."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:153
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Zwraca 0, jeśli katalog istnieje, 2 - w przeciwnym wypadku"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:162
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 "Kończy działanie gconfd. NIE UŻYWAJ TEJ OPCJI BEZ NAPRAWDĘ WAŻNEGO POWODU."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:171
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Zwraca 0, jeśli gconf jest aktywny, 2 - w przeciwnym wypadku"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:180
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1374,7 +1264,7 @@ msgstr ""
 "Uruchamia serwer konfiguracji (gconfd). (Normalnie uruchamiany jest on "
 "automatycznie w razie potrzeby.)"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1382,11 +1272,11 @@ msgstr ""
 "Określa typ ustawianej wartości lub wartości opisywanej przez schemat. "
 "Dopuszczalne są jednoznaczne skróty."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:190
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1394,11 +1284,11 @@ msgstr ""
 "Określa typ elementu ustawianej wartości listy lub wartości opisywanej przez "
 "schemat. Dopuszczalne są jednoznaczne skróty."
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:199 gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:207
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1406,7 +1296,7 @@ msgstr ""
 "Określa typ pierwszego elementu ustawianej wartości pary lub wartości "
 "opisywanej przez schemat. Dopuszczalne są jednoznaczne skróty."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:216
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1414,43 +1304,43 @@ msgstr ""
 "Określa typ drugiego elementu ustawianej wartości pary lub wartości "
 "opisywanej przez schemat. Dopuszczalne są jednoznaczne skróty."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:225
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Określa krótki, kilkudziesięcioznakowy opis, umieszczany w schemacie."
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:226 gconf/gconftool.c:235
 msgid "DESCRIPTION"
 msgstr "OPIS"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:234
 msgid "Specify a several-line description to go in a schema."
 msgstr "Określa wielowierszowy opis schematu."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:243
 msgid "Specify the owner of a schema"
 msgstr "Określa właściciela schematu"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:244
 msgid "OWNER"
 msgstr "WŁAŚCICIEL"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:252
 msgid "Specify a schema file to be installed"
 msgstr "Określa nazwę pliku instalowanego schematu"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:253
 msgid "FILENAME"
 msgstr "NAZWAPLIKU"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:261
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "Określa źródło konfiguracji wykorzystywane zamiast domyślnej ścieżki"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:262
 msgid "SOURCE"
 msgstr "ŹRÓDŁO"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:270
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1458,7 +1348,7 @@ msgstr ""
 "Powoduje bezpośrednie odwoływanie się do bazy danych konfiguracji, z "
 "pominięciem serwera. Opcja wymaga, aby nie był uruchomiony gconfd."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:279
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1468,7 +1358,7 @@ msgstr ""
 "źródła konfiguracji innego, niż domyślne, powinna na nie wskazywać zmienna "
 "środowiskowa GCONF_CONFIG_SOURCE, pusta wartość oznacza domyślne źródło."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:288
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1476,7 +1366,7 @@ msgstr ""
 "Przeprowadza intensywny test aplikacji, ustawiając i czyszcząc mnóstwo "
 "wartości różnych typów dla kluczy podanych w wierszu poleceń."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:297
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1485,405 +1375,415 @@ msgstr ""
 "wartości różnych typów dla kluczy wewnątrz katalogów, podanych w wierszu "
 "poleceń."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:306
 msgid "Get the short doc string for a key"
 msgstr "Pobiera krótki napis dokumentujący powiązany z kluczem"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:315
 msgid "Get the long doc string for a key"
 msgstr "Pobiera długi napis dokumentujący powiązany z kluczem"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:324
 msgid "Get the name of the schema applied to this key"
 msgstr "Pobiera nazwę schematu zastosowanego do tego klucza"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:333
 msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr ""
 "Określa nazwę schematu z występującą po nim nazwą klucza, do którego "
 "powinien być wykorzystany"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:342
 msgid "Remove any schema name applied to the given keys"
 msgstr "Usuwa wszystkie nazwy schematów zastosowane do podanych kluczy"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:351
 msgid "Get the name of the default source"
 msgstr "Pobiera nazwę domyślnego źródła"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:408
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Błąd przy opcji %s: %s.\n"
+"Uruchom \"%s --help\", aby wypisać pełną listę opcji dostępnych z wiersza "
+"poleceń.\n"
+
+#: gconf/gconftool.c:420
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Nie można jednocześnie pobrać i ustawić wartości\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:427
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Nie można jednocześnie ustawić i pobrać wartości\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:435
 msgid "Can't use --all-entries with --get or --set\n"
 msgstr "Nie można używać --all-entries wraz z --get lub --set\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:443
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Nie można używać --all-pairs wraz z --get lub --set\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:453
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, "
-"--all-entries, or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
-"--recursive-list nie powinno być używane wraz z --get, --set, --unset, "
-"--all-entries lub --all-dirs\n"
+"--recursive-list nie powinno być używane wraz z --get, --set, --unset, --all-"
+"entries lub --all-dirs\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:463
 msgid ""
-"--set_schema should not be used with --get, --set, --unset, --all-entries, "
-"--all-dirs\n"
+"--set_schema should not be used with --get, --set, --unset, --all-entries, --"
+"all-dirs\n"
 msgstr ""
-"--set_schema nie powinno być używane wraz z --get, --set, --unset, "
-"--all-entries, --all-dirs\n"
+"--set_schema nie powinno być używane wraz z --get, --set, --unset, --all-"
+"entries, --all-dirs\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:469
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Typ wartości ma sens tylko przy ustawianiu wartości\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:475
 msgid "Must specify a type when setting a value\n"
 msgstr "Przy ustawianiu wartości należy określić typ\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:485
 msgid "Ping option must be used by itself.\n"
 msgstr "Opcja ping musi występować samodzielnie.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:495
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "Opcja --dir-exists musi występować samodzielnie.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:505
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "Opcja --install-schema-file musi występować samodzielnie.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:516
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "Opcja --makefile-install-rule musi występować samodzielnie.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:527
 msgid "--break-key must be used by itself.\n"
 msgstr "Opcja --break-key musi występować samodzielnie.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:538
 msgid "--break-directory must be used by itself.\n"
 msgstr "Opcja --break-directory musi występować samodzielnie.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:546
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
-"Przy użyciu --direct należy podać źródło konfiguracji przy użyciu "
-"--config-source\n"
+"Przy użyciu --direct należy podać źródło konfiguracji przy użyciu --config-"
+"source\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:552
 msgid "You should use --direct when using a non-default configuration source\n"
 msgstr ""
-"Przy korzystaniu z źródła konfiguracji innego niż domyślne należy użyć "
-"--direct\n"
+"Przy korzystaniu z źródła konfiguracji innego niż domyślne należy użyć --"
+"direct\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:558
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Inicjacja GConfa nie powiodła się: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:587
 msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
 msgstr ""
 "Ustawione jest GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL, zaniechano instalacji "
 "schematów\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:600
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Należy ustawić zmienną środowiskową GCONF_CONFIG_SOURCE\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:629
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Błąd przy dostępie do źródła konfiguracji: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:851
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Błąd przy zamykaniu: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:894
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "Należy podać jeden lub więcej katalogów przeznaczonych do rekurencyjnego "
 "wypisania.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:928
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Błąd przy wypisywaniu elementów spod \"%s\": %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:946
 msgid "(no value set)"
 msgstr "(nie ustawiono wartości)"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Uruchomienie serwera konfiguracji (gconfd) nie powiodło się: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1015
 msgid "Must specify a key or keys to get\n"
 msgstr "Należy podać klucz lub klucze przeznaczone do pobrania\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1050
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1051
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Typ listy: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1052
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Typ pierwszego elementu: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1053
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Typ drugiego elementu: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Wartość domyślna: %s\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1 gconf/gconftool.c:1
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1058 gconf/gconftool.c:1060 gconf/gconftool.c:1061
+#: gconf/gconftool.c:1062
 msgid "Unset"
 msgstr "Brak wartości"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1060
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Właściciel: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1061
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Krótki opis: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1062
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Długi opis: %s\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1365
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Nie ustawiono wartości dla \"%s\"\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:1075 gconf/gconftool.c:1369
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Nie można pobrać wartości \"%s\": %s\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:1118 gconf/gconftool.c:1130
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Niezrozumiały typ \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1142
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Jako argumenty należy podać alternatywne klucze/wartości\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1162
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Nie ustawiono wartości dla klucza: \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1190
 msgid "Cannot set schema as value\n"
 msgstr "Nie można ustawić schematu jako wartości\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1200
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Przy ustawianiu listy należy podać typ podstawowy list-type\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1214
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Przy ustawianiu pary należy podać typy podstawowe car-type i cdr-type\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1229
 #, c-format
 msgid "Error: %s\n"
 msgstr "Błąd: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Błąd przy ustawianiu wartości: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1260
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Błąd przy synchronizacji: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1283
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Należy podać w wierszy poleceń klucz lub klucze\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "Brak znanego schematu dla \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1336
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "W schemacie pod \"%s\" nie zapisano dokumentacji\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1341
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Błąd przy pobieraniu schematu spod \"%s\": %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1348
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "Brak schematu zapisanego pod \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1351
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "Wartość pod \"%s\" nie jest schematem\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:1407 gconf/gconftool.c:1432
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 "Należy podać nazwę schematu i występującą po nim nazwę klucza, do którego "
 "powinien być wykorzystany\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1414
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "Błąd przy wiązaniu schematu \"%s\" z kluczem \"%s\": %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1442
 #, c-format
 msgid "Error removing schema name from '%s': %s\n"
 msgstr "Błąd przy usuwaniu schematu spod \"%s\": %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1467
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Należy podać klucz (nazwę schematu) jako jedyny argument\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1509
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Typ listy musi być typem podstawowym: string, int, float lub bool\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1529
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Typ pierwszego elementu pary musi być typem podstawowym: string, int, float "
 "lub bool\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1549
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Typ drugiego elementu pary musi być typem podstawowym: string, int, float "
 "lub bool\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1564
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Błąd przy ustawianiu wartości: %s"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1578
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Błąd przy synchronizacji: %s"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1593
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Należy podać co najmniej jeden katalog, z którego powinny być pobrane pary "
 "klucz/wartość.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1607
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Należy podać co najmniej jeden klucz przeznaczony do wyczyszczenia.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1618
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Błąd przy czyszczeniu \"%s\": %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1638
 msgid "Must specify one or more keys to recursively unset.\n"
 msgstr ""
 "Należy podać jeden lub więcej kluczy, przeznaczonych do rekurencyjnego "
 "wyczyszczenia.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1652
 #, c-format
 msgid "Failure during recursive unset of \"%s\": %s\n"
 msgstr "Błąd przy rekurencyjnym czyszczeniu \"%s\": %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1670
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Należy podać co najmniej jeden katalog, z którego powinny być pobrane "
 "podkatalogi.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1704
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Błąd przy wypisywaniu katalogów: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1746
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "UWAGA: Niepoprawny lub brakujący typ schematu (%s)\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1755
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "UWAGA: Niepoprawna lub brakująca wartość list_type schematu (%s)\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:1766 gconf/gconftool.c:1796 gconf/gconftool.c:1825
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "UWAGA: Niezrozumiała wartość \"%s\" schematu (%s)\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1784
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
-"UWAGA: Niepoprawna lub brakująca wartość car_type lub cdr_type schematu "
-"(%s)\n"
+"UWAGA: Niepoprawna lub brakująca wartość car_type lub cdr_type schematu (%"
+"s)\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1809
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "UWAGA: Nie można ustawić domyślnej wartości schematu\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1838
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "UWAGA: wewnętrzny błąd gconftoola, nieznany GConfValueType\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1 gconf/gconftool.c:1
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1885 gconf/gconftool.c:1906 gconf/gconftool.c:1927
+#: gconf/gconftool.c:1948
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "UWAGA: Nie można rozpoznać nazwy typu \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1902
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1891,39 +1791,39 @@ msgstr ""
 "UWAGA: Wartością list_type może być tylko int, float, string lub bool, nie "
 "zaś \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1923
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "UWAGA: Wartością car_type może być tylko int, float, string lub bool, nie "
 "zaś \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1944
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "UWAGA: Wartością cdr_type może być tylko int, float, string lub bool, nie "
 "zaś \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1972
 msgid "WARNING: empty <applyto> node"
 msgstr "UWAGA: Pusty węzeł <applyto>"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:1975 gconf/gconftool.c:2238
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "UWAGA: Węzeł <%s> nie jest zrozumiały wewnątrz <schema>\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1985
 msgid "WARNING: no key specified for schema\n"
 msgstr "UWAGA: nie określono klucza dla schematu\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2018
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "UWAGA: Węzeł <locale> nie zawiera atrybutu name=\"locale\", zignorowano\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2024
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1931,54 +1831,54 @@ msgstr ""
 "UWAGA: Wiele węzłów <locale> z wartością \"%s\", Zignorowano wszystkie, poza "
 "pierwszym.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2105
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "UWAGA: Niepoprawny węzeł <%s> wewnątrz węzła <locale>\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2134
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 "UWAGA: zainstalowanie schematu \"%s\" dla ustawień narodowych \"%s\" nie "
 "powiodło się: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2142
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Zainstalowano schemat \"%s\" dla ustawień narodowych \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2164
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 "UWAGA: powiązanie schematu \"%s\" z kluczem \"%s\" nie powiodło się: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2172
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Schemat \"%s\" został przyłączony do klucza \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2251
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Wewnątrz <schema> musi występować co najmniej jedno <locale>\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2282
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "UWAGA: niezrozumiały węzeł <%s> poniżej węzła <schemalist>\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2305
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Nie można otworzyć \"%s\": %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2312
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument \"%s\" jest pusty?\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2324
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1987,26 +1887,26 @@ msgstr ""
 "Dokument \"%s\" zawiera nieprawidłowy węzeł główny (<%s>, powinno być "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2337
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Głównym węzłem dokumentu \"%s\" nie jest gconfschemafile\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2351
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "UWAGA: niezrozumiały węzeł <%s> poniżej węzła <gconfschemafile>\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:2362 gconf/gconftool.c:2394
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Błąd przy synchronizacji danych konfiguracji: %s"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2378
 msgid "Must specify some schema files to install\n"
 msgstr "Należy podać jakieś pliki schematów do zainstalowania\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -2015,16 +1915,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2435
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Nie można wyczyścić klucza %s: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2561
 msgid "Must specify some keys to break\n"
 msgstr "Należy podać klucze przeznaczone do uszkodzenia\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2567
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -2034,11 +1934,11 @@ msgstr ""
 "klucza:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2585
 msgid "Must specify some directories to break\n"
 msgstr "Należy podać katalogi przeznaczone do uszkodzenia\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2604
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -2048,3 +1948,99 @@ msgstr ""
 "Próba uszkodzenia aplikacji poprzez przypisanie niepoprawnych wartości do "
 "kluczy w katalogu:\n"
 "  %s\n"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "Failed to parse XML file \"%s\""
+#~ msgstr "Przy analizie pliku XML \"%s\" wystąpił błąd"
+
+#~ msgid "Server ping error: %s"
+#~ msgstr "Brak odpowiedzi serwera przy sprawdzeniu aktywności: %s"
+
+#~ msgid ""
+#~ "Failed to contact configuration server; some possible causes are that you "
+#~ "need to enable TCP/IP networking for ORBit, or you have stale NFS locks "
+#~ "due to a system crash. See http://www.gnome.org/projects/gconf/ for "
+#~ "information. (Details - %s)"
+#~ msgstr ""
+#~ "Nie można nawiązać połączenia z serwerem konfiguracji. Możliwe, że "
+#~ "konieczne będzie uaktywnienie obsługi TCP/IP w konfiguracji ORBita. Może "
+#~ "to też być spowodowane blokadami pozostałymi po awarii systemu. Aby "
+#~ "uzyskać więcej informacji, odwiedź stronę http://www.gnome.org/projects/"
+#~ "gconf/ (szczegóły - %s)."
+
+#~ msgid "none"
+#~ msgstr "brak"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not open or create the file \"%s\"; this indicates that there may "
+#~ "be a problem with your configuration, as many programs will need to "
+#~ "create files in your home directory. The error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Skontaktuj się z administratorem systemu, aby rozwiązać następujący "
+#~ "problem:\n"
+#~ "Nie można otworzyć lub stworzyć pliku \"%s\"; wskazuje to, że może "
+#~ "istnieć problem z konfiguracją, gdyż wiele programów wymaga tworzenia w "
+#~ "katalogu domowym pewnych plików. Błąd, który wystąpił: \"%s\" (errno = %"
+#~ "d)."
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not lock the file \"%s\"; this indicates that there may be a "
+#~ "problem with your operating system configuration. If you have an NFS-"
+#~ "mounted home directory, either the client or the server may be set up "
+#~ "incorrectly. See the rpc.statd and rpc.lockd documentation. A common "
+#~ "cause of this error is that the \"nfslock\" service has been disabled.The "
+#~ "error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Skontaktuj się z administratorem systemu, aby rozwiązać następujący "
+#~ "problem:\n"
+#~ "Nie można zablokować pliku \"%s\"; wskazuje to, że może istnieć problem z "
+#~ "konfiguracją systemu operacyjnego. Jeśli katalog domowy jest udostępniany "
+#~ "poprzez NFS, może to być spowodowane niewłaściwymi ustawieniami klienta "
+#~ "lub serwera. Zajrzyj do dokumentacji rpc.statd i rpc.lockd. Częstą "
+#~ "przyczyną tego błędu jest zablokowana usługa \"nfslock\". Błąd, który "
+#~ "wystąpił: \"%s\" (errno = %d)."
+
+#~ msgid "Can't remove file %s: %s\n"
+#~ msgstr "Nie można usunąć pliku \"%s\": %s\n"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "No configuration sources in the configuration file \"%s\"; this means "
+#~ "that preferences and other settings can't be saved. %s%s"
+#~ msgstr ""
+#~ "Skontaktuj się z administratorem systemu, aby rozwiązać następujący "
+#~ "problem:\n"
+#~ "W pliku konfiguracyjnym \"%s\" nie ma żadnych źródeł konfiguracji; "
+#~ "oznacza to, że nie jest możliwy zapis preferencji i innych ustawień. %s%s"
+
+#~ msgid "Error reading the file: "
+#~ msgstr "Błąd przy odczycie pliku: "
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
+#~ msgstr ""
+#~ "Skontaktuj się z administratorem systemu, aby rozwiązać następujący "
+#~ "problem:\n"
+#~ "Nie można odnaleźć adresu \"%s\", występującego w pliku konfiguracyjnym "
+#~ "\"%s\": %s"
+
+#~ msgid "Multiple segmentation faults occurred; can't display error dialog\n"
+#~ msgstr ""
+#~ "Wystąpiło wielokrotne naruszenie segmentacji, nie można wyświetlić okna z "
+#~ "informacją o błędzie\n"
+
+#~ msgid ""
+#~ "Segmentation fault!\n"
+#~ "Cannot display crash dialog: %s\n"
+#~ msgstr ""
+#~ "Naruszenie segmentacji!\n"
+#~ "Nie można wyświetlić okna z informacją o błędzie: %s\n"
diff --git a/po/pt.po b/po/pt.po
index fe278536..de571ac9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0\n"
-"POT-Creation-Date: 2002-03-28 01:15+0000\n"
+"POT-Creation-Date: 2002-01-28 21:35-0500\n"
 "PO-Revision-Date: 2002-03-28 01:20+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -31,7 +31,7 @@ msgstr "A inicializar m�dulo de suporte BDB"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "Direct�rio ra�z %s n�o encontrado no endere�o `%s'"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1209
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1176
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Imposs�vel criar direct�rio `%s': %s"
@@ -62,12 +62,12 @@ msgstr ""
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Permiss�es de direct�rio/ficheiro para fonte XML na ra�z %s s�o: %o/%o"
 
-#: backends/xml-backend.c:590
+#: backends/xml-backend.c:584
 #, c-format
 msgid "Error syncing the XML backend directory cache: %s"
 msgstr "Erro ao sincronizar direct�rio de cache do motor XML: %s"
 
-#: backends/xml-backend.c:655
+#: backends/xml-backend.c:651
 msgid ""
 "Remove dir operation is no longer supported, just remove all the values in "
 "the directory"
@@ -75,20 +75,20 @@ msgstr ""
 "Opera��o remover sirect�rio j� n�o � suportada, apenas remova todos os "
 "valores no direct�rio"
 
-#: backends/xml-backend.c:722
+#: backends/xml-backend.c:718
 msgid "Initializing XML backend module"
 msgstr "A inicializar m�dulo de suporte XML"
 
-#: backends/xml-backend.c:790
+#: backends/xml-backend.c:786
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Desistiu de libertar XML no direct�rio `%s': %s"
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:248
 msgid "Failed to sync XML cache contents to disk"
 msgstr "Falha ao xincronizar conteudos de cache XML para disco"
 
-#: backends/xml-cache.c:273
+#: backends/xml-cache.c:278
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -97,7 +97,7 @@ msgstr ""
 "Imposs�vel remover direct�rio `%s' da cache do m�dulo XML, pois n�o foi "
 "correctamente sincronizada para o disco"
 
-#: backends/xml-cache.c:300
+#: backends/xml-cache.c:305
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than %"
@@ -106,182 +106,172 @@ msgstr ""
 "Permanecem %u itens na cache ap�s limpar itens j� sincronizados anteriores a "
 "%u segundos"
 
-#: backends/xml-dir.c:171
+#: backends/xml-dir.c:168
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "Imposs�vel iniciar `%s': %s"
 
-#: backends/xml-dir.c:181
+#: backends/xml-dir.c:178
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "Nome de ficheiro XML `%s' � um direct�rio"
 
-#: backends/xml-dir.c:372 backends/xml-dir.c:379
+#: backends/xml-dir.c:369 backends/xml-dir.c:376
 #, c-format
 msgid "Failed to delete \"%s\": %s"
 msgstr "Falha ao apagar \"%s\": %s"
 
-#: backends/xml-dir.c:424
+#: backends/xml-dir.c:421
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Falha ao escrever ficheiro `%s': %s"
 
-#: backends/xml-dir.c:437
+#: backends/xml-dir.c:434
 #, c-format
 msgid "Failed to set mode on `%s': %s"
 msgstr "Falha ao definir modo em `%s': %s"
 
-#: backends/xml-dir.c:447
+#: backends/xml-dir.c:444
 #, c-format
 msgid "Failed to write XML data to `%s': %s"
 msgstr "Falha ao escrever dados XML para `%s': %s"
 
-#: backends/xml-dir.c:457 backends/xml-dir.c:1233
+#: backends/xml-dir.c:454 backends/xml-dir.c:1200
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Falha ao fechar ficheiro `%s': %s"
 
-#: backends/xml-dir.c:473 backends/xml-dir.c:483
+#: backends/xml-dir.c:470 backends/xml-dir.c:480
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Falha ao renomear `%s' para `%s': %s"
 
-#: backends/xml-dir.c:489
+#: backends/xml-dir.c:486
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Falha ao repor `%s' de `%s': %s"
 
-#: backends/xml-dir.c:501
+#: backends/xml-dir.c:498
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Falha ao apagar ficheiro antigo `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:929
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Falha no estado `%s': %s"
 
-#: backends/xml-dir.c:956
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: backends/xml-dir.c:1106
+#: backends/xml-dir.c:1073
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Entrada duplicada `%s' em `%s', a ignorar"
 
-#: backends/xml-dir.c:1128
+#: backends/xml-dir.c:1095
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Entrada sem nome no ficheiro XML `%s', a ignorar"
 
-#: backends/xml-dir.c:1136
+#: backends/xml-dir.c:1103
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 "Um n� de n�vel superior no ficheiro XML `%s' � <%s> em vez de <entry>, a "
 "ignorar"
 
-#: backends/xml-dir.c:1225
+#: backends/xml-dir.c:1192
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Falha ao criar ficheiro `%s': %s"
 
-#: backends/xml-dir.c:1324
-#, c-format
-msgid "Failed to parse XML file \"%s\""
-msgstr "Falha ao parsear ficheiro XML \"%s\""
-
 #. There was an error
-#: backends/xml-entry.c:154
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "A ignorar n� XML com o nome `%s': %s"
 
-#: backends/xml-entry.c:332
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "A ignorar nome de esquema `%s', inv�lido: %s"
 
-#: backends/xml-entry.c:380
+#: backends/xml-entry.c:376
 #, c-format
 msgid "Ignoring XML node `%s': %s"
 msgstr "A ignorar n� XML `%s': %s"
 
-#: backends/xml-entry.c:732
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Falha ao ler valor de defeito para o esquema: %s"
 
-#: backends/xml-entry.c:952
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Nenhum atributo \"type\" para o n� <%s>"
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Um n� tem o atributo \"type\" desconhecido `%s', a ignorar"
 
-#: backends/xml-entry.c:981
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "Nenhum atributo \"value\" para o n�"
 
-#: backends/xml-entry.c:1029 backends/xml-entry.c:1105
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "N� <%s> dentro de um n� de lista XML n�o foi compreendido"
 
-#: backends/xml-entry.c:1063
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Tipo inv�lido (lista, par ou desconhecido) num n� de lista"
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "N� XML inv�lido: %s"
 
-#: backends/xml-entry.c:1094
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Lista cont�m um n� de tipo incorrecto (%s, deveria ser %s)"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "A ignorar car inv�lido em par XML: %s"
 
-#: backends/xml-entry.c:1155 backends/xml-entry.c:1178
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "a parsear ficheiro XML: listas e pares n�o podem ser colocados dentro de um "
 "par"
 
-#: backends/xml-entry.c:1168
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "A ignorar cdr inv�lido em par XML: %s"
 
-#: backends/xml-entry.c:1187
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "N� XML <%s> dentro de n� de par XML n�o compreendido"
 
-#: backends/xml-entry.c:1205
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "car e cdr para n� de par XML n�o encontrados"
 
-#: backends/xml-entry.c:1211
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Falta cdr em par de valores no ficheiro XML"
 
-#: backends/xml-entry.c:1218
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "Falta car em par de valores no ficheiro XML"
 
-#: backends/xml-entry.c:1223
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Faltam cdr e car em par de valores no ficheiro XML"
 
@@ -319,48 +309,52 @@ msgstr "Falha ao desligar m�dulo"
 msgid "GConf Error: %s\n"
 msgstr "Erro GConf: %s\n"
 
-#: gconf/gconf-client.c:881
+#: gconf/gconf-client.c:899
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Aviso GConf: falha ao listar pares em `%s': %s"
 
-#: gconf/gconf-client.c:1146
+#: gconf/gconf-client.c:1165
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Esperava `%s' obteve `%s' para a chave %s"
 
-#: gconf/gconf-database.c:234
+#: gconf/gconf-database.c:233
 msgid "Received invalid value in set request"
 msgstr "Valor inv�lido recebido em pedido de defini��o (set)"
 
-#: gconf/gconf-database.c:242
+#: gconf/gconf-database.c:241
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Valor CORBA recebido em pedido de defini��o (set), para a chave `%s', n�o "
 "compreendido"
 
-#: gconf/gconf-database.c:523
+#: gconf/gconf-database.c:522
 msgid "Received request to drop all cached data"
 msgstr "Recebido pedido para descartar todos os dados em cache"
 
-#: gconf/gconf-database.c:540
+#: gconf/gconf-database.c:539
 msgid "Received request to sync synchronously"
 msgstr "Pedido recebido para sincronizar sincronamente"
 
-#: gconf/gconf-database.c:824
+#: gconf/gconf-database.c:823
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Erro fatal: falha ao obter refer�ncia de objecto para ConfigDatabase"
 
-#: gconf/gconf-database.c:986
+#: gconf/gconf-database.c:985
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Falha ao sincronizar uma ou mais fontes: %s"
 
-#: gconf/gconf-database.c:1078
-#, c-format
+#. This error is not fatal; we basically ignore it.
+#. * Because it's likely the right thing for the client
+#. * app to simply continue.
+#.
+#: gconf/gconf-database.c:1076
+#, fuzzy, c-format
 msgid ""
-"Failed to log addition of listener %s (%s);will not be able to restore this "
+"Failed to log addition of listener %s (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
@@ -368,12 +362,12 @@ msgstr ""
 "este listener ao reiniciar o gconfd, resultando na notifica��o sem confian�a "
 "de altera��es na configura��o."
 
-#: gconf/gconf-database.c:1109
+#: gconf/gconf-database.c:1103
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "ID de Listener %lu n�o existe"
 
-#: gconf/gconf-database.c:1123
+#: gconf/gconf-database.c:1117
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -382,57 +376,57 @@ msgstr ""
 "Falha ao registar no ficheiro log remo��o do listener (inofensivo, poder� "
 "resultar em a notifica��o surgir novamente): %s"
 
-#: gconf/gconf-database.c:1241 gconf/gconf-sources.c:1540
+#: gconf/gconf-database.c:1235 gconf/gconf-sources.c:1540
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Erro ao obter (get) valor para `%s': %s"
 
-#: gconf/gconf-database.c:1288
+#: gconf/gconf-database.c:1282
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Erro ao definir (set) valor para `%s': %s"
 
-#: gconf/gconf-database.c:1331
+#: gconf/gconf-database.c:1325
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Erro do des-definir `%s': %s"
 
-#: gconf/gconf-database.c:1360
+#: gconf/gconf-database.c:1354
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Erro ao obter valor de defeito para `%s': %s"
 
-#: gconf/gconf-database.c:1411
+#: gconf/gconf-database.c:1405
 #, c-format
 msgid "Error unsetting \"%s\": %s"
 msgstr "Erro ao des-definir \"%s\": %s"
 
-#: gconf/gconf-database.c:1443
+#: gconf/gconf-database.c:1437
 #, c-format
 msgid "Error getting new value for \"%s\": %s"
 msgstr "Erro ao obter (get) novo valor para \"%s\": %s"
 
-#: gconf/gconf-database.c:1491
+#: gconf/gconf-database.c:1485
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Erro ao verificar a exist�ncia de `%s': %s"
 
-#: gconf/gconf-database.c:1515
+#: gconf/gconf-database.c:1509
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Erro ao remover direct�rio `%s': %s"
 
-#: gconf/gconf-database.c:1542
+#: gconf/gconf-database.c:1536
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Falha ao obter todas as entradas em `%s': %s"
 
-#: gconf/gconf-database.c:1568
+#: gconf/gconf-database.c:1562
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Erro ao listar os direct�rios em `%s': %s"
 
-#: gconf/gconf-database.c:1589
+#: gconf/gconf-database.c:1583
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Erro ao definir esquema para `%s': %s"
@@ -559,66 +553,66 @@ msgstr "A adicionar fonte `%s'\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "Erro de leitura no ficheiro `%s': %s\n"
 
-#: gconf/gconf-internals.c:1195 gconf/gconf-internals.c:1261
+#: gconf/gconf-internals.c:1211 gconf/gconf-internals.c:1277
 #: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
-#: gconf/gconf-value.c:1511
+#: gconf/gconf-value.c:1341
 msgid "Text contains invalid UTF-8"
 msgstr "Texto cont�m UTF-8 inv�lido"
 
-#: gconf/gconf-internals.c:1346
+#: gconf/gconf-internals.c:1362
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Esperava lista, recebeu %s"
 
-#: gconf/gconf-internals.c:1356
+#: gconf/gconf-internals.c:1372
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Esperava lista de %s, recebeu lista de %s"
 
-#: gconf/gconf-internals.c:1498
+#: gconf/gconf-internals.c:1511
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Esperava par, recebeu %s"
 
-#: gconf/gconf-internals.c:1512
+#: gconf/gconf-internals.c:1525
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Esperava par (%s,%s), recebeu um par com um ou ambos os valores em falta"
 
-#: gconf/gconf-internals.c:1528
+#: gconf/gconf-internals.c:1541
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Esperava par do tipo (%s,%s) recebeu tipo (%s,%s)"
 
-#: gconf/gconf-internals.c:1644
+#: gconf/gconf-internals.c:1657
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Express�o citada n�o iniciada com uma aspa"
 
-#: gconf/gconf-internals.c:1706
+#: gconf/gconf-internals.c:1719
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Express�o citada n�o terminada com uma aspa"
 
-#: gconf/gconf-internals.c:1842
+#: gconf/gconf-internals.c:1855
 msgid "Encoded value is not valid UTF-8"
 msgstr "Valor codificado n�o � UTF-8 v�lido"
 
-#: gconf/gconf-internals.c:2301
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Could not lock temporary file '%s': %s"
 msgstr "Incapaz de obter exclusividade (lock) de ficheiro '%s': %s"
 
-#: gconf/gconf-internals.c:2328
+#: gconf/gconf-internals.c:2341
 #, c-format
 msgid "Could not create file '%s', probably because it already exists"
 msgstr "Incapaz de criar ficheiro '%s', provavelmente pois j� existe"
 
-#: gconf/gconf-internals.c:2374
+#: gconf/gconf-internals.c:2387
 #, c-format
 msgid "Failed to create or open '%s'"
 msgstr "Falha ao criar ou abrir '%s'"
 
-#: gconf/gconf-internals.c:2384
+#: gconf/gconf-internals.c:2397
 #, c-format
 msgid ""
 "Failed to lock '%s': probably another process has the lock, or your "
@@ -628,173 +622,98 @@ msgstr ""
 "exclusividade ou o seu sistema operativo tem a exclusividade de ficheiro NFS "
 "mal configurada (%s)"
 
-#: gconf/gconf-internals.c:2413
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr "Insucesso ao abrir ficheiro IOR '%s', gconfd n�o localizado: %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2455
 #, c-format
 msgid "gconftool or other non-gconfd process has the lock file '%s'"
 msgstr ""
 "gconftool ou outro processo n�o.gconf tem a exclusividade sobre o ficheiro '%"
 "s'"
 
-#: gconf/gconf-internals.c:2460
+#: gconf/gconf-internals.c:2472
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
 msgstr ""
 "imposs�vel contactar ORB para resolver refer�ncia de objecto gconfd existente"
 
-#: gconf/gconf-internals.c:2470
+#: gconf/gconf-internals.c:2482
 #, c-format
 msgid "Failed to convert IOR '%s' to an object reference"
 msgstr "Falha na convers�o de IOR '%s' para uma refer�ncia de objecto"
 
-#: gconf/gconf-internals.c:2520
+#: gconf/gconf-internals.c:2510
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "incapaz de criar direct�rio `%s': %s"
 
-#: gconf/gconf-internals.c:2579
+#: gconf/gconf-internals.c:2569
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Incapaz de escrever para ficheiro `%s': %s"
 
-#: gconf/gconf-internals.c:2620
+#: gconf/gconf-internals.c:2610
 #, c-format
 msgid "We didn't have the lock on file `%s', but we should have"
 msgstr "N�o se tinha a exclusividade sobre `%s', mas devia-se ter"
 
-#: gconf/gconf-internals.c:2641
+#: gconf/gconf-internals.c:2631
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
 msgstr "Falha ao ligar '%s' a '%s': %s"
 
-#: gconf/gconf-internals.c:2653
+#: gconf/gconf-internals.c:2643
 #, c-format
 msgid "Failed to remove lock file `%s': %s"
 msgstr "Falha ao remover exclusividade (lock) do ficheiro `%s': %s"
 
-#: gconf/gconf-internals.c:2672
+#: gconf/gconf-internals.c:2662
 #, c-format
 msgid "Failed to clean up file '%s': %s"
 msgstr "Falha ao limpar ficheiro '%s': %s"
 
-#: gconf/gconf-internals.c:2686
+#: gconf/gconf-internals.c:2676
 #, c-format
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "Falha ao remover direct�rio de lock `%s': %s"
 
-#: gconf/gconf-internals.c:2860 gconf/gconfd.c:591
+#: gconf/gconf-internals.c:2842 gconf/gconfd.c:583
 #, c-format
 msgid "Failed to create %s: %s"
 msgstr "Falha ao criar %s: %s"
 
-#: gconf/gconf-internals.c:2882
-#, c-format
-msgid "Server ping error: %s"
-msgstr "Erro de ping servidor: %s"
-
-#: gconf/gconf-internals.c:2903
+#: gconf/gconf-internals.c:2875
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr "Falha ao criar canal (pipe) para comunicar com deamon gconf: %s\n"
 
-#: gconf/gconf-internals.c:2927
+#: gconf/gconf-internals.c:2899
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Falha ao lan�ar servidor de configura��o: %s\n"
 
-#: gconf/gconf-internals.c:2952
-#, c-format
-msgid ""
-"Failed to contact configuration server; some possible causes are that you "
-"need to enable TCP/IP networking for ORBit, or you have stale NFS locks due "
-"to a system crash. See http://www.gnome.org/projects/gconf/ for information. "
-"(Details - %s)"
-msgstr ""
-"Falha a contactar servidor de configura��o; algumas causas poss�veis s�o que "
-"voc� necessita de activar liga��es TCP/IP para ORBit, ou possui exclusividades "
-"(locks) NFS derivados de um crash de sistema. Consulte http://www.gnome.org/"
-"projects/gconf/ para mais informa��es. (Detalhes - %s)"
-
-#: gconf/gconf-internals.c:2953
-msgid "none"
-msgstr "nenhum"
-
-#: gconf/gconf-sanity-check.c:39 gconf/gconftool.c:72
-msgid "Help options"
-msgstr "Op��es de ajuda"
-
-#: gconf/gconf-sanity-check.c:74 gconf/gconftool.c:411
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Erro na op��o %s: %s.\n"
-"Execute '%s --help' para ver uma lista das op��es de linha de comando "
-"dispon�veis.\n"
-
-#: gconf/gconf-sanity-check.c:131
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not open or create the file \"%s\"; this indicates that there may be a "
-"problem with your configuration, as many programs will need to create files "
-"in your home directory. The error was \"%s\" (errno = %d)."
-msgstr ""
-"Contacte o seu administrador de sistemas para resolver o seguinte problema:\n"
-"Incapaz de abrir ou criar o ficheiro \"%s\"; isto indica que poder� existir "
-"um problema com a configura��o, j� que muitas aplica��es necessitar�o de criar "
-"ficheiros no seu direct�rio pessoal (home). O erro foi \"%s\" (errno = %d)."
-
-#: gconf/gconf-sanity-check.c:143
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not lock the file \"%s\"; this indicates that there may be a problem "
-"with your operating system configuration. If you have an NFS-mounted home "
-"directory, either the client or the server may be set up incorrectly. See "
-"the rpc.statd and rpc.lockd documentation. A common cause of this error is "
-"that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
-"%d)."
-msgstr ""
-"Contacte o seu administrador de sistemas para resolver o seguinte problema:\n"
-"Incapaz de trancar o ficheiro \"%s\"; isto indica que poder� existir um problema "
-"com a configura��o do seu sistema operativo. Se tiver um direct�rio pessoal (home) "
-"montado NFS, ou o cliente ou o servidor podem estar incorrectamente configurados. "
-"Veja a documenta��o rpc.statd e rpc.lockd. Uma causa comum para este erro � "
-"que o servi�o \"nfslock\" foi desactivado. O erro foi \"%s\" (errno = %d)."
-
-#: gconf/gconf-sanity-check.c:160
-#, c-format
-msgid "Can't remove file %s: %s\n"
-msgstr "Incapaz de remover ficheiro %s: %s\n"
-
-#: gconf/gconf-sanity-check.c:195
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"No configuration sources in the configuration file \"%s\"; this means that "
-"preferences and other settings can't be saved. %s%s"
-msgstr ""
-"Contacte o seu administrador de sistemas para resolver o seguinte problema:\n"
-"Nenhumas fontes de configura��o no ficheiro de configura��o \"%s\"; isto "
-"significa que prefer�ncias e outras defini��es n�o poder�o ser gravadas. %s%s"
-
-#: gconf/gconf-sanity-check.c:198
-msgid "Error reading the file: "
-msgstr "Erro ao ler ficheiro: "
-
-#: gconf/gconf-sanity-check.c:220
-#, c-format
+#: gconf/gconf-internals.c:2923
 msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
-msgstr ""
-"Contacte o seu administrador de sistemas para resolver o seguinte problema:\n"
-"Incapaz de resolver o endere�o \"%s\" no ficheiro de configura��o \"%s\": %s"
+"Failed to contact configuration server; some possible causes are:\n"
+"a) you have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit by putting the line \"ORBIIOPIPv4=1"
+"\" in /etc/orbitrc\n"
+"b) you have stale locks in your NFS-mounted home directory due to a system "
+"crash, try removing ~/.gconf/*.lock and ~/.gconfd/lock if you are sure no "
+"gconfd processes are running on any machine using your home dir"
+msgstr ""
+"Falha ao contactar servidor de configura��o; algumas causas poss�veis s�o:\n"
+"a) j� existe um servidor de configura��o (gconfd) a correr, mas n�o � "
+"alcan�avel daqui - se estiver ligado de duas m�quinas simultaneamente, "
+"poder� ter de activar redes TCP para o ORBit pondo a linha \"ORBIIOPOPv4=1\" "
+"em /etc/orbitrc\n"
+"b) tem locks mortos no seu direct�rio home, montado por NFS, devido a um "
+"crash de sistema. tente remover ~/.gconf/*.lock e ~/.gconfd/lock se tiver a "
+"certeza de que nenhuns processos gconfd est�o a correr em nenhuma m�quina "
+"utilzando o seu direct�rio home"
 
 #: gconf/gconf-schema.c:190 gconf/gconf-schema.c:198 gconf/gconf-schema.c:206
 #: gconf/gconf-schema.c:214
@@ -972,104 +891,104 @@ msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
 "`%s' n�o compreendido (')' extra n�o 'escaped' encontrado dentro do par)"
 
-#: gconf/gconf.c:55
+#: gconf/gconf.c:54
 #, c-format
 msgid "Key \"%s\" is NULL"
 msgstr "Tecla \"%s\" � NULL"
 
-#: gconf/gconf.c:62
+#: gconf/gconf.c:61
 #, c-format
 msgid "\"%s\": %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:343
+#: gconf/gconf.c:333
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Servidor incapaz de resolver endere�o `%s'"
 
-#: gconf/gconf.c:634
+#: gconf/gconf.c:624
 msgid "Can't add notifications to a local configuration source"
 msgstr "Incapaz de adicionar notifica��es a uma fonte de configura��o local"
 
-#: gconf/gconf.c:2079
+#: gconf/gconf.c:2072
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Falha na asi��o de cliente � lista do servidor, erro CORBA: %s"
 
-#: gconf/gconf.c:2434
+#: gconf/gconf.c:2393
 msgid "Must begin with a slash (/)"
 msgstr "Tem de come�ar com uma barra (/)"
 
-#: gconf/gconf.c:2456
+#: gconf/gconf.c:2415
 msgid "Can't have two slashes (/) in a row"
 msgstr "N�o pode ter duas barras (/) numa linha"
 
-#: gconf/gconf.c:2458
+#: gconf/gconf.c:2417
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "N�o pode ter um ponto (.) logo ap�s uma barra (/)"
 
-#: gconf/gconf.c:2477
+#: gconf/gconf.c:2436
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
 msgstr ""
 "'%c' n�o � um caracter ASCII, pelo que n�o � aceit�vel em nomes de chaves"
 
-#: gconf/gconf.c:2487
+#: gconf/gconf.c:2446
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' � um caracter inv�lido em nomes de chaves/direct�rios"
 
-#: gconf/gconf.c:2501
+#: gconf/gconf.c:2460
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Chave/direct�rio n�o pode erminar em barra (/)"
 
-#: gconf/gconf.c:2870
+#: gconf/gconf.c:2829
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Falha ao desligar servidor de configura��o: %s"
 
-#: gconf/gconf.c:2931
+#: gconf/gconf.c:2890
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Esperava float, recebeu %s"
 
-#: gconf/gconf.c:2966
+#: gconf/gconf.c:2925
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Esperava int, recebeu %s"
 
-#: gconf/gconf.c:3001
+#: gconf/gconf.c:2960
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Esperava string, recebeu %s"
 
-#: gconf/gconf.c:3038
+#: gconf/gconf.c:2997
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Esperava bool, recebeu %s"
 
-#: gconf/gconf.c:3071
+#: gconf/gconf.c:3030
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Esperava schema, recebeu %s"
 
-#: gconf/gconf.c:3432
+#: gconf/gconf.c:3391
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Erro CORBA: %s"
 
-#: gconf/gconfd.c:249
+#: gconf/gconfd.c:246
 msgid "Shutdown request received"
 msgstr "Recebido pedido de desligar"
 
-#: gconf/gconfd.c:281
+#: gconf/gconfd.c:278
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 "gconfd compilado com depura��o; a tentar ler gconf.path do direct�rio fonte"
 
-#: gconf/gconfd.c:295
+#: gconf/gconfd.c:292
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1080,7 +999,7 @@ msgstr ""
 #. We want to stay alive but do nothing, because otherwise every
 #. request would result in another failed gconfd being spawned.
 #.
-#: gconf/gconfd.c:303
+#: gconf/gconfd.c:300
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1088,16 +1007,16 @@ msgstr ""
 "Nenhuma fonte de configura��o no caminho de fontes, configura��o n�o ser� "
 "gravada; editar "
 
-#: gconf/gconfd.c:303
+#: gconf/gconfd.c:300
 msgid "/path"
 msgstr "/caminho"
 
-#: gconf/gconfd.c:316
+#: gconf/gconfd.c:313
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Erro ao carregar algumas fontes de configura��o: %s"
 
-#: gconf/gconfd.c:328
+#: gconf/gconfd.c:325
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1105,7 +1024,7 @@ msgstr ""
 "Nenhum endere�o de fonte de configura��o resolvido com sucesso, incapaz de "
 "carregar ou gravar dados de configura��o"
 
-#: gconf/gconfd.c:345
+#: gconf/gconfd.c:342
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1113,12 +1032,12 @@ msgstr ""
 "Nenhuma fonte de configura��o de escrita resolvida com sucesso, incapaz de "
 "carregar ou gravar dados de configura��o"
 
-#: gconf/gconfd.c:371
+#: gconf/gconfd.c:368
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr "Recebido sinal %d, a criar core. Reporte um bug do GConf, por favor."
 
-#: gconf/gconfd.c:389
+#: gconf/gconfd.c:384
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
@@ -1126,53 +1045,53 @@ msgstr ""
 "Recebido sinal %d, a desligar anormalmente. Reporte um bug do GConf, por "
 "favor."
 
-#: gconf/gconfd.c:406
+#: gconf/gconfd.c:401
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Recebido sinal %d, a desligar normalmente"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:538
+#: gconf/gconfd.c:531
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "a iniciar (vers�o %s), pid %u utilizador '%s'"
 
-#: gconf/gconfd.c:578
+#: gconf/gconfd.c:570
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Falha ao obter refer�ncia de objecto para ConfigServer"
 
-#: gconf/gconfd.c:616
+#: gconf/gconfd.c:608
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 "Falha ao escrever byte para pipe fd %d pelo que aplica��o cliente poder� "
 "pendurar: %s"
 
-#: gconf/gconfd.c:626
+#: gconf/gconfd.c:618
 #, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "Falha ao obter exclusividade no deamon, a terminar: %s"
 
-#: gconf/gconfd.c:664
+#: gconf/gconfd.c:656
 #, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "Erro ao libertar ficheiro de lock: %s"
 
-#: gconf/gconfd.c:672
+#: gconf/gconfd.c:664
 msgid "Exiting"
 msgstr "A terminar"
 
-#: gconf/gconfd.c:698
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "Servidor GConf n�o est� a ser utilizado, a terminar."
 
-#: gconf/gconfd.c:1063
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "A devolver excep��o: %s"
 
-#: gconf/gconfd.c:1163
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1181,7 +1100,7 @@ msgstr ""
 "Falha ao abrir ficheiro log do gconfd; ser� imposs�vel restaurar listeners "
 "ap�s o fecho do gconfd (%s)"
 
-#: gconf/gconfd.c:1198
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1189,33 +1108,33 @@ msgstr ""
 "Falha ao fechar ficheiro de log do gconfd; dados poder�o n�o ter sido "
 "correctamente gravados (%s)"
 
-#: gconf/gconfd.c:1267
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Incapaz de abrir ficheiro de estado gravado '%s' para escrita: %s"
 
-#: gconf/gconfd.c:1281
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Incapaz de escrever ficheiro de estado gravado '%s' fd: %d: %s"
 
-#: gconf/gconfd.c:1290
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Falha ao fechar novo ficheiro de estado gravado '%s': %s"
 
-#: gconf/gconfd.c:1304
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Incapaz de por de lado ficheiro de estado gravado antigo '%s': %s"
 
-#: gconf/gconfd.c:1314
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 "Falha ao mover novo ficheiro de estado gravado para o local correcto: %s"
 
-#: gconf/gconfd.c:1323
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1223,7 +1142,7 @@ msgstr ""
 "Falha ao repor ficheiro de estado gravado original que tinha sido movido "
 "para '%s': %s"
 
-#: gconf/gconfd.c:1794
+#: gconf/gconfd.c:1790
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1231,17 +1150,17 @@ msgstr ""
 "Incapaz de repor um listener no endere�o '%s', incapaz de resolver a base de "
 "dados"
 
-#: gconf/gconfd.c:1840
+#: gconf/gconfd.c:1836
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Erro ao ler ficheiro de estado gravado: %s"
 
-#: gconf/gconfd.c:1893
+#: gconf/gconfd.c:1889
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Incapaz de abrir ficheiro de estado gravado '%s': %s"
 
-#: gconf/gconfd.c:2010
+#: gconf/gconfd.c:2006
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1250,7 +1169,7 @@ msgstr ""
 "Falha ao registar no ficheiro de log do gconfd a adi��o de listener; ser� "
 "imposs�vel re-adicionar o listener se o gconfd sair ou terminar (%s)"
 
-#: gconf/gconfd.c:2015
+#: gconf/gconfd.c:2011
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1259,59 +1178,46 @@ msgstr ""
 "Falha ao remover do ficheiro de log do gconfd o listener; poder� erradamente "
 "re-adicionar o  listener caso o gconfd saia ou termine (%s)"
 
-#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
+#: gconf/gconfd.c:2034 gconf/gconfd.c:2199
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Falha ao obter IOR para cliente: %s"
 
-#: gconf/gconfd.c:2053
+#: gconf/gconfd.c:2049
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Falha ao abrir ficheiro de estado gravado: %s"
 
-#: gconf/gconfd.c:2066
+#: gconf/gconfd.c:2062
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "Falha ao escrever adi��o de cliente no ficheiro de estado gravado: %s"
 
-#: gconf/gconfd.c:2074
+#: gconf/gconfd.c:2070
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr ""
 "Falha no flush de adi��o de cliente para ficheiro de estado gravado: %s"
 
-#: gconf/gconfd.c:2164
+#: gconf/gconfd.c:2160
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 "Algum cliente removeu-se do servidor GConf mas n�o tinha l� sido adicionado."
 
-#. dialog display isn't working out
-#: gconf/gconfd.c:2303
-msgid "Multiple segmentation faults occurred; can't display error dialog\n"
-msgstr ""
-"Ocorreram m�ltiplas falhas de segmenta��o; incapaz de mostrar di�logo de "
-"erro\n"
-
-#. Eeeek! Can't show dialog
-#: gconf/gconfd.c:2312
-#, c-format
-msgid ""
-"Segmentation fault!\n"
-"Cannot display crash dialog: %s\n"
-msgstr ""
-"Falha de segmenta��o!\n"
-"Incapaz de mostrar di�logo de crash: %s\n"
+#: gconf/gconftool.c:71
+msgid "Help options"
+msgstr "Op��es de ajuda"
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Definir uma chave para um valor e sincronizar. Utilizar com --type."
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid "Print the value of a key to standard output."
 msgstr "Imprimir o valor de uma chave para a consola."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:98
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
@@ -1319,11 +1225,11 @@ msgstr ""
 "Definir um esquema e sincronizar. Utilizar com --short-desc, --long-desc, --"
 "owner, e --type."
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 msgid "Unset the keys on the command line"
 msgstr "Desfazer (unset) as chaves na linha de comando"
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
@@ -1331,32 +1237,32 @@ msgstr ""
 "Recursivamente desactivar todas as chaves dentro ou abaixo dos nomes de "
 "direct�rio/chave na linha de comando"
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all key/value pairs in a directory."
 msgstr "Imprimir todos os pares chave/valor num direct�rio."
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Print all subdirectories in a directory."
 msgstr "Imprimir todos os subdirect�rios de um direct�rio."
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Imprimir todos os subdirect�rios e entradas de um direct�rio, recursivamente."
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Devolver 0 se o direct�rio existir, caso contr�rio 2."
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Desligar o gconfd. N�O UTILIZAR ESTA OP��O SEM UMA BOA RAZ�O."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Devolver 0 se o gconfd estiver a correr, caso contr�rio 2."
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1364,7 +1270,7 @@ msgstr ""
 "Iniciar o servidor de configura��o (gconfd). (Normalmente acontece "
 "automaticamente quando necess�rio.)"
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1372,11 +1278,11 @@ msgstr ""
 "Especifica o tipo do valor a ser definido, ou o tipo de valor que um esquema "
 "descreve. Abrevia��es �nicas OK."
 
-#: gconf/gconftool.c:191
+#: gconf/gconftool.c:190
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1384,11 +1290,11 @@ msgstr ""
 "Especifica o tipo de uma lista de valores a ser definida, ou o tipo de valor "
 "que um esquema descreve. Abrevia��es �nicas OK."
 
-#: gconf/gconftool.c:200 gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:199 gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1396,7 +1302,7 @@ msgstr ""
 "Especifica o tipo do par car a ser definido, ou o tipo de valor que um "
 "esquema descreve. Abrevia��es �nicas OK."
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1404,44 +1310,44 @@ msgstr ""
 "Especifica o tipo do par cdr a ser definido, ou o tipo de valor que um "
 "esquema descreve. Abrevia��es �nicas OK."
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Especifique uma desci��o de meia linha para acompanhar o esquema."
 
-#: gconf/gconftool.c:227 gconf/gconftool.c:236
+#: gconf/gconftool.c:226 gconf/gconftool.c:235
 msgid "DESCRIPTION"
 msgstr "DESCRICAO"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a several-line description to go in a schema."
 msgstr "Especifique uma descr��o de v�rias linhas para acompanhar o esquema."
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 msgid "Specify the owner of a schema"
 msgstr "Especifique o dono de um esquema"
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 msgid "OWNER"
 msgstr "OWNER"
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid "Specify a schema file to be installed"
 msgstr "Especifique um ficheiro de esquema a ser instalado"
 
-#: gconf/gconftool.c:254
+#: gconf/gconftool.c:253
 msgid "FILENAME"
 msgstr "NOMEFICHEIRO"
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Especifique uma fonte de configura��o a utilizar em vez do caminho de defeito"
 
-#: gconf/gconftool.c:263
+#: gconf/gconftool.c:262
 msgid "SOURCE"
 msgstr "FONTE"
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1449,7 +1355,7 @@ msgstr ""
 "Aceder � base de dados de configura��o directamente, ignorando servidor. "
 "Requer que o gconfd n�o esteja a correr."
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1460,7 +1366,7 @@ msgstr ""
 "uma fonte de configura��o n�o de defeito ou definida para uma express�o "
 "vazia para utilizar o defeito."
 
-#: gconf/gconftool.c:289
+#: gconf/gconftool.c:288
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1468,7 +1374,7 @@ msgstr ""
 "Fa�a um teste-tortura � aplica��o definindo e redefinindo na linha de "
 "comandos um monte de valores para chaves de tipos diferentes."
 
-#: gconf/gconftool.c:298
+#: gconf/gconftool.c:297
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1476,50 +1382,60 @@ msgstr ""
 "Fa�a um teste-tortura � aplica��o definindo e redefinindo na linha de "
 "comandos um monte de valores para chaves dentro de direct�rios."
 
-#: gconf/gconftool.c:307
+#: gconf/gconftool.c:306
 msgid "Get the short doc string for a key"
 msgstr "Obter a express�o doc pequena para uma chave"
 
-#: gconf/gconftool.c:316
+#: gconf/gconftool.c:315
 msgid "Get the long doc string for a key"
 msgstr "Obter a express�o doc longa para uma chave"
 
-#: gconf/gconftool.c:325
+#: gconf/gconftool.c:324
 msgid "Get the name of the schema applied to this key"
 msgstr "Obter o nome do esquema aplicado a esta chave"
 
-#: gconf/gconftool.c:334
+#: gconf/gconftool.c:333
 msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr ""
 "Especifique o nome do esquema seguido da chave a aplicar o nome do esquema"
 
-#: gconf/gconftool.c:343
+#: gconf/gconftool.c:342
 msgid "Remove any schema name applied to the given keys"
 msgstr "Remover qualquer nome de esquema aplicado a estas chaves"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:351
 msgid "Get the name of the default source"
 msgstr "Obter o nome da fonte de defeito"
 
-#: gconf/gconftool.c:423
+#: gconf/gconftool.c:408
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Erro na op��o %s: %s.\n"
+"Execute '%s --help' para ver uma lista das op��es de linha de comando "
+"dispon�veis.\n"
+
+#: gconf/gconftool.c:420
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 "Imposs�vel obter (get) e definir/redefinir (set/unset) simultaneamente\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:427
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 "Imposs�vel definir (set) e obter/redefinir (set/unset) simultaneamente\n"
 
-#: gconf/gconftool.c:438
+#: gconf/gconftool.c:435
 msgid "Can't use --all-entries with --get or --set\n"
 msgstr "N�o pode ser utilizado --all-entries com --get ou --set\n"
 
-#: gconf/gconftool.c:446
+#: gconf/gconftool.c:443
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "N�o pode ser utilizado --all-dirs com --get ou --set\n"
 
-#: gconf/gconftool.c:456
+#: gconf/gconftool.c:453
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-"
 "entries, or --all-dirs\n"
@@ -1527,7 +1443,7 @@ msgstr ""
 "--recursive-list n�o dever� ser utilizado com --get, --set, --unset, --all-"
 "entries, ou --all-dirs\n"
 
-#: gconf/gconftool.c:466
+#: gconf/gconftool.c:463
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
@@ -1535,375 +1451,375 @@ msgstr ""
 "--set_schema n�o dever� ser utilizado com --get, --set, --unset, --all-"
 "entries, --all-dirs\n"
 
-#: gconf/gconftool.c:472
+#: gconf/gconftool.c:469
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Tipo de valor apenas � relevante ao definir valor\n"
 
-#: gconf/gconftool.c:478
+#: gconf/gconftool.c:475
 msgid "Must specify a type when setting a value\n"
 msgstr "Tem de definir um tipo ao definir valor\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:485
 msgid "Ping option must be used by itself.\n"
 msgstr "Op��o ping tem de ser utilizada por ela pr�pria.\n"
 
-#: gconf/gconftool.c:498
+#: gconf/gconftool.c:495
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "Op��o --dir-exists tem de ser utilizada por ela pr�pria.\n"
 
-#: gconf/gconftool.c:508
+#: gconf/gconftool.c:505
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file tem de ser utilizada por ela pr�pria.\n"
 
-#: gconf/gconftool.c:519
+#: gconf/gconftool.c:516
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule tem de ser utilizada por ela pr�pria.\n"
 
-#: gconf/gconftool.c:530
+#: gconf/gconftool.c:527
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key tem de ser utilizada por ela pr�pria.\n"
 
-#: gconf/gconftool.c:541
+#: gconf/gconftool.c:538
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory tem de ser utilizada por ela pr�pria.\n"
 
-#: gconf/gconftool.c:549
+#: gconf/gconftool.c:546
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "Tem de especificar uma fonte de configura��o com --config-source ao utilizar "
 "--direct\n"
 
-#: gconf/gconftool.c:555
+#: gconf/gconftool.c:552
 msgid "You should use --direct when using a non-default configuration source\n"
 msgstr ""
 "Deve utilizar --direct quando utiliza uma fonte de configura��o n�o-defeito\n"
 
-#: gconf/gconftool.c:561
+#: gconf/gconftool.c:558
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Falha ao inicializar GConf: %s\n"
 
-#: gconf/gconftool.c:590
+#: gconf/gconftool.c:587
 msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
 msgstr ""
 "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL est� definido, n�o se instalar�o "
 "esquemas\n"
 
-#: gconf/gconftool.c:603
+#: gconf/gconftool.c:600
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "tem de definir a vari�vel de ambiente GCONF_CONFIG_SOURCE\n"
 
-#: gconf/gconftool.c:632
+#: gconf/gconftool.c:629
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Falha ao aceder a fonte(s) de configura��o: %s\n"
 
-#: gconf/gconftool.c:854
+#: gconf/gconftool.c:851
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Erro ao terminar: %s\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:894
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Tem de especificar um ou mais direct�rios a listar recursivamente.\n"
 
-#: gconf/gconftool.c:931
+#: gconf/gconftool.c:928
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Falha ao listar as entradas em `%s': %s\n"
 
-#: gconf/gconftool.c:949
+#: gconf/gconftool.c:946
 msgid "(no value set)"
 msgstr "(nenhum valor definido)"
 
-#: gconf/gconftool.c:1004
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Falha no spawn do servidor de configura��o (gconfd): %s\n"
 
-#: gconf/gconftool.c:1018
+#: gconf/gconftool.c:1015
 msgid "Must specify a key or keys to get\n"
 msgstr "Tem de especificar chave ou chaves a obter\n"
 
-#: gconf/gconftool.c:1053
+#: gconf/gconftool.c:1050
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tipo: %s\n"
 
-#: gconf/gconftool.c:1054
+#: gconf/gconftool.c:1051
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Tipo Lista: %s\n"
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1052
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Tipo Car: %s\n"
 
-#: gconf/gconftool.c:1056
+#: gconf/gconftool.c:1053
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Tipo Cdr: %s\n"
 
-#: gconf/gconftool.c:1061
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Valor Defeito: %s\n"
 
-#: gconf/gconftool.c:1061 gconf/gconftool.c:1063 gconf/gconftool.c:1064
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058 gconf/gconftool.c:1060 gconf/gconftool.c:1061
+#: gconf/gconftool.c:1062
 msgid "Unset"
 msgstr "N�o definido"
 
-#: gconf/gconftool.c:1063
+#: gconf/gconftool.c:1060
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Dono: %s\n"
 
-#: gconf/gconftool.c:1064
+#: gconf/gconftool.c:1061
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Desc. Curta: %s\n"
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1062
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Desc. Longa: %s\n"
 
-#: gconf/gconftool.c:1074 gconf/gconftool.c:1368
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1365
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Nenhum valor definido para `%s'\n"
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1372
+#: gconf/gconftool.c:1075 gconf/gconftool.c:1369
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Falha ao obter valor para `%s': %s\n"
 
-#: gconf/gconftool.c:1121 gconf/gconftool.c:1133
+#: gconf/gconftool.c:1118 gconf/gconftool.c:1130
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Tipo `%s' n�o compreendido\n"
 
-#: gconf/gconftool.c:1145
+#: gconf/gconftool.c:1142
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Tem de especificar chaves/valores alternados como argumentos\n"
 
-#: gconf/gconftool.c:1165
+#: gconf/gconftool.c:1162
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Nenhum valor definido para chave: `%s'\n"
 
-#: gconf/gconftool.c:1193
+#: gconf/gconftool.c:1190
 msgid "Cannot set schema as value\n"
 msgstr "Incapaz de definir esquema como valor\n"
 
-#: gconf/gconftool.c:1203
+#: gconf/gconftool.c:1200
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 "Quando a definir uma lista tem de especificar o tipo de lista primitivo\n"
 
-#: gconf/gconftool.c:1217
+#: gconf/gconftool.c:1214
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Ao definir um par tem de especificar um tipo-car e tipo-cdr primitivos\n"
 
-#: gconf/gconftool.c:1232
+#: gconf/gconftool.c:1229
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erro: %s\n"
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Erro a definir valor: %s\n"
 
-#: gconf/gconftool.c:1263
+#: gconf/gconftool.c:1260
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Erro a sincronizar: %s\n"
 
-#: gconf/gconftool.c:1286
+#: gconf/gconftool.c:1283
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Tem de especificar uma chave ou chaves na linha de comando\n"
 
-#: gconf/gconftool.c:1306
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "Nenhum esquema conhecido para `%s'\n"
 
-#: gconf/gconftool.c:1339
+#: gconf/gconftool.c:1336
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "Nenhuma express�o doc armazenada em esquema em '%s'\n"
 
-#: gconf/gconftool.c:1344
+#: gconf/gconftool.c:1341
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Erro ao obter esquema em '%s': %s\n"
 
-#: gconf/gconftool.c:1351
+#: gconf/gconftool.c:1348
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "Nenhum esquema armazenado em '%s'\n"
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1351
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "Valor em '%s' n�o � um esquema\n"
 
-#: gconf/gconftool.c:1410 gconf/gconftool.c:1435
+#: gconf/gconftool.c:1407 gconf/gconftool.c:1432
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 "Tem de especificar um nome de esquema seguido de um nome de chave � qual "
 "aplica-lo\n"
 
-#: gconf/gconftool.c:1417
+#: gconf/gconftool.c:1414
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "Erro ao associar nome de esquema '%s' com nome de chave '%s': %s\n"
 
-#: gconf/gconftool.c:1445
+#: gconf/gconftool.c:1442
 #, c-format
 msgid "Error removing schema name from '%s': %s\n"
 msgstr "Erro ao remover nome de esquema de '%s': %s\n"
 
-#: gconf/gconftool.c:1470
+#: gconf/gconftool.c:1467
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Tem de especificar uma chave (nome de esquema) como �nico argumento\n"
 
-#: gconf/gconftool.c:1512
+#: gconf/gconftool.c:1509
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Tipo de lista tem de ser um tipo primitivo: string, int, float or bool\n"
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1529
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Tipo de par car tem de ser um tipo primitivo: string, int, float or bool\n"
 
-#: gconf/gconftool.c:1552
+#: gconf/gconftool.c:1549
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Tipo de par cdr tem de ser um tipo primitivo: string, int, float or bool\n"
 
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1564
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Erro ao definir valor: %s"
 
-#: gconf/gconftool.c:1581
+#: gconf/gconftool.c:1578
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Erro ao sincronizar: %s"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1593
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "tem de especificar um ou mais direct�rios de onde obter os pares chave/"
 "valor.\n"
 
-#: gconf/gconftool.c:1610
+#: gconf/gconftool.c:1607
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Tem de especificar uma ou mais chaves a redefinir (unset).\n"
 
-#: gconf/gconftool.c:1621
+#: gconf/gconftool.c:1618
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Erro ao redefinir (unset) `%s': %s\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1638
 msgid "Must specify one or more keys to recursively unset.\n"
 msgstr "Tem de especificar uma ou mais chaves a desactivar recursivamente.\n"
 
-#: gconf/gconftool.c:1655
+#: gconf/gconftool.c:1652
 #, c-format
 msgid "Failure during recursive unset of \"%s\": %s\n"
 msgstr "Falha ao des-definir recursivamente \"%s\": %s\n"
 
-#: gconf/gconftool.c:1673
+#: gconf/gconftool.c:1670
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Tem de especificar um ou mais direct�rios de onde obter subdirect�rios.\n"
 
-#: gconf/gconftool.c:1707
+#: gconf/gconftool.c:1704
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Erro ao listar direct�rios: %s\n"
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1746
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "AVISO: tipo de esquema (%s) inv�lido ou em falta\n"
 
-#: gconf/gconftool.c:1758
+#: gconf/gconftool.c:1755
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "AVISO: list_type de esquema (%s) inv�lido ou em falta\n"
 
-#: gconf/gconftool.c:1769 gconf/gconftool.c:1799 gconf/gconftool.c:1828
+#: gconf/gconftool.c:1766 gconf/gconftool.c:1796 gconf/gconftool.c:1825
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "AVISO: Falha ao parsear valor de defeito `%s' para esquema (%s)\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1784
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "AVISO: car_type ou cdr_type inv�lido ou em falta para esquema (%s)\n"
 
-#: gconf/gconftool.c:1812
+#: gconf/gconftool.c:1809
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "AVISO: N�o pode definir um valor de defeito para um esquema\n"
 
-#: gconf/gconftool.c:1841
+#: gconf/gconftool.c:1838
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "AVISO: erro interno de gconftool, GConfValueType desconhecido\n"
 
-#: gconf/gconftool.c:1888 gconf/gconftool.c:1909 gconf/gconftool.c:1930
-#: gconf/gconftool.c:1951
+#: gconf/gconftool.c:1885 gconf/gconftool.c:1906 gconf/gconftool.c:1927
+#: gconf/gconftool.c:1948
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "AVISO: falha ao parsear tipo de nome `%s'\n"
 
-#: gconf/gconftool.c:1905
+#: gconf/gconftool.c:1902
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVISO: list_type apenas pode ser int, float, string ou bool e n�o `%s'\n"
 
-#: gconf/gconftool.c:1926
+#: gconf/gconftool.c:1923
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVISO: car_type apenas pode ser int, float, string ou bool e n�o `%s'\n"
 
-#: gconf/gconftool.c:1947
+#: gconf/gconftool.c:1944
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVISO: cdr_type apenas pode ser int, float, string ou bool e n�o `%s'\n"
 
-#: gconf/gconftool.c:1975
+#: gconf/gconftool.c:1972
 msgid "WARNING: empty <applyto> node"
 msgstr "AVISO: n� <applyto> vazio"
 
-#: gconf/gconftool.c:1978 gconf/gconftool.c:2241
+#: gconf/gconftool.c:1975 gconf/gconftool.c:2238
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "AVISO: n� <%s> n�o compreendido abaixo de <schema>\n"
 
-#: gconf/gconftool.c:1988
+#: gconf/gconftool.c:1985
 msgid "WARNING: no key specified for schema\n"
 msgstr "AVISO: nenhuma chave especificada para o esquema\n"
 
-#: gconf/gconftool.c:2021
+#: gconf/gconftool.c:2018
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr "AVISO: n� <locale> n�o tem atributo `name=\"locale\"', a ignorar\n"
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2024
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1911,51 +1827,51 @@ msgstr ""
 "AVISO: m�ltiplos n�s <locale> para o locale `%s', a ignorar todos ap�s o "
 "primeiro\n"
 
-#: gconf/gconftool.c:2108
+#: gconf/gconftool.c:2105
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "AVISO: N� <%s> inv�lido num n� <locale>\n"
 
-#: gconf/gconftool.c:2137
+#: gconf/gconftool.c:2134
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "AVISO: falha ao instalar esquema `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:2145
+#: gconf/gconftool.c:2142
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Instalado o esquema `%s' para o locale `%s'\n"
 
-#: gconf/gconftool.c:2167
+#: gconf/gconftool.c:2164
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "AVISO: falha ao associar o esquema `%s' com a chave `%s': %s\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2172
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Associado o esquema `%s' � chave `%s'\n"
 
-#: gconf/gconftool.c:2254
+#: gconf/gconftool.c:2251
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Tem de ter pelo menos uma entrada <locale> num <schema>\n"
 
-#: gconf/gconftool.c:2285
+#: gconf/gconftool.c:2282
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "AVISO: n� <%s> n�o compreendido abaixo de <schemalist>\n"
 
-#: gconf/gconftool.c:2308
+#: gconf/gconftool.c:2305
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Falha ao abrir `%s': %s\n"
 
-#: gconf/gconftool.c:2315
+#: gconf/gconftool.c:2312
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Documento `%s' est� vazio?\n"
 
-#: gconf/gconftool.c:2327
+#: gconf/gconftool.c:2324
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1964,26 +1880,26 @@ msgstr ""
 "Documento `%s' tem o tipo errado de n� ra�z (<%s>, deveria ser "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:2340
+#: gconf/gconftool.c:2337
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Documento `%s' n�o tem n� de n�vel de topo <gconfschemafile>\n"
 
-#: gconf/gconftool.c:2354
+#: gconf/gconftool.c:2351
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "AVISO: n� <%s> abaixo de <gconfschemafile> n�o compreendido\n"
 
-#: gconf/gconftool.c:2365 gconf/gconftool.c:2397
+#: gconf/gconftool.c:2362 gconf/gconftool.c:2394
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Erro ao sincronizar dados de configura��o: %s"
 
-#: gconf/gconftool.c:2381
+#: gconf/gconftool.c:2378
 msgid "Must specify some schema files to install\n"
 msgstr "Tem de especificar ficheiros de esquema a instalar\n"
 
-#: gconf/gconftool.c:2418
+#: gconf/gconftool.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -1992,16 +1908,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2438
+#: gconf/gconftool.c:2435
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Falha ao redefinir (unset) quebra de chave %s: %s\n"
 
-#: gconf/gconftool.c:2564
+#: gconf/gconftool.c:2561
 msgid "Must specify some keys to break\n"
 msgstr "Tem de especificar algumas chaves a quebrar\n"
 
-#: gconf/gconftool.c:2570
+#: gconf/gconftool.c:2567
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -2010,11 +1926,11 @@ msgstr ""
 "Tente quebrar a sua aplica��o definindo valores incorrectos para a chave:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2588
+#: gconf/gconftool.c:2585
 msgid "Must specify some directories to break\n"
 msgstr "Tem de especificar alguns direct�rios a quebrar\n"
 
-#: gconf/gconftool.c:2607
+#: gconf/gconftool.c:2604
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -2025,26 +1941,102 @@ msgstr ""
 "chaves no direct�rio:\n"
 "  %s\n"
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "Failed to parse XML file \"%s\""
+#~ msgstr "Falha ao parsear ficheiro XML \"%s\""
+
+#~ msgid "Server ping error: %s"
+#~ msgstr "Erro de ping servidor: %s"
+
+#~ msgid ""
+#~ "Failed to contact configuration server; some possible causes are that you "
+#~ "need to enable TCP/IP networking for ORBit, or you have stale NFS locks "
+#~ "due to a system crash. See http://www.gnome.org/projects/gconf/ for "
+#~ "information. (Details - %s)"
+#~ msgstr ""
+#~ "Falha a contactar servidor de configura��o; algumas causas poss�veis s�o "
+#~ "que voc� necessita de activar liga��es TCP/IP para ORBit, ou possui "
+#~ "exclusividades (locks) NFS derivados de um crash de sistema. Consulte "
+#~ "http://www.gnome.org/projects/gconf/ para mais informa��es. (Detalhes - %"
+#~ "s)"
+
+#~ msgid "none"
+#~ msgstr "nenhum"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not open or create the file \"%s\"; this indicates that there may "
+#~ "be a problem with your configuration, as many programs will need to "
+#~ "create files in your home directory. The error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Contacte o seu administrador de sistemas para resolver o seguinte "
+#~ "problema:\n"
+#~ "Incapaz de abrir ou criar o ficheiro \"%s\"; isto indica que poder� "
+#~ "existir um problema com a configura��o, j� que muitas aplica��es "
+#~ "necessitar�o de criar ficheiros no seu direct�rio pessoal (home). O erro "
+#~ "foi \"%s\" (errno = %d)."
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not lock the file \"%s\"; this indicates that there may be a "
+#~ "problem with your operating system configuration. If you have an NFS-"
+#~ "mounted home directory, either the client or the server may be set up "
+#~ "incorrectly. See the rpc.statd and rpc.lockd documentation. A common "
+#~ "cause of this error is that the \"nfslock\" service has been disabled.The "
+#~ "error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Contacte o seu administrador de sistemas para resolver o seguinte "
+#~ "problema:\n"
+#~ "Incapaz de trancar o ficheiro \"%s\"; isto indica que poder� existir um "
+#~ "problema com a configura��o do seu sistema operativo. Se tiver um "
+#~ "direct�rio pessoal (home) montado NFS, ou o cliente ou o servidor podem "
+#~ "estar incorrectamente configurados. Veja a documenta��o rpc.statd e rpc."
+#~ "lockd. Uma causa comum para este erro � que o servi�o \"nfslock\" foi "
+#~ "desactivado. O erro foi \"%s\" (errno = %d)."
+
+#~ msgid "Can't remove file %s: %s\n"
+#~ msgstr "Incapaz de remover ficheiro %s: %s\n"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "No configuration sources in the configuration file \"%s\"; this means "
+#~ "that preferences and other settings can't be saved. %s%s"
+#~ msgstr ""
+#~ "Contacte o seu administrador de sistemas para resolver o seguinte "
+#~ "problema:\n"
+#~ "Nenhumas fontes de configura��o no ficheiro de configura��o \"%s\"; isto "
+#~ "significa que prefer�ncias e outras defini��es n�o poder�o ser gravadas. %"
+#~ "s%s"
+
+#~ msgid "Error reading the file: "
+#~ msgstr "Erro ao ler ficheiro: "
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
+#~ msgstr ""
+#~ "Contacte o seu administrador de sistemas para resolver o seguinte "
+#~ "problema:\n"
+#~ "Incapaz de resolver o endere�o \"%s\" no ficheiro de configura��o \"%s\": "
+#~ "%s"
+
+#~ msgid "Multiple segmentation faults occurred; can't display error dialog\n"
+#~ msgstr ""
+#~ "Ocorreram m�ltiplas falhas de segmenta��o; incapaz de mostrar di�logo de "
+#~ "erro\n"
+
 #~ msgid ""
-#~ "Failed to contact configuration server; some possible causes are:\n"
-#~ "a) you have an existing configuration server (gconfd) running, but it "
-#~ "isn't reachable from here - if you're logged in from two machines at "
-#~ "once, you may need to enable TCP networking for ORBit by putting the line "
-#~ "\"ORBIIOPIPv4=1\" in /etc/orbitrc\n"
-#~ "b) you have stale locks in your NFS-mounted home directory due to a "
-#~ "system crash, try removing ~/.gconf/*.lock and ~/.gconfd/lock if you are "
-#~ "sure no gconfd processes are running on any machine using your home dir"
+#~ "Segmentation fault!\n"
+#~ "Cannot display crash dialog: %s\n"
 #~ msgstr ""
-#~ "Falha ao contactar servidor de configura��o; algumas causas poss�veis "
-#~ "s�o:\n"
-#~ "a) j� existe um servidor de configura��o (gconfd) a correr, mas n�o � "
-#~ "alcan�avel daqui - se estiver ligado de duas m�quinas simultaneamente, "
-#~ "poder� ter de activar redes TCP para o ORBit pondo a linha \"ORBIIOPOPv4=1"
-#~ "\" em /etc/orbitrc\n"
-#~ "b) tem locks mortos no seu direct�rio home, montado por NFS, devido a um "
-#~ "crash de sistema. tente remover ~/.gconf/*.lock e ~/.gconfd/lock se tiver "
-#~ "a certeza de que nenhuns processos gconfd est�o a correr em nenhuma "
-#~ "m�quina utilzando o seu direct�rio home"
+#~ "Falha de segmenta��o!\n"
+#~ "Incapaz de mostrar di�logo de crash: %s\n"
 
 #~ msgid "Unsynced directory deletions when shutting down XML backend"
 #~ msgstr "Apagar direct�rios n�o sincronizados ao desligar m�dulo XML"
diff --git a/po/ru.po b/po/ru.po
index 9511ded5..feede2a2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -70,7 +70,9 @@ msgstr ""
 msgid ""
 "Remove dir operation is no longer supported, just remove all the values in "
 "the directory"
-msgstr "�������� �������� �������� ������ �� ��������������, ������ ������� ��� �������� � ��������"
+msgstr ""
+"�������� �������� �������� ������ �� ��������������, ������ ������� ��� "
+"�������� � ��������"
 
 #: backends/xml-backend.c:718
 msgid "Initializing XML backend module"
@@ -1042,7 +1044,9 @@ msgstr ""
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
-msgstr "�� ������� ������� ���� ������� gconfd; �������� ������ �� ������� ��������� ��������� (%s)"
+msgstr ""
+"�� ������� ������� ���� ������� gconfd; �������� ������ �� ������� ��������� "
+"��������� (%s)"
 
 #: gconf/gconfd.c:1263
 #, c-format
@@ -1591,15 +1595,21 @@ msgstr "���������� ��������� ���� (�������� �����) ��� ������������ ��������\n"
 
 #: gconf/gconftool.c:1509
 msgid "List type must be a primitive type: string, int, float or bool\n"
-msgstr "��� ������ ������ ���� ����������� �����: �������, �����, � ��������� ������ ��� ����������\n"
+msgstr ""
+"��� ������ ������ ���� ����������� �����: �������, �����, � ��������� ������ "
+"��� ����������\n"
 
 #: gconf/gconftool.c:1529
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
-msgstr "��� ����� ���� ������ ���� ����������� �����: �������, �����, � ��������� ������ ��� ����������\n"
+msgstr ""
+"��� ����� ���� ������ ���� ����������� �����: �������, �����, � ��������� "
+"������ ��� ����������\n"
 
 #: gconf/gconftool.c:1549
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
-msgstr "��� �������� ���� ������ ���� ����������� �����: �������, �����, � ��������� ������ ��� ����������\n"
+msgstr ""
+"��� �������� ���� ������ ���� ����������� �����: �������, �����, � ��������� "
+"������ ��� ����������\n"
 
 #: gconf/gconftool.c:1564
 #, c-format
@@ -1613,7 +1623,9 @@ msgstr "������ �������������: %s"
 
 #: gconf/gconftool.c:1593
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
-msgstr "���������� ������� ���� ��� ����� ��������� ��� ��������� ��� ����/��������.\n"
+msgstr ""
+"���������� ������� ���� ��� ����� ��������� ��� ��������� ��� ����/"
+"��������.\n"
 
 #: gconf/gconftool.c:1607
 msgid "Must specify one or more keys to unset.\n"
@@ -1626,7 +1638,8 @@ msgstr "������ �������� �������� \"%s\": %s\n"
 
 #: gconf/gconftool.c:1638
 msgid "Must specify one or more keys to recursively unset.\n"
-msgstr "��������� ������� ���� ��� ����� ������ ��� ������������ �������� ��������.\n"
+msgstr ""
+"��������� ������� ���� ��� ����� ������ ��� ������������ �������� ��������.\n"
 
 #: gconf/gconftool.c:1652
 #, c-format
diff --git a/po/sk.po b/po/sk.po
index bb0f4487..a8a54707 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 1.1\n"
-"POT-Creation-Date: 2002-03-26 14:00+0100\n"
+"POT-Creation-Date: 2002-01-28 21:35-0500\n"
 "PO-Revision-Date: 2002-03-26 14:05+0100\n"
 "Last-Translator: Stanislav Višňovský <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -32,7 +32,7 @@ msgstr "Inicializujem BDB modul"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "Nie je možné nájsť koreňový priečinok pre %s na adrese `%s'"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1209
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1176
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nie je možné vytvoriť priečinok '%s': %s"
@@ -65,12 +65,12 @@ msgstr ""
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Práva k priečinku/súboru pre zdroj XML v koreni %s sú: %o/%o"
 
-#: backends/xml-backend.c:590
+#: backends/xml-backend.c:584
 #, c-format
 msgid "Error syncing the XML backend directory cache: %s"
 msgstr "Chyba pri synchronizácii vyrovnávacej pamäti pre modul XML: %s"
 
-#: backends/xml-backend.c:655
+#: backends/xml-backend.c:651
 msgid ""
 "Remove dir operation is no longer supported, just remove all the values in "
 "the directory"
@@ -78,20 +78,20 @@ msgstr ""
 "Operácia odstránenia priečinku už nie je podporovaná, jednoducho odstráňte "
 "hodnoty v priečinku"
 
-#: backends/xml-backend.c:722
+#: backends/xml-backend.c:718
 msgid "Initializing XML backend module"
 msgstr "Inicializujem XML modul"
 
-#: backends/xml-backend.c:790
+#: backends/xml-backend.c:786
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Zlyhalo uvoľnenie zámku na priečinku XML `%s': %s"
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:248
 msgid "Failed to sync XML cache contents to disk"
 msgstr "Nepodarilo sa synchronizovať obsah vyrovnávacej pamäti XML na disk"
 
-#: backends/xml-cache.c:273
+#: backends/xml-cache.c:278
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -100,7 +100,7 @@ msgstr ""
 "Nepodarilo s odstrániť priečinok `%s' z keše modulu XML, pretože nebol "
 "úspešne zapísaný na disk"
 
-#: backends/xml-cache.c:300
+#: backends/xml-cache.c:305
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than %"
@@ -109,178 +109,169 @@ msgstr ""
 "%u položiek zostalo v keši po vyčistení už synchronizovaných položiek "
 "starších ako %u sekúnd"
 
-#: backends/xml-dir.c:171
+#: backends/xml-dir.c:168
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "Nedá sa zistiť stav `%s': %s"
 
-#: backends/xml-dir.c:181
+#: backends/xml-dir.c:178
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "Meno súboru XML `%s' je priečinok"
 
-#: backends/xml-dir.c:372 backends/xml-dir.c:379
+#: backends/xml-dir.c:369 backends/xml-dir.c:376
 #, c-format
 msgid "Failed to delete \"%s\": %s"
 msgstr "Nepodarilo sa odstrániť \"%s\": %s"
 
-#: backends/xml-dir.c:424
+#: backends/xml-dir.c:421
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Nepodarilo sa zapísať do súboru `%s': %s"
 
-#: backends/xml-dir.c:437
+#: backends/xml-dir.c:434
 #, c-format
 msgid "Failed to set mode on `%s': %s"
 msgstr "Nepodarilo sa nastaviť mód na `%s': %s"
 
-#: backends/xml-dir.c:447
+#: backends/xml-dir.c:444
 #, c-format
 msgid "Failed to write XML data to `%s': %s"
 msgstr "Nepodarilo sa zapísať XML dáta do `%s': %s"
 
-#: backends/xml-dir.c:457 backends/xml-dir.c:1233
+#: backends/xml-dir.c:454 backends/xml-dir.c:1200
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Nepodarilo sa zavrieť súbor `%s': %s"
 
-#: backends/xml-dir.c:473 backends/xml-dir.c:483
+#: backends/xml-dir.c:470 backends/xml-dir.c:480
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Nepodarilo sa premenovať súbor `%s' na `%s': %s"
 
-#: backends/xml-dir.c:489
+#: backends/xml-dir.c:486
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Nepodarilo sa obnoviť `%s' zo súboru `%s': %s"
 
-#: backends/xml-dir.c:501
+#: backends/xml-dir.c:498
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Nepodarilo sa odstrániť starý súbor `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:929
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Nepodarilo sa zistiť stav `%s': %s"
 
-#: backends/xml-dir.c:956
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: backends/xml-dir.c:1106
+#: backends/xml-dir.c:1073
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Duplikovaná položka `%s' v `%s', ignorujem"
 
-#: backends/xml-dir.c:1128
+#: backends/xml-dir.c:1095
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Položka bez mena v súbore XML `%s', ignorujem"
 
-#: backends/xml-dir.c:1136
+#: backends/xml-dir.c:1103
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
-msgstr "Uzol na najvyššej úrovni v súbore XML `%s' je <%s> a nie <entry>, ignorujem"
+msgstr ""
+"Uzol na najvyššej úrovni v súbore XML `%s' je <%s> a nie <entry>, ignorujem"
 
-#: backends/xml-dir.c:1225
+#: backends/xml-dir.c:1192
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Nepodarilo sa vytvoriť súbor `%s': %s"
 
-#: backends/xml-dir.c:1324
-#, c-format
-msgid "Failed to parse XML file \"%s\""
-msgstr "Nepodarilo sa spracovať súbor XML \"%s\""
-
 #. There was an error
-#: backends/xml-entry.c:154
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorujem uzol XML s menom `%s': %s"
 
-#: backends/xml-entry.c:332
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignorujem meno schémy `%s', nie je platné: %s"
 
-#: backends/xml-entry.c:380
+#: backends/xml-entry.c:376
 #, c-format
 msgid "Ignoring XML node `%s': %s"
 msgstr "Ignorujem uzol XML `%s': %s"
 
-#: backends/xml-entry.c:732
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Nepodarilo sa prečítať štandardnú hodnotu pre schému: %s"
 
-#: backends/xml-entry.c:952
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "V uzle  <%s> chýba atribút \"type\""
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Uzol má neznámy atribút \"type\" `%s', ignorujem"
 
-#: backends/xml-entry.c:981
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "V uzle chýba atribút \"value\""
 
-#: backends/xml-entry.c:1029 backends/xml-entry.c:1105
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Nerozpoznaný uzol XML <%s> v XML zozname"
 
-#: backends/xml-entry.c:1063
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Neplatný typ (zoznam, pár alebo neznámy) v uzle zoznamu"
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Neplatný uzol XML: %s"
 
-#: backends/xml-entry.c:1094
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Zoznam obsahuje nesprávne typovaný uzol (%s, má byť %s)"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorujem neplatný car z páru XML: %s"
 
-#: backends/xml-entry.c:1155 backends/xml-entry.c:1178
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "spracovanie súboru XML: zoznamy a páry možno nie sú umiestnené v páre"
 
-#: backends/xml-entry.c:1168
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorujem neplatný cdr z páru XML: %s"
 
-#: backends/xml-entry.c:1187
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Nerozpoznaný uzol XML <%s> v XML uzle páru"
 
-#: backends/xml-entry.c:1205
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Nenájdené car a cdr v páre uzla XML"
 
-#: backends/xml-entry.c:1211
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Chýbajúce cdr z páru hodnôt v súbore XML"
 
-#: backends/xml-entry.c:1218
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "Chýbajúce car z páru hodnôt v súbore XML"
 
-#: backends/xml-entry.c:1223
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Chýbajúce obidve hodnoty car aj cdr z páru v súbore XML"
 
@@ -318,46 +309,50 @@ msgstr "Nepodarilo sa ukončiť modul"
 msgid "GConf Error: %s\n"
 msgstr "Chyba GConf: %s\n"
 
-#: gconf/gconf-client.c:881
+#: gconf/gconf-client.c:899
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Varovanie GConf: zlyhanie v zozname párov v `%s': %s"
 
-#: gconf/gconf-client.c:1146
+#: gconf/gconf-client.c:1165
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Očakávané `%s' prijaté `%s' pre kľúč %s"
 
-#: gconf/gconf-database.c:234
+#: gconf/gconf-database.c:233
 msgid "Received invalid value in set request"
 msgstr "Zachytená neplatná hodnota v požiadavke"
 
-#: gconf/gconf-database.c:242
+#: gconf/gconf-database.c:241
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr "Nezmyselná CORBA hodnota vrátená pri požiadavke na kľúč `%s'"
 
-#: gconf/gconf-database.c:523
+#: gconf/gconf-database.c:522
 msgid "Received request to drop all cached data"
 msgstr "Prijatá požiadavka pre zahodenie všetkých dát v keši"
 
-#: gconf/gconf-database.c:540
+#: gconf/gconf-database.c:539
 msgid "Received request to sync synchronously"
 msgstr "Prijatá požiadavka na synchronizáciu"
 
-#: gconf/gconf-database.c:824
+#: gconf/gconf-database.c:823
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Kritická chyba: nepodarilo sa získať referenciu na ConfigDatabase"
 
-#: gconf/gconf-database.c:986
+#: gconf/gconf-database.c:985
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Nepodarilo sa synchronizovať jeden alebo viac zdrojov: %s"
 
-#: gconf/gconf-database.c:1078
-#, c-format
+#. This error is not fatal; we basically ignore it.
+#. * Because it's likely the right thing for the client
+#. * app to simply continue.
+#.
+#: gconf/gconf-database.c:1076
+#, fuzzy, c-format
 msgid ""
-"Failed to log addition of listener %s (%s);will not be able to restore this "
+"Failed to log addition of listener %s (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
@@ -365,12 +360,12 @@ msgstr ""
 "možné obnoviť pri reštarte gconfd. Výsledkom bude nespoľahlivé upozorňovanie "
 "na zmeny konfigurácie."
 
-#: gconf/gconf-database.c:1109
+#: gconf/gconf-database.c:1103
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Listener ID %lu neexistuje"
 
-#: gconf/gconf-database.c:1123
+#: gconf/gconf-database.c:1117
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -379,57 +374,57 @@ msgstr ""
 "Nepodarilo sa zaznamenať odstránenie listenera do súboru so záznamom (asi "
 "neškodné, ale môže sa objaviť divné opakovanie upozornení): %s"
 
-#: gconf/gconf-database.c:1241 gconf/gconf-sources.c:1540
+#: gconf/gconf-database.c:1235 gconf/gconf-sources.c:1540
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Chyba pri získavaní hodnoty pre `%s': %s"
 
-#: gconf/gconf-database.c:1288
+#: gconf/gconf-database.c:1282
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Chyba pri nastavovaní hodnoty pre `%s': %s"
 
-#: gconf/gconf-database.c:1331
+#: gconf/gconf-database.c:1325
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Chyba pri mazaní hodnoty pre `%s': %s"
 
-#: gconf/gconf-database.c:1360
+#: gconf/gconf-database.c:1354
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Chyba pri získavaní štandardnej hodnoty pre `%s': %s"
 
-#: gconf/gconf-database.c:1411
+#: gconf/gconf-database.c:1405
 #, c-format
 msgid "Error unsetting \"%s\": %s"
 msgstr "Chyba pri mazaní hodnoty pre \"%s\": %s"
 
-#: gconf/gconf-database.c:1443
+#: gconf/gconf-database.c:1437
 #, c-format
 msgid "Error getting new value for \"%s\": %s"
 msgstr "Chyba pri získavaní hodnoty pre \"%s\": %s"
 
-#: gconf/gconf-database.c:1491
+#: gconf/gconf-database.c:1485
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Chyba pri kontrole existencie `%s': %s"
 
-#: gconf/gconf-database.c:1515
+#: gconf/gconf-database.c:1509
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Chyba pri odstraňovaní priečinku `%s': %s"
 
-#: gconf/gconf-database.c:1542
+#: gconf/gconf-database.c:1536
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Nepodarilo sa získať všetky položky v `%s': %s"
 
-#: gconf/gconf-database.c:1568
+#: gconf/gconf-database.c:1562
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Chyba pri výpise priečinkov v `%s': %s"
 
-#: gconf/gconf-database.c:1589
+#: gconf/gconf-database.c:1583
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Chyba pri nastavovaní schémy pre `%s': %s"
@@ -556,65 +551,66 @@ msgstr "Pridávam zdroj `%s'\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "Chyba pri čítaní súboru `%s': %s\n"
 
-#: gconf/gconf-internals.c:1195 gconf/gconf-internals.c:1261
+#: gconf/gconf-internals.c:1211 gconf/gconf-internals.c:1277
 #: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
-#: gconf/gconf-value.c:1511
+#: gconf/gconf-value.c:1341
 msgid "Text contains invalid UTF-8"
 msgstr "Text obsahuje neplatné UTF-8"
 
-#: gconf/gconf-internals.c:1346
+#: gconf/gconf-internals.c:1362
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Očakávaný zoznam, prijaté %s"
 
-#: gconf/gconf-internals.c:1356
+#: gconf/gconf-internals.c:1372
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Očakávaný zoznam %s, prijatý zoznam %s"
 
-#: gconf/gconf-internals.c:1498
+#: gconf/gconf-internals.c:1511
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Očakávaný pár, prijaté %s"
 
-#: gconf/gconf-internals.c:1512
+#: gconf/gconf-internals.c:1525
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
-msgstr "Očakávaný (%s,%s) pár, prijatý pár s jednou alebo obomi chýbajúcimi hodnotami"
+msgstr ""
+"Očakávaný (%s,%s) pár, prijatý pár s jednou alebo obomi chýbajúcimi hodnotami"
 
-#: gconf/gconf-internals.c:1528
+#: gconf/gconf-internals.c:1541
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Očakávaný pár typu (%s,%s), načítaný typ (%s,%s)"
 
-#: gconf/gconf-internals.c:1644
+#: gconf/gconf-internals.c:1657
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Text v úvodzovkách nezačína úvodzovkami"
 
-#: gconf/gconf-internals.c:1706
+#: gconf/gconf-internals.c:1719
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Text v úvodzovkách nekončí úvodzovkami"
 
-#: gconf/gconf-internals.c:1842
+#: gconf/gconf-internals.c:1855
 msgid "Encoded value is not valid UTF-8"
 msgstr "Kódovaná hodnota nie je platné UTF-8"
 
-#: gconf/gconf-internals.c:2301
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Could not lock temporary file '%s': %s"
 msgstr "Nie je možné uzamknúť dočasný súbor `%s': %s"
 
-#: gconf/gconf-internals.c:2328
+#: gconf/gconf-internals.c:2341
 #, c-format
 msgid "Could not create file '%s', probably because it already exists"
 msgstr "Nie je možné vytvoriť súbor '%s', možno už existuje"
 
-#: gconf/gconf-internals.c:2374
+#: gconf/gconf-internals.c:2387
 #, c-format
 msgid "Failed to create or open '%s'"
 msgstr "Nepodarilo sa vytvoriť alebo otvoriť '%s'"
 
-#: gconf/gconf-internals.c:2384
+#: gconf/gconf-internals.c:2397
 #, c-format
 msgid ""
 "Failed to lock '%s': probably another process has the lock, or your "
@@ -623,172 +619,97 @@ msgstr ""
 "Nepodarilo sa uzamknúť '%s': zamknuté iným procesom alebo je váš systém "
 "nesprávne nastavené zamykanie NFS súborov (%s)"
 
-#: gconf/gconf-internals.c:2413
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
-msgstr "Súbor IOR '%s' nebol úspešne otvorený, na adrese nebol nájdený gconfd: %s"
+msgstr ""
+"Súbor IOR '%s' nebol úspešne otvorený, na adrese nebol nájdený gconfd: %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2455
 #, c-format
 msgid "gconftool or other non-gconfd process has the lock file '%s'"
 msgstr "gconftool alebo proces  iný ako gconfd má zamknutý súbor '%s'"
 
-#: gconf/gconf-internals.c:2460
+#: gconf/gconf-internals.c:2472
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
-msgstr "nie je možné spojiť sa s ORBom pre zistenie referencie na existujúci gconfd"
+msgstr ""
+"nie je možné spojiť sa s ORBom pre zistenie referencie na existujúci gconfd"
 
-#: gconf/gconf-internals.c:2470
+#: gconf/gconf-internals.c:2482
 #, c-format
 msgid "Failed to convert IOR '%s' to an object reference"
 msgstr "Nepodarilo sa previesť IOR '%s' na referenciu na objekt"
 
-#: gconf/gconf-internals.c:2520
+#: gconf/gconf-internals.c:2510
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "Nie je možné vytvoriť priečinok `%s': %s"
 
-#: gconf/gconf-internals.c:2579
+#: gconf/gconf-internals.c:2569
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Nie je možné zapisovať do súboru `%s': %s"
 
-#: gconf/gconf-internals.c:2620
+#: gconf/gconf-internals.c:2610
 #, c-format
 msgid "We didn't have the lock on file `%s', but we should have"
 msgstr "Nemáme zámok pre súbor `%s', ale mali by sme mať"
 
-#: gconf/gconf-internals.c:2641
+#: gconf/gconf-internals.c:2631
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
 msgstr "Nepodarilo sa vytvoriť odkaz `%s' na `%s': %s"
 
-#: gconf/gconf-internals.c:2653
+#: gconf/gconf-internals.c:2643
 #, c-format
 msgid "Failed to remove lock file `%s': %s"
 msgstr "Nepodarilo sa odstrániť súbor so zámkom `%s': %s"
 
-#: gconf/gconf-internals.c:2672
+#: gconf/gconf-internals.c:2662
 #, c-format
 msgid "Failed to clean up file '%s': %s"
 msgstr "Nepodarilo sa vyčistiť súbor `%s': %s"
 
-#: gconf/gconf-internals.c:2686
+#: gconf/gconf-internals.c:2676
 #, c-format
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "Nepodarilo sa odstrániť priečinok pre zámky `%s': %s"
 
-#: gconf/gconf-internals.c:2860 gconf/gconfd.c:591
+#: gconf/gconf-internals.c:2842 gconf/gconfd.c:583
 #, c-format
 msgid "Failed to create %s: %s"
 msgstr "Nepodarilo sa vytvoriť %s: %s"
 
-#: gconf/gconf-internals.c:2882
-#, c-format
-msgid "Server ping error: %s"
-msgstr "Chyba pri pingu na server: %s"
-
-#: gconf/gconf-internals.c:2903
+#: gconf/gconf-internals.c:2875
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
-msgstr "Nepodarilo sa vytvoriť rúru pre komunikáciu s potomkami démona gconf: %s\n"
+msgstr ""
+"Nepodarilo sa vytvoriť rúru pre komunikáciu s potomkami démona gconf: %s\n"
 
-#: gconf/gconf-internals.c:2927
+#: gconf/gconf-internals.c:2899
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Nepodarilo sa spustiť konfiguračný server: %s\n"
 
-#: gconf/gconf-internals.c:2952
-#, c-format
-msgid ""
-"Failed to contact configuration server; some possible causes are that you "
-"need to enable TCP/IP networking for ORBit, or you have stale NFS locks due "
-"to a system crash. See http://www.gnome.org/projects/gconf/ for information. "
-"(Details - %s)"
-msgstr ""
-"Nepodarilo sa kontaktovať konfiguračný server. Možno ste museli zapnúť "
-"podporu siete TCP/IP pre ORBit alebo máte staré zámky NFS od pádu "
-"systému. Informácie nájdete na http://www.gnome.org/projects/gconf/. "
-"(Detaily - %s)"
-
-#: gconf/gconf-internals.c:2953
-msgid "none"
-msgstr "žiadne"
-
-#: gconf/gconf-sanity-check.c:39 gconf/gconftool.c:72
-msgid "Help options"
-msgstr "Možnosti pomocníka"
-
-#: gconf/gconf-sanity-check.c:74 gconf/gconftool.c:411
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Chyba vo voľbe %s: %s.\n"
-"Spusťte '%s --help' pre úplný zoznam možností príkazového riadku.\n"
-
-#: gconf/gconf-sanity-check.c:131
-#, c-format
+#: gconf/gconf-internals.c:2923
 msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not open or create the file \"%s\"; this indicates that there may be a "
-"problem with your configuration, as many programs will need to create files "
-"in your home directory. The error was \"%s\" (errno = %d)."
+"Failed to contact configuration server; some possible causes are:\n"
+"a) you have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit by putting the line \"ORBIIOPIPv4=1"
+"\" in /etc/orbitrc\n"
+"b) you have stale locks in your NFS-mounted home directory due to a system "
+"crash, try removing ~/.gconf/*.lock and ~/.gconfd/lock if you are sure no "
+"gconfd processes are running on any machine using your home dir"
 msgstr ""
-"Prosím, kontaktujte administrátora systému pre vyriešenie nasledujúceho "
-"problému:\n"
-"Nepodarilo sa otvoriť alebo vytvoriť súbor \"%s\", čo ukazuje na problém s "
-"konfiguráciou, pretože veľa programov potrebuje vytvárať súbory vo vašom "
-"domovskom priečinku. Chyba bola \"%s\" (errno = %d)."
-
-#: gconf/gconf-sanity-check.c:143
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not lock the file \"%s\"; this indicates that there may be a problem "
-"with your operating system configuration. If you have an NFS-mounted home "
-"directory, either the client or the server may be set up incorrectly. See "
-"the rpc.statd and rpc.lockd documentation. A common cause of this error is "
-"that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
-"%d)."
-msgstr ""
-"Prosím, kontaktujte administrátora systému pre vyriešenie nasledujúceho "
-"problému:\n"
-"Nepodarilo sa otvoriť alebo vytvoriť súbor \"%s\", čo ukazuje na problém s "
-"konfiguráciou. Ak máte domovský priečinok pripojený pomocou NFS, asi je "
-"nesprávne nakonfigurovaný klient alebo server. Prečítajte si dokumentáciu k "
-"rpc.statd a rpc.lockd. Častým dôvodom tejto chyby je, že "
-"bola vypnutá služba \"nfslock\". Chyba bola \"%s\" (errno = %d)."
-
-#: gconf/gconf-sanity-check.c:160
-#, c-format
-msgid "Can't remove file %s: %s\n"
-msgstr "Nie je možné odstrániť súbor %s: %s\n"
-
-#: gconf/gconf-sanity-check.c:195
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"No configuration sources in the configuration file \"%s\"; this means that "
-"preferences and other settings can't be saved. %s%s"
-msgstr ""
-"Prosím, kontaktujte administrátora systému pre vyriešenie nasledujúceho "
-"problému:\n"
-"V konfiguračnom súbore \"%s\" nie sú zdroje konfigurácie, takže "
-"nie je možné uložiť žiadne nastavenie. %s%s"
-
-#: gconf/gconf-sanity-check.c:198
-msgid "Error reading the file: "
-msgstr "Chyba pri čítaní súboru:"
-
-#: gconf/gconf-sanity-check.c:220
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
-msgstr ""
-"Prosím, kontaktujte administrátora systému pre vyriešenie nasledujúceho "
-"Nepodarilo sa zistiť adresu \"%s\" v konfiguračnom súbore \"%s\": %s"
+"Nepodarilo sa spojiť s konfiguračným serverom. Časté príčiny:\n"
+"a) máte bežiaci konfiguračný server (gconfd), ale odtiaľto nie je dostupný - "
+"ak ste prihlásený na dvoj počítačoch naraz, možno budete musieť povoliť sieť "
+"TCP pre ORBit pridaním  \"ORBIIOPIPv4=1\" in /etc/orbitrc\n"
+"b) v domovskom NFS priečinku máte staré zámky, ktoré vznikli pádom systému. "
+"Skúste odstrániť ~/.gconf/*.lock a ~/.gconfd/lock ak viete, že na žiadnom "
+"počítači, ktorý používa váš domovský priečinok, nebežia žiadne procesy "
+"gconfd."
 
 #: gconf/gconf-schema.c:190 gconf/gconf-schema.c:198 gconf/gconf-schema.c:206
 #: gconf/gconf-schema.c:214
@@ -808,11 +729,13 @@ msgstr "Zistená adresa \"%s\" je konfiguračný zdroj so zápisom na pozícii %
 #: gconf/gconf-sources.c:352
 #, c-format
 msgid "Resolved address \"%s\" to a read-only config source at position %d"
-msgstr "Zistená adresa \"%s\" je konfiguračný zdroj iba pre čítanie na pozícii %di"
+msgstr ""
+"Zistená adresa \"%s\" je konfiguračný zdroj iba pre čítanie na pozícii %di"
 
 #: gconf/gconf-sources.c:359
 #, c-format
-msgid "Resolved address \"%s\" to a partially writable config source at position %d"
+msgid ""
+"Resolved address \"%s\" to a partially writable config source at position %d"
 msgstr ""
 "Zistená adresa \"%s\" je konfiguračný zdroj s čiastočným zápisom na pozícii %"
 "d"
@@ -955,96 +878,96 @@ msgstr "Nerozpoznané `%s' (nesprávny počet elementov)"
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "Nerozpoznané `%s' (extra ')' nájdená v rámci páru)"
 
-#: gconf/gconf.c:55
+#: gconf/gconf.c:54
 #, c-format
 msgid "Key \"%s\" is NULL"
 msgstr "Kľúč \"%s\" je NULL"
 
-#: gconf/gconf.c:62
+#: gconf/gconf.c:61
 #, c-format
 msgid "\"%s\": %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:343
+#: gconf/gconf.c:333
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Server nemohol zistiť adresu `%s'"
 
-#: gconf/gconf.c:634
+#: gconf/gconf.c:624
 msgid "Can't add notifications to a local configuration source"
 msgstr "Nie je možné pridávať upozornenia k lokálnemu konfiguračnému zdroju"
 
-#: gconf/gconf.c:2079
+#: gconf/gconf.c:2072
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Pridanie klienta do zoznamu serveru zlyhalo, chyba CORBA: %s"
 
-#: gconf/gconf.c:2434
+#: gconf/gconf.c:2393
 msgid "Must begin with a slash (/)"
 msgstr "Musí začínať znamienkom lomeno (/)"
 
-#: gconf/gconf.c:2456
+#: gconf/gconf.c:2415
 msgid "Can't have two slashes (/) in a row"
 msgstr "Dve znamienka lomeno (/) nesmú byť hneď za sebou"
 
-#: gconf/gconf.c:2458
+#: gconf/gconf.c:2417
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Bodka (.) nesmie byť hneď za znamienkom lomeno (/)"
 
-#: gconf/gconf.c:2477
+#: gconf/gconf.c:2436
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
 msgstr "'%c' nie je platný znak v menách kľúčov/priečinkov"
 
-#: gconf/gconf.c:2487
+#: gconf/gconf.c:2446
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' nie je platný znak v menách kľúčov/priečinkov"
 
-#: gconf/gconf.c:2501
+#: gconf/gconf.c:2460
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Kľúč/priečinok nesmie končiť znamienkom lomeno (/)"
 
-#: gconf/gconf.c:2870
+#: gconf/gconf.c:2829
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Zlyhalo vypnutie konfiguračného serveru: %s"
 
-#: gconf/gconf.c:2931
+#: gconf/gconf.c:2890
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Očakávaný float, prijaté %s"
 
-#: gconf/gconf.c:2966
+#: gconf/gconf.c:2925
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Očakávaný int, prijaté %s"
 
-#: gconf/gconf.c:3001
+#: gconf/gconf.c:2960
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Očakávaný string, prijaté %s"
 
-#: gconf/gconf.c:3038
+#: gconf/gconf.c:2997
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Očakávaný bool, prijaté %s"
 
-#: gconf/gconf.c:3071
+#: gconf/gconf.c:3030
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Očakávaná schéma, prijaté %s"
 
-#: gconf/gconf.c:3432
+#: gconf/gconf.c:3391
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Chyba CORBA: %s"
 
-#: gconf/gconfd.c:249
+#: gconf/gconfd.c:246
 msgid "Shutdown request received"
 msgstr "Prijatá požiadavka na ukončenie"
 
-#: gconf/gconfd.c:281
+#: gconf/gconfd.c:278
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -1052,9 +975,10 @@ msgstr ""
 "gconfd bol preložený s ladiacimi informáciami, pokúšam sa načítať gconf.path "
 "zo zdrojového priečinku"
 
-#: gconf/gconfd.c:295
+#: gconf/gconfd.c:292
 #, c-format
-msgid "No configuration files found, trying to use the default config source `%s'"
+msgid ""
+"No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 "Nenájdené žiadne konfiguračné súbory, pokúsim sa použiť štandardný "
 "konfiguračný zdroj `%s'"
@@ -1062,7 +986,7 @@ msgstr ""
 #. We want to stay alive but do nothing, because otherwise every
 #. request would result in another failed gconfd being spawned.
 #.
-#: gconf/gconfd.c:303
+#: gconf/gconfd.c:300
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1070,16 +994,16 @@ msgstr ""
 "Nenájdené žiadne konfiguračné súbory v zdrojovej ceste, konfigurácia nebude "
 "uložená ani upravená"
 
-#: gconf/gconfd.c:303
+#: gconf/gconfd.c:300
 msgid "/path"
 msgstr "/cesta"
 
-#: gconf/gconfd.c:316
+#: gconf/gconfd.c:313
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Chyba pri nahrávaní niektorých konfiguračných zdrojov: %s"
 
-#: gconf/gconfd.c:328
+#: gconf/gconfd.c:325
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1087,7 +1011,7 @@ msgstr ""
 "Neboli úspešne nájdené žiadne konfiguračné zdroje, nebude možné ukladať ani "
 "načítať konfiguračné dáta"
 
-#: gconf/gconfd.c:345
+#: gconf/gconfd.c:342
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1095,65 +1019,67 @@ msgstr ""
 "Neboli úspešne nájdené žiadne konfiguračné zdroje, do ktorých je možný "
 "zápis, niektoré zmeny konfigurácie asi nebude možné uložiť"
 
-#: gconf/gconfd.c:371
+#: gconf/gconfd.c:368
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr "Zachytený signál %d, zapisujem súbor core. Prosím, oznámte chybu GConfu."
+msgstr ""
+"Zachytený signál %d, zapisujem súbor core. Prosím, oznámte chybu GConfu."
 
-#: gconf/gconfd.c:389
+#: gconf/gconfd.c:384
 #, c-format
-msgid "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 "Zachytený signál %d, končím abnormálne. Prosím, vyplňte správu o chybe v "
 "GConf."
 
-#: gconf/gconfd.c:406
+#: gconf/gconfd.c:401
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Zachytený signál %d, vypínam"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:538
+#: gconf/gconfd.c:531
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "starting (version %s), pid %u user '%s'"
 
-#: gconf/gconfd.c:578
+#: gconf/gconfd.c:570
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Nepodarilo sa získať referenciu na objekt pre ConfigServer"
 
-#: gconf/gconfd.c:616
+#: gconf/gconfd.c:608
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 "Nepodarilo sa zapísať bajt do rúry %d, takže klientský program môže prestať "
 "reagovať: %s"
 
-#: gconf/gconfd.c:626
+#: gconf/gconfd.c:618
 #, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "Nepodarilo sa získať zámok pre démona, končím: %s"
 
-#: gconf/gconfd.c:664
+#: gconf/gconfd.c:656
 #, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "Nepodarilo sa uvoľniť súbor zámku: %s"
 
-#: gconf/gconfd.c:672
+#: gconf/gconfd.c:664
 msgid "Exiting"
 msgstr "Končím"
 
-#: gconf/gconfd.c:698
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "GConf server sa nepoužíva, končím."
 
-#: gconf/gconfd.c:1063
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Vraciam výnimku: %s"
 
-#: gconf/gconfd.c:1163
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1162,63 +1088,66 @@ msgstr ""
 "Nepodarilo sa otvoriť súbor so záznamom pre gconfd; nebude možné obnoviť "
 "listenerom po vypnutí gconfd (%s)"
 
-#: gconf/gconfd.c:1198
+#: gconf/gconfd.c:1194
 #, c-format
-msgid "Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 "Nepodarilo sa zavrieť súbor so záznamom pre gconfd, dáta možno nie sú "
 "správne uložené (%s)"
 
-#: gconf/gconfd.c:1267
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Nepodarilo sa otvoriť súbor s uloženým stavom '%s' pre zápis: %s"
 
-#: gconf/gconfd.c:1281
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Nie je možné sa zapisovať do súboru s uloženým stavom '%s' fd: %d: %s"
 
-#: gconf/gconfd.c:1290
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Nepodarilo sa zavrieť súbor s uloženým stavom '%s': %s"
 
-#: gconf/gconfd.c:1304
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Nie je možné odsunúť nabok starý súbor s uloženým stavom '%s': %s"
 
-#: gconf/gconfd.c:1314
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Nepodarilo sa presunúť nový súbor s uloženým stavom na miesto: %s"
 
-#: gconf/gconfd.c:1323
+#: gconf/gconfd.c:1319
 #, c-format
-msgid "Failed to restore original saved state file that had been moved to '%s': %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 "Nepodarilo sa obnoviť pôvodný súbor s uloženým stavom, ktorý bol presunutý "
 "do '%s': %s"
 
-#: gconf/gconfd.c:1794
+#: gconf/gconfd.c:1790
 #, c-format
-msgid "Unable to restore a listener on address '%s', couldn't resolve the database"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 "Nepodarilo sa obnoviť listenera na adrese '%s', nie je možné zistiť adresu "
 "databáze"
 
-#: gconf/gconfd.c:1840
+#: gconf/gconfd.c:1836
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Chyba pri čítaní súboru s uloženým stavom: %s"
 
-#: gconf/gconfd.c:1893
+#: gconf/gconfd.c:1889
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Nepodarilo sa otvoriť súbor s uloženým stavom '%s': %s"
 
-#: gconf/gconfd.c:2010
+#: gconf/gconfd.c:2006
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1227,7 +1156,7 @@ msgstr ""
 "Nepodarilo sa zaznamenať pridanie listeneru do súboru so záznamom pre "
 "gconfd, nebude možné znovu-pridať listenera aj bude gconfd ukončený (%s)"
 
-#: gconf/gconfd.c:2015
+#: gconf/gconfd.c:2011
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1237,54 +1166,44 @@ msgstr ""
 "gconfd, je možné, že bude listener nesprávne znovu-pridaný pri ukončení "
 "gconfd (%s)"
 
-#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
+#: gconf/gconfd.c:2034 gconf/gconfd.c:2199
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Nepodarilo sa získať IOR klienta: %s"
 
-#: gconf/gconfd.c:2053
+#: gconf/gconfd.c:2049
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Nepodarilo sa otvoriť súbor s uloženým stavom: %s"
 
-#: gconf/gconfd.c:2066
+#: gconf/gconfd.c:2062
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "Nepodarilo sa zapísať dáta od klienta do súboru s uloženým stavom: %s"
 
-#: gconf/gconfd.c:2074
+#: gconf/gconfd.c:2070
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr "Nepodarilo sa pridať dáta od klienta do súboru s uloženým stavom: %s"
 
-#: gconf/gconfd.c:2164
-msgid "Some client removed itself from the GConf server when it hadn't been added."
+#: gconf/gconfd.c:2160
+msgid ""
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr "Niektorý klient sa odstránil z GConf serveru keď tam nebol pridaný."
 
-#. dialog display isn't working out
-#: gconf/gconfd.c:2303
-msgid "Multiple segmentation faults occurred; can't display error dialog\n"
-msgstr "Nastalo viac chýb segmentácie, nie je možné zobraziť chybový dialóg\n"
-
-#. Eeeek! Can't show dialog
-#: gconf/gconfd.c:2312
-#, c-format
-msgid ""
-"Segmentation fault!\n"
-"Cannot display crash dialog: %s\n"
-msgstr ""
-"Chyba segmentácie.\n"
-"Nie je možné zobraziť dialóg pre pád programu: %s\n"
+#: gconf/gconftool.c:71
+msgid "Help options"
+msgstr "Možnosti pomocníka"
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Nastaviť kľúč na hodnotu a synchronizovať. Použiť s --type."
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid "Print the value of a key to standard output."
 msgstr "Vypísať hodnotu kľúča na štandardný výstup."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:98
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
@@ -1292,41 +1211,41 @@ msgstr ""
 "Nastaviť schému a synchronizovať. Použiť s --short-desc, --long-desc, --"
 "owner, a --type."
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 msgid "Unset the keys on the command line"
 msgstr "Vymazať kľúče z príkazového riadku"
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
 msgstr "Rekurzívne vymaže všetky kľúče v a pod zadanými kľúčmi/priečinkami"
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all key/value pairs in a directory."
 msgstr "Vypísať všetky páry kľúč/hodnota v priečinku."
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Print all subdirectories in a directory."
 msgstr "Vypísať všetky podpriečinky v priečinku."
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "Vypísať všetky podpriečinky a položky v priečinku, rekurzívne."
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Vrátiť 0, ak priečinok existuje, 2 ak neexistuje."
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Ukončiť gconfd. POUŽÍVAJTE IBA V PRÍPADE, ŽE MÁTE ROZUMNÝ DÔVOD."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Vrátiť 0, ak gconfd beží, inak vrátiť 2."
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1334,7 +1253,7 @@ msgstr ""
 "Spustiť konfiguračný server (gconfd). (Normálne spúšťaný, až keď je "
 "potrebný.)"
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1342,11 +1261,11 @@ msgstr ""
 "Typ nastavovanej hodnoty alebo typ hodnoty popisovanej schémou. Jednoznačné "
 "skratky sú akceptované."
 
-#: gconf/gconftool.c:191
+#: gconf/gconftool.c:190
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1354,11 +1273,11 @@ msgstr ""
 "Typ nastavovaného zoznamu hodnôt alebo typ hodnoty popisovanej schémou. "
 "Jednoznačné skratky sú akceptované."
 
-#: gconf/gconftool.c:200 gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:199 gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1366,7 +1285,7 @@ msgstr ""
 "Typ nastavovaného car páru hodnôt alebo typ hodnoty popisovanej schémou. "
 "Jednoznačné skratky sú akceptované."
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1374,43 +1293,43 @@ msgstr ""
 "Typ nastavovaného cdr páru hodnôt alebo typ hodnoty popisovanej schémou. "
 "Jednoznačné skratky sú akceptované."
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Krátky, polriadkový popis pre uloženie do schémy."
 
-#: gconf/gconftool.c:227 gconf/gconftool.c:236
+#: gconf/gconftool.c:226 gconf/gconftool.c:235
 msgid "DESCRIPTION"
 msgstr "POPIS"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a several-line description to go in a schema."
 msgstr "Niekoľkoriadkový popis pre uloženie do schémy."
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 msgid "Specify the owner of a schema"
 msgstr "Vlastník schémy"
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 msgid "OWNER"
 msgstr "VLASTNÍK"
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid "Specify a schema file to be installed"
 msgstr "Inštalovaný súbor schémy"
 
-#: gconf/gconftool.c:254
+#: gconf/gconftool.c:253
 msgid "FILENAME"
 msgstr "MENOSÚBORU"
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "Konfiguračný zdroj použitý namiesto štandardnej cesty"
 
-#: gconf/gconftool.c:263
+#: gconf/gconftool.c:262
 msgid "SOURCE"
 msgstr "ZDROJ"
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1418,7 +1337,7 @@ msgstr ""
 "Pristupovať do konfiguračnej databáze priamo, obísť server. Vyžaduje, aby "
 "gconfd nebežal."
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1428,7 +1347,7 @@ msgstr ""
 "neštandardný zdroj dát by mala byť nastavená premenná prostredia "
 "GCONF_CONFIG_SOURCE, alebo by mala byť prázdna pre štandardný zdroj."
 
-#: gconf/gconftool.c:289
+#: gconf/gconftool.c:288
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1436,7 +1355,7 @@ msgstr ""
 "Testovať aplikáciu nastavovaním a vymazávaním obsahu skupiny hodnôt pre "
 "rôzne typy kľúčov z príkazového riadku."
 
-#: gconf/gconftool.c:298
+#: gconf/gconftool.c:297
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1444,47 +1363,57 @@ msgstr ""
 "Testovať aplikáciu nastavovaním a vymazávaním obsahu skupiny hodnôt v "
 "priečinku z príkazového riadku."
 
-#: gconf/gconftool.c:307
+#: gconf/gconftool.c:306
 msgid "Get the short doc string for a key"
 msgstr "Získať krátky dokumentačný reťazec pre kľúč"
 
-#: gconf/gconftool.c:316
+#: gconf/gconftool.c:315
 msgid "Get the long doc string for a key"
 msgstr "Získať dlhý dokumentačný reťazec pre kľúč"
 
-#: gconf/gconftool.c:325
+#: gconf/gconftool.c:324
 msgid "Get the name of the schema applied to this key"
 msgstr "Získať meno schémy použitej pre tento kľúč"
 
-#: gconf/gconftool.c:334
+#: gconf/gconftool.c:333
 msgid "Specify the schema name followed by the key to apply the schema name to"
-msgstr "Zadajte meno schémy nasledované kľúčom, na ktorý sa má táto schéma použiť"
+msgstr ""
+"Zadajte meno schémy nasledované kľúčom, na ktorý sa má táto schéma použiť"
 
-#: gconf/gconftool.c:343
+#: gconf/gconftool.c:342
 msgid "Remove any schema name applied to the given keys"
 msgstr "Odstrániť všetky mená schém použitých pre dané kľúče"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:351
 msgid "Get the name of the default source"
 msgstr "Získať meno štandardného zdroja"
 
-#: gconf/gconftool.c:423
+#: gconf/gconftool.c:408
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Chyba vo voľbe %s: %s.\n"
+"Spusťte '%s --help' pre úplný zoznam možností príkazového riadku.\n"
+
+#: gconf/gconftool.c:420
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Nie je možné naraz získať hodnotu a nastaviť/vymazať hodnotu\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:427
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Nie je možné naraz nastaviť hodnotu a získať hodnotu/vymazať hodnotu\n"
 
-#: gconf/gconftool.c:438
+#: gconf/gconftool.c:435
 msgid "Can't use --all-entries with --get or --set\n"
 msgstr "Neviem použiť --all-entries spolu s --get alebo --set\n"
 
-#: gconf/gconftool.c:446
+#: gconf/gconftool.c:443
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Neviem použiť --all-dirs spolu s --get alebo --set\n"
 
-#: gconf/gconftool.c:456
+#: gconf/gconftool.c:453
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-"
 "entries, or --all-dirs\n"
@@ -1492,7 +1421,7 @@ msgstr ""
 "--recursive-list nesmie byť použité spolu s --get, --set, --unset, --all-"
 "entries, alebo --all-dirs\n"
 
-#: gconf/gconftool.c:466
+#: gconf/gconftool.c:463
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
@@ -1500,417 +1429,428 @@ msgstr ""
 "--set_schema nesmie byť použité spolu s --get, --set, --unset, --all-"
 "entries, --all-dirs\n"
 
-#: gconf/gconftool.c:472
+#: gconf/gconftool.c:469
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Typ hodnoty je dôležitý iba pri nastavovaní hodnoty\n"
 
-#: gconf/gconftool.c:478
+#: gconf/gconftool.c:475
 msgid "Must specify a type when setting a value\n"
 msgstr "Pri nastavovaní hodnoty musíte zadať typ\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:485
 msgid "Ping option must be used by itself.\n"
 msgstr "Voľba ping musí byť použitá iba samostatne.\n"
 
-#: gconf/gconftool.c:498
+#: gconf/gconftool.c:495
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists musí byť použité iba samostatne.\n"
 
-#: gconf/gconftool.c:508
+#: gconf/gconftool.c:505
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file musí byť použité iba samostatne.\n"
 
-#: gconf/gconftool.c:519
+#: gconf/gconftool.c:516
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule musí byť použité iba samostatne.\n"
 
-#: gconf/gconftool.c:530
+#: gconf/gconftool.c:527
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key musí byť použité iba samostatne.\n"
 
-#: gconf/gconftool.c:541
+#: gconf/gconftool.c:538
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory musí byť použité iba samostatne.\n"
 
-#: gconf/gconftool.c:549
-msgid "You must specify a config source with --config-source when using --direct\n"
+#: gconf/gconftool.c:546
+msgid ""
+"You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "Keď používate --direct, musíte zadať konfiguračný zdroj pomocou --config-"
 "source\n"
 
-#: gconf/gconftool.c:555
+#: gconf/gconftool.c:552
 msgid "You should use --direct when using a non-default configuration source\n"
-msgstr "Keď používate neštandardný konfiguračný zdroj, mali by ste použiť --direct.\n"
+msgstr ""
+"Keď používate neštandardný konfiguračný zdroj, mali by ste použiť --direct.\n"
 
-#: gconf/gconftool.c:561
+#: gconf/gconftool.c:558
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Nepodarilo sa inicializovať GConf: %s\n"
 
-#: gconf/gconftool.c:590
+#: gconf/gconftool.c:587
 msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
 msgstr ""
 "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL je nastavená, schémy nebudú "
 "nainštalované\n"
 
-#: gconf/gconftool.c:603
+#: gconf/gconftool.c:600
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Musíte nastaviť premenné prostredia GCONF_CONFIG_SOURCE\n"
 
-#: gconf/gconftool.c:632
+#: gconf/gconftool.c:629
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Nepodaril sa prístup ku konfiguračnému zdroju: %s\n"
 
-#: gconf/gconftool.c:854
+#: gconf/gconftool.c:851
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Chyba pri ukončovaní: %s\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:894
 msgid "Must specify one or more dirs to recursively list.\n"
-msgstr "Musíte zadať jeden alebo viac priečinkov, ktoré chcete rekurzívne vypísať.\n"
+msgstr ""
+"Musíte zadať jeden alebo viac priečinkov, ktoré chcete rekurzívne vypísať.\n"
 
-#: gconf/gconftool.c:931
+#: gconf/gconftool.c:928
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Nepodarilo sa vypísať zoznam hodnôt v `%s': %s\n"
 
-#: gconf/gconftool.c:949
+#: gconf/gconftool.c:946
 msgid "(no value set)"
 msgstr "(hodnota nenastavená)"
 
-#: gconf/gconftool.c:1004
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Nepodarilo sa spustiť konfiguračný server (gconfd): %s\n"
 
-#: gconf/gconftool.c:1018
+#: gconf/gconftool.c:1015
 msgid "Must specify a key or keys to get\n"
 msgstr "Musíte zadať, ktorý kľúč alebo kľúče chcete získať\n"
 
-#: gconf/gconftool.c:1053
+#: gconf/gconftool.c:1050
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:1054
+#: gconf/gconftool.c:1051
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Typ zoznamu: %s\n"
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1052
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Typ car: %s\n"
 
-#: gconf/gconftool.c:1056
+#: gconf/gconftool.c:1053
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Typ cdr: %s\n"
 
-#: gconf/gconftool.c:1061
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Štandardná hodnota: %s\n"
 
-#: gconf/gconftool.c:1061 gconf/gconftool.c:1063 gconf/gconftool.c:1064
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058 gconf/gconftool.c:1060 gconf/gconftool.c:1061
+#: gconf/gconftool.c:1062
 msgid "Unset"
 msgstr "Nenaplnená"
 
-#: gconf/gconftool.c:1063
+#: gconf/gconftool.c:1060
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Vlastník: %s\n"
 
-#: gconf/gconftool.c:1064
+#: gconf/gconftool.c:1061
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Krátky popis: %s\n"
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1062
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Dlhý popis: %s\n"
 
-#: gconf/gconftool.c:1074 gconf/gconftool.c:1368
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1365
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Pre `%s' nie je nastavená hodnota\n"
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1372
+#: gconf/gconftool.c:1075 gconf/gconftool.c:1369
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Nepodarilo sa získať hodnotu pre `%s': %s\n"
 
-#: gconf/gconftool.c:1121 gconf/gconftool.c:1133
+#: gconf/gconftool.c:1118 gconf/gconftool.c:1130
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Nerozpoznaný typ `%s'\n"
 
-#: gconf/gconftool.c:1145
+#: gconf/gconftool.c:1142
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Musíte zadať striedavo kľúče a hodnoty ako argumenty\n"
 
-#: gconf/gconftool.c:1165
+#: gconf/gconftool.c:1162
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Pre kľúč nie je nastavená hodnota: `%s'\n"
 
-#: gconf/gconftool.c:1193
+#: gconf/gconftool.c:1190
 msgid "Cannot set schema as value\n"
 msgstr "Nie je možné nastaviť schému ako hodnotu\n"
 
-#: gconf/gconftool.c:1203
+#: gconf/gconftool.c:1200
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Pri nastavovaní zoznamu musíte zadať primitívny typ zoznamu.\n"
 
-#: gconf/gconftool.c:1217
-msgid "When setting a pair you must specify a primitive car-type and cdr-type\n"
+#: gconf/gconftool.c:1214
+msgid ""
+"When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "Pri nastavovaní páru musíte zadať primitívny typ car alebo typ cdr.\n"
 
-#: gconf/gconftool.c:1232
+#: gconf/gconftool.c:1229
 #, c-format
 msgid "Error: %s\n"
 msgstr "Chyba: %s\n"
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Chyba pri nastavovaní hodnoty: %s\n"
 
-#: gconf/gconftool.c:1263
+#: gconf/gconftool.c:1260
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Chyba pri synchronizácii: %s\n"
 
-#: gconf/gconftool.c:1286
+#: gconf/gconftool.c:1283
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Musíte zadať, ktorý kľúč alebo kľúče na príkazovom riadku\n"
 
-#: gconf/gconftool.c:1306
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "Pre `%s' nie je známa schéma\n"
 
-#: gconf/gconftool.c:1339
+#: gconf/gconftool.c:1336
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "V schéme '%s' nie je uložený žiadny dokumentačný reťazec\n"
 
-#: gconf/gconftool.c:1344
+#: gconf/gconftool.c:1341
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Chyba pri získavaní schémy z '%s': %s\n"
 
-#: gconf/gconftool.c:1351
+#: gconf/gconftool.c:1348
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "V '%s' nie je uložená schéma\n"
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1351
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "Hodnota v '%s' nie je schéma\n"
 
-#: gconf/gconftool.c:1410 gconf/gconftool.c:1435
+#: gconf/gconftool.c:1407 gconf/gconftool.c:1432
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr "Musíte zadať meno schémy a za ním meno kľúča, na ktorý sa má použiť.\n"
 
-#: gconf/gconftool.c:1417
+#: gconf/gconftool.c:1414
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "Nepodarilo sa asociovať schému '%s' s kľúčom '%s': %s\n"
 
-#: gconf/gconftool.c:1445
+#: gconf/gconftool.c:1442
 #, c-format
 msgid "Error removing schema name from '%s': %s\n"
 msgstr "Chyba pri získavaní mena schémy z '%s': %s\n"
 
-#: gconf/gconftool.c:1470
+#: gconf/gconftool.c:1467
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Musíte zadať kľúč (meno schémy) ako jediný argument\n"
 
-#: gconf/gconftool.c:1512
+#: gconf/gconftool.c:1509
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Typ zoznamu musí byť primitívny typ: string, int, float alebo bool\n"
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1529
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr "Typ car páru musí byť primitívny typ: string, int, float alebo bool\n"
 
-#: gconf/gconftool.c:1552
+#: gconf/gconftool.c:1549
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr "Typ cdr páru musí byť primitívny typ: string, int, float alebo bool\n"
 
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1564
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Chyba pri nastavovaní hodnoty: %s"
 
-#: gconf/gconftool.c:1581
+#: gconf/gconftool.c:1578
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Chyba pri synchronizácii: %s"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1593
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Musíte zadať jeden alebo viac priečinkov, z ktorých chcete páry kľúč/"
 "hodnota.\n"
 
-#: gconf/gconftool.c:1610
+#: gconf/gconftool.c:1607
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Musíte uviesť jeden alebo viac kľúčov, ktoré chcete vymazať.\n"
 
-#: gconf/gconftool.c:1621
+#: gconf/gconftool.c:1618
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Chyba mazania `%s': %s\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1638
 msgid "Must specify one or more keys to recursively unset.\n"
-msgstr "Musíte zadať jeden alebo viac priečinkov, ktoré chcete rekurzívne vymazať.\n"
+msgstr ""
+"Musíte zadať jeden alebo viac priečinkov, ktoré chcete rekurzívne vymazať.\n"
 
-#: gconf/gconftool.c:1655
+#: gconf/gconftool.c:1652
 #, c-format
 msgid "Failure during recursive unset of \"%s\": %s\n"
 msgstr "Nepodarilo sa zrušiť hodnoty v '%s': %s\n"
 
-#: gconf/gconftool.c:1673
+#: gconf/gconftool.c:1670
 msgid "Must specify one or more dirs to get subdirs from.\n"
-msgstr "Musíte zadať jeden alebo viac priečinkov, z ktorých chcete podpriečinky.\n"
+msgstr ""
+"Musíte zadať jeden alebo viac priečinkov, z ktorých chcete podpriečinky.\n"
 
-#: gconf/gconftool.c:1707
+#: gconf/gconftool.c:1704
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Chyba pri vypisovaní priečinkov: %s\n"
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1746
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "VAROVANIE: neplatný alebo chýbajúci typ pre schému (%s)\n"
 
-#: gconf/gconftool.c:1758
+#: gconf/gconftool.c:1755
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "VAROVANIE: neplatný alebo chýbajúci list_type pre schému (%s)\n"
 
-#: gconf/gconftool.c:1769 gconf/gconftool.c:1799 gconf/gconftool.c:1828
+#: gconf/gconftool.c:1766 gconf/gconftool.c:1796 gconf/gconftool.c:1825
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
-msgstr "VAROVANIE: Neporadilo sa spracovať štandardnú hodnotu `%s' pre schému (%s)\n"
+msgstr ""
+"VAROVANIE: Neporadilo sa spracovať štandardnú hodnotu `%s' pre schému (%s)\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1784
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
-msgstr "VAROVANIE: neplatný alebo chýbajúci car_type alebo cdr_type pre schému (%s)\n"
+msgstr ""
+"VAROVANIE: neplatný alebo chýbajúci car_type alebo cdr_type pre schému (%s)\n"
 
-#: gconf/gconftool.c:1812
+#: gconf/gconftool.c:1809
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "VAROVANIE: Nemôžete nastaviť štandardnú hodnotu pre schému\n"
 
-#: gconf/gconftool.c:1841
+#: gconf/gconftool.c:1838
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "VAROVANIE: interná chyba gconftool, neznámy GConfValueType\n"
 
-#: gconf/gconftool.c:1888 gconf/gconftool.c:1909 gconf/gconftool.c:1930
-#: gconf/gconftool.c:1951
+#: gconf/gconftool.c:1885 gconf/gconftool.c:1906 gconf/gconftool.c:1927
+#: gconf/gconftool.c:1948
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "VAROVANIE: nepodarilo sa spracovať meno typu `%s'\n"
 
-#: gconf/gconftool.c:1905
+#: gconf/gconftool.c:1902
 #, c-format
-msgid "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
+msgid ""
+"WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "VAROVANIE: list_type môže byť iba int, float, string alebo bool, ale nie `%"
 "s'\n"
 
-#: gconf/gconftool.c:1926
+#: gconf/gconftool.c:1923
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "VAROVANIE: car_type môže byť iba int, float, string alebo bool, ale nie `%"
 "s'\n"
 
-#: gconf/gconftool.c:1947
+#: gconf/gconftool.c:1944
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "VAROVANIE: cdr_type môže byť iba int, float, string alebo bool, ale nie `%"
 "s'\n"
 
-#: gconf/gconftool.c:1975
+#: gconf/gconftool.c:1972
 msgid "WARNING: empty <applyto> node"
 msgstr "VAROVANIE: prázdny uzol <applyto>"
 
-#: gconf/gconftool.c:1978 gconf/gconftool.c:2241
+#: gconf/gconftool.c:1975 gconf/gconftool.c:2238
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "VAROVANIE: uzol <%s> nie je rozpoznaný pod <schema>\n"
 
-#: gconf/gconftool.c:1988
+#: gconf/gconftool.c:1985
 msgid "WARNING: no key specified for schema\n"
 msgstr "VAROVANIE: neuvedený žiadny kľúč pre schému\n"
 
-#: gconf/gconftool.c:2021
+#: gconf/gconftool.c:2018
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
-msgstr "VAROVANIE: uzol <locale> neobsahuje atribút `name=\"locale\"', ignorujem\n"
+msgstr ""
+"VAROVANIE: uzol <locale> neobsahuje atribút `name=\"locale\"', ignorujem\n"
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2024
 #, c-format
-msgid "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
+msgid ""
+"WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 "VAROVANIE: viacnásobný uzol <locale> pre locale `%s', ignorujem všetky okrem "
 "prvého\n"
 
-#: gconf/gconftool.c:2108
+#: gconf/gconftool.c:2105
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "VAROVANIE: Neplatný uzol <%s> v uzle <locale>\n"
 
-#: gconf/gconftool.c:2137
+#: gconf/gconftool.c:2134
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "VAROVANIE: Nepodarilo sa nainštalovať schému `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:2145
+#: gconf/gconftool.c:2142
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Nainštalovaná schéma `%s' pre locale `%s'\n"
 
-#: gconf/gconftool.c:2167
+#: gconf/gconftool.c:2164
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "VAROVANIE: Nepodarilo sa asociovať schému `%s' s kľúčom `%s': %s\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2172
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Schéma `%s' pripojená ku kľúču `%s'\n"
 
-#: gconf/gconftool.c:2254
+#: gconf/gconftool.c:2251
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Musíte mať aspoň jednu položku <locale> v <schema>\n"
 
-#: gconf/gconftool.c:2285
+#: gconf/gconftool.c:2282
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "VAROVANIE: uzol <%s> nie je rozpoznaný pod <schemalist>\n"
 
-#: gconf/gconftool.c:2308
+#: gconf/gconftool.c:2305
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Nepodarilo sa otvoriť `%s': %s\n"
 
-#: gconf/gconftool.c:2315
+#: gconf/gconftool.c:2312
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument `%s' je prázdny?\n"
 
-#: gconf/gconftool.c:2327
+#: gconf/gconftool.c:2324
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1919,26 +1859,26 @@ msgstr ""
 "Dokument `%s' má nesprávny typ koreňového uzlu ( <%s>, má byť "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:2340
+#: gconf/gconftool.c:2337
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokument `%s' nie je <gconfschemafile> uzol na najvyššej úrovni\n"
 
-#: gconf/gconftool.c:2354
+#: gconf/gconftool.c:2351
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "VAROVANIE: uzol <%s> pod <gconfschemafile> nerozpoznaný\n"
 
-#: gconf/gconftool.c:2365 gconf/gconftool.c:2397
+#: gconf/gconftool.c:2362 gconf/gconftool.c:2394
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Chyba pri synchronizácii konfiguračných dát: %s"
 
-#: gconf/gconftool.c:2381
+#: gconf/gconftool.c:2378
 msgid "Must specify some schema files to install\n"
 msgstr "Musíte zadať nejaké súbory so schémou, ktoré sa majú nainštalovať\n"
 
-#: gconf/gconftool.c:2418
+#: gconf/gconftool.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -1947,16 +1887,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2438
+#: gconf/gconftool.c:2435
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Nepodarilo sa zrušiť hodnotu prelamovacieho kľúča %s: %s\n"
 
-#: gconf/gconftool.c:2564
+#: gconf/gconftool.c:2561
 msgid "Must specify some keys to break\n"
 msgstr "Musíte zadať kľúče, ktoré majú byť poškodené\n"
 
-#: gconf/gconftool.c:2570
+#: gconf/gconftool.c:2567
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1965,11 +1905,11 @@ msgstr ""
 "Pokúšam sa o porušenie aplikácie nastavením nesprávnych hodnôt pre kľúč:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2588
+#: gconf/gconftool.c:2585
 msgid "Must specify some directories to break\n"
 msgstr "Musíte zadať priečinky, ktoré majú byť poškodené\n"
 
-#: gconf/gconftool.c:2607
+#: gconf/gconftool.c:2604
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1980,23 +1920,92 @@ msgstr ""
 "priečinku:\n"
 "  %s\n"
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "Failed to parse XML file \"%s\""
+#~ msgstr "Nepodarilo sa spracovať súbor XML \"%s\""
+
+#~ msgid "Server ping error: %s"
+#~ msgstr "Chyba pri pingu na server: %s"
+
 #~ msgid ""
-#~ "Failed to contact configuration server; some possible causes are:\n"
-#~ "a) you have an existing configuration server (gconfd) running, but it "
-#~ "isn't reachable from here - if you're logged in from two machines at "
-#~ "once, you may need to enable TCP networking for ORBit by putting the line "
-#~ "\"ORBIIOPIPv4=1\" in /etc/orbitrc\n"
-#~ "b) you have stale locks in your NFS-mounted home directory due to a "
-#~ "system crash, try removing ~/.gconf/*.lock and ~/.gconfd/lock if you are "
-#~ "sure no gconfd processes are running on any machine using your home dir"
+#~ "Failed to contact configuration server; some possible causes are that you "
+#~ "need to enable TCP/IP networking for ORBit, or you have stale NFS locks "
+#~ "due to a system crash. See http://www.gnome.org/projects/gconf/ for "
+#~ "information. (Details - %s)"
 #~ msgstr ""
-#~ "Nepodarilo sa spojiť s konfiguračným serverom. Časté príčiny:\n"
-#~ "a) máte bežiaci konfiguračný server (gconfd), ale odtiaľto nie je "
-#~ "dostupný - ak ste prihlásený na dvoj počítačoch naraz, možno budete "
-#~ "musieť povoliť sieť TCP pre ORBit pridaním  \"ORBIIOPIPv4=1\" in /etc/"
-#~ "orbitrc\n"
-#~ "b) v domovskom NFS priečinku máte staré zámky, ktoré vznikli pádom "
-#~ "systému. Skúste odstrániť ~/.gconf/*.lock a ~/.gconfd/lock ak viete, že "
-#~ "na žiadnom počítači, ktorý používa váš domovský priečinok, nebežia žiadne "
-#~ "procesy gconfd."
+#~ "Nepodarilo sa kontaktovať konfiguračný server. Možno ste museli zapnúť "
+#~ "podporu siete TCP/IP pre ORBit alebo máte staré zámky NFS od pádu "
+#~ "systému. Informácie nájdete na http://www.gnome.org/projects/gconf/. "
+#~ "(Detaily - %s)"
 
+#~ msgid "none"
+#~ msgstr "žiadne"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not open or create the file \"%s\"; this indicates that there may "
+#~ "be a problem with your configuration, as many programs will need to "
+#~ "create files in your home directory. The error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Prosím, kontaktujte administrátora systému pre vyriešenie nasledujúceho "
+#~ "problému:\n"
+#~ "Nepodarilo sa otvoriť alebo vytvoriť súbor \"%s\", čo ukazuje na problém "
+#~ "s konfiguráciou, pretože veľa programov potrebuje vytvárať súbory vo "
+#~ "vašom domovskom priečinku. Chyba bola \"%s\" (errno = %d)."
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not lock the file \"%s\"; this indicates that there may be a "
+#~ "problem with your operating system configuration. If you have an NFS-"
+#~ "mounted home directory, either the client or the server may be set up "
+#~ "incorrectly. See the rpc.statd and rpc.lockd documentation. A common "
+#~ "cause of this error is that the \"nfslock\" service has been disabled.The "
+#~ "error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Prosím, kontaktujte administrátora systému pre vyriešenie nasledujúceho "
+#~ "problému:\n"
+#~ "Nepodarilo sa otvoriť alebo vytvoriť súbor \"%s\", čo ukazuje na problém "
+#~ "s konfiguráciou. Ak máte domovský priečinok pripojený pomocou NFS, asi je "
+#~ "nesprávne nakonfigurovaný klient alebo server. Prečítajte si dokumentáciu "
+#~ "k rpc.statd a rpc.lockd. Častým dôvodom tejto chyby je, že bola vypnutá "
+#~ "služba \"nfslock\". Chyba bola \"%s\" (errno = %d)."
+
+#~ msgid "Can't remove file %s: %s\n"
+#~ msgstr "Nie je možné odstrániť súbor %s: %s\n"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "No configuration sources in the configuration file \"%s\"; this means "
+#~ "that preferences and other settings can't be saved. %s%s"
+#~ msgstr ""
+#~ "Prosím, kontaktujte administrátora systému pre vyriešenie nasledujúceho "
+#~ "problému:\n"
+#~ "V konfiguračnom súbore \"%s\" nie sú zdroje konfigurácie, takže nie je "
+#~ "možné uložiť žiadne nastavenie. %s%s"
+
+#~ msgid "Error reading the file: "
+#~ msgstr "Chyba pri čítaní súboru:"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
+#~ msgstr ""
+#~ "Prosím, kontaktujte administrátora systému pre vyriešenie nasledujúceho "
+#~ "Nepodarilo sa zistiť adresu \"%s\" v konfiguračnom súbore \"%s\": %s"
+
+#~ msgid "Multiple segmentation faults occurred; can't display error dialog\n"
+#~ msgstr ""
+#~ "Nastalo viac chýb segmentácie, nie je možné zobraziť chybový dialóg\n"
+
+#~ msgid ""
+#~ "Segmentation fault!\n"
+#~ "Cannot display crash dialog: %s\n"
+#~ msgstr ""
+#~ "Chyba segmentácie.\n"
+#~ "Nie je možné zobraziť dialóg pre pád programu: %s\n"
diff --git a/po/sl.po b/po/sl.po
index 58e1d4d9..589692f0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2002-03-08 02:42+0100\n"
+"POT-Creation-Date: 2002-01-28 21:35-0500\n"
 "PO-Revision-Date: 2001-02-12 20:02+0100\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -304,48 +304,52 @@ msgstr "Nisem uspel ustaviti ozadnega modula"
 msgid "GConf Error: %s\n"
 msgstr "Napaka gconf %s\n"
 
-#: gconf/gconf-client.c:897
+#: gconf/gconf-client.c:899
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Opozorilo GConf: napaka ob izpisovanju praov v `%s': %s"
 
-#: gconf/gconf-client.c:1162
+#: gconf/gconf-client.c:1165
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Za ključ %s pričakoval `%s' dobil `%s'"
 
-#: gconf/gconf-database.c:234
+#: gconf/gconf-database.c:233
 msgid "Received invalid value in set request"
 msgstr "Prejel sem neveljavno vrednost v zahtevku \"set\""
 
-#: gconf/gconf-database.c:242
+#: gconf/gconf-database.c:241
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Nisem mogel najti smisla vredosti CORBA prejete v zahtevku \"set\" za ključ `"
 "%s'"
 
-#: gconf/gconf-database.c:523
+#: gconf/gconf-database.c:522
 msgid "Received request to drop all cached data"
 msgstr "Prejel zahtevek za opustitev vseh predpomnjenih podatkov"
 
-#: gconf/gconf-database.c:540
+#: gconf/gconf-database.c:539
 msgid "Received request to sync synchronously"
 msgstr "Prejel zahtevek za usklajeno (sinhrono) uskladitev"
 
-#: gconf/gconf-database.c:824
+#: gconf/gconf-database.c:823
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Usodna napaka: nisem uspel dobiti sklica predmeta za ConfigDatabase"
 
-#: gconf/gconf-database.c:986
+#: gconf/gconf-database.c:985
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Nisem uspel uskladiti enega ali več virov: %s"
 
-#: gconf/gconf-database.c:1078
-#, c-format
+#. This error is not fatal; we basically ignore it.
+#. * Because it's likely the right thing for the client
+#. * app to simply continue.
+#.
+#: gconf/gconf-database.c:1076
+#, fuzzy, c-format
 msgid ""
-"Failed to log addition of listener %s (%s);will not be able to restore this "
+"Failed to log addition of listener %s (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
@@ -353,12 +357,12 @@ msgstr ""
 "gconfd-ja poslušalca ne bom mogel obnoviti, kar bo povzročilo nezanesljivo "
 "obveščanje o spremembah nastavitev."
 
-#: gconf/gconf-database.c:1109
+#: gconf/gconf-database.c:1103
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Poslušalec z ID %lu ne obstaja"
 
-#: gconf/gconf-database.c:1123
+#: gconf/gconf-database.c:1117
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -367,57 +371,57 @@ msgstr ""
 "V dnevnik nisem uspel zapisati odstranitve poslušalca (verjetno ni "
 "škodljivo, lahko pa povzroči ponavljanje obvestil): %s"
 
-#: gconf/gconf-database.c:1241 gconf/gconf-sources.c:1540
+#: gconf/gconf-database.c:1235 gconf/gconf-sources.c:1540
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Napaka ob branju vrednosti za `%s': %s"
 
-#: gconf/gconf-database.c:1288
+#: gconf/gconf-database.c:1282
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Napaka ob nastavljanju vrednosti za `%s': %s"
 
-#: gconf/gconf-database.c:1331
+#: gconf/gconf-database.c:1325
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Napaka ob odnastavljanju `%s': %s"
 
-#: gconf/gconf-database.c:1360
+#: gconf/gconf-database.c:1354
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Napaka ob branju privzete vrednosti za `%s': %s"
 
-#: gconf/gconf-database.c:1411
+#: gconf/gconf-database.c:1405
 #, c-format
 msgid "Error unsetting \"%s\": %s"
 msgstr "Napaka ob odnastavljanju \"%s\": %s"
 
-#: gconf/gconf-database.c:1443
+#: gconf/gconf-database.c:1437
 #, c-format
 msgid "Error getting new value for \"%s\": %s"
 msgstr "Napaka ob branju nove vrednosti za \"%s\": %s"
 
-#: gconf/gconf-database.c:1491
+#: gconf/gconf-database.c:1485
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Napaka ob preverjanju obstoja `%s': %s"
 
-#: gconf/gconf-database.c:1515
+#: gconf/gconf-database.c:1509
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Napaka ob odstranjevanju imenika `%s': %s"
 
-#: gconf/gconf-database.c:1542
+#: gconf/gconf-database.c:1536
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Nisem uspel prebrati vseh vnosov v %s': %s"
 
-#: gconf/gconf-database.c:1568
+#: gconf/gconf-database.c:1562
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Napaka ob izpisu seznama imenikov v %s': %s"
 
-#: gconf/gconf-database.c:1589
+#: gconf/gconf-database.c:1583
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Napaka ob nastavljanju sheme za %s': %s"
@@ -546,7 +550,7 @@ msgstr "Napaka ob branju datoteke `%s': %s\n"
 
 #: gconf/gconf-internals.c:1211 gconf/gconf-internals.c:1277
 #: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
-#: gconf/gconf-value.c:1363
+#: gconf/gconf-value.c:1341
 msgid "Text contains invalid UTF-8"
 msgstr "Besedilo vsebuje neveljaven UTF-8"
 
@@ -670,23 +674,23 @@ msgstr "Nisem uspel počistiti datoteke %s': %s"
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "Nisem uspel odstraniti ključavničnega imenika `%s': %s"
 
-#: gconf/gconf-internals.c:2846 gconf/gconfd.c:587
+#: gconf/gconf-internals.c:2842 gconf/gconfd.c:583
 #, c-format
 msgid "Failed to create %s: %s"
 msgstr "Nisem uspel ustvariti %s: %s"
 
-#: gconf/gconf-internals.c:2879
+#: gconf/gconf-internals.c:2875
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 "Nisem uspel ustvariti pipe za komunikacijo z odcepljenim daemonom gconf: %s\n"
 
-#: gconf/gconf-internals.c:2903
+#: gconf/gconf-internals.c:2899
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Nisem uspel pognati strežnika nastavitev: %s\n"
 
-#: gconf/gconf-internals.c:2927
+#: gconf/gconf-internals.c:2923
 msgid ""
 "Failed to contact configuration server; some possible causes are:\n"
 "a) you have an existing configuration server (gconfd) running, but it isn't "
@@ -707,52 +711,6 @@ msgstr ""
 "uporablja vaš domač imenik ne teče gconfd, poskusite odstraniti datoteke ~/."
 "gconf/*.lock in ~/.gconfd/lock"
 
-#: gconf/gconf-sanity-check.c:38 gconf/gconftool.c:71
-msgid "Help options"
-msgstr "Možnosti pomoči"
-
-#: gconf/gconf-sanity-check.c:74 gconf/gconftool.c:408
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Napaka ob možnosti %s: %s.\n"
-" Poženite '%s --help', če želite videti popoln seznam možnosti ukazne "
-"vrstice.\n"
-
-#: gconf/gconf-sanity-check.c:131
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not open or create the file \"%s\"; this indicates that there may be a "
-"problem with your configuration, as many programs will need to create files "
-"in your home directory. The error was \"%s\" (errno = %d)."
-msgstr ""
-"Za rešitev sledečega problema stopite v stik z administratorjem sistema:\n"
-"Ne morem odpreti ali ustvariti datoteke \"%s\"; to kaže, da je verjetno "
-"problem v vaših nastavitvah, saj veliko programov potrebuje ustvarjanje "
-"datotek v vašem domačem imeniku. Napaka je bila \"%s\" (errno = % d)."
-
-#: gconf/gconf-sanity-check.c:143
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not lock the file \"%s\"; this indicates that there may be a problem "
-"with your operating system configuration. If you have an NFS-mounted home "
-"directory, either the client or the server may be set up incorrectly. See "
-"the rpc.statd and rpc.lockd documentation. The error was \"%s\" (errno = %d)."
-msgstr ""
-"Za rešitev sledečega problema stopite v stik z administratorjem sistema:\n"
-"Nisem mogel zakleniti datoteke \"%s\"; to kaže, da je morda problem z nastavitvami "
-"vašega operacijskega sistema. Če imate domač imenik priklopljen z NFS, "
-"sta lahko ali odjemalec ali strežnik narobe nastavljena. Poglejte "
-"dokumentacijo za rpc.statd in rpc.lockd. Napaka je bila \"%s\" (errno = %d)."
-
-#: gconf/gconf-sanity-check.c:159
-msgid "Can't remove file %s: %s\n"
-msgstr "Ne morem odstraniti datoteke %s: %s\n"
-
 #: gconf/gconf-schema.c:190 gconf/gconf-schema.c:198 gconf/gconf-schema.c:206
 #: gconf/gconf-schema.c:214
 msgid "Schema contains invalid UTF-8"
@@ -918,96 +876,96 @@ msgstr "Nisem razumel `%s' (napačno število elementov)"
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "Nisem razumel `%s' (dodaten neubežen ')' najden znotraj para)"
 
-#: gconf/gconf.c:55
+#: gconf/gconf.c:54
 #, c-format
 msgid "Key \"%s\" is NULL"
 msgstr "Ključ \"%s\" je NULL"
 
-#: gconf/gconf.c:62
+#: gconf/gconf.c:61
 #, c-format
 msgid "\"%s\": %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:343
+#: gconf/gconf.c:333
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Strežnik ni mogel razvozlati naslova `%s'"
 
-#: gconf/gconf.c:634
+#: gconf/gconf.c:624
 msgid "Can't add notifications to a local configuration source"
 msgstr "Krajevnemu viru nastavitev ne  morem dodati obveščanj"
 
-#: gconf/gconf.c:2079
+#: gconf/gconf.c:2072
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Dodajanje odjemalca v seznam strežnika ni uspelo, napaka CORBA: %s"
 
-#: gconf/gconf.c:2434
+#: gconf/gconf.c:2393
 msgid "Must begin with a slash (/)"
 msgstr "Mora se začeti s poševnico (/)"
 
-#: gconf/gconf.c:2456
+#: gconf/gconf.c:2415
 msgid "Can't have two slashes (/) in a row"
 msgstr "Ne more imeti dveh poševnic (/) zapored"
 
-#: gconf/gconf.c:2458
+#: gconf/gconf.c:2417
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Ne more imeti pike (.) takoj za poševnico (/)"
 
-#: gconf/gconf.c:2477
+#: gconf/gconf.c:2436
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
 msgstr "znak '%c' je neveljaven ASCII znak, zato ni dovoljen v imenih ključev"
 
-#: gconf/gconf.c:2487
+#: gconf/gconf.c:2446
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "znak '%c' je neveljaven v imenu ključev/imenikov"
 
-#: gconf/gconf.c:2501
+#: gconf/gconf.c:2460
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Ključ/imenik se ne sme končati s poševnico (/)"
 
-#: gconf/gconf.c:2870
+#: gconf/gconf.c:2829
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Napaka ob ustavljanju strežnika nastavitev: %s"
 
-#: gconf/gconf.c:2931
+#: gconf/gconf.c:2890
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Pričakoval število s plavajočo vejico, dobil %s"
 
-#: gconf/gconf.c:2966
+#: gconf/gconf.c:2925
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Pričakoval celo število, dobil %s"
 
-#: gconf/gconf.c:3001
+#: gconf/gconf.c:2960
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Pričakoval niz, dobil %s"
 
-#: gconf/gconf.c:3038
+#: gconf/gconf.c:2997
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Pričakoval booleanovo vrednost, dobil %s"
 
-#: gconf/gconf.c:3071
+#: gconf/gconf.c:3030
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Pričakoval shemo, dobil %s"
 
-#: gconf/gconf.c:3432
+#: gconf/gconf.c:3391
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Napaka CORBA: %s"
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:246
 msgid "Shutdown request received"
 msgstr "Prejet je bil zahtevek za ustavitev"
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:278
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -1015,7 +973,7 @@ msgstr ""
 "gconfd preveden z razhroščvenjem; poskušam naložiti gconf.path iz imenika z "
 "izvorno kodo"
 
-#: gconf/gconfd.c:294
+#: gconf/gconfd.c:292
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1026,23 +984,23 @@ msgstr ""
 #. We want to stay alive but do nothing, because otherwise every
 #. request would result in another failed gconfd being spawned.
 #.
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:300
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 "Ni virov nastavitev v poti virov, nastavitve ne bodo shranjene; uredite "
 
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:300
 msgid "/path"
 msgstr "/pot"
 
-#: gconf/gconfd.c:315
+#: gconf/gconfd.c:313
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Napaka ob nalaganju nekaterih virov nastavitev: %s"
 
-#: gconf/gconfd.c:327
+#: gconf/gconfd.c:325
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1050,7 +1008,7 @@ msgstr ""
 "Noben naslov virov nastavitev ni bil usptešno razvozlan, ne morem nalagati "
 "ali shranjevati podatkov o nastavitvah"
 
-#: gconf/gconfd.c:344
+#: gconf/gconfd.c:342
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1058,13 +1016,13 @@ msgstr ""
 "Noben pisljiv naslov virov nastavitev ni bil usptešno razvozlan, ne morem "
 "shranjevati podatkov o nastavitvah"
 
-#: gconf/gconfd.c:370
+#: gconf/gconfd.c:368
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 "Prejel signal %d, izpisujem pomnilnik. Prosimo poročajte o hrošču v GConf."
 
-#: gconf/gconfd.c:388
+#: gconf/gconfd.c:384
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
@@ -1072,53 +1030,53 @@ msgstr ""
 "Prejel singal %d, neobičajno se ustavljam. Prosimo poročajte o hrošču v "
 "GConf."
 
-#: gconf/gconfd.c:405
+#: gconf/gconfd.c:401
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Prejel signal %d, ustavljam se po pravilih"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:535
+#: gconf/gconfd.c:531
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "pričenjam (različica %s), pid %u uporabnik '%s'"
 
-#: gconf/gconfd.c:574
+#: gconf/gconfd.c:570
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Nisem uspel dobiti sklica predmeta za ConfigServer"
 
-#: gconf/gconfd.c:612
+#: gconf/gconfd.c:608
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 "Nisem uspel vpisati bajta v pipo fd %d, morda se je odjemalski program "
 "obesil: %s"
 
-#: gconf/gconfd.c:622
+#: gconf/gconfd.c:618
 #, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "Nisem uspel dobiti ključavnice za daemona: %s"
 
-#: gconf/gconfd.c:660
+#: gconf/gconfd.c:656
 #, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "Nisem uspel sprostiti ključavnične datoteke: %s"
 
-#: gconf/gconfd.c:668
+#: gconf/gconfd.c:664
 msgid "Exiting"
 msgstr "Končujem"
 
-#: gconf/gconfd.c:694
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "Strežnik GConf ni v uporabi, končujem."
 
-#: gconf/gconfd.c:1063
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Vračam izjemo: %s"
 
-#: gconf/gconfd.c:1163
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1127,7 +1085,7 @@ msgstr ""
 "Nisem uspel odpreti dnevniške datoteke gconf; poslušalci ne bodo bili "
 "obnovljeni po ustavitvi gconfd-ja (%s)"
 
-#: gconf/gconfd.c:1198
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1135,33 +1093,33 @@ msgstr ""
 "Nisem uspel zapreti dnevniške datoteke gconfd-ja; podatki morda niso "
 "pravilno shranjeni (%s)"
 
-#: gconf/gconfd.c:1267
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Za pisanje nisem uspel odpreti datoteke s shranjenim stanjem '%s': %s"
 
-#: gconf/gconfd.c:1281
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Nisem mogel zapisati datoteke shranjenega stanja '%s' fd: %d: %s"
 
-#: gconf/gconfd.c:1290
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Nisem uspel zapreti nove datoteke shranjenega stanja '%s': %s"
 
-#: gconf/gconfd.c:1304
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Nisem mogel odmakniti stare datoteke shranjenega stanja '%s': %s"
 
-#: gconf/gconfd.c:1314
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 "Nisem uspel premakniti nove datoteke shranjenega stanja na ustrezno mesto: %s"
 
-#: gconf/gconfd.c:1323
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1169,7 +1127,7 @@ msgstr ""
 "Nisem uspel obnoviti izvorne datoteke shranjenega stanja, ki je bila "
 "premaknjena v '%s': %s"
 
-#: gconf/gconfd.c:1794
+#: gconf/gconfd.c:1790
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1177,17 +1135,17 @@ msgstr ""
 "Nisem mogel obnoviti poslušalca na naslovu '%s', nisem mogel razvozlati "
 "zbirke podatkov"
 
-#: gconf/gconfd.c:1840
+#: gconf/gconfd.c:1836
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Napaka ob branju datoteke s shranjenim stanjem: %s"
 
-#: gconf/gconfd.c:1893
+#: gconf/gconfd.c:1889
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Ne morem odpreti datoteke s shranjenim stanjem '%s': %s"
 
-#: gconf/gconfd.c:2010
+#: gconf/gconfd.c:2006
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1196,7 +1154,7 @@ msgstr ""
 "V dnevnik nisem uspel zapisati dodajanja poslušalca; ob novem zagonu gconfd-"
 "ja poslušalca poslušalca ne bo možno dodati (%s)"
 
-#: gconf/gconfd.c:2015
+#: gconf/gconfd.c:2011
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1205,48 +1163,36 @@ msgstr ""
 "V dnevnik nisem uspel zapisati odstranitve poslušalca; lahko se napačno doda "
 "poslušalca ob novem zagonu gconfd-ja: (%s)"
 
-#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
+#: gconf/gconfd.c:2034 gconf/gconfd.c:2199
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Nisem uspel dobiti IOR za odjemalca: %s"
 
-#: gconf/gconfd.c:2053
+#: gconf/gconfd.c:2049
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Nisem uspel odpreti datoteke s shranjenim stanjem: %s"
 
-#: gconf/gconfd.c:2066
+#: gconf/gconfd.c:2062
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr ""
 "Nisem uspel zapisati dodajanja odjemalca v datoteko s shranjenim stanjem: %s"
 
-#: gconf/gconfd.c:2074
+#: gconf/gconfd.c:2070
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr ""
 "Nisem uspel zapisati dodajanja odjemalca v datoteko s shranjenim stanjem: %s"
 
-#: gconf/gconfd.c:2164
+#: gconf/gconfd.c:2160
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr "Nek odjemalec se je odstranil z GConf strežnika, čeprav ni bil dodan."
 
-#. dialog display isn't working out
-#: gconf/gconfd.c:2303
-msgid "Multiple segmentation faults occurred; can't display error dialog\n"
-msgstr ""
-"Zgodilo se je več segmentacijskih napak; ne morem prikazati dialoga z "
-"napako\n"
-
-#. Eeeek! Can't show dialog
-#: gconf/gconfd.c:2312
-msgid ""
-"Segmentation fault!\n"
-"Cannot display crash dialog\n"
-msgstr ""
-"Segmentacijska napaka!\n"
-"Ne morem prikazati dialoga z napako\n"
+#: gconf/gconftool.c:71
+msgid "Help options"
+msgstr "Možnosti pomoči"
 
 #: gconf/gconftool.c:80
 msgid "Set a key to a value and sync. Use with --type."
@@ -1442,6 +1388,16 @@ msgstr "Odstrani vsako ime sheme ki je uveljavljena na danih ključih"
 msgid "Get the name of the default source"
 msgstr "Dobi ime prvizetega vira"
 
+#: gconf/gconftool.c:408
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Napaka ob možnosti %s: %s.\n"
+" Poženite '%s --help', če želite videti popoln seznam možnosti ukazne "
+"vrstice.\n"
+
 #: gconf/gconftool.c:420
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Ne morem prebrati in nastaviti/odnastaviti hkrati\n"
@@ -1961,6 +1917,49 @@ msgstr ""
 "imeniku:\n"
 "  %s\n"
 
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not open or create the file \"%s\"; this indicates that there may "
+#~ "be a problem with your configuration, as many programs will need to "
+#~ "create files in your home directory. The error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Za rešitev sledečega problema stopite v stik z administratorjem sistema:\n"
+#~ "Ne morem odpreti ali ustvariti datoteke \"%s\"; to kaže, da je verjetno "
+#~ "problem v vaših nastavitvah, saj veliko programov potrebuje ustvarjanje "
+#~ "datotek v vašem domačem imeniku. Napaka je bila \"%s\" (errno = % d)."
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not lock the file \"%s\"; this indicates that there may be a "
+#~ "problem with your operating system configuration. If you have an NFS-"
+#~ "mounted home directory, either the client or the server may be set up "
+#~ "incorrectly. See the rpc.statd and rpc.lockd documentation. The error was "
+#~ "\"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Za rešitev sledečega problema stopite v stik z administratorjem sistema:\n"
+#~ "Nisem mogel zakleniti datoteke \"%s\"; to kaže, da je morda problem z "
+#~ "nastavitvami vašega operacijskega sistema. Če imate domač imenik "
+#~ "priklopljen z NFS, sta lahko ali odjemalec ali strežnik narobe "
+#~ "nastavljena. Poglejte dokumentacijo za rpc.statd in rpc.lockd. Napaka je "
+#~ "bila \"%s\" (errno = %d)."
+
+#~ msgid "Can't remove file %s: %s\n"
+#~ msgstr "Ne morem odstraniti datoteke %s: %s\n"
+
+#~ msgid "Multiple segmentation faults occurred; can't display error dialog\n"
+#~ msgstr ""
+#~ "Zgodilo se je več segmentacijskih napak; ne morem prikazati dialoga z "
+#~ "napako\n"
+
+#~ msgid ""
+#~ "Segmentation fault!\n"
+#~ "Cannot display crash dialog\n"
+#~ msgstr ""
+#~ "Segmentacijska napaka!\n"
+#~ "Ne morem prikazati dialoga z napako\n"
+
 #~ msgid "Unsynced directory deletions when shutting down XML backend"
 #~ msgstr "Neskladna brisanja imenikov ob zapiranju modula XML"
 
diff --git a/po/sv.po b/po/sv.po
index 977faf38..43436984 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2002-03-27 00:06+0100\n"
+"POT-Creation-Date: 2002-01-28 21:35-0500\n"
 "PO-Revision-Date: 2002-03-27 00:06+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -35,7 +35,7 @@ msgstr "Initierar BDB-backendmodulen"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "Kunde inte hitta %s-rotkatalogen i adressen \"%s\""
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1209
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1176
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kunde inte skapa katalogen \"%s\": %s"
@@ -64,12 +64,12 @@ msgstr "Kunde inte läsa eller skriva till XML-rotkatalogen i adressen \"%s\""
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Katalog- och filrättigheterna för XML-koden vid roten %s är: %o/%o"
 
-#: backends/xml-backend.c:590
+#: backends/xml-backend.c:584
 #, c-format
 msgid "Error syncing the XML backend directory cache: %s"
 msgstr "Fel vid synkronisering av XML-backendkatalogcache: %s"
 
-#: backends/xml-backend.c:655
+#: backends/xml-backend.c:651
 msgid ""
 "Remove dir operation is no longer supported, just remove all the values in "
 "the directory"
@@ -77,20 +77,20 @@ msgstr ""
 "Katalogborttagningsåtgärden stöds inte längre, ta bara bort alla värden i "
 "katalogen"
 
-#: backends/xml-backend.c:722
+#: backends/xml-backend.c:718
 msgid "Initializing XML backend module"
 msgstr "Initierar XML-backendmodulen"
 
-#: backends/xml-backend.c:790
+#: backends/xml-backend.c:786
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Kunde inte ge upp lås på XML-katalogen \"%s\": %s"
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:248
 msgid "Failed to sync XML cache contents to disk"
 msgstr "Misslyckades med att synkronisera innehållet i XML-cache till disk"
 
-#: backends/xml-cache.c:273
+#: backends/xml-cache.c:278
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -99,7 +99,7 @@ msgstr ""
 "Kunde inte ta bort katalogen \"%s\" från XML-backenden eftersom den inte har "
 "synkroniserats korrekt till disk"
 
-#: backends/xml-cache.c:300
+#: backends/xml-cache.c:305
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than %"
@@ -108,179 +108,169 @@ msgstr ""
 "%u objekt återstår i cachen efter städning av objekt som redan synkats och "
 "som är äldre än %u sekunder"
 
-#: backends/xml-dir.c:171
+#: backends/xml-dir.c:168
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "Kunde inte ta status på \"%s\": %s"
 
-#: backends/xml-dir.c:181
+#: backends/xml-dir.c:178
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "XML-filnamnet \"%s\" är en katalog"
 
-#: backends/xml-dir.c:372 backends/xml-dir.c:379
+#: backends/xml-dir.c:369 backends/xml-dir.c:376
 #, c-format
 msgid "Failed to delete \"%s\": %s"
 msgstr "Misslyckades med att ta bort \"%s\": %s"
 
-#: backends/xml-dir.c:424
+#: backends/xml-dir.c:421
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Misslyckades med att skriva filen \"%s\": %s"
 
-#: backends/xml-dir.c:437
+#: backends/xml-dir.c:434
 #, c-format
 msgid "Failed to set mode on `%s': %s"
 msgstr "Misslyckades med att sätta läge på \"%s\": %s"
 
-#: backends/xml-dir.c:447
+#: backends/xml-dir.c:444
 #, c-format
 msgid "Failed to write XML data to `%s': %s"
 msgstr "Misslyckades med att skriva XML-data till \"%s\": %s"
 
-#: backends/xml-dir.c:457 backends/xml-dir.c:1233
+#: backends/xml-dir.c:454 backends/xml-dir.c:1200
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Misslyckades med att stänga filen \"%s\": %s"
 
-#: backends/xml-dir.c:473 backends/xml-dir.c:483
+#: backends/xml-dir.c:470 backends/xml-dir.c:480
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Misslyckades med att byta namn på \"%s\" till \"%s\": %s"
 
-#: backends/xml-dir.c:489
+#: backends/xml-dir.c:486
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Misslyckades med att återskapa \"%s\" från \"%s\": %s"
 
-#: backends/xml-dir.c:501
+#: backends/xml-dir.c:498
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Misslyckades med att ta bort den gamla filen \"%s\": %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:929
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Misslyckades med att ta status på \"%s\": %s"
 
-#: backends/xml-dir.c:956
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: backends/xml-dir.c:1106
+#: backends/xml-dir.c:1073
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Dubbla \"%s\"-poster i \"%s\", ignorerar"
 
-#: backends/xml-dir.c:1128
+#: backends/xml-dir.c:1095
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Post utan namn i XML-filen \"%s\", ignorerar"
 
-#: backends/xml-dir.c:1136
+#: backends/xml-dir.c:1103
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 "Översta noden i XML-filen \"%s\" är <%s> istället för <entry>, ignorerar"
 
-#: backends/xml-dir.c:1225
+#: backends/xml-dir.c:1192
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Misslyckades med att skapa filen \"%s\": %s"
 
-#: backends/xml-dir.c:1324
-#, c-format
-msgid "Failed to parse XML file \"%s\""
-msgstr "Misslyckades med att tolka XML-filen \"%s\""
-
 #. There was an error
-#: backends/xml-entry.c:154
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorerar XML-noden med namnet \"%s\": %s"
 
-#: backends/xml-entry.c:332
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignorerar schemanamnet \"%s\", ogiltigt: %s"
 
-#: backends/xml-entry.c:380
+#: backends/xml-entry.c:376
 #, c-format
 msgid "Ignoring XML node `%s': %s"
 msgstr "Ignorerar XML-noden \"%s\": %s"
 
-#: backends/xml-entry.c:732
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Misslyckades med att läsa standardvärdet för schema: %s"
 
-#: backends/xml-entry.c:952
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Inget \"type\"-attribut för noden <%s>"
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "En nod har okänt \"type\"-attribut \"%s\", ignorerar"
 
-#: backends/xml-entry.c:981
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "Inget \"value\"-attribut för nod"
 
-#: backends/xml-entry.c:1029 backends/xml-entry.c:1105
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Förstod inte XML-noden <%s> inuti en XML-listnod"
 
-#: backends/xml-entry.c:1063
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Ogiltig typ (lista, par eller okänd) i en listnod"
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Felaktig XML-nod: %s"
 
-#: backends/xml-entry.c:1094
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Listan innehåller en felaktigt skriven nod (%s, borde varit %s)"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorerar felaktig car i XML-par: %s"
 
-#: backends/xml-entry.c:1155 backends/xml-entry.c:1178
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "tolkar XML-fil: listor och par får inte placeras inuti par"
 
-#: backends/xml-entry.c:1168
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorerar felaktig cdr i XML-par: %s"
 
-#: backends/xml-entry.c:1187
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Förstod inte XML-noden <%s> inuti en XML-parnod"
 
-#: backends/xml-entry.c:1205
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Hittade inte car och cdr för XML-parnoden"
 
-#: backends/xml-entry.c:1211
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Cdr saknas i ett par med värden i XML-filen"
 
-#: backends/xml-entry.c:1218
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "Car saknas i ett par med värden i XML-filen"
 
-#: backends/xml-entry.c:1223
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Både car- och cdr-värden saknas i ett par med värden i XML-filen"
 
@@ -318,49 +308,53 @@ msgstr "Fel vid avstängning av backend"
 msgid "GConf Error: %s\n"
 msgstr "GConf-fel: %s\n"
 
-#: gconf/gconf-client.c:881
+#: gconf/gconf-client.c:899
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf-varning: misslyckades med att lista par i \"%s\": %s"
 
-#: gconf/gconf-client.c:1146
+#: gconf/gconf-client.c:1165
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Förväntade \"%s\", fick \"%s\" för nyckeln \"%s\""
 
-#: gconf/gconf-database.c:234
+#: gconf/gconf-database.c:233
 msgid "Received invalid value in set request"
 msgstr "Mottog ogiltigt värde i inställningsbegäran"
 
-#: gconf/gconf-database.c:242
+#: gconf/gconf-database.c:241
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Kunde inte få ut något vettigt av CORBA-värdet som mottogs i "
 "inställningsbegäran för nyckeln \"%s\""
 
-#: gconf/gconf-database.c:523
+#: gconf/gconf-database.c:522
 msgid "Received request to drop all cached data"
 msgstr "Mottog begäran att släppa all cachad data"
 
-#: gconf/gconf-database.c:540
+#: gconf/gconf-database.c:539
 msgid "Received request to sync synchronously"
 msgstr "Mottog begäran att synkronisera synkront"
 
-#: gconf/gconf-database.c:824
+#: gconf/gconf-database.c:823
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "Allvarligt fel: misslyckades med att få objektreferens för ConfigDatabase"
 
-#: gconf/gconf-database.c:986
+#: gconf/gconf-database.c:985
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Misslyckades med att synkronisera med en eller flera källor: %s"
 
-#: gconf/gconf-database.c:1078
-#, c-format
+#. This error is not fatal; we basically ignore it.
+#. * Because it's likely the right thing for the client
+#. * app to simply continue.
+#.
+#: gconf/gconf-database.c:1076
+#, fuzzy, c-format
 msgid ""
-"Failed to log addition of listener %s (%s);will not be able to restore this "
+"Failed to log addition of listener %s (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
@@ -368,12 +362,12 @@ msgstr ""
 "att kunna återställa den här lyssnaren vid omstart av gconfd, vilket kommer "
 "att resultera i otillförlitliga meddelanden om konfigurationsändringar."
 
-#: gconf/gconf-database.c:1109
+#: gconf/gconf-database.c:1103
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Lyssnar-ID %lu finns inte"
 
-#: gconf/gconf-database.c:1123
+#: gconf/gconf-database.c:1117
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -382,57 +376,57 @@ msgstr ""
 "Misslyckades med att logga borttagningen av lyssnare i loggfilen (troligtvis "
 "ofarligt, men kan resultera i att ett meddelande plötsligt återkommer): %s"
 
-#: gconf/gconf-database.c:1241 gconf/gconf-sources.c:1540
+#: gconf/gconf-database.c:1235 gconf/gconf-sources.c:1540
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fel vid hämtning av värde för \"%s\": %s"
 
-#: gconf/gconf-database.c:1288
+#: gconf/gconf-database.c:1282
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Fel när värde för \"%s\" sattes: %s"
 
-#: gconf/gconf-database.c:1331
+#: gconf/gconf-database.c:1325
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Fel vid återställning av \"%s\": %s"
 
-#: gconf/gconf-database.c:1360
+#: gconf/gconf-database.c:1354
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Fel vid hämtning av standardvärde för \"%s\": %s"
 
-#: gconf/gconf-database.c:1411
+#: gconf/gconf-database.c:1405
 #, c-format
 msgid "Error unsetting \"%s\": %s"
 msgstr "Fel vid återställning av \"%s\": %s"
 
-#: gconf/gconf-database.c:1443
+#: gconf/gconf-database.c:1437
 #, c-format
 msgid "Error getting new value for \"%s\": %s"
 msgstr "Fel vid hämtning av nytt värde för \"%s\": %s"
 
-#: gconf/gconf-database.c:1491
+#: gconf/gconf-database.c:1485
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Fel vid existenskontroll av \"%s\": %s"
 
-#: gconf/gconf-database.c:1515
+#: gconf/gconf-database.c:1509
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Fel vid borttagning av katalogen \"%s\": %s"
 
-#: gconf/gconf-database.c:1542
+#: gconf/gconf-database.c:1536
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Misslyckades med att hämta alla poster i \"%s\": %s"
 
-#: gconf/gconf-database.c:1568
+#: gconf/gconf-database.c:1562
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Fel vid listning av kataloger i \"%s\": %s"
 
-#: gconf/gconf-database.c:1589
+#: gconf/gconf-database.c:1583
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Fel när schema för \"%s\" sattes: %s"
@@ -559,67 +553,67 @@ msgstr "Lägger till källan \"%s\"\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "Fel vid läsning av filen \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:1195 gconf/gconf-internals.c:1261
+#: gconf/gconf-internals.c:1211 gconf/gconf-internals.c:1277
 #: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
-#: gconf/gconf-value.c:1511
+#: gconf/gconf-value.c:1341
 msgid "Text contains invalid UTF-8"
 msgstr "Text innehåller ogiltig UTF-8"
 
-#: gconf/gconf-internals.c:1346
+#: gconf/gconf-internals.c:1362
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Förväntade lista, fick %s"
 
-#: gconf/gconf-internals.c:1356
+#: gconf/gconf-internals.c:1372
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Förväntade lista med %s, fick lista med %s"
 
-#: gconf/gconf-internals.c:1498
+#: gconf/gconf-internals.c:1511
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Förväntade par, fick %s"
 
-#: gconf/gconf-internals.c:1512
+#: gconf/gconf-internals.c:1525
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Förväntade ett (%s,%s)-par, fick ett par där ett eller båda värdena saknades"
 
-#: gconf/gconf-internals.c:1528
+#: gconf/gconf-internals.c:1541
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Förväntade par av typen (%s,%s), men fick typen (%s,%s)"
 
-#: gconf/gconf-internals.c:1644
+#: gconf/gconf-internals.c:1657
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Citerad sträng börjar inte med ett citationstecken"
 
-#: gconf/gconf-internals.c:1706
+#: gconf/gconf-internals.c:1719
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Citerad sträng slutar inte med ett citationstecken"
 
-#: gconf/gconf-internals.c:1842
+#: gconf/gconf-internals.c:1855
 msgid "Encoded value is not valid UTF-8"
 msgstr "Kodat värde är inte giltig UTF-8"
 
-#: gconf/gconf-internals.c:2301
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Could not lock temporary file '%s': %s"
 msgstr "Kunde inte låsa temporära filen \"%s\": %s"
 
-#: gconf/gconf-internals.c:2328
+#: gconf/gconf-internals.c:2341
 #, c-format
 msgid "Could not create file '%s', probably because it already exists"
 msgstr ""
 "Kunde inte skapa filen \"%s\", troligtvis på grund av att den redan finns"
 
-#: gconf/gconf-internals.c:2374
+#: gconf/gconf-internals.c:2387
 #, c-format
 msgid "Failed to create or open '%s'"
 msgstr "Misslyckades med att skapa eller öppna \"%s\""
 
-#: gconf/gconf-internals.c:2384
+#: gconf/gconf-internals.c:2397
 #, c-format
 msgid ""
 "Failed to lock '%s': probably another process has the lock, or your "
@@ -628,173 +622,98 @@ msgstr ""
 "Misslyckades med att låsa \"%s\": en annan process har låset, eller så har "
 "operativsystemet felaktigt konfigurerad NFS-fillåsning (%s)"
 
-#: gconf/gconf-internals.c:2413
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr "IOR-filen \"%s\" kunde inte öppnas korrekt, ingen gconfd hittades: %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2455
 #, c-format
 msgid "gconftool or other non-gconfd process has the lock file '%s'"
 msgstr "gconftool eller en annan icke-gconfd-process har låsfilen \"%s\""
 
-#: gconf/gconf-internals.c:2460
+#: gconf/gconf-internals.c:2472
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
 msgstr "kunde inte kontakta ORB för slå upp existerande gconfd-objektreferens"
 
-#: gconf/gconf-internals.c:2470
+#: gconf/gconf-internals.c:2482
 #, c-format
 msgid "Failed to convert IOR '%s' to an object reference"
 msgstr "Misslyckades med att konvertera IOR \"%s\" till en objektreferens"
 
-#: gconf/gconf-internals.c:2520
+#: gconf/gconf-internals.c:2510
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "kunde inte skapa katalogen \"%s\": %s"
 
-#: gconf/gconf-internals.c:2579
+#: gconf/gconf-internals.c:2569
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kan inte skriva till filen \"%s\": %s"
 
-#: gconf/gconf-internals.c:2620
+#: gconf/gconf-internals.c:2610
 #, c-format
 msgid "We didn't have the lock on file `%s', but we should have"
 msgstr "Vi hade inte låset på filen \"%s\", men vi borde haft det"
 
-#: gconf/gconf-internals.c:2641
+#: gconf/gconf-internals.c:2631
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
 msgstr "Misslyckades med att länka \"%s\" till \"%s\": %s"
 
-#: gconf/gconf-internals.c:2653
+#: gconf/gconf-internals.c:2643
 #, c-format
 msgid "Failed to remove lock file `%s': %s"
 msgstr "Misslyckades med att ta bort låsfilen \"%s\": %s"
 
-#: gconf/gconf-internals.c:2672
+#: gconf/gconf-internals.c:2662
 #, c-format
 msgid "Failed to clean up file '%s': %s"
 msgstr "Misslyckades med att städa filen \"%s\": %s"
 
-#: gconf/gconf-internals.c:2686
+#: gconf/gconf-internals.c:2676
 #, c-format
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "Misslyckades med att ta bort låskatalogen \"%s\": %s"
 
-#: gconf/gconf-internals.c:2860 gconf/gconfd.c:591
+#: gconf/gconf-internals.c:2842 gconf/gconfd.c:583
 #, c-format
 msgid "Failed to create %s: %s"
 msgstr "Misslyckades med att skapa %s: %s"
 
-#: gconf/gconf-internals.c:2882
-#, c-format
-msgid "Server ping error: %s"
-msgstr "Serverpingfel: %s"
-
-#: gconf/gconf-internals.c:2903
+#: gconf/gconf-internals.c:2875
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 "Misslyckades med att skapa rör för kommunikation med startad gconf-demon: %"
 "s\n"
 
-#: gconf/gconf-internals.c:2927
+#: gconf/gconf-internals.c:2899
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Misslyckades med att starta konfigurationsservern: %s\n"
 
-#: gconf/gconf-internals.c:2952
-#, c-format
-msgid ""
-"Failed to contact configuration server; some possible causes are that you "
-"need to enable TCP/IP networking for ORBit, or you have stale NFS locks due "
-"to a system crash. See http://www.gnome.org/projects/gconf/ for information. "
-"(Details - %s)"
-msgstr ""
-"Misslyckades med att kontakta konfigurationsservern. En del möjliga orsaker "
-"kan vara att du måste aktivera stöd för TCP/IP-nätverk i ORBit, eller att du "
-"har överblivna NFS-lås på grund av en systemkrasch. Se http://www.gnome.org/"
-"projects/gconf/ för mer information. (Detaljer - %s)"
-
-#: gconf/gconf-internals.c:2953
-msgid "none"
-msgstr "inga"
-
-#: gconf/gconf-sanity-check.c:39 gconf/gconftool.c:72
-msgid "Help options"
-msgstr "Hjälpalternativ"
-
-#: gconf/gconf-sanity-check.c:74 gconf/gconftool.c:411
-#, c-format
+#: gconf/gconf-internals.c:2923
 msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Fel vid flaggan %s: %s.\n"
-"Kör \"%s --help\" för att sen en fullständig lista med tillgängliga "
-"kommandoradsflaggor.\n"
-
-#: gconf/gconf-sanity-check.c:131
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not open or create the file \"%s\"; this indicates that there may be a "
-"problem with your configuration, as many programs will need to create files "
-"in your home directory. The error was \"%s\" (errno = %d)."
-msgstr ""
-"Kontakta din systemadministratör för att lösa följande problem:\n"
-"Kunde inte öppna eller skapa filen \"%s\"; detta indikerar att det kan "
-"finnas ett problem med din konfiguration, eftersom många program kommer att "
-"behöva skapa filer i din hemkatalog. Felet var \"%s\" (felnummer = %d)."
-
-#: gconf/gconf-sanity-check.c:143
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not lock the file \"%s\"; this indicates that there may be a problem "
-"with your operating system configuration. If you have an NFS-mounted home "
-"directory, either the client or the server may be set up incorrectly. See "
-"the rpc.statd and rpc.lockd documentation. A common cause of this error is "
-"that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
-"%d)."
-msgstr ""
-"Kontakta din systemadministratör för att lösa följande problem:\n"
-"Kunde inte låsa filen \"%s\"; detta indikerar att det kan finnas ett problem "
-"med din operativsystemskonfiguration. Om du har en NFS-monterad hemkatalog "
-"kan antingen klienten eller servern vara felaktigt konfigurerad. Se "
-"dokumentationen för rpc.statd och rpc.lockd. En vanlig orsak till detta fel "
-"är att tjänsten \"nfslock\" har deaktiverats. Felet var \"%s\" (felnummer = %"
-"d)."
-
-#: gconf/gconf-sanity-check.c:160
-#, c-format
-msgid "Can't remove file %s: %s\n"
-msgstr "Kan inte ta bort filen %s: %s\n"
-
-#: gconf/gconf-sanity-check.c:195
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"No configuration sources in the configuration file \"%s\"; this means that "
-"preferences and other settings can't be saved. %s%s"
-msgstr ""
-"Kontakta din systemadministratör för att lösa följande problem:\n"
-"Inga konfigurationskällor i konfigurationsfilen \"%s\"; detta indikerar att "
-"inställningar inte kan sparas. %s%s"
-
-#: gconf/gconf-sanity-check.c:198
-msgid "Error reading the file: "
-msgstr "Fel vid läsning av filen: "
-
-#: gconf/gconf-sanity-check.c:220
-#, c-format
-msgid ""
-"Please contact your system administrator to resolve the following problem:\n"
-"Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
-msgstr ""
-"Kontakta din systemadministratör för att lösa följande problem:\n"
-"Kunde inte slå upp adressen \"%s\" i konfigurationsfilen \"%s\": %s"
+"Failed to contact configuration server; some possible causes are:\n"
+"a) you have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit by putting the line \"ORBIIOPIPv4=1"
+"\" in /etc/orbitrc\n"
+"b) you have stale locks in your NFS-mounted home directory due to a system "
+"crash, try removing ~/.gconf/*.lock and ~/.gconfd/lock if you are sure no "
+"gconfd processes are running on any machine using your home dir"
+msgstr ""
+"Misslyckades med att kontakta konfigurationsserver; en del möjliga orsaker "
+"till detta är:\n"
+"a) att du har en existerande konfigurationsserver (gconfd) körandes, men att "
+"den inte är nåbar härifrån - om du är inloggad från två maskiner samtidigt "
+"kan du behöva aktivera TCP-nätverksstöd för ORBit genom att stoppa raden "
+"\"ORBIIOPIPv4=1\" i /etc/orbitrc\n"
+"b) du har gamla spöklås i din NFS-monterade hemkatalog på grund av en "
+"systemkrasch, prova att ta bort ~/.gconf/*.lock och ~/.gconfd/lock om du är "
+"säker på att inga gconfd-processer kör på den maskin som använder din "
+"hemkatalog"
 
 #: gconf/gconf-schema.c:190 gconf/gconf-schema.c:198 gconf/gconf-schema.c:206
 #: gconf/gconf-schema.c:214
@@ -967,96 +886,96 @@ msgstr "Förstod inte \"%s\" (felaktigt antal element)"
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "Förstod inte \"%s\" (ett extra \")\" utan escape hittades inuti par)"
 
-#: gconf/gconf.c:55
+#: gconf/gconf.c:54
 #, c-format
 msgid "Key \"%s\" is NULL"
 msgstr "Nyckeln \"%s\" är NULL"
 
-#: gconf/gconf.c:62
+#: gconf/gconf.c:61
 #, c-format
 msgid "\"%s\": %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:343
+#: gconf/gconf.c:333
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Servern kunde inte slå upp adressen \"%s\""
 
-#: gconf/gconf.c:634
+#: gconf/gconf.c:624
 msgid "Can't add notifications to a local configuration source"
 msgstr "Kan inte lägga till notifikationer till lokal konfigurationskälla"
 
-#: gconf/gconf.c:2079
+#: gconf/gconf.c:2072
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Tillägg av klient till serverns lista misslyckades, CORBA-fel: %s"
 
-#: gconf/gconf.c:2434
+#: gconf/gconf.c:2393
 msgid "Must begin with a slash (/)"
 msgstr "Måste börja med ett snedstreck (/)"
 
-#: gconf/gconf.c:2456
+#: gconf/gconf.c:2415
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan inte ha två snedstreck (/) i rad"
 
-#: gconf/gconf.c:2458
+#: gconf/gconf.c:2417
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan inte ha en punkt (.) precis efter ett snedstreck (/)"
 
-#: gconf/gconf.c:2477
+#: gconf/gconf.c:2436
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
 msgstr "\"%c\" är inte ett ASCII-tecken, så det är inte tillåtet i nyckelnamn"
 
-#: gconf/gconf.c:2487
+#: gconf/gconf.c:2446
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "\"%c\" är ett ogiligt tecken i nyckel/katalognamn"
 
-#: gconf/gconf.c:2501
+#: gconf/gconf.c:2460
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Nyckel/katalog kan inte avslutas med ett snedstreck (/)"
 
-#: gconf/gconf.c:2870
+#: gconf/gconf.c:2829
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Misslyckades med att stänga ner konfigurationsservern: %s"
 
-#: gconf/gconf.c:2931
+#: gconf/gconf.c:2890
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Förväntade flyttal, fick %s"
 
-#: gconf/gconf.c:2966
+#: gconf/gconf.c:2925
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Förväntade heltal, fick %s"
 
-#: gconf/gconf.c:3001
+#: gconf/gconf.c:2960
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Förväntade sträng, fick %s"
 
-#: gconf/gconf.c:3038
+#: gconf/gconf.c:2997
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Förväntade boolean, fick %s"
 
-#: gconf/gconf.c:3071
+#: gconf/gconf.c:3030
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Förväntade schema, fick %s"
 
-#: gconf/gconf.c:3432
+#: gconf/gconf.c:3391
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-fel: %s"
 
-#: gconf/gconfd.c:249
+#: gconf/gconfd.c:246
 msgid "Shutdown request received"
 msgstr "Avstängningsbegäran mottagen"
 
-#: gconf/gconfd.c:281
+#: gconf/gconfd.c:278
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -1064,7 +983,7 @@ msgstr ""
 "gconfd kompilerades med felsökning; försök att läsa in gconf.path från "
 "källkatalogen"
 
-#: gconf/gconfd.c:295
+#: gconf/gconfd.c:292
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1075,7 +994,7 @@ msgstr ""
 #. We want to stay alive but do nothing, because otherwise every
 #. request would result in another failed gconfd being spawned.
 #.
-#: gconf/gconfd.c:303
+#: gconf/gconfd.c:300
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1083,16 +1002,16 @@ msgstr ""
 "Inga konfigurationskällor i källsökvägen, konfigurationen kommer inte att  "
 "sparas; redigera "
 
-#: gconf/gconfd.c:303
+#: gconf/gconfd.c:300
 msgid "/path"
 msgstr "/sökväg"
 
-#: gconf/gconfd.c:316
+#: gconf/gconfd.c:313
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Fel vid inläsning av vissa konfigurationskällor: %s"
 
-#: gconf/gconfd.c:328
+#: gconf/gconfd.c:325
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1100,7 +1019,7 @@ msgstr ""
 "Inga konfigurationskällor kunde slås upp, kan inte läsa in eller spara "
 "konfigurationsdata"
 
-#: gconf/gconfd.c:345
+#: gconf/gconfd.c:342
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1108,65 +1027,65 @@ msgstr ""
 "Inga skrivbara konfigurationskällor kunde slås upp korrekt, kommer kanske "
 "inte att kunna spara vissa konfigurationsändringar"
 
-#: gconf/gconfd.c:371
+#: gconf/gconfd.c:368
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 "Mottog signal %d, lämnar en core-fil. Rapportera gärna ett fel i GConf."
 
-#: gconf/gconfd.c:389
+#: gconf/gconfd.c:384
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 "Mottog signal %d, stänger ner onormalt. Skicka gärna in en GConf-felrapport."
 
-#: gconf/gconfd.c:406
+#: gconf/gconfd.c:401
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Mottog signal %d, stänger ner snyggt"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:538
+#: gconf/gconfd.c:531
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "startar (version %s), pid %u användare \"%s\""
 
-#: gconf/gconfd.c:578
+#: gconf/gconfd.c:570
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Misslyckades med att få objektreferensen för konfigurationsservern"
 
-#: gconf/gconfd.c:616
+#: gconf/gconfd.c:608
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 "Misslyckades med att skriva byte till rör-fh %d, så programmet kan hänga: %s"
 
-#: gconf/gconfd.c:626
+#: gconf/gconfd.c:618
 #, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "Misslyckades med att få lås för demonen, avslutar: %s"
 
-#: gconf/gconfd.c:664
+#: gconf/gconfd.c:656
 #, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "Fel vid släppande av låsfil: %s"
 
-#: gconf/gconfd.c:672
+#: gconf/gconfd.c:664
 msgid "Exiting"
 msgstr "Avslutar"
 
-#: gconf/gconfd.c:698
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "GConf-servern används inte, stänger ner."
 
-#: gconf/gconfd.c:1063
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Returnerar undantag: %s"
 
-#: gconf/gconfd.c:1163
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1175,7 +1094,7 @@ msgstr ""
 "Misslyckades med att öppna gconfd-loggfilen; kommer inte att kunna "
 "återställa lyssnare efter avslutning av gconfd (%s)"
 
-#: gconf/gconfd.c:1198
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1183,32 +1102,32 @@ msgstr ""
 "Misslyckades med att stänga gconfd-loggfilen; data kanske inte har sparats "
 "korrekt (%s)"
 
-#: gconf/gconfd.c:1267
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Kunde inte öppna tillståndsfilen \"%s\" för skrivning: %s"
 
-#: gconf/gconfd.c:1281
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Kunde inte skriva fildeskriptorn för tillståndsfilen \"%s\": %d: %s"
 
-#: gconf/gconfd.c:1290
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Misslyckades med att stänga den nya tillståndsfilen \"%s\": %s"
 
-#: gconf/gconfd.c:1304
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Kunde inte flytta undan den gamla tillståndsfilen \"%s\": %s"
 
-#: gconf/gconfd.c:1314
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Misslyckades med att flytta den nya tillståndsfilen på plats: %s"
 
-#: gconf/gconfd.c:1323
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1216,7 +1135,7 @@ msgstr ""
 "Misslyckades med att återskapa den ursprungliga tillståndsfilen som hade "
 "flyttats till \"%s\": %s"
 
-#: gconf/gconfd.c:1794
+#: gconf/gconfd.c:1790
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1224,17 +1143,17 @@ msgstr ""
 "Kunde inte återställa lyssnaren på adress \"%s\", kunde inte slå upp "
 "databasen"
 
-#: gconf/gconfd.c:1840
+#: gconf/gconfd.c:1836
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Fel vid läsning av tillståndsfilen: %s"
 
-#: gconf/gconfd.c:1893
+#: gconf/gconfd.c:1889
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Misslyckades med att öppna tillståndsfilen \"%s\": %s"
 
-#: gconf/gconfd.c:2010
+#: gconf/gconfd.c:2006
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1244,7 +1163,7 @@ msgstr ""
 "kommer inte att kunna lägga in lyssnaren igen om gconfd avslutar eller "
 "stängs av (%s)"
 
-#: gconf/gconfd.c:2015
+#: gconf/gconfd.c:2011
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1254,56 +1173,45 @@ msgstr ""
 "kan komma att felaktigt lägga in lyssnaren igen om gconfd avslutar eller "
 "stängs ner (%s)"
 
-#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
+#: gconf/gconfd.c:2034 gconf/gconfd.c:2199
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Misslyckades med att få IOR för klienten: %s"
 
-#: gconf/gconfd.c:2053
+#: gconf/gconfd.c:2049
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Misslyckades med att öppna tillståndsfilen: %s"
 
-#: gconf/gconfd.c:2066
+#: gconf/gconfd.c:2062
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "Misslyckades med att skriva klienttillägg till tillståndsfilen: %s"
 
-#: gconf/gconfd.c:2074
+#: gconf/gconfd.c:2070
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr "Misslyckades med att tömma klienttillägg till tillståndsfilen: %s"
 
-#: gconf/gconfd.c:2164
+#: gconf/gconfd.c:2160
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 "Någon klient tog bort sig själv från GConf-servern när den inte var tillagd."
 
-#. dialog display isn't working out
-#: gconf/gconfd.c:2303
-msgid "Multiple segmentation faults occurred; can't display error dialog\n"
-msgstr "Flera segmenteringsfel inträffade; kan inte visa feldialogen\n"
-
-#. Eeeek! Can't show dialog
-#: gconf/gconfd.c:2312
-#, c-format
-msgid ""
-"Segmentation fault!\n"
-"Cannot display crash dialog: %s\n"
-msgstr ""
-"Segmenteringsfel!\n"
-"Kan inte visa kraschdialogen: %s\n"
+#: gconf/gconftool.c:71
+msgid "Help options"
+msgstr "Hjälpalternativ"
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Sätt en nyckel till ett värde och synkronisera. Används med --type."
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid "Print the value of a key to standard output."
 msgstr "Skriv ut värdet av en nyckel till standard ut."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:98
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
@@ -1311,11 +1219,11 @@ msgstr ""
 "Sätter ett schema och synkroniserar. Används med --short-desc, --long-desc, "
 "--owner, och --type."
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 msgid "Unset the keys on the command line"
 msgstr "Nollställer nycklarna på kommandoraden"
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
@@ -1323,33 +1231,33 @@ msgstr ""
 "Nollställ alla nycklar rekursivt på eller under nyckelnamnet/katalognamnet "
 "på kommandoraden"
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all key/value pairs in a directory."
 msgstr "Skriv ut alla nyckel-/värdepar i en katalog."
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Print all subdirectories in a directory."
 msgstr "Skriv ut alla underkataloger i en katalog."
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "Skriv ut alla underkataloger och poster under en katalog, rekursivt."
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Returnera 0 om katalogen finns, 2 om den inte finns."
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 "Stäng ner gconfd. ANVÄND INTE DETTA ALTERNATIV SÅVIDA DU INTE HAR EN BRA "
 "ANLEDNING."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Returnera 0 om gconfd är igång, 2 om den inte är igång."
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1357,7 +1265,7 @@ msgstr ""
 "Startar konfigurationsservern (gconfd). (Händer normalt automatiskt när det "
 "behövs)."
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1365,11 +1273,11 @@ msgstr ""
 "Ange typen av värde som ska sättas, eller typen av värde som ett schema "
 "beskriver. Unika förkortningar är ok."
 
-#: gconf/gconftool.c:191
+#: gconf/gconftool.c:190
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1377,11 +1285,11 @@ msgstr ""
 "Ange typen av listvärde som ska sättas, eller typen av värde som ett schema "
 "beskriver. Unika förkortningar är ok."
 
-#: gconf/gconftool.c:200 gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:199 gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1389,7 +1297,7 @@ msgstr ""
 "Ange typen av car-parvärde som ska sättas, eller typen av värde som ett "
 "schema beskriver. Unika förkortningar är ok."
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1397,44 +1305,44 @@ msgstr ""
 "Ange typen av cdr-parvärde som ska sättas, eller typen av värde som ett "
 "schema beskriver. Unika förkortningar är ok."
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Ange en kort halvradsbeskrivning som ska ingå i ett schema."
 
-#: gconf/gconftool.c:227 gconf/gconftool.c:236
+#: gconf/gconftool.c:226 gconf/gconftool.c:235
 msgid "DESCRIPTION"
 msgstr "BESKRIVNING"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a several-line description to go in a schema."
 msgstr "Ange en mångradsbeskrivning som ska ingå i ett schema."
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 msgid "Specify the owner of a schema"
 msgstr "Ange ägaren av ett schema"
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 msgid "OWNER"
 msgstr "ÄGARE"
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid "Specify a schema file to be installed"
 msgstr "Ange en schemafil som ska installeras"
 
-#: gconf/gconftool.c:254
+#: gconf/gconftool.c:253
 msgid "FILENAME"
 msgstr "FILNAMN"
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Ange en konfigurationskälla som ska användas istället för standardsökvägen"
 
-#: gconf/gconftool.c:263
+#: gconf/gconftool.c:262
 msgid "SOURCE"
 msgstr "KÄLLA"
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1442,7 +1350,7 @@ msgstr ""
 "Använder konfigurationsdatabasen direkt och går förbi servern. Kräver att "
 "gconfd inte är igång."
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1453,7 +1361,7 @@ msgstr ""
 "som inte är standard eller ställd in till en tom sträng för att använda "
 "standardvärdet."
 
-#: gconf/gconftool.c:289
+#: gconf/gconftool.c:288
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1461,7 +1369,7 @@ msgstr ""
 "Tortyrtestar ett program genom att sätta och nollställa en massa värden av "
 "olika typer för nycklar på kommandoraden."
 
-#: gconf/gconftool.c:298
+#: gconf/gconftool.c:297
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1469,47 +1377,57 @@ msgstr ""
 "Tortyrtestar ett program genom att sätta och nollställa en massa nycklar "
 "inuti katalogerna på kommandoraden."
 
-#: gconf/gconftool.c:307
+#: gconf/gconftool.c:306
 msgid "Get the short doc string for a key"
 msgstr "Hämta den korta dokumentationssträngen för en nyckel"
 
-#: gconf/gconftool.c:316
+#: gconf/gconftool.c:315
 msgid "Get the long doc string for a key"
 msgstr "Hämta den långa dokumentationssträngen för en nyckel"
 
-#: gconf/gconftool.c:325
+#: gconf/gconftool.c:324
 msgid "Get the name of the schema applied to this key"
 msgstr "Hämta namnet på det schema som tillämpas på denna nyckel"
 
-#: gconf/gconftool.c:334
+#: gconf/gconftool.c:333
 msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr "Ange schemanamnet följt av nyckeln att tillämpa schemanamnet på"
 
-#: gconf/gconftool.c:343
+#: gconf/gconftool.c:342
 msgid "Remove any schema name applied to the given keys"
 msgstr "Ta bort alla schemanamn tillämpade på de angivna nycklarna"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:351
 msgid "Get the name of the default source"
 msgstr "Hämta namnet på standardkällan"
 
-#: gconf/gconftool.c:423
+#: gconf/gconftool.c:408
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Fel vid flaggan %s: %s.\n"
+"Kör \"%s --help\" för att sen en fullständig lista med tillgängliga "
+"kommandoradsflaggor.\n"
+
+#: gconf/gconftool.c:420
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Kan inte hämta och sätta/nollställa samtidigt\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:427
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Kan inte sätta och hämta/nollställa samtidigt\n"
 
-#: gconf/gconftool.c:438
+#: gconf/gconftool.c:435
 msgid "Can't use --all-entries with --get or --set\n"
 msgstr "Kan inte använda --all-entries med --get eller --set\n"
 
-#: gconf/gconftool.c:446
+#: gconf/gconftool.c:443
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Kan inte använda --all-dirs med --get eller --set\n"
 
-#: gconf/gconftool.c:456
+#: gconf/gconftool.c:453
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-"
 "entries, or --all-dirs\n"
@@ -1517,7 +1435,7 @@ msgstr ""
 "--recursive-list kan inte användas med --get, --set, --unset, --all-entries, "
 "eller --all-dirs\n"
 
-#: gconf/gconftool.c:466
+#: gconf/gconftool.c:463
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
@@ -1525,332 +1443,332 @@ msgstr ""
 "--set_schema kan inte användas med --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
 
-#: gconf/gconftool.c:472
+#: gconf/gconftool.c:469
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Värdetyp är bara relevant när ett värde sätts\n"
 
-#: gconf/gconftool.c:478
+#: gconf/gconftool.c:475
 msgid "Must specify a type when setting a value\n"
 msgstr "Måste ange en typ när värde sätts\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:485
 msgid "Ping option must be used by itself.\n"
 msgstr "Pingflaggan måste användas för sig själv.\n"
 
-#: gconf/gconftool.c:498
+#: gconf/gconftool.c:495
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists måste användas för sig själv.\n"
 
-#: gconf/gconftool.c:508
+#: gconf/gconftool.c:505
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file måste användas för sig själv.\n"
 
-#: gconf/gconftool.c:519
+#: gconf/gconftool.c:516
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule måste användas för sig själv.\n"
 
-#: gconf/gconftool.c:530
+#: gconf/gconftool.c:527
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key måste användas för sig själv.\n"
 
-#: gconf/gconftool.c:541
+#: gconf/gconftool.c:538
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory måste användas för sig själv.\n"
 
-#: gconf/gconftool.c:549
+#: gconf/gconftool.c:546
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "Du måste ange en konfigurationskälla med --config-source vid användning av --"
 "direct\n"
 
-#: gconf/gconftool.c:555
+#: gconf/gconftool.c:552
 msgid "You should use --direct when using a non-default configuration source\n"
 msgstr "Du bör använda --direct när en icke-tom konfigurationskälla används\n"
 
-#: gconf/gconftool.c:561
+#: gconf/gconftool.c:558
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Misslyckades med att initiera GConf: %s\n"
 
-#: gconf/gconftool.c:590
+#: gconf/gconftool.c:587
 msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
 msgstr ""
 "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL är satt, installerar inte scheman\n"
 
-#: gconf/gconftool.c:603
+#: gconf/gconftool.c:600
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Måste sätta miljövariabeln GCONF_CONFIG_SOURCE\n"
 
-#: gconf/gconftool.c:632
+#: gconf/gconftool.c:629
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Misslyckades med att få tillgång till konfigurationskällor: %s\n"
 
-#: gconf/gconftool.c:854
+#: gconf/gconftool.c:851
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Avstängningsfel: %s\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:894
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Måste ange en eller flera kataloger att rekursivt lista.\n"
 
-#: gconf/gconftool.c:931
+#: gconf/gconftool.c:928
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Misslyckades med att lista poster i \"%s\": %s\n"
 
-#: gconf/gconftool.c:949
+#: gconf/gconftool.c:946
 msgid "(no value set)"
 msgstr "(inget värde satt)"
 
-#: gconf/gconftool.c:1004
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Misslyckades med att starta konfigurationsservern (gconfd): %s\n"
 
-#: gconf/gconftool.c:1018
+#: gconf/gconftool.c:1015
 msgid "Must specify a key or keys to get\n"
 msgstr "Måste ange en nyckel eller flera att hämta\n"
 
-#: gconf/gconftool.c:1053
+#: gconf/gconftool.c:1050
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:1054
+#: gconf/gconftool.c:1051
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listtyp: %s\n"
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1052
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car-typ: %s\n"
 
-#: gconf/gconftool.c:1056
+#: gconf/gconftool.c:1053
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr-typ: %s\n"
 
-#: gconf/gconftool.c:1061
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Standardvärde: %s\n"
 
-#: gconf/gconftool.c:1061 gconf/gconftool.c:1063 gconf/gconftool.c:1064
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058 gconf/gconftool.c:1060 gconf/gconftool.c:1061
+#: gconf/gconftool.c:1062
 msgid "Unset"
 msgstr "Nollställ"
 
-#: gconf/gconftool.c:1063
+#: gconf/gconftool.c:1060
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Ägare: %s\n"
 
-#: gconf/gconftool.c:1064
+#: gconf/gconftool.c:1061
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kort beskrivning: %s\n"
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1062
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Lång beskrivning: %s\n"
 
-#: gconf/gconftool.c:1074 gconf/gconftool.c:1368
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1365
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Inget värde satt för \"%s\"\n"
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1372
+#: gconf/gconftool.c:1075 gconf/gconftool.c:1369
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Misslyckades med att få värdet för \"%s\": %s\n"
 
-#: gconf/gconftool.c:1121 gconf/gconftool.c:1133
+#: gconf/gconftool.c:1118 gconf/gconftool.c:1130
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Förstår inte typen \"%s\"\n"
 
-#: gconf/gconftool.c:1145
+#: gconf/gconftool.c:1142
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Du måste ange alternativa nycklar/värden som argument\n"
 
-#: gconf/gconftool.c:1165
+#: gconf/gconftool.c:1162
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Inget värde satt för nyckel: \"%s\"\n"
 
-#: gconf/gconftool.c:1193
+#: gconf/gconftool.c:1190
 msgid "Cannot set schema as value\n"
 msgstr "Kan inte sätta schema som värde\n"
 
-#: gconf/gconftool.c:1203
+#: gconf/gconftool.c:1200
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "När du anger en lista måste du ange en primitiv listtyp\n"
 
-#: gconf/gconftool.c:1217
+#: gconf/gconftool.c:1214
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "När du anger ett par måste du ange en primitiv car-typ och cdr-typ\n"
 
-#: gconf/gconftool.c:1232
+#: gconf/gconftool.c:1229
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fel: %s\n"
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Fel när värde sattes: %s\n"
 
-#: gconf/gconftool.c:1263
+#: gconf/gconftool.c:1260
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Fel vid synkronisering: %s\n"
 
-#: gconf/gconftool.c:1286
+#: gconf/gconftool.c:1283
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Måste ange en nyckel eller nycklar på kommandoraden\n"
 
-#: gconf/gconftool.c:1306
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "Inget schema är känt för \"%s\"\n"
 
-#: gconf/gconftool.c:1339
+#: gconf/gconftool.c:1336
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "Ingen dokumentationssträng är lagrad i schema på \"%s\"\n"
 
-#: gconf/gconftool.c:1344
+#: gconf/gconftool.c:1341
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Fel vid hämtning av schema på \"%s\": %s\n"
 
-#: gconf/gconftool.c:1351
+#: gconf/gconftool.c:1348
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "Inget schema är lagrat på \"%s\"\n"
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1351
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "Värdet på \"%s\" är inte ett schema\n"
 
-#: gconf/gconftool.c:1410 gconf/gconftool.c:1435
+#: gconf/gconftool.c:1407 gconf/gconftool.c:1432
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr "Måste ange ett schemanamn följt av nyckelnamnet att tillämpa det på\n"
 
-#: gconf/gconftool.c:1417
+#: gconf/gconftool.c:1414
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr ""
 "Fel vid associering av schemanamnet \"%s\" med nyckelnamnet \"%s\": %s\n"
 
-#: gconf/gconftool.c:1445
+#: gconf/gconftool.c:1442
 #, c-format
 msgid "Error removing schema name from '%s': %s\n"
 msgstr "Fel vid borttagning av schemanamn från \"%s\": %s\n"
 
-#: gconf/gconftool.c:1470
+#: gconf/gconftool.c:1467
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Måste ange nyckel (schemanamn) som det enda argumentet\n"
 
-#: gconf/gconftool.c:1512
+#: gconf/gconftool.c:1509
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Listtypen måste vara en primitiv typ: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1529
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Car-partypen måste vara en primitiv typ: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1552
+#: gconf/gconftool.c:1549
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Cdr-partypen måste vara en primitiv typ: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1564
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Fel när värde sattes: %s"
 
-#: gconf/gconftool.c:1581
+#: gconf/gconftool.c:1578
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Fel vid synkronisering: %s"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1593
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr "Måste ange en eller flera kataloger att få nyckel/värde par från.\n"
 
-#: gconf/gconftool.c:1610
+#: gconf/gconftool.c:1607
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Måste ange en eller flera nycklar att nollställa.\n"
 
-#: gconf/gconftool.c:1621
+#: gconf/gconftool.c:1618
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Fel vid nollställning av \"%s\": %s\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1638
 msgid "Must specify one or more keys to recursively unset.\n"
 msgstr "Måste ange en eller flera nycklar att rekursivt nollställa.\n"
 
-#: gconf/gconftool.c:1655
+#: gconf/gconftool.c:1652
 #, c-format
 msgid "Failure during recursive unset of \"%s\": %s\n"
 msgstr "Misslyckande med rekursiv återställning av \"%s\": %s\n"
 
-#: gconf/gconftool.c:1673
+#: gconf/gconftool.c:1670
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr "Måste ange en eller flera kataloger att få underkataloger från.\n"
 
-#: gconf/gconftool.c:1707
+#: gconf/gconftool.c:1704
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Fel vid listning av kataloger: %s\n"
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1746
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "VARNING: ogiltig eller saknad typ för schema (%s)\n"
 
-#: gconf/gconftool.c:1758
+#: gconf/gconftool.c:1755
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "VARNING: ogiltig eller saknad list_type för schema (%s)\n"
 
-#: gconf/gconftool.c:1769 gconf/gconftool.c:1799 gconf/gconftool.c:1828
+#: gconf/gconftool.c:1766 gconf/gconftool.c:1796 gconf/gconftool.c:1825
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "VARNING: Misslyckades med att tolka standardvärde \"%s\" för schema (%s)\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1784
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "VARNING: ogiltig eller saknad car_type eller cdr_type för schema (%s)\n"
 
-#: gconf/gconftool.c:1812
+#: gconf/gconftool.c:1809
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "VARNING: Du kan inte sätta ett standardvärde för ett schema\n"
 
-#: gconf/gconftool.c:1841
+#: gconf/gconftool.c:1838
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "VARNING: internt fel i gconftool, okänd GConfValueType\n"
 
-#: gconf/gconftool.c:1888 gconf/gconftool.c:1909 gconf/gconftool.c:1930
-#: gconf/gconftool.c:1951
+#: gconf/gconftool.c:1885 gconf/gconftool.c:1906 gconf/gconftool.c:1927
+#: gconf/gconftool.c:1948
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "VARNING: misslyckades med att tolka typnamnet \"%s\"\n"
 
-#: gconf/gconftool.c:1905
+#: gconf/gconftool.c:1902
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1858,39 +1776,39 @@ msgstr ""
 "VARNING: list_type kan bara vara int, float, string eller bool och inte \"%s"
 "\"\n"
 
-#: gconf/gconftool.c:1926
+#: gconf/gconftool.c:1923
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "VARNING: car_type kan bara vara int, float, string eller bool och inte \"%s"
 "\"\n"
 
-#: gconf/gconftool.c:1947
+#: gconf/gconftool.c:1944
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "VARNING: cdr_type kan bara vara int, float, string eller bool och inte \"%s"
 "\"\n"
 
-#: gconf/gconftool.c:1975
+#: gconf/gconftool.c:1972
 msgid "WARNING: empty <applyto> node"
 msgstr "VARNING: tom <applyto>-nod"
 
-#: gconf/gconftool.c:1978 gconf/gconftool.c:2241
+#: gconf/gconftool.c:1975 gconf/gconftool.c:2238
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "VARNING: noden <%s> kan inte förstås under <schema>\n"
 
-#: gconf/gconftool.c:1988
+#: gconf/gconftool.c:1985
 msgid "WARNING: no key specified for schema\n"
 msgstr "VARNING: ingen nyckel angiven för schema\n"
 
-#: gconf/gconftool.c:2021
+#: gconf/gconftool.c:2018
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "VARNING: <locale>-noden har inget `name=\"locale\"'-attribut, ignorerar\n"
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2024
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1898,53 +1816,53 @@ msgstr ""
 "VARNING: flera <locale>-noder för platsen \"%s\", ignorerar allt föregående "
 "först\n"
 
-#: gconf/gconftool.c:2108
+#: gconf/gconftool.c:2105
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "VARNING: Ogiltig nod <%s> i en <locale>-nod\n"
 
-#: gconf/gconftool.c:2137
+#: gconf/gconftool.c:2134
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 "VARNING: misslyckades med att installera schemat \"%s\" lokal \"%s\": %s\n"
 
-#: gconf/gconftool.c:2145
+#: gconf/gconftool.c:2142
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Installerade schemat \"%s\" för lokalen \"%s\"\n"
 
-#: gconf/gconftool.c:2167
+#: gconf/gconftool.c:2164
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 "VARNING: misslyckades med att associera schemat `%s' med nyckeln `%s': %s\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2172
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Kopplade ihop schemat \"%s\" med nyckeln \"%s\"\n"
 
-#: gconf/gconftool.c:2254
+#: gconf/gconftool.c:2251
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Du måste ha minst en <locale>-post i ett <schema>\n"
 
-#: gconf/gconftool.c:2285
+#: gconf/gconftool.c:2282
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "VARNING: noden <%s> kan inte förstås under <schemalist>\n"
 
-#: gconf/gconftool.c:2308
+#: gconf/gconftool.c:2305
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Misslyckades med att öppna \"%s\": %s\n"
 
-#: gconf/gconftool.c:2315
+#: gconf/gconftool.c:2312
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokumentet \"%s\" är tomt?\n"
 
-#: gconf/gconftool.c:2327
+#: gconf/gconftool.c:2324
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1953,26 +1871,26 @@ msgstr ""
 "Dokumentet \"%s\" har fel typ av rotnod (<%s>, borde vara "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:2340
+#: gconf/gconftool.c:2337
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokumentet \"%s\" har ingen toppnivå <gconfschemafil> nod\n"
 
-#: gconf/gconftool.c:2354
+#: gconf/gconftool.c:2351
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "VARNING: noden <%s> nedanför <gconfschemafile> kan inte förstås\n"
 
-#: gconf/gconftool.c:2365 gconf/gconftool.c:2397
+#: gconf/gconftool.c:2362 gconf/gconftool.c:2394
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Fel vid synkronisering av konfigurationsdata: %s"
 
-#: gconf/gconftool.c:2381
+#: gconf/gconftool.c:2378
 msgid "Must specify some schema files to install\n"
 msgstr "Måste ange någon schemafil att installera\n"
 
-#: gconf/gconftool.c:2418
+#: gconf/gconftool.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -1981,16 +1899,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2438
+#: gconf/gconftool.c:2435
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Misslyckades med att nollställa knäcknyckeln %s: %s\n"
 
-#: gconf/gconftool.c:2564
+#: gconf/gconftool.c:2561
 msgid "Must specify some keys to break\n"
 msgstr "Måste ange några nycklar att knäcka\n"
 
-#: gconf/gconftool.c:2570
+#: gconf/gconftool.c:2567
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1999,11 +1917,11 @@ msgstr ""
 "Försöker att knäcka ditt program genom att sätta dåliga värden för nyckeln:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2588
+#: gconf/gconftool.c:2585
 msgid "Must specify some directories to break\n"
 msgstr "Måste ange några kataloger att knäcka\n"
 
-#: gconf/gconftool.c:2607
+#: gconf/gconftool.c:2604
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -2014,26 +1932,93 @@ msgstr ""
 "katalogen:\n"
 "  %s\n"
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "Failed to parse XML file \"%s\""
+#~ msgstr "Misslyckades med att tolka XML-filen \"%s\""
+
+#~ msgid "Server ping error: %s"
+#~ msgstr "Serverpingfel: %s"
+
+#~ msgid ""
+#~ "Failed to contact configuration server; some possible causes are that you "
+#~ "need to enable TCP/IP networking for ORBit, or you have stale NFS locks "
+#~ "due to a system crash. See http://www.gnome.org/projects/gconf/ for "
+#~ "information. (Details - %s)"
+#~ msgstr ""
+#~ "Misslyckades med att kontakta konfigurationsservern. En del möjliga "
+#~ "orsaker kan vara att du måste aktivera stöd för TCP/IP-nätverk i ORBit, "
+#~ "eller att du har överblivna NFS-lås på grund av en systemkrasch. Se "
+#~ "http://www.gnome.org/projects/gconf/ för mer information. (Detaljer - %s)"
+
+#~ msgid "none"
+#~ msgstr "inga"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not open or create the file \"%s\"; this indicates that there may "
+#~ "be a problem with your configuration, as many programs will need to "
+#~ "create files in your home directory. The error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Kontakta din systemadministratör för att lösa följande problem:\n"
+#~ "Kunde inte öppna eller skapa filen \"%s\"; detta indikerar att det kan "
+#~ "finnas ett problem med din konfiguration, eftersom många program kommer "
+#~ "att behöva skapa filer i din hemkatalog. Felet var \"%s\" (felnummer = %"
+#~ "d)."
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not lock the file \"%s\"; this indicates that there may be a "
+#~ "problem with your operating system configuration. If you have an NFS-"
+#~ "mounted home directory, either the client or the server may be set up "
+#~ "incorrectly. See the rpc.statd and rpc.lockd documentation. A common "
+#~ "cause of this error is that the \"nfslock\" service has been disabled.The "
+#~ "error was \"%s\" (errno = %d)."
+#~ msgstr ""
+#~ "Kontakta din systemadministratör för att lösa följande problem:\n"
+#~ "Kunde inte låsa filen \"%s\"; detta indikerar att det kan finnas ett "
+#~ "problem med din operativsystemskonfiguration. Om du har en NFS-monterad "
+#~ "hemkatalog kan antingen klienten eller servern vara felaktigt "
+#~ "konfigurerad. Se dokumentationen för rpc.statd och rpc.lockd. En vanlig "
+#~ "orsak till detta fel är att tjänsten \"nfslock\" har deaktiverats. Felet "
+#~ "var \"%s\" (felnummer = %d)."
+
+#~ msgid "Can't remove file %s: %s\n"
+#~ msgstr "Kan inte ta bort filen %s: %s\n"
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "No configuration sources in the configuration file \"%s\"; this means "
+#~ "that preferences and other settings can't be saved. %s%s"
+#~ msgstr ""
+#~ "Kontakta din systemadministratör för att lösa följande problem:\n"
+#~ "Inga konfigurationskällor i konfigurationsfilen \"%s\"; detta indikerar "
+#~ "att inställningar inte kan sparas. %s%s"
+
+#~ msgid "Error reading the file: "
+#~ msgstr "Fel vid läsning av filen: "
+
+#~ msgid ""
+#~ "Please contact your system administrator to resolve the following "
+#~ "problem:\n"
+#~ "Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
+#~ msgstr ""
+#~ "Kontakta din systemadministratör för att lösa följande problem:\n"
+#~ "Kunde inte slå upp adressen \"%s\" i konfigurationsfilen \"%s\": %s"
+
+#~ msgid "Multiple segmentation faults occurred; can't display error dialog\n"
+#~ msgstr "Flera segmenteringsfel inträffade; kan inte visa feldialogen\n"
+
 #~ msgid ""
-#~ "Failed to contact configuration server; some possible causes are:\n"
-#~ "a) you have an existing configuration server (gconfd) running, but it "
-#~ "isn't reachable from here - if you're logged in from two machines at "
-#~ "once, you may need to enable TCP networking for ORBit by putting the line "
-#~ "\"ORBIIOPIPv4=1\" in /etc/orbitrc\n"
-#~ "b) you have stale locks in your NFS-mounted home directory due to a "
-#~ "system crash, try removing ~/.gconf/*.lock and ~/.gconfd/lock if you are "
-#~ "sure no gconfd processes are running on any machine using your home dir"
+#~ "Segmentation fault!\n"
+#~ "Cannot display crash dialog: %s\n"
 #~ msgstr ""
-#~ "Misslyckades med att kontakta konfigurationsserver; en del möjliga "
-#~ "orsaker till detta är:\n"
-#~ "a) att du har en existerande konfigurationsserver (gconfd) körandes, men "
-#~ "att den inte är nåbar härifrån - om du är inloggad från två maskiner "
-#~ "samtidigt kan du behöva aktivera TCP-nätverksstöd för ORBit genom att "
-#~ "stoppa raden \"ORBIIOPIPv4=1\" i /etc/orbitrc\n"
-#~ "b) du har gamla spöklås i din NFS-monterade hemkatalog på grund av en "
-#~ "systemkrasch, prova att ta bort ~/.gconf/*.lock och ~/.gconfd/lock om du "
-#~ "är säker på att inga gconfd-processer kör på den maskin som använder din "
-#~ "hemkatalog"
+#~ "Segmenteringsfel!\n"
+#~ "Kan inte visa kraschdialogen: %s\n"
 
 #~ msgid ""
 #~ "Please contact your system administrator to resolve the following "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6ec922dc..fdcac57f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2002-02-17 17:16+0800\n"
+"POT-Creation-Date: 2002-01-28 21:35-0500\n"
 "PO-Revision-Date: 2002-02-17 17:48+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -69,8 +69,7 @@ msgstr "在同步XML后端目录缓存时发生错误：%s"
 msgid ""
 "Remove dir operation is no longer supported, just remove all the values in "
 "the directory"
-msgstr ""
-"删除目录操作不再被支持，仅删除目录中所有的值"
+msgstr "删除目录操作不再被支持，仅删除目录中所有的值"
 
 #: backends/xml-backend.c:718
 msgid "Initializing XML backend module"
@@ -90,16 +89,14 @@ msgstr "无法同步 XML 缓存内容到磁盘"
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
-msgstr ""
-"无法从 XML 后代缓存中删除目录“%s”，因为它还没有成功地同步到磁盘"
+msgstr "无法从 XML 后代缓存中删除目录“%s”，因为它还没有成功地同步到磁盘"
 
 #: backends/xml-cache.c:305
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than %"
 "u seconds"
-msgstr ""
-"在清除旧于“%u”秒的已同步的项后，有 %u 项保留在缓存中"
+msgstr "在清除旧于“%u”秒的已同步的项后，有 %u 项保留在缓存中"
 
 #: backends/xml-dir.c:168
 #, c-format
@@ -300,113 +297,117 @@ msgstr "无法关闭后端模块"
 msgid "GConf Error: %s\n"
 msgstr "GConf 错误：%s\n"
 
-#: gconf/gconf-client.c:897
+#: gconf/gconf-client.c:899
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf 警告：无法列出“%s”中的对：%s"
 
-#: gconf/gconf-client.c:1162
+#: gconf/gconf-client.c:1165
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
 
-#: gconf/gconf-database.c:234
+#: gconf/gconf-database.c:233
 msgid "Received invalid value in set request"
 msgstr "接收到“设置请求中有无效值”"
 
-#: gconf/gconf-database.c:242
+#: gconf/gconf-database.c:241
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:523
+#: gconf/gconf-database.c:522
 msgid "Received request to drop all cached data"
 msgstr "接收到“丢弃所有缓冲的数据”的请求"
 
-#: gconf/gconf-database.c:540
+#: gconf/gconf-database.c:539
 msgid "Received request to sync synchronously"
 msgstr "接收到“同步地进行同步”的请求"
 
-#: gconf/gconf-database.c:824
+#: gconf/gconf-database.c:823
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "严重错误：无法为 ConfigDatabase 得到对象引用"
 
-#: gconf/gconf-database.c:986
+#: gconf/gconf-database.c:985
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "无法同步一个或多个源：%s"
 
-#: gconf/gconf-database.c:1078
+#. This error is not fatal; we basically ignore it.
+#. * Because it's likely the right thing for the client
+#. * app to simply continue.
+#.
+#: gconf/gconf-database.c:1076
 #, c-format
 msgid ""
-"Failed to log addition of listener %s (%s);will not be able to restore this "
+"Failed to log addition of listener %s (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:1109
+#: gconf/gconf-database.c:1103
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "监听程序 ID %lu 不存在"
 
-#: gconf/gconf-database.c:1123
+#: gconf/gconf-database.c:1117
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1241 gconf/gconf-sources.c:1540
+#: gconf/gconf-database.c:1235 gconf/gconf-sources.c:1540
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "获取“%s”的值时发生错误：%s"
 
-#: gconf/gconf-database.c:1288
+#: gconf/gconf-database.c:1282
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "设置“%s”的值时发生错误：%s"
 
-#: gconf/gconf-database.c:1331
+#: gconf/gconf-database.c:1325
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "取消“%s”设置值时发生错误：%s"
 
-#: gconf/gconf-database.c:1360
+#: gconf/gconf-database.c:1354
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "获取“%s”的默认值时发生错误：%s"
 
-#: gconf/gconf-database.c:1411
+#: gconf/gconf-database.c:1405
 #, c-format
 msgid "Error unsetting \"%s\": %s"
 msgstr "取消“%s”的设置值时发生错误：%s"
 
-#: gconf/gconf-database.c:1443
+#: gconf/gconf-database.c:1437
 #, c-format
 msgid "Error getting new value for \"%s\": %s"
 msgstr "获取“%s”的新值时发生错误：%s"
 
-#: gconf/gconf-database.c:1491
+#: gconf/gconf-database.c:1485
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "检查“%s”的存在时发生错误：%s"
 
-#: gconf/gconf-database.c:1515
+#: gconf/gconf-database.c:1509
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "删除目录“%s”发生错误：%s"
 
-#: gconf/gconf-database.c:1542
+#: gconf/gconf-database.c:1536
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "无法获取“%s”中的所有项：%s"
 
-#: gconf/gconf-database.c:1568
+#: gconf/gconf-database.c:1562
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "列出“%s”中的目录时发生错误：%s"
 
-#: gconf/gconf-database.c:1589
+#: gconf/gconf-database.c:1583
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "为“%s”设置 schema 时发生错误：%s"
@@ -652,22 +653,22 @@ msgstr "无法关闭文件“%s”：%s"
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "无法将“%s”改名为“%s”：%s"
 
-#: gconf/gconf-internals.c:2846 gconf/gconfd.c:587
+#: gconf/gconf-internals.c:2842 gconf/gconfd.c:583
 #, fuzzy, c-format
 msgid "Failed to create %s: %s"
 msgstr "无法创建文件“%s”：%s"
 
-#: gconf/gconf-internals.c:2879
+#: gconf/gconf-internals.c:2875
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:2903
+#: gconf/gconf-internals.c:2899
 #, fuzzy, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "无法访问配置源：%s\n"
 
-#: gconf/gconf-internals.c:2927
+#: gconf/gconf-internals.c:2923
 msgid ""
 "Failed to contact configuration server; some possible causes are:\n"
 "a) you have an existing configuration server (gconfd) running, but it isn't "
@@ -823,102 +824,102 @@ msgstr ""
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
 
-#: gconf/gconf.c:55
+#: gconf/gconf.c:54
 #, c-format
 msgid "Key \"%s\" is NULL"
 msgstr ""
 
-#: gconf/gconf.c:62
+#: gconf/gconf.c:61
 #, c-format
 msgid "\"%s\": %s"
 msgstr ""
 
-#: gconf/gconf.c:343
+#: gconf/gconf.c:333
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:634
+#: gconf/gconf.c:624
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:2079
+#: gconf/gconf.c:2072
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:2434
+#: gconf/gconf.c:2393
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2456
+#: gconf/gconf.c:2415
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:2458
+#: gconf/gconf.c:2417
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2477
+#: gconf/gconf.c:2436
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
 msgstr ""
 
-#: gconf/gconf.c:2487
+#: gconf/gconf.c:2446
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:2501
+#: gconf/gconf.c:2460
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2870
+#: gconf/gconf.c:2829
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2931
+#: gconf/gconf.c:2890
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2966
+#: gconf/gconf.c:2925
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:3001
+#: gconf/gconf.c:2960
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:3038
+#: gconf/gconf.c:2997
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:3071
+#: gconf/gconf.c:3030
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconf.c:3432
+#: gconf/gconf.c:3391
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:246
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:278
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:294
+#: gconf/gconfd.c:292
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -927,199 +928,187 @@ msgstr ""
 #. We want to stay alive but do nothing, because otherwise every
 #. request would result in another failed gconfd being spawned.
 #.
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:300
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:300
 msgid "/path"
 msgstr ""
 
-#: gconf/gconfd.c:315
+#: gconf/gconfd.c:313
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:327
+#: gconf/gconfd.c:325
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:344
+#: gconf/gconfd.c:342
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:370
+#: gconf/gconfd.c:368
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 
-#: gconf/gconfd.c:388
+#: gconf/gconfd.c:384
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 
-#: gconf/gconfd.c:405
+#: gconf/gconfd.c:401
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr ""
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:535
+#: gconf/gconfd.c:531
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:574
+#: gconf/gconfd.c:570
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:612
+#: gconf/gconfd.c:608
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 
-#: gconf/gconfd.c:622
+#: gconf/gconfd.c:618
 #, fuzzy, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "无法设置“%s”的目录：%s"
 
-#: gconf/gconfd.c:660
+#: gconf/gconfd.c:656
 #, fuzzy, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "无法创建文件“%s”：%s"
 
-#: gconf/gconfd.c:668
+#: gconf/gconfd.c:664
 msgid "Exiting"
 msgstr ""
 
-#: gconf/gconfd.c:694
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr ""
 
-#: gconf/gconfd.c:1063
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1163
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1198
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1267
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1281
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1290
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1304
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1314
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1323
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1794
+#: gconf/gconfd.c:1790
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1840
+#: gconf/gconfd.c:1836
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1893
+#: gconf/gconfd.c:1889
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:2010
+#: gconf/gconfd.c:2006
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
 "add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:2015
+#: gconf/gconfd.c:2011
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
 "add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
+#: gconf/gconfd.c:2034 gconf/gconfd.c:2199
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2053
+#: gconf/gconfd.c:2049
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2066
+#: gconf/gconfd.c:2062
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2074
+#: gconf/gconfd.c:2070
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2164
+#: gconf/gconfd.c:2160
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 
-#. dialog display isn't working out
-#: gconf/gconfd.c:2303
-msgid "Multiple segmentation faults occurred; can't display error dialog\n"
-msgstr ""
-
-#. Eeeek! Can't show dialog
-#: gconf/gconfd.c:2312
-msgid ""
-"Segmentation fault!\n"
-"Cannot display crash dialog\n"
-msgstr ""
-
 #: gconf/gconftool.c:71
 msgid "Help options"
 msgstr ""
diff --git a/tests/testaddress.c b/tests/testaddress.c
index 2bc0113d..5c05be02 100644
--- a/tests/testaddress.c
+++ b/tests/testaddress.c
@@ -108,7 +108,7 @@ main (int argc, char** argv)
       gchar*  protocol;
       gchar*  resource;
       
-      flat_flags = g_strjoinv(",", iter->flags);
+      flat_flags = g_strjoinv (",", iter->flags);
 
       address = g_strconcat(iter->protocol, ":", flat_flags, ":", iter->resource, NULL);
 
diff --git a/tests/testchangeset.c b/tests/testchangeset.c
index d5841d53..faddb6cc 100644
--- a/tests/testchangeset.c
+++ b/tests/testchangeset.c
@@ -29,7 +29,7 @@
 /*
  *
  *
- * DO NOT USE THESE CRAPPY TESTS AS EXAMPLE CODE. USE THE DOCS AND examples/*
+ * DO NOT USE THESE CRAPPY TESTS AS EXAMPLE CODE. USE THE DOCS AND examples
  *
  *
  *
@@ -49,6 +49,8 @@
 #include <locale.h>
 #include <unistd.h>
 #include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
 static void
 check(gboolean condition, const gchar* fmt, ...)
diff --git a/tests/testdirlist.c b/tests/testdirlist.c
index 6e6b0c41..d16cd6c1 100644
--- a/tests/testdirlist.c
+++ b/tests/testdirlist.c
@@ -29,7 +29,7 @@
 /*
  *
  *
- * DO NOT USE THESE CRAPPY TESTS AS EXAMPLE CODE. USE THE DOCS AND examples/*
+ * DO NOT USE THESE CRAPPY TESTS AS EXAMPLE CODE. USE THE DOCS AND examples
  *
  *
  *
@@ -44,11 +44,13 @@
 
 
 #include <gconf/gconf.h>
+#include <gconf/gconf-internals.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <math.h>
 #include <locale.h>
-#include <gconf/gconf-internals.h>
+#include <stdlib.h>
+#include <string.h>
 
 static void
 check(gboolean condition, const gchar* fmt, ...)
diff --git a/tests/testschemas.c b/tests/testschemas.c
index 9a933353..0b871782 100644
--- a/tests/testschemas.c
+++ b/tests/testschemas.c
@@ -299,7 +299,7 @@ check_one_schema(GConfEngine* conf, const gchar** keyp, GConfSchema* schema)
 
       if (err != NULL)
         {
-          check (gotten == NULL, "NULL not returned though there was an error");
+          check (val == NULL, "NULL not returned though there was an error");
 
           fprintf (stderr, "Failed to get key `%s': %s\n",
                    *keyp, err->message);
author	Havoc Pennington <hp@pobox.com>	2002-03-29 06:27:13 +0000
committer	Havoc Pennington <hp@src.gnome.org>	2002-03-29 06:27:13 +0000
commit	f7315e5a41f1a501ea6b6d41fcb56b5038f0b9db (patch)
tree	8a11d69b2ba2715c1c6968bd17597ca3b58042fe
parent	15fd7b87b7dc5fa83dcb740cc82e26faed272402 (diff)
download	gconf-f7315e5a41f1a501ea6b6d41fcb56b5038f0b9db.tar.gz