Update to return fully qualified name in GConfEntry

2000-09-14  Havoc Pennington  <hp@pobox.com>

        * gconf/gconf.c (gconf_engine_all_dirs): Update to
	        return fully qualified name in GConfEntry
		        (gconf_engine_all_entries): missed the local case
			        earlier when adapting it to use
fully-qualified name

        * acinclude.m4: Add never-use-included-gettext macro

	        * configure.in: Bump version to 0.9

23 files changed, 9360 insertions, 5413 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a70d8fa..570877d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-09-14  Havoc Pennington  <hp@pobox.com>
+
+	* gconf/gconf.c (gconf_engine_all_dirs): Update to 
+	return fully qualified name in GConfEntry
+	(gconf_engine_all_entries): missed the local case
+	earlier when adapting it to use fully-qualified name
+
+	* acinclude.m4: Add never-use-included-gettext macro
+
+	* configure.in: Bump version to 0.9
+
 2000-09-14  Darin Adler  <darin@eazel.com>
 
 	* backends/xml-dir.c: (dir_load): Fixed code that set up file mode
diff --git a/Makefile.am b/Makefile.am
index 2e21e832..a2d8b852 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 
-SUBDIRS = gconf backends wrappers po intl doc examples standard-schemas
+SUBDIRS = intl gconf backends wrappers po doc examples standard-schemas
 DIST_SUBDIRS=tests $(SUBDIRS)
 
-EXTRA_DIST=gconf-config.in gconf.m4.in gconf.spec.in gconf.spec
+EXTRA_DIST=gconf-config.in gconf.m4.in gconf.spec.in gconf.spec TODO
 
 WARNING_MESSAGE="If this is your first install of GConf, you may need to move $(prefix)/etc/gconf/$(MAJOR_VERSION)/path.example to $(prefix)/etc/gconf/$(MAJOR_VERSION)/path, so that the default configuration is sane. If you are already using GConf, you may need to move your old configuration into place if $(MAJOR_VERSION) is not the same as your old version."
 
diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 00000000..9abb53dd
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,338 @@
+
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# Modified to never use included libintl. 
+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
+#
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 5
+
+AC_DEFUN(AM_GCONF_WITH_NLS,
+  [AC_MSG_CHECKING([whether NLS is requested])
+    dnl Default is enabled NLS
+    AC_ARG_ENABLE(nls,
+      [  --disable-nls           do not use Native Language Support],
+      USE_NLS=$enableval, USE_NLS=yes)
+    AC_MSG_RESULT($USE_NLS)
+    AC_SUBST(USE_NLS)
+
+    USE_INCLUDED_LIBINTL=no
+
+    dnl If we use NLS figure out what method
+    if test "$USE_NLS" = "yes"; then
+#      AC_DEFINE(ENABLE_NLS)
+#      AC_MSG_CHECKING([whether included gettext is requested])
+#      AC_ARG_WITH(included-gettext,
+#        [  --with-included-gettext use the GNU gettext library included here],
+#        nls_cv_force_use_gnu_gettext=$withval,
+#        nls_cv_force_use_gnu_gettext=no)
+#      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+      nls_cv_force_use_gnu_gettext="no"
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If gettext or catgets are available (in this order) we
+        dnl use this.  Else we have to fall back to GNU NLS library.
+	dnl catgets is only used if permitted by option --with-catgets.
+	nls_cv_header_intl=
+	nls_cv_header_libgt=
+	CATOBJEXT=NONE
+
+	AC_CHECK_HEADER(libintl.h,
+	  [AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+	    [AC_TRY_LINK([#include <libintl.h>], [return (int) dgettext ("","")],
+	       gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no)])
+
+	   if test "$gt_cv_func_dgettext_libc" != "yes"; then
+	     AC_CHECK_LIB(intl, bindtextdomain,
+	       [AC_CACHE_CHECK([for dgettext in libintl],
+		 gt_cv_func_dgettext_libintl,
+		 [AC_CHECK_LIB(intl, dgettext,
+		  gt_cv_func_dgettext_libintl=yes,
+		  gt_cv_func_dgettext_libintl=no)],
+		 gt_cv_func_dgettext_libintl=no)])
+	   fi
+
+           if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+	     LIBS="$LIBS -lintl";
+           fi
+
+	   if test "$gt_cv_func_dgettext_libc" = "yes" \
+	      || test "$gt_cv_func_dgettext_libintl" = "yes"; then
+	      AC_DEFINE(HAVE_GETTEXT)
+	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	      if test "$MSGFMT" != "no"; then
+		AC_CHECK_FUNCS(dcgettext)
+		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+		AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+			       return _nl_msg_cat_cntr],
+		  [CATOBJEXT=.gmo
+		   DATADIRNAME=share],
+		  [CATOBJEXT=.mo
+		   DATADIRNAME=lib])
+		INSTOBJEXT=.mo
+	      fi
+	    fi
+
+	    # Added by Martin Baulig 12/15/98 for libc5 systems
+	    if test "$gt_cv_func_dgettext_libc" != "yes" \
+	       && test "$gt_cv_func_dgettext_libintl" = "yes"; then
+	       INTLLIBS=-lintl
+	       LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+	    fi
+	])
+
+        if test "$CATOBJEXT" = "NONE"; then
+	  AC_MSG_CHECKING([whether catgets can be used])
+	  AC_ARG_WITH(catgets,
+	    [  --with-catgets          use catgets functions if available],
+	    nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
+	  AC_MSG_RESULT($nls_cv_use_catgets)
+
+	  if test "$nls_cv_use_catgets" = "yes"; then
+	    dnl No gettext in C library.  Try catgets next.
+	    AC_CHECK_LIB(i, main)
+	    AC_CHECK_FUNC(catgets,
+	      [AC_DEFINE(HAVE_CATGETS)
+	       INTLOBJS="\$(CATOBJS)"
+	       AC_PATH_PROG(GENCAT, gencat, no)dnl
+#	       if test "$GENCAT" != "no"; then
+#		 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
+#		 if test "$GMSGFMT" = "no"; then
+#		   AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
+#		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
+#		 fi
+#		 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+#		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+#		 USE_INCLUDED_LIBINTL=yes
+#		 CATOBJEXT=.cat
+#		 INSTOBJEXT=.cat
+#		 DATADIRNAME=lib
+#		 INTLDEPS='$(top_builddir)/intl/libintl.a'
+#		 INTLLIBS=$INTLDEPS
+#		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+#		 nls_cv_header_intl=intl/libintl.h
+#		 nls_cv_header_libgt=intl/libgettext.h
+#              fi
+            ])
+	  fi
+        fi
+
+        if test "$CATOBJEXT" = "NONE"; then
+	  dnl Neither gettext nor catgets in included in the C library.
+	  dnl Fall back on GNU gettext library.
+	  nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" != "yes"; then
+        AC_DEFINE(ENABLE_NLS)
+      else
+         # Unset this variable since we use the non-zero value as a flag.
+         CATOBJEXT=
+#        dnl Mark actions used to generate GNU NLS library.
+#        INTLOBJS="\$(GETTOBJS)"
+#        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+#	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+#        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+#        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+#	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+#        AC_SUBST(MSGFMT)
+#	USE_INCLUDED_LIBINTL=yes
+#        CATOBJEXT=.gmo
+#        INSTOBJEXT=.mo
+#        DATADIRNAME=share
+#	INTLDEPS='$(top_builddir)/intl/libintl.a'
+#	INTLLIBS=$INTLDEPS
+#	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+#        nls_cv_header_intl=intl/libintl.h
+#        nls_cv_header_libgt=intl/libgettext.h
+      fi
+
+      dnl Test whether we really found GNU xgettext.
+      if test "$XGETTEXT" != ":"; then
+	dnl If it is no GNU xgettext we define it as : so that the
+	dnl Makefiles still can work.
+	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+	  : ;
+	else
+	  AC_MSG_RESULT(
+	    [found xgettext program is not GNU xgettext; ignore it])
+	  XGETTEXT=":"
+	fi
+      fi
+
+      # We need to process the po/ directory.
+      POSUB=po
+    else
+      DATADIRNAME=share
+      nls_cv_header_intl=intl/libintl.h
+      nls_cv_header_libgt=intl/libgettext.h
+    fi
+    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+    AC_OUTPUT_COMMANDS(
+     [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
+
+
+#    # If this is used in GNU gettext we have to set USE_NLS to `yes'
+#    # because some of the sources are only built for this goal.
+#    if test "$PACKAGE" = gettext; then
+#      USE_NLS=yes
+#      USE_INCLUDED_LIBINTL=yes
+#    fi
+
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.in.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(USE_INCLUDED_LIBINTL)
+    AC_SUBST(CATALOGS)
+    AC_SUBST(CATOBJEXT)
+    AC_SUBST(DATADIRNAME)
+    AC_SUBST(GMOFILES)
+    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INTLDEPS)
+    AC_SUBST(INTLLIBS)
+    AC_SUBST(INTLOBJS)
+    AC_SUBST(POFILES)
+    AC_SUBST(POSUB)
+  ])
+
+AC_DEFUN(AM_GCONF_GNU_GETTEXT,
+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+   AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_PROG_RANLIB])dnl
+   AC_REQUIRE([AC_ISC_POSIX])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   AC_REQUIRE([AC_C_CONST])dnl
+   AC_REQUIRE([AC_C_INLINE])dnl
+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+   AC_REQUIRE([AC_FUNC_MMAP])dnl
+
+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
+unistd.h sys/param.h])
+   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
+strdup __argz_count __argz_stringify __argz_next])
+
+   if test "${ac_cv_func_stpcpy+set}" != "set"; then
+     AC_CHECK_FUNCS(stpcpy)
+   fi
+   if test "${ac_cv_func_stpcpy}" = "yes"; then
+     AC_DEFINE(HAVE_STPCPY)
+   fi
+
+   AM_LC_MESSAGES
+   AM_GCONF_WITH_NLS
+
+   if test "x$CATOBJEXT" != "x"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
+         case "$ALL_LINGUAS" in
+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+         esac
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+   dnl The reference to <locale.h> in the installed <libintl.h> file
+   dnl must be resolved because we cannot expect the users of this
+   dnl to define HAVE_LOCALE_H.
+   if test $ac_cv_header_locale_h = yes; then
+     INCLUDE_LOCALE_H="#include <locale.h>"
+   else
+     INCLUDE_LOCALE_H="\
+/* The system does not provide the header <locale.h>.  Take care yourself.  */"
+   fi
+   AC_SUBST(INCLUDE_LOCALE_H)
+
+   dnl Determine which catalog format we have (if any is needed)
+   dnl For now we know about two different formats:
+   dnl   Linux libc-5 and the normal X/Open format
+   test -d intl || mkdir intl
+   if test "$CATOBJEXT" = ".cat"; then
+     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
+
+     dnl Transform the SED scripts while copying because some dumb SEDs
+     dnl cannot handle comments.
+     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
+   fi
+   dnl po2tbl.sed is always needed.
+   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
+     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
+
+   dnl In the intl/Makefile.in we have a special dependency which makes
+   dnl only sense for gettext.  We comment this out for non-gettext
+   dnl packages.
+   if test "$PACKAGE" = "gettext"; then
+     GT_NO="#NO#"
+     GT_YES=
+   else
+     GT_NO=
+     GT_YES="#YES#"
+   fi
+   AC_SUBST(GT_NO)
+   AC_SUBST(GT_YES)
+
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl *** For now the libtool support in intl/Makefile is not for real.
+   l=
+   AC_SUBST(l)
+
+   dnl Generate list of files to be processed by xgettext which will
+   dnl be included in po/Makefile.
+   test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
+   fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
+  ])
+
diff --git a/configure.in b/configure.in
index 53baeb65..bd5213ec 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, 0.8)
+AM_INIT_AUTOMAKE(GConf, 0.9)
 
 AM_MAINTAINER_MODE
 
@@ -36,8 +36,8 @@ AC_SUBST(SCMGCONF_AGE)
 
 dnl libtool versioning for GConfClient wrapper
 
-GCONFGTK_CURRENT=0
-GCONFGTK_REVISION=1
+GCONFGTK_CURRENT=1
+GCONFGTK_REVISION=0
 GCONFGTK_AGE=0
 
 AC_SUBST(GCONFGTK_CURRENT)
@@ -47,11 +47,11 @@ AC_SUBST(GCONFGTK_AGE)
 dnl libtool versioning for libgconf
 
 dnl increment if the interface has additions, changes, removals.
-GCONF_CURRENT=0
+GCONF_CURRENT=1
 
 dnl increment any time the source changes; set to 
 dnl  0 if you increment CURRENT
-GCONF_REVISION=1
+GCONF_REVISION=0
 
 dnl increment if any interfaces have been added; set to 0
 dnl  if any interfaces have been removed. removal has 
@@ -174,7 +174,7 @@ fi # docs_only
 
 ALL_LINGUAS="ca cs da de el fi fr ga ja ko no pt_BR ru sv tr uk"
 
-AM_GNU_GETTEXT
+AM_GCONF_GNU_GETTEXT
 
 # AM_GNU_GETTEXT above substs $DATADIRNAME
 # this is the directory where the *.{mo,gmo} files are installed
diff --git a/gconf/gconf.c b/gconf/gconf.c
index 59e5e026..e4e2120a 100644
--- a/gconf/gconf.c
+++ b/gconf/gconf.c
@@ -1059,6 +1059,25 @@ gconf_engine_associate_schema  (GConfEngine* conf, const gchar* key,
   return TRUE;
 }
 
+
+static void
+qualify_entries (GSList *entries, const char *dir)
+{
+  GSList *tmp = entries;
+  while (tmp != NULL)
+    {
+      GConfEntry *entry = tmp->data;
+      gchar *full;
+
+      full = gconf_concat_key_and_dir (dir, entry->key);
+
+      g_free (entry->key);
+      entry->key = full;
+
+      tmp = g_slist_next (tmp);
+    }
+}
+
 GSList*      
 gconf_engine_all_entries(GConfEngine* conf, const gchar* dir, GError** err)
 {
@@ -1108,6 +1127,8 @@ gconf_engine_all_entries(GConfEngine* conf, const gchar* dir, GError** err)
           
           return NULL;
         }
+
+      qualify_entries (retval, dir);
       
       return retval;
     }
@@ -1218,6 +1239,8 @@ gconf_engine_all_dirs(GConfEngine* conf, const gchar* dir, GError** err)
           
           return NULL;
         }
+
+      qualify_entries (retval, dir);
       
       return retval;
     }
@@ -1261,7 +1284,7 @@ gconf_engine_all_dirs(GConfEngine* conf, const gchar* dir, GError** err)
     {
       gchar* s;
 
-      s = g_strdup(keys->_buffer[i]);
+      s = gconf_concat_key_and_dir (dir, keys->_buffer[i]);
       
       subdirs = g_slist_prepend(subdirs, s);
       
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index cf3aa8cb..111b40fc 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -24,8 +24,6 @@ gnulocaledir = $(prefix)/share/locale
 gettextsrcdir = $(prefix)/share/gettext/po
 subdir = po
 
-DESTDIR =
-
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
@@ -113,16 +111,16 @@ install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
 	if test -r "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+	  $(MKINSTALLDIRS) $(datadir); \
 	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
 	fi
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  case "$$cat" in \
-	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
-	    *)     destdir=$(DESTDIR)$(localedir);; \
+	    *.gmo) destdir=$(gnulocaledir);; \
+	    *)     destdir=$(localedir);; \
 	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  dir=$$destdir/$$lang/LC_MESSAGES; \
@@ -155,12 +153,12 @@ install-data-yes: all
 	done
 	if test "$(PACKAGE)" = "gettext"; then \
 	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
+	    $(MKINSTALLDIRS) $(gettextsrcdir); \
 	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
 	  fi; \
 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+			  $(gettextsrcdir)/Makefile.in.in; \
 	else \
 	  : ; \
 	fi
@@ -173,12 +171,12 @@ uninstall:
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 	done
-	rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
+	rm -f $(gettextsrcdir)/po-Makefile.in.in
 
 check: all
 
diff --git a/po/ca.po b/po/ca.po
index d732bb19..03674924 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 0.5\n"
-"POT-Creation-Date: 2000-08-19 16:51-0400\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-04-14 11:35+01:00\n"
 "Last-Translator: Softcatala <linux@softcatala.org>\n"
 "Language-Team: \n"
@@ -13,138 +13,138 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Descarregant el component de fons del XML"
 
-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "No s'ha pogut trobar el directori arrel del XML a l'adreГa `%s'"
 
-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "No s'ha pogut crear el directori `%s': %s"
 
-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 "No es pot llegir des de/escriure al directori arrel del XML a l'adreГa `%s'"
 
-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "Els permisos del directori o fitxer per l'origen del XML a l'arrel %s sСn: "
 "%o/%o"
 
-#: backends/xml-backend.c:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr "Inicialitzant el component de fons del XML"
 
-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Impossible d'abandonar bloqueig en el directori del XML `%s': %s"
 
-#: backends/xml-cache.c:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
 "%u seconds"
 msgstr ""
 
-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, fuzzy, c-format
 msgid "Could not stat `%s': %s"
 msgstr "No s'ha pogut crear el directori `%s': %s"
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr ""
 
-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, fuzzy, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Impossible d'obrir `%s': %s\n"
 
-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, fuzzy, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Impossible de tancar el fitxer `%s': %s"
 
-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, fuzzy, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Impossible d'obrir `%s': %s\n"
 
-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, fuzzy, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Impossible de prendre valor per `%s': %s\n"
 
-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, fuzzy, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Impossible de tancar el fitxer `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:802
+#: backends/xml-dir.c:788
 #, fuzzy, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Impossible d'obrir `%s': %s\n"
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:975
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, fuzzy, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Impossible de tancar el fitxer `%s': %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2455
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Impossible de tancar el fitxer `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, fuzzy, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Error en definir esquema per `%s': %s"
 
-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2159
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, fuzzy, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Error en definir esquema per `%s': %s"
@@ -152,293 +152,579 @@ msgstr "Error en definir esquema per `%s': %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr ""
 
-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, fuzzy, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr ""
 "ADVERTхNCIA: Impossible de processar valor per defecte `%s' per esquema "
 "(%s)\n"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, fuzzy, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "ADVERTхNCIA: <locale> node no tИ `name=\"locale\"' atribut, ignorant\n"
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1055
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
 #. -- end debug only
-#: gconf/gconf-backend.c:180
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "No arxiu tal que `%s'\n"
 
-#: gconf/gconf-backend.c:208
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "AdreГa errРnia `%s'"
 
-#: gconf/gconf-backend.c:233
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr "El GConf no funcionarЮ sense el mРdul de suport dinЮmic (gmodule)"
 
-#: gconf/gconf-backend.c:243
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr "Error en obrir el mРdul `%s': %s\n"
 
-#: gconf/gconf-backend.c:275
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr "No s'ha pogut ubicar el mРdul del component de fons per `%s'"
 
-#: gconf/gconf-backend.c:312
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr "Impossible de tancar el component de fons"
 
-#: gconf/gconf-error.c:39
+#: gconf/gconf-database.c:193
+msgid "Received invalid value in set request"
+msgstr "S'ha rebut un valor no vЮlid en definir el requeriment"
+
+#: gconf/gconf-database.c:201
+#, c-format
+msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
+msgstr ""
+"No s'ha pogut tenir en compte el valor CORBA rebut en definir el requeriment "
+"per la clau `%s'"
+
+#: gconf/gconf-database.c:416
+msgid "Received request to drop all cached data"
+msgstr "S'ha rebut el requeriment per deixar anar totes les dades recollides"
+
+#: gconf/gconf-database.c:430
+msgid "Received request to sync synchronously"
+msgstr "S'ha rebut un requeriment per sync sincrРnicament"
+
+#: gconf/gconf-database.c:495
+#, fuzzy
+msgid "Fatal error: failed to get object reference for ConfigDatabase"
+msgstr "Impossible d'obtenir les referХncies pel ConfigServer"
+
+#: gconf/gconf-database.c:617
+#, c-format
+msgid "Failed to sync one or more sources: %s"
+msgstr "Impossible de sincronitzar una o mИs fonts: %s"
+
+#. 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:699
+#, c-format
+msgid ""
+"Failed to log addition of listener (%s); will not be able to restore this "
+"listener on gconfd restart, resulting in unreliable notification of "
+"configuration changes."
+msgstr ""
+
+#: gconf/gconf-database.c:724
+#, c-format
+msgid "Listener ID %lu doesn't exist"
+msgstr ""
+
+#: gconf/gconf-database.c:733
+#, 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:838 gconf/gconf-sources.c:1189
+#, c-format
+msgid "Error getting value for `%s': %s"
+msgstr "Error en obtenir valor per `%s': %s"
+
+#: gconf/gconf-database.c:875
+#, c-format
+msgid "Error setting value for `%s': %s"
+msgstr "Error en especificar valor per `%s': %s"
+
+#: gconf/gconf-database.c:910
+#, c-format
+msgid "Error unsetting `%s': %s"
+msgstr "Error d'indefiniciС `%s': %s"
+
+#: gconf/gconf-database.c:931
+#, c-format
+msgid "Error getting default value for `%s': %s"
+msgstr "Error en prendre valor per defecte per `%s': %s"
+
+#: gconf/gconf-database.c:969
+#, c-format
+msgid "Error checking existence of `%s': %s"
+msgstr "Error en comprobar l'existХncia de `%s': %s"
+
+#: gconf/gconf-database.c:993
+#, c-format
+msgid "Error removing dir `%s': %s"
+msgstr "Error en eliminar directori `%s': %s"
+
+#: gconf/gconf-database.c:1019
+#, c-format
+msgid "Failed to get all entries in `%s': %s"
+msgstr "Impossible de rebre totes les entrades en `%s': %s"
+
+#: gconf/gconf-database.c:1045
+#, c-format
+msgid "Error listing dirs in `%s': %s"
+msgstr "Error en llistar directoris en `%s': %s"
+
+#: gconf/gconf-database.c:1066
+#, c-format
+msgid "Error setting schema for `%s': %s"
+msgstr "Error en definir esquema per `%s': %s"
+
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr ""
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr ""
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr ""
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr ""
 
-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 #, fuzzy
 msgid "Couldn't resolve address for configuration source"
 msgstr "Impossible d'accedir a la/es font/s de configuraciС: %s\n"
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr ""
 
-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 #, fuzzy
 msgid "Parse error"
 msgstr "Error de parse de OAF: %s"
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr ""
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr ""
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr ""
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr ""
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr ""
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr ""
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr ""
 
-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 #, fuzzy
 msgid "Failed to get a lock"
 msgstr "Impossible de prendre valor per `%s': %s\n"
 
-#: gconf/gconf-internals.c:100
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Impossible de tancar el fitxer `%s': %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Error en eliminar directori `%s': %s"
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "No '/' a la clau `%s'"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "No s'ha pogut interpretar valor CORBA per l'element llista"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Tipus incorrecte per l'element llista en %s"
 
-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "S'ha rebut la llista de gconfd amb un tipus de llista incorrecta"
 
-#: gconf/gconf-internals.c:798
+#: gconf/gconf-internals.c:445
+#, fuzzy
+msgid "Failed to convert object to IOR"
+msgstr "Impossible de sincronitzar una o mИs fonts: %s"
+
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "No s'ha pogut obrir el camМ del fitxer `%s': %s\n"
 
-#: gconf/gconf-internals.c:853
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Afegint origen `%s'\n"
 
-#: gconf/gconf-internals.c:865
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Error de lectura en el fitxer `%s': %s\n"
 
-#: gconf/gconf-internals.c:1307
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "S'esperava llista, s'ha obtingut %s"
 
-#: gconf/gconf-internals.c:1317
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "S'esperava llista de %s, s'ha obtingut llista de %s"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "S'esperava parella, s'ha obtingut %s"
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "S'esperava parella (%s,%s), s'ha obtingut una parella amb un valor o ambdСs "
 "perduts"
 
-#: gconf/gconf-internals.c:1486
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 "S'esperava parella del tipus (%s,%s) i se n'ha obtingut del tipus (%s,%s)"
 
-#: gconf/gconf-internals.c:1602
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "La cadena citada no comenГa amb una marca de citaciС"
 
-#: gconf/gconf-internals.c:1664
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "La cadena de citaciС no acaba amb una marca de citaciС"
 
-#: gconf/gconf-internals.c:2144 gconf/gconf.c:2643
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Error CORBA: %s"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "intenta d'eliminar directori d'objectes OAF no llistats"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "intenta d'afegir directoris OAF ja llistats"
 
-#: gconf/gconf-internals.c:2176
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Error de parse de OAF: %s"
 
-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Error desconegut de OAF"
 
-#: gconf/gconf-internals.c:2264
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "No existeix fitxer ior a `%s'"
 
-#: gconf/gconf-internals.c:2295
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd estЮ blocant `%s' des d'algun altre procИs"
 
-#: gconf/gconf-internals.c:2306
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Un altre programa ha blocat `%s'"
 
-#: gconf/gconf-internals.c:2326
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "no s'ha pogut trobar el ORB per fer pings en el gconfd existent"
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -447,45 +733,45 @@ msgstr ""
 "Eliminant el blocatge antic `%s' degut a que IOR no s'ha pogut convetiren "
 "objecte referХncia, IOR `%s'"
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "Eliminant el blocatge antic `%s' degut a un error en fer pings al servidor: "
 "%s"
 
-#: gconf/gconf-internals.c:2358
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "La configuraciС daemon de GConf (gconfd) ha blocat `%s'"
 
-#: gconf/gconf-internals.c:2372
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "no s'ha pogut crear el directori `%s': %s"
 
-#: gconf/gconf-internals.c:2407
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "No s'ha pogut crear el bloqueig `%s': %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "No s'ha pogut escriure al fitxer `%s': %s"
 
-#: gconf/gconf-internals.c:2486
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "No s'ha pogut obrir el fitxer blocat `%s'; assumint que no Иs el nostre: %s"
 
-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Bloqueig de fitxer `%s' corrupte, eliminant igualment"
 
-#: gconf/gconf-internals.c:2513
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -494,132 +780,127 @@ msgstr ""
 "No s'ha creat el fitxer de blocatge `%s' (El creador pid %u, el nostre pid "
 "%u;assumnint que algЗ ha pres el nostre blocatge"
 
-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Impossible de llanГar el blocatge del directori `%s': %s"
 
-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, fuzzy, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Impossible de tancar el fitxer `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, fuzzy, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Error en llistar directoris: %s\n"
 
-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, fuzzy, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Error en establir valor: %s"
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 
-#: gconf/gconf-sources.c:1205 gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr "Error en obtenir valor per `%s': %s"
-
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr ""
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr ""
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr ""
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr ""
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr ""
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr ""
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
 
-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:271
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "El servidor no ha pogut resoldre l'adreГa `%s'"
 
-#: gconf/gconf.c:408
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "No es poden afegir configuracions a una font local de configuraciС"
 
-#: gconf/gconf.c:1466
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Fallada del servidor fent pings, error de CORBA: %s"
 
-#: gconf/gconf.c:1482
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -629,85 +910,66 @@ msgstr ""
 "oaf_activate_from_id() i no ha trobat una excepciС explicant el problema.Si "
 "us plau arxiveu un report d'error fortuОt"
 
-#: gconf/gconf.c:1677
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Impossible d'inicialitzar GConf, abandonant\n"
 
-#: gconf/gconf.c:1714
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Ha de comenГar amb una barra (/)"
 
-#: gconf/gconf.c:1736
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "No es poden tenir dues barres (/) en una lМnia"
 
-#: gconf/gconf.c:1738
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "No es pot tenir un punt (.) just desprИs d'una barra (/)"
 
-#: gconf/gconf.c:1759
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' no Иs un carЮcter vЮlid en claus/noms de directoris"
 
-#: gconf/gconf.c:1773
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "La clau/directori pot no acabar amb una barra (/)"
 
-#: gconf/gconf.c:2115
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fallada tancant la configuraciС del servidor: %s"
 
-#: gconf/gconf.c:2176
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "S'esperava coma flotant, s'ha obtingut %s"
 
-#: gconf/gconf.c:2211
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "S'esperava un enter, s'ha obtingut %s"
 
-#: gconf/gconf.c:2246
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "S'esperava una cadena, s'ha obtingut %s"
 
-#: gconf/gconf.c:2283
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "S'esperava un boleЮ, s'ha obtingut %s"
 
-#: gconf/gconf.c:2316
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "S'esperava un esquema, s'ha obtingut %s"
 
-#: gconf/gconfd.c:511
-msgid "Received invalid value in set request"
-msgstr "S'ha rebut un valor no vЮlid en definir el requeriment"
-
-#: gconf/gconfd.c:519
-#, c-format
-msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
-msgstr ""
-"No s'ha pogut tenir en compte el valor CORBA rebut en definir el requeriment "
-"per la clau `%s'"
-
-#: gconf/gconfd.c:789
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "S'ha rebut un requeriment d'apagar"
 
-#: gconf/gconfd.c:802
-msgid "Received request to drop all cached data"
-msgstr "S'ha rebut el requeriment per deixar anar totes les dades recollides"
-
-#: gconf/gconfd.c:822
-msgid "Received request to sync synchronously"
-msgstr "S'ha rebut un requeriment per sync sincrРnicament"
-
-#: gconf/gconfd.c:861
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -715,7 +977,7 @@ msgstr ""
 "El gconfd ha compilat amb depuraciС; intentant carregar gconf.path des "
 "deldirectori font"
 
-#: gconf/gconfd.c:879
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -723,7 +985,7 @@ msgstr ""
 "No s'han trobat fitxers de configuraciС, intentant d'usar "
 "l'origenpredeterminat de configuraciС `%s'"
 
-#: gconf/gconfd.c:888
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -731,12 +993,12 @@ msgstr ""
 "No existeixen origens de configuraciС en el camМ arrel, la configuraciС no "
 "haestat guardada; editar "
 
-#: gconf/gconfd.c:901
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Error configurant alguns origens de configuraciС: %s"
 
-#: gconf/gconfd.c:913
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -744,32 +1006,37 @@ msgstr ""
 "No s'han resolt satisfactРriament els origens de les adreces, no es "
 "podencarregar ni guardar les dades de configuraciС"
 
-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:287
+#, fuzzy
 msgid ""
-"No writeable config sources successfully resolved, may not be able to save "
+"No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 "No s'han pogut escriure satisfactРriament els origens de configuraciС, pot "
 "noser possible de grabar alguns canvis de configuraciС"
 
-#: gconf/gconfd.c:955 gconf/gconfd.c:967
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr "Rebut senyal %d, apagant."
 
-#: gconf/gconfd.c:972
-#, c-format
-msgid "Received signal %d, ignoring"
-msgstr "Rebut senyal %d, ignorant"
+#: gconf/gconfd.c:329
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down cleanly"
+msgstr "Rebut senyal %d, apagant."
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:1013
-#, c-format
-msgid "starting, pid %u user `%s'"
+#: gconf/gconfd.c:376
+#, fuzzy, c-format
+msgid "starting (version %s), pid %u user '%s'"
 msgstr "s'estЮ iniciant, pid %u usuari `%s'"
 
-#: gconf/gconfd.c:1036
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -777,11 +1044,11 @@ msgstr ""
 "Impossible d'inicialitzar Object Activation Framework: si us plau envieu "
 "unreport d'error fortuОt als qui mantenen OAF"
 
-#: gconf/gconfd.c:1056
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Impossible d'obtenir les referХncies pel ConfigServer"
 
-#: gconf/gconfd.c:1075
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -789,106 +1056,142 @@ msgstr ""
 "L'OAF no coneix el vostre IID; aixР indica instal╥laciС incorrecta; no pot "
 "ser registrada; sortint\n"
 
-#: gconf/gconfd.c:1079
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Existeix un altre gconfd ja registrat amb OAF; sortint\n"
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Error desconegut en registrar gconfd amb OAF; sortint\n"
 
-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Sortint"
 
-#: gconf/gconfd.c:1194
+#: gconf/gconfd.c:818
 #, c-format
-msgid "Failed to sync one or more sources: %s"
-msgstr "Impossible de sincronitzar una o mИs fonts: %s"
+msgid "Returning exception: %s"
+msgstr "Retornant excepciС: %s"
 
-#: gconf/gconfd.c:1561
+#: gconf/gconfd.c:885
 #, c-format
-msgid "Error setting value for `%s': %s"
-msgstr "Error en especificar valor per `%s': %s"
+msgid ""
+"Failed to open gconfd logfile; won't be able to restore listeners after "
+"gconfd shutdown (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:1593
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Error unsetting `%s': %s"
-msgstr "Error d'indefiniciС `%s': %s"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:1614
-#, c-format
-msgid "Error getting default value for `%s': %s"
-msgstr "Error en prendre valor per defecte per `%s': %s"
+#: gconf/gconfd.c:966
+#, fuzzy, c-format
+msgid "Could not open saved state file '%s' for writing: %s"
+msgstr "No s'ha pogut obrir el camМ del fitxer `%s': %s\n"
 
-#: gconf/gconfd.c:1652
-#, c-format
-msgid "Error checking existence of `%s': %s"
-msgstr "Error en comprobar l'existХncia de `%s': %s"
+#: gconf/gconfd.c:980
+#, fuzzy, c-format
+msgid "Could not write saved state file '%s' fd: %d: %s"
+msgstr "No s'ha pogut escriure al fitxer `%s': %s"
 
-#: gconf/gconfd.c:1676
-#, c-format
-msgid "Error removing dir `%s': %s"
-msgstr "Error en eliminar directori `%s': %s"
+#: gconf/gconfd.c:989
+#, fuzzy, c-format
+msgid "Failed to close new saved state file '%s': %s"
+msgstr "Impossible de tancar el fitxer `%s': %s"
 
-#: gconf/gconfd.c:1701
-#, c-format
-msgid "Failed to get all entries in `%s': %s"
-msgstr "Impossible de rebre totes les entrades en `%s': %s"
+#: gconf/gconfd.c:1003
+#, fuzzy, c-format
+msgid "Could not move aside old saved state file '%s': %s"
+msgstr "No s'ha pogut obrir el camМ del fitxer `%s': %s\n"
 
-#: gconf/gconfd.c:1725
+#: gconf/gconfd.c:1013
+#, fuzzy, c-format
+msgid "Failed to move new save state file into place: %s"
+msgstr "Impossible de tancar el fitxer `%s': %s"
+
+#: gconf/gconfd.c:1022
 #, c-format
-msgid "Error listing dirs in `%s': %s"
-msgstr "Error en llistar directoris en `%s': %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr ""
 
-#: gconf/gconfd.c:1745
+#: gconf/gconfd.c:1110
 #, c-format
-msgid "Error setting schema for `%s': %s"
-msgstr "Error en definir esquema per `%s': %s"
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr ""
 
-#: gconf/gconfd.c:1913
-msgid "Attempt to unregister invalid context ID"
-msgstr "Intent de desregistrar un context de ID no vЮlid"
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
+msgstr ""
 
-#: gconf/gconfd.c:1920
+#: gconf/gconfd.c:1140
 #, c-format
-msgid "Bad context ID %lu, request ignored"
-msgstr "Context erroni de ID %lu, requeriment ignorat"
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr ""
 
-#: gconf/gconfd.c:1928
+#: gconf/gconfd.c:1160
 #, c-format
-msgid "Already-unregistered context ID %lu, request ignored"
-msgstr "Ja s'havia desregistrat el context ID %lu, requeriment ignorat"
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr ""
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Impossible de tancar el fitxer `%s': %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
 
-#: gconf/gconfd.c:1953
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Attempt to use invalid context ID %lu"
-msgstr "Intent d'usar un context no vЮlid de ID %lu"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
 
-#: gconf/gconfd.c:1963
+#: gconf/gconfd.c:1377
+#, fuzzy, c-format
+msgid "Unable to open saved state file '%s': %s"
+msgstr "Impossible de tancar el fitxer `%s': %s"
+
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Attempt to use already-unregistered context ID %lu"
-msgstr "Intent d'usar un context ja desregistrat de ID %lu"
+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:2123
+#: gconf/gconfd.c:1481
 #, c-format
-msgid "Returning exception: %s"
-msgstr "Retornant excepciС: %s"
+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/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Opcions d'ajuda"
 
-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 "DefiniciС d'un valor i sincronitzar amb una tecla. Usar amb --carЮcters."
 
-#: gconf/gconftool.c:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "ImpressiС del valor d'una tecla com a sortida standard."
 
-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -896,37 +1199,37 @@ msgstr ""
 "Definir un esquema i sincronitzar. Usar amb --short-desc, --long-desc, "
 "--owner, i --type."
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "Desseleccionar les claus en la lМnia d'ordres"
 
-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "ImpressiС de totes les parelles clau/valor en un directori"
 
-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "ImpressiС de tots els subdirectoris en un directori"
 
-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "ImpressiС de tots els subdirectoris i entrades per sota d'un directori, "
 "recursivament."
 
-#: gconf/gconftool.c:149
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Retorna 0 si el directori existeix, 2 si no existeix."
 
-#: gconf/gconftool.c:158
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Apagar gconfd. NO USEU AQUESTA OPCIс SENSE UNA BONA RAс."
 
-#: gconf/gconftool.c:167
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Retorna 0 si gconfd s'estЮ executant, 2 si no Иs aixМ."
 
-#: gconf/gconftool.c:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -934,7 +1237,7 @@ msgstr ""
 "LlanГa el configurador del servidor (gconfd). (Normalment es llanГa "
 "automЮticament quan Иs necessari.)"
 
-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -942,12 +1245,12 @@ msgstr ""
 "Especificar el tipus de valor que s'ha de definir, o el tipus de valor que "
 "un esquema descriu. зnicament abreviacions acceptades."
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 #, fuzzy
 msgid "int|bool|float|string|list|pair"
 msgstr "enter|boleЮ|coma flotant|cadena"
 
-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 #, fuzzy
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
@@ -956,11 +1259,11 @@ msgstr ""
 "Especificar el tipus de valor que s'ha de definir, o el tipus de valor que "
 "un esquema descriu. зnicament abreviacions acceptades."
 
-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "enter|boleЮ|coma flotant|cadena"
 
-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 #, fuzzy
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
@@ -969,7 +1272,7 @@ msgstr ""
 "Especificar el tipus de valor que s'ha de definir, o el tipus de valor que "
 "un esquema descriu. зnicament abreviacions acceptades."
 
-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 #, fuzzy
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
@@ -978,45 +1281,45 @@ msgstr ""
 "Especificar el tipus de valor que s'ha de definir, o el tipus de valor que "
 "un esquema descriu. зnicament abreviacions acceptades."
 
-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "Especificar una curta descripciС de mitja lМnia per accedir a un esquema"
 
-#: gconf/gconftool.c:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "DESCRIPCIс"
 
-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "Especificar una descripciС de vЮries lМnies per accedir a un esquema"
 
-#: gconf/gconftool.c:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "Especificar el propietari d'un esquema"
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "PROPIETARI"
 
-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "Especificar un fitxer esquema per instal╥lar-lo"
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "NOM DEL FITXER"
 
-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Especificar una font de configuraciС per usar enlloc del camМ per defecte"
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "FONT"
 
-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1024,7 +1327,7 @@ msgstr ""
 "Accedir a la base de dades de configuraciС directament, saltant-nos el "
 "servidor. Requereix que el gconfd no estigui en Зs "
 
-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1035,7 +1338,7 @@ msgstr ""
 "deconfigurar-se a una font no predeterminada o seleccionar la cadena buida "
 "perusar la predeterminada"
 
-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1043,7 +1346,7 @@ msgstr ""
 "Proba per tortura una aplicaciС en seleccionar i desseleccionar un munt "
 "devalors de diferents tipus per claus en la lМnia de comandes."
 
-#: gconf/gconftool.c:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1051,7 +1354,7 @@ msgstr ""
 "Proba per tortura una aplicaciС en seleccionar i desseleccionar un munt "
 "declaus dins dels directoris en la lМnia de comandes."
 
-#: gconf/gconftool.c:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1061,23 +1364,23 @@ msgstr ""
 "Executeu '%s --help' per veure una llista completa d'opcions d'ordres de "
 "lМnia possibles.\n"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "No es pot seleccionar/desseleccionar simultЮniament\n"
 
-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "No es pot seleccionar i obtenir/desseleccionar simultЮniament\n"
 
-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "No es pot usar --all-pairs amb --get o --set\n"
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "No es pot usar --all-dirs amb --get o --set\n"
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1085,7 +1388,7 @@ msgstr ""
 "--recursive-list no s'hauria d'usar amb --get, --set, --unset, --all-pairs,o "
 "--all-dirs\n"
 
-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1093,58 +1396,58 @@ msgstr ""
 "--set-schema no s'hauria d'usar amb --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
 
-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Els tipus dels valors nomИs sСn rellevants quan defineixen un valor\n"
 
-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "Heu d'especificar un tipus quan definiu un valor\n"
 
-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "La opciС de fer pings ha de ser usada per ella mateixa.\n"
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "la opciС --dir-exists ha de ser usada per ella mateixa.\n"
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file ha de ser usat per ell mateix.\n"
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule ha de ser usat per ell mateix.\n"
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key ha de ser usat per ell mateix.\n"
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory ha de ser usat per ell mateix.\n"
 
-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "Heu d'especificar una font de configuraciС amb --config-source quan useu "
 "--direct\n"
 
-#: gconf/gconftool.c:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Impossible d'inicialitzar GConf: %s\n"
 
-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Heu de definir el contorn GCONF_CONFIG_SOURCE com a variable\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1156,242 +1459,242 @@ msgstr ""
 "nohi hagi aplicacions en procИs\n"
 "(malgrat que hauria de funcionar encara que hi hagi aplicacions en procИs).\n"
 
-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Impossible d'accedir a la/es font/s de configuraciС: %s\n"
 
-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Error en tancar: %s\n"
 
-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Heu d'especificar un o mИs directoris per llistar recursivament.\n"
 
-#: gconf/gconftool.c:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "Fallada en llistar parelles en `%s': %s"
 
-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(no hi ha valor definit)"
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Impossible de spawn el servidor de configuraciС (gconfd): %s\n"
 
-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "Heu d'especificar una clau o claus per obtenir\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tipus: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, fuzzy, c-format
 msgid "List Type: %s\n"
 msgstr "Tipus: %s\n"
 
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, fuzzy, c-format
 msgid "Car Type: %s\n"
 msgstr "Tipus: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, fuzzy, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Tipus: %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Propietari: %s\n"
 
-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Desactivar"
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Curta Desc: %s\n"
 
-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Llarga Desc: %s\n"
 
-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "No s'ha especificat valor per `%s'\n"
 
-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Impossible de prendre valor per `%s': %s\n"
 
-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "No es comprХn tipus `%s'\n"
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Heu d'especificar alternativament claus/valors com a arguments\n"
 
-#: gconf/gconftool.c:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "No existeix valor per definir clau: `%s'\n"
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Error: %s\n"
 
-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Error en establir valor: %s"
 
-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Error en sincronitzar: %s"
 
-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Heu d'especificar clau (nom de l'esquema) com a Зnic argument\n"
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1201
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Heu d'especificar un o mИs directoris per obtenir-ne parelles clau/valor\n"
 
-#: gconf/gconftool.c:1259
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Heu d'especificar una o mИs claus per desactivar.\n"
 
-#: gconf/gconftool.c:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Error en desactivar `%s': %s\n"
 
-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Heu d'especificar un o mИs directoris per tal d'obtenir-ne subdirectoris.\n"
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Error en llistar directoris: %s\n"
 
-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "ADVERTхNCIA: tipus no vЮlid o perdut per a esquema (%s)\n"
 
-#: gconf/gconftool.c:1378
+#: gconf/gconftool.c:1366
 #, fuzzy, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "ADVERTхNCIA: tipus no vЮlid o perdut per a esquema (%s)\n"
 
-#: gconf/gconftool.c:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "ADVERTхNCIA: Impossible de processar valor per defecte `%s' per esquema "
 "(%s)\n"
 
-#: gconf/gconftool.c:1407
+#: gconf/gconftool.c:1395
 #, fuzzy, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "ADVERTхNCIA: tipus no vЮlid o perdut per a esquema (%s)\n"
 
-#: gconf/gconftool.c:1432
+#: gconf/gconftool.c:1420
 #, fuzzy
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 "ADVERTхNCIA: Impossible de processar valor per defecte `%s' per esquema "
 "(%s)\n"
 
-#: gconf/gconftool.c:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "ADVERTхNCIA: error intern de gconftool, desconegut GConfValueType\n"
 
-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ADVERTхNCIA: impossible de processar nom del tipus `%s'\n"
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "ADVERTхNCIA: node <applyto> buit"
 
-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ADVERTхNCIA: node <%s> no entХs sota <schema>\n"
 
-#: gconf/gconftool.c:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "ADVERTхNCIA: no s'ha especificat clau per a l'esquema\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr "ADVERTхNCIA: <locale> node no tИ `name=\"locale\"' atribut, ignorant\n"
 
-#: gconf/gconftool.c:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1399,51 +1702,51 @@ msgstr ""
 "ADVERTхNCIA: Hi ha mЗltiples <locale> nodes per locale `%s', ignorant totes "
 "les primeres passades\n"
 
-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "ADVERTхNCIA: Node <%s> no vЮlid en un <locale> node\n"
 
-#: gconf/gconftool.c:1757
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "ADVERTхNCIA: impossible d'instal╥lar esquema `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Instal╥lat esquema `%s' per locale `%s'\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "ADVERTхNCIA: impossible d'associar esquema `%s' amb clau `%s': %s\n"
 
-#: gconf/gconftool.c:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Esquema `%s' adjunt a tecla `%s'\n"
 
-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Heu de tenir com a mМnim una entrada <locale> en un <schema>\n"
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "ADVERTхNCIA: node <%s> no comprХs sota <schemalist>\n"
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Impossible d'obrir `%s': %s\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "EstЮ buit el document `%s'?\n"
 
-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1452,26 +1755,26 @@ msgstr ""
 "El document `%s' tИ un tipus incorrecte de node arrel (<%s>, hauria de "
 "ser<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "El document `%s' no tИ nivell superior <gconfschemafile> node\n"
 
-#: gconf/gconftool.c:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ADVERTхNCIA: node <%s> sota <gconfschemafile> no comprХs\n"
 
-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Error eincronitzant dades de configuraciС: %s"
 
-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Heu d'especificar alguns esquemes de fitxers per instal╥lar\n"
 
-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1480,16 +1783,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Impossible de desactivar la clau de pausa %s: %s\n"
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "Heu d'especificar algunes claus per pausar\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1498,11 +1801,11 @@ msgstr ""
 "Intentant pausar la vostra aplicaciС especificant valors dolents per clau:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "Cal especificar alguns directoris per pausar\n"
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1518,11 +1821,29 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Fallada en llistar parelles en `%s': %s"
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, fuzzy, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "S'esperava llista de %s, s'ha obtingut llista de %s"
 
+#~ msgid "Received signal %d, ignoring"
+#~ msgstr "Rebut senyal %d, ignorant"
+
+#~ msgid "Attempt to unregister invalid context ID"
+#~ msgstr "Intent de desregistrar un context de ID no vЮlid"
+
+#~ msgid "Bad context ID %lu, request ignored"
+#~ msgstr "Context erroni de ID %lu, requeriment ignorat"
+
+#~ msgid "Already-unregistered context ID %lu, request ignored"
+#~ msgstr "Ja s'havia desregistrat el context ID %lu, requeriment ignorat"
+
+#~ msgid "Attempt to use invalid context ID %lu"
+#~ msgstr "Intent d'usar un context no vЮlid de ID %lu"
+
+#~ msgid "Attempt to use already-unregistered context ID %lu"
+#~ msgstr "Intent d'usar un context ja desregistrat de ID %lu"
+
 #~ msgid ""
 #~ "WARNING: For now gconftool only knows how to install default values for "
 #~ "simple types (int, string, bool, float)\n"
diff --git a/po/cs.po b/po/cs.po
index 649394d1..49e55a4a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf VERSION\n"
-"POT-Creation-Date: 2000-08-19 16:51-0400\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-03-09 14:58-0500\n"
 "Last-Translator: George Lebl <jirka@5z.com>\n"
 "Language-Team: czech <cs@li.org>\n"
@@ -13,135 +13,135 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr ""
 
-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nelze vytvoЬit adresАЬ `%s': %s"
 
-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/xml-backend.c:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr ""
 
-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Nelze otevЬМt adresАЬ `%s': %s"
 
-#: backends/xml-cache.c:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
 "%u seconds"
 msgstr ""
 
-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "`stat' selhal na `%s': %s"
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "XML soubor `%s' je adresАЬ"
 
-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Nelze vymazat `%s': %s"
 
-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, fuzzy, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Nelze zavЬМt soubor `%s': %s"
 
-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Nelze pЬejmenovat `%s' na `%s': %s"
 
-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, fuzzy, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Nelze pЬejmenovat `%s' na `%s': %s"
 
-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Nelze smazat starЩ soubor `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:802
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "`stat' selhal na `%s': %s"
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, fuzzy, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "ZdvojenА polo╬ka `%s' v `%s', vymazАvАm"
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, fuzzy, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Polo╬ka beze jmИna v XML souboru `%s', vymazАvАm"
 
-#: backends/xml-dir.c:975
+#: backends/xml-dir.c:961
 #, fuzzy, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Polo╬ka beze jmИna v XML souboru `%s', vymazАvАm"
 
-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, fuzzy, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Nelze zavЬМt soubor `%s': %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2455
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Nelze zavЬМt soubor `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2159
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr ""
@@ -149,927 +149,1227 @@ msgstr ""
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr ""
 
-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr ""
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1055
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
 #. -- end debug only
-#: gconf/gconf-backend.c:180
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr ""
 
-#: gconf/gconf-backend.c:208
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr ""
 
-#: gconf/gconf-backend.c:233
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr ""
 
-#: gconf/gconf-backend.c:243
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-backend.c:275
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr ""
 
-#: gconf/gconf-backend.c:312
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr ""
 
-#: gconf/gconf-error.c:39
+#: gconf/gconf-database.c:193
+msgid "Received invalid value in set request"
+msgstr ""
+
+#: gconf/gconf-database.c:201
+#, c-format
+msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
+msgstr ""
+
+#: gconf/gconf-database.c:416
+msgid "Received request to drop all cached data"
+msgstr ""
+
+#: gconf/gconf-database.c:430
+msgid "Received request to sync synchronously"
+msgstr ""
+
+#: gconf/gconf-database.c:495
+msgid "Fatal error: failed to get object reference for ConfigDatabase"
+msgstr ""
+
+#: gconf/gconf-database.c:617
+#, c-format
+msgid "Failed to sync one or more sources: %s"
+msgstr ""
+
+#. 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:699
+#, c-format
+msgid ""
+"Failed to log addition of listener (%s); will not be able to restore this "
+"listener on gconfd restart, resulting in unreliable notification of "
+"configuration changes."
+msgstr ""
+
+#: gconf/gconf-database.c:724
+#, c-format
+msgid "Listener ID %lu doesn't exist"
+msgstr ""
+
+#: gconf/gconf-database.c:733
+#, 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:838 gconf/gconf-sources.c:1189
+#, c-format
+msgid "Error getting value for `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:875
+#, c-format
+msgid "Error setting value for `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:910
+#, c-format
+msgid "Error unsetting `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:931
+#, c-format
+msgid "Error getting default value for `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:969
+#, c-format
+msgid "Error checking existence of `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:993
+#, c-format
+msgid "Error removing dir `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:1019
+#, c-format
+msgid "Failed to get all entries in `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:1045
+#, c-format
+msgid "Error listing dirs in `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:1066
+#, c-format
+msgid "Error setting schema for `%s': %s"
+msgstr ""
+
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr ""
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr ""
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr ""
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr ""
 
-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
 msgstr ""
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr ""
 
-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 msgid "Parse error"
 msgstr ""
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr ""
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr ""
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr ""
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr ""
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr ""
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr ""
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr ""
 
-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 #, fuzzy
 msgid "Failed to get a lock"
 msgstr "Nelze vymazat `%s': %s"
 
-#: gconf/gconf-internals.c:100
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Nelze zavЬМt soubor `%s': %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Chyba v ХtenМ souboru `%s': %s\n"
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:798
+#: gconf/gconf-internals.c:445
+msgid "Failed to convert object to IOR"
+msgstr ""
+
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:853
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Zdroj `%s' pЬidАn\n"
 
-#: gconf/gconf-internals.c:865
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Chyba v ХtenМ souboru `%s': %s\n"
 
-#: gconf/gconf-internals.c:1307
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1317
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1486
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1602
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1664
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2144 gconf/gconf.c:2643
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA chyba: %s"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2176
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2264
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2295
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2306
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2326
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2358
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2372
+#: gconf/gconf-internals.c:2385
 #, fuzzy, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "Nelze vytvoЬit adresАЬ `%s': %s"
 
-#: gconf/gconf-internals.c:2407
+#: gconf/gconf-internals.c:2420
 #, fuzzy, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Nelze vytvoЬit soubor `%s': %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2456
 #, fuzzy, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Nelze psАt do souboru `%s': %s"
 
-#: gconf/gconf-internals.c:2486
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2513
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
 
-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2543
 #, fuzzy, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Nelze otevЬМt adresАЬ `%s': %s"
 
-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, fuzzy, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Nelze zavЬМt soubor `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 
-#: gconf/gconf-sources.c:1205 gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr ""
-
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr ""
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr ""
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr ""
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr ""
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr ""
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr ""
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
 
-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:271
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:408
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1466
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1482
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
 "Please file an OAF bug report."
 msgstr ""
 
-#: gconf/gconf.c:1677
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:1714
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1736
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:1738
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1759
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:1773
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2115
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2176
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2211
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2246
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2283
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2316
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:511
-msgid "Received invalid value in set request"
-msgstr ""
-
-#: gconf/gconfd.c:519
-#, c-format
-msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
-msgstr ""
-
-#: gconf/gconfd.c:789
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:802
-msgid "Received request to drop all cached data"
-msgstr ""
-
-#: gconf/gconfd.c:822
-msgid "Received request to sync synchronously"
-msgstr ""
-
-#: gconf/gconfd.c:861
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:879
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:888
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:901
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:913
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:287
 msgid ""
-"No writeable config sources successfully resolved, may not be able to save "
+"No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:955 gconf/gconfd.c:967
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr ""
 
-#: gconf/gconfd.c:972
+#: gconf/gconfd.c:329
 #, c-format
-msgid "Received signal %d, ignoring"
+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:1013
+#: gconf/gconfd.c:376
 #, c-format
-msgid "starting, pid %u user `%s'"
+msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:1036
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:1056
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:1075
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:1079
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:476
 #, fuzzy
 msgid "Exiting"
 msgstr "NormАlnМ konec"
 
-#: gconf/gconfd.c:1194
+#: gconf/gconfd.c:818
 #, c-format
-msgid "Failed to sync one or more sources: %s"
+msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1561
+#: gconf/gconfd.c:885
 #, c-format
-msgid "Error setting value for `%s': %s"
+msgid ""
+"Failed to open gconfd logfile; won't be able to restore listeners after "
+"gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1593
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Error unsetting `%s': %s"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1614
+#: gconf/gconfd.c:966
 #, c-format
-msgid "Error getting default value for `%s': %s"
+msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1652
+#: gconf/gconfd.c:980
+#, fuzzy, c-format
+msgid "Could not write saved state file '%s' fd: %d: %s"
+msgstr "Nelze psАt do souboru `%s': %s"
+
+#: gconf/gconfd.c:989
+#, fuzzy, c-format
+msgid "Failed to close new saved state file '%s': %s"
+msgstr "Nelze zavЬМt soubor `%s': %s"
+
+#: gconf/gconfd.c:1003
+#, fuzzy, c-format
+msgid "Could not move aside old saved state file '%s': %s"
+msgstr "`stat' selhal na `%s': %s"
+
+#: gconf/gconfd.c:1013
+#, fuzzy, c-format
+msgid "Failed to move new save state file into place: %s"
+msgstr "Nelze zavЬМt soubor `%s': %s"
+
+#: gconf/gconfd.c:1022
 #, c-format
-msgid "Error checking existence of `%s': %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1676
+#: gconf/gconfd.c:1110
 #, c-format
-msgid "Error removing dir `%s': %s"
+msgid "Didn't understand line in saved state file: '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:1701
-#, c-format
-msgid "Failed to get all entries in `%s': %s"
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
 msgstr ""
 
-#: gconf/gconfd.c:1725
+#: gconf/gconfd.c:1140
 #, c-format
-msgid "Error listing dirs in `%s': %s"
+msgid "Failed to unquote config source address from saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1745
+#: gconf/gconfd.c:1160
 #, c-format
-msgid "Error setting schema for `%s': %s"
+msgid "Failed to unquote listener location from saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1913
-msgid "Attempt to unregister invalid context ID"
-msgstr ""
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Nelze zavЬМt soubor `%s': %s"
 
-#: gconf/gconfd.c:1920
-#, c-format
-msgid "Bad context ID %lu, request ignored"
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
 msgstr ""
 
-#: gconf/gconfd.c:1928
-#, c-format
-msgid "Already-unregistered context ID %lu, request ignored"
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
 msgstr ""
 
-#: gconf/gconfd.c:1953
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Attempt to use invalid context ID %lu"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1963
+#: gconf/gconfd.c:1377
+#, fuzzy, c-format
+msgid "Unable to open saved state file '%s': %s"
+msgstr "Nelze zavЬМt soubor `%s': %s"
+
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Attempt to use already-unregistered context ID %lu"
+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:2123
+#: gconf/gconfd.c:1481
 #, c-format
-msgid "Returning exception: %s"
+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/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr ""
 
-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr ""
 
-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
 msgstr ""
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 
-#: gconf/gconftool.c:149
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr ""
 
-#: gconf/gconftool.c:158
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 
-#: gconf/gconftool.c:167
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr ""
 
-#: gconf/gconftool.c:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 
-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr ""
 
-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr ""
 
-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr ""
 
-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr ""
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr ""
 
-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr ""
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr ""
 
-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr ""
 
-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
 "config source or set to the empty string to use the default."
 msgstr ""
 
-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr ""
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1077,338 +1377,338 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr ""
 
-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, fuzzy, c-format
 msgid "List Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, fuzzy, c-format
 msgid "Car Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, fuzzy, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "VlastnМk: %s\n"
 
-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Chyba: %s\n"
 
-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1201
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1259
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1378
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1407
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1432
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1757
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Nelze otevЬМt `%s': %s\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument `%s' je prАzdnЩ?\n"
 
-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, fuzzy, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Nelze vytvoЬit soubor `%s': %s"
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1421,7 +1721,7 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 21be583d..43afcffe 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf\n"
-"POT-Creation-Date: 2000-06-01 19:42-0400\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-09-09 21:35+01:00\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -14,44 +14,44 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "LФs XML-backend-modulet af."
 
-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Kunne ikke finde XML-rodkatalog pЕ adressen '%s'"
 
-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kunne ikke oprette kataloget `%s': %s"
 
-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr "Kunne ikke lФse fra eller skrive til XML-rodkatalog pЕ adressen '%s'"
 
-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 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:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr "Opstarter XML-backend-modul"
 
-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Kunne ikke opgive lЕs pЕ XML-katalog '%s': %s"
 
-#: backends/xml-cache.c:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "Usynkroniseret sletning af kataloger under nedlukning af XML-backenden"
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -60,7 +60,7 @@ msgstr ""
 "Kunne ikke fjerne katalog `%s' fra XML-backend bufferen, fordi den ikke er "
 "synkroniseret til disk"
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -69,84 +69,84 @@ msgstr ""
 "%u punkter er i bufferen efter fjerning af allerede-synkroniserede punkter "
 "Фldre end %u sekunder"
 
-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "Kunne ikke stat `%s': %s"
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "XML-filnavn `%s' er et katalog"
 
-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Kunne ikke slette '%s': %s"
 
-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Kunne ikke skrive filen `%s': %s"
 
-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Kunne ikke omdЬbe '%s'til %s : %s"
 
-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Kunne ikke genskabe '%s' fra %s : %s"
 
-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, 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:802
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Kunne ikke stat '%s': %s"
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Duplikeret punkt `%s' i `%s', ignorerer"
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Punkt uden navn i XML-fil `%s', ignorerer"
 
-#: backends/xml-dir.c:975
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Topniveau-node i XML-fil `%s' er ikke et <punkt>, ignorerer"
 
-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Kunne ikke oprette filen `%s': %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2455
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Kunne ikke lukke filen `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorerer XML-node med navn `%s': %s"
 
-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2159
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "ignorerer skemanavn `%s', ugyldig: %s"
@@ -154,250 +154,274 @@ msgstr "ignorerer skemanavn `%s', ugyldig: %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "Ignorerer XML-node `%s', bortset fra mulig skema navn:: %s"
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr "fandt <local_schema> uden lokaleindstilling"
 
-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Kunne ikke lФse standardvФrdi for skema: %s"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Ingen \"type\" attribut for <%s> node"
 
-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "En node har ukendt \"type\" attribut `%s', ignorerer"
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "Ingen \"vФrdi\" attribut for node"
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Forstod ikke XML-node <%s> inde i en XML listenode"
 
-#: backends/xml-entry.c:1055
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Ugyldig type (liste, par, eller ukendt) i en listenode"
 
-#: backends/xml-entry.c:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Ugyldig XML-node: %s"
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Listen indeholder en fejlskrevet node (%s, skulle vФre %s)"
 
-#: backends/xml-entry.c:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorerer ugyldig car fra XML-par: %s"
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "tolker XML-fil: lister og par kan ikke placeres inde i et par"
 
-#: backends/xml-entry.c:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorerer ugyldig cdr fra XML-par: %s"
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Forstod ikke XML-node <%s> inde i en XML-parnode"
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Fandt ikke car og cdr for XML-parnode"
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Manglende cdr fra vФrdipar i XML-fil"
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "Manglende car fra vФrdipar i XML-fil"
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Mangler bЕde car og cdr vФrdier fra par i XML-fil"
 
 #. -- end debug only
-#: gconf/gconf-backend.c:182
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "Ingen sЕdan fil `%s'\n"
 
-#: gconf/gconf-backend.c:210
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "Ugyldig adresse `%s'"
 
-#: gconf/gconf-backend.c:235
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr "GConf virker ikke uden understЬttelse for dynamiske moduler (gmodule)"
 
-#: gconf/gconf-backend.c:245
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr "Fejl ved Еbning af modul `%s': %s\n"
 
-#: gconf/gconf-backend.c:277
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr "Kunne ikke finde backend-modul for `%s'"
 
-#: gconf/gconf-backend.c:314
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr "Kunne ikke lukke backend ned"
 
-#: gconf/gconf-database.c:209
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Modtog ugyldig vФrdi i sФt-forespЬrgsel"
 
-#: gconf/gconf-database.c:217
+#: gconf/gconf-database.c:201
 #, 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Ьgle `%s'"
 
-#: gconf/gconf-database.c:432
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "Modtog forespЬrgsel om at slippe alle mellemlagrede data"
 
-#: gconf/gconf-database.c:446
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Modtog forespЬrgsel om at udfЬre synkron synkronisering"
 
-#: gconf/gconf-database.c:511
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Fatal fejl: kunne ikke hente objektreference for ConfigDatabase"
 
-#: gconf/gconf-database.c:629
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Fejlede ved synkronisering af en eller flere kilder: %s"
 
-#: gconf/gconf-database.c:806 gconf/gconf-sources.c:1205
+#. 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:699
+#, c-format
+msgid ""
+"Failed to log addition of listener (%s); will not be able to restore this "
+"listener on gconfd restart, resulting in unreliable notification of "
+"configuration changes."
+msgstr ""
+
+#: gconf/gconf-database.c:724
+#, c-format
+msgid "Listener ID %lu doesn't exist"
+msgstr ""
+
+#: gconf/gconf-database.c:733
+#, 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:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fejl ved forespЬrgsel pЕ vФrdi af '%s': %s"
 
-#: gconf/gconf-database.c:843
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Fejl ved opsФtning af vФrdi for '%s': %s"
 
-#: gconf/gconf-database.c:878
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Fejl under nulstilling af `%s': %s"
 
-#: gconf/gconf-database.c:899
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Fejl ved skafning af standard vФrdi for '%s': %s"
 
-#: gconf/gconf-database.c:937
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Fejl ved tjekning af eksisterende `%s': %s"
 
-#: gconf/gconf-database.c:961
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Fejl under fjernelse af katalog '%s': %s"
 
-#: gconf/gconf-database.c:987
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Kunne ikke fЕ alle indgange i '%s': %s"
 
-#: gconf/gconf-database.c:1013
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Fejl under listning af kataloger i `%s': %s"
 
-#: gconf/gconf-database.c:1034
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Fejl under opsФtning af skema for `%s': %s"
 
-#: gconf/gconf-error.c:39
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr "Succes"
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr "Fejlede"
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr "Konfigurationstjeneren kunne ikke kontaktes"
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr "Adgang nФgtet"
 
-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
 msgstr "Kunne ikke finde adresse for konfigurationskilde"
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr "Ugyldig nЬgle eller katalognavn"
 
-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 msgid "Parse error"
 msgstr "Fejl i tolkning"
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr "Korrupt data i konfigurationskildedatabasen"
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr "Typefejl"
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr "NЬgleoperation pЕ katalog"
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr "Katalogoperation pЕ nЬgle"
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr "Kan ikke overskrive eksisterende skrivebeskyttet vФrdi"
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr "Object Activation Framework fejl"
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr "Operation ikke tilladt uden konfigurationstjener"
 
-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 msgid "Failed to get a lock"
 msgstr "Kunne ikke fЕ en lЕs"
 
-#: gconf/gconf-glib.c:631
+#: gconf/gconf-glib.c:629
 #, c-format
 msgid ""
 "Error on line %d char %d: %s\n"
@@ -406,7 +430,7 @@ msgstr ""
 "Fejl pЕ linje %d tegn %d: %s\n"
 "(Tekst i nФrheden var '%s')\n"
 
-#: gconf/gconf-glib.c:751
+#: gconf/gconf-glib.c:749
 msgid ""
 "Text ended in the middle of an entity, or entity name too long to be valid "
 "('&' should begin an entity such as '&quot;')"
@@ -414,20 +438,20 @@ msgstr ""
 "Teksten sluttede midt i en entitet eller entitetens navn overskred gyldig "
 "lФngde ('&' bЬr vФre begyndelsen pЕ en entitet sЕsom '&quot;')"
 
-#: gconf/gconf-glib.c:803
+#: gconf/gconf-glib.c:801
 #, c-format
 msgid ""
 "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
 msgstr ""
-"Ukendt entitet '%s' ('&' skal vФre begyndelsen pЕ entiteterne &amp; &quot; &lt; "
-"&gt; &apos;)"
+"Ukendt entitet '%s' ('&' skal vФre begyndelsen pЕ entiteterne &amp; &quot; "
+"&lt; &gt; &apos;)"
 
-#: gconf/gconf-glib.c:843
+#: gconf/gconf-glib.c:841
 msgid ""
 "Markup text ended in the middle of a character reference, just after '&#'"
 msgstr "MФrket tekst sluttede midt i en tegnreference, lige efter '&#'"
 
-#: gconf/gconf-glib.c:869
+#: gconf/gconf-glib.c:867
 #, c-format
 msgid ""
 "Character reference contained non-digit '%s' ('&#' should begin a reference "
@@ -436,15 +460,15 @@ msgstr ""
 "Tegnreferencen indeholdt ikke-tal '%s' ('&#' skal vФre begyndelsen pЕ en "
 "reference til et UCS tegn, sЕsom '&#2342;')"
 
-#: gconf/gconf-glib.c:893
+#: gconf/gconf-glib.c:891
 msgid ""
 "Text ended in the middle of an character reference ('&#' should begin a "
 "character reference such as '&#2342;')"
 msgstr ""
-"Tekst sluttede i midten af en tegnreference ('&#' skal vФre begyndelsen pЕ en "
-"tegnreference sЕsom '&#2342;')"
+"Tekst sluttede i midten af en tegnreference ('&#' skal vФre begyndelsen pЕ "
+"en tegnreference sЕsom '&#2342;')"
 
-#: gconf/gconf-glib.c:918
+#: gconf/gconf-glib.c:916
 #, c-format
 msgid ""
 "Couldn't parse character reference '%s' ('&#' must begin a character "
@@ -453,7 +477,7 @@ msgstr ""
 "Kunne ikke tolke tegnreferencen '%s' ('&#' skal vФre begyndelsen pЕ en "
 "tegnreference sЕsom '&#2343;')"
 
-#: gconf/gconf-glib.c:940
+#: gconf/gconf-glib.c:938
 #, c-format
 msgid ""
 "Character code %#lx is not allowed in XML documents or is not a valid "
@@ -462,7 +486,7 @@ msgstr ""
 "Tegnkoden %#lx er ikke tilladt i XML-dokumenter eller den er ikke et gyldigt "
 "UCS tegn"
 
-#: gconf/gconf-glib.c:1015
+#: gconf/gconf-glib.c:1013
 msgid ""
 "Documented ended just after an '&', '&' should begin an entity or character "
 "reference."
@@ -470,7 +494,7 @@ msgstr ""
 "Dokumentet sluttede lige efter en '&', '&' skal vФre begyndelsen pЕ en "
 "entitet eller tegnreference."
 
-#: gconf/gconf-glib.c:1029
+#: gconf/gconf-glib.c:1027
 msgid ""
 "'<' or '>' character not allowed here; only allowed around tags, for example "
 "<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
@@ -480,27 +504,27 @@ msgstr ""
 "eksempel <bold> eller <paragraph>. Andre steder skal disse tegn kodes som "
 "entiteterne &lt; og &gt;"
 
-#: gconf/gconf-glib.c:1084
+#: gconf/gconf-glib.c:1082
 #, c-format
 msgid "Character '%s' is not valid at the start of an attribute name"
 msgstr "Tegn '%s' er ikke gyldigt ved starten af et attributnavn"
 
-#: gconf/gconf-glib.c:1111
+#: gconf/gconf-glib.c:1109
 msgid "Document ended just after attribute name"
 msgstr "Dokumentet sluttede lige efter et attributnavn"
 
-#: gconf/gconf-glib.c:1122
+#: gconf/gconf-glib.c:1120
 msgid "Attribute name must be immediately followed by an '=' character"
 msgstr "Attributnavn skal vФre direkte efterfulgt af et '='-tegn"
 
-#: gconf/gconf-glib.c:1137
+#: gconf/gconf-glib.c:1135
 msgid ""
 "'=' character after attribute must be immediately followed by an '\"' "
 "character"
 msgstr ""
 "'='-tegnet efter attributten skal vФre direkte efterfulgt af et '\"'-tegn"
 
-#: gconf/gconf-glib.c:1163
+#: gconf/gconf-glib.c:1161
 #, c-format
 msgid ""
 "Character '%c' found inside an attribute value; perhaps your attribute value "
@@ -509,46 +533,46 @@ msgstr ""
 "Tegnet '%c' fundet inde i en attributvФrdi; mЕske mangler din attributvФrdi "
 "det afsluttende anfЬrelsestegn '\"'"
 
-#: gconf/gconf-glib.c:1183
+#: gconf/gconf-glib.c:1181
 msgid ""
 "Ran out of text before a quote mark ('\"') was seen at the end of an "
 "attribute value"
 msgstr ""
-"UdlЬb for tekst, fЬr et anfЬrelsestegn ('\"') blev fundet ved slutningen af en "
-"attributvФrdi"
+"UdlЬb for tekst, fЬr et anfЬrelsestegn ('\"') blev fundet ved slutningen af "
+"en attributvФrdi"
 
-#: gconf/gconf-glib.c:1196
+#: gconf/gconf-glib.c:1194
 msgid ""
 "Text ends immediately after an attribute value, before the element was closed"
 msgstr "Teksten slutter lige efter en attributvФrdi, fЬr elementet blev lukket"
 
-#: gconf/gconf-glib.c:1510
+#: gconf/gconf-glib.c:1508
 msgid "Missing '<' at start of element"
 msgstr "Manglende '<' ved starten af elementet"
 
-#: gconf/gconf-glib.c:1521
+#: gconf/gconf-glib.c:1519
 msgid "Document ended just after '<' character"
 msgstr "Dokumentet sluttede lige efter '<'-tegnet"
 
-#: gconf/gconf-glib.c:1549
+#: gconf/gconf-glib.c:1547
 msgid "No closing '>' found for a <? or <!"
 msgstr "Ingen afsluttende '>' fundet for en <? eller <!"
 
-#: gconf/gconf-glib.c:1578
+#: gconf/gconf-glib.c:1576
 #, c-format
 msgid "Character '%s' is not valid at the start of an element name"
 msgstr "Tegnet '%s' er ikke gyldigt ved starten af et elementnavn"
 
-#: gconf/gconf-glib.c:1602 gconf/gconf-glib.c:1615
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
 msgid "Document ended just after element name, no '>' seen"
 msgstr "Dokumentet sluttede lige efter elementnavnet, ingen '>' sИt"
 
-#: gconf/gconf-glib.c:1640
+#: gconf/gconf-glib.c:1638
 #, c-format
 msgid "Elements should be closed with '>' or '/>', not with '%s'"
 msgstr "Elementer skal lukkes med '>' eller '/>, ikke med '%s'"
 
-#: gconf/gconf-glib.c:1657
+#: gconf/gconf-glib.c:1655
 msgid ""
 "Element ended just after '/', no '>' seen; empty elements should end with "
 "'/>'"
@@ -556,37 +580,37 @@ msgstr ""
 "Element sluttede lige efter '/', ingen '>' sИt; tomme elementer bЬr slutte "
 "med '/>'"
 
-#: gconf/gconf-glib.c:1696
+#: gconf/gconf-glib.c:1694
 msgid "Close tag not found at end of element"
 msgstr "MФrke for lukning blev ikke fundet ved slutningen af elementet"
 
-#: gconf/gconf-glib.c:1711
+#: gconf/gconf-glib.c:1709
 msgid "Close tag ends just after '<' character"
 msgstr "Lukke-mФrket slutter lige efter '<'-tegnet"
 
-#: gconf/gconf-glib.c:1725
+#: gconf/gconf-glib.c:1723
 msgid "Close tag should begin with '</', '/' character is missing"
 msgstr "Lukke-mФrket skal begynde med '</', '/'-tegnet mangler"
 
-#: gconf/gconf-glib.c:1739
+#: gconf/gconf-glib.c:1737
 msgid "Close tag ends just after '/' character"
 msgstr "Lukke-mФrket slutter lige efter '/'-tegnet"
 
-#: gconf/gconf-glib.c:1774
+#: gconf/gconf-glib.c:1772
 msgid "Document ended just after element name in close tag, no '>' seen"
 msgstr ""
 "Dokumentet sluttede lige efter elementnavnet i lukke-mФrket, ingen '>' sИt"
 
-#: gconf/gconf-glib.c:1790
+#: gconf/gconf-glib.c:1788
 msgid "Document ended just after close tag name, no '>' seen"
 msgstr "Dokumentet sluttede lige efter navnet pЕ lukke-mФrket, ingen '>' sИt"
 
-#: gconf/gconf-glib.c:1809
+#: gconf/gconf-glib.c:1807
 #, c-format
 msgid "Close tag '%s' does not match opening tag '%s'"
 msgstr "Lukke-mФrket '%s' er ikke lig Еbnings-mФrket '%s'"
 
-#: gconf/gconf-glib.c:2147
+#: gconf/gconf-glib.c:2145
 #, c-format
 msgid ""
 "Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
@@ -595,128 +619,133 @@ msgstr ""
 "Ugyldigt UTF-8-tegn ved byte %d i kodet tekst. Noget af teksten fЬr det "
 "ugyldige tegn var '%s'"
 
-#: gconf/gconf-glib.c:2204
+#: gconf/gconf-glib.c:2202
 msgid "The marked-up text contained nothing but whitespace."
 msgstr "Den kodede tekst indeholdt kun tomrum."
 
-#: gconf/gconf-glib.c:10668
+#: gconf/gconf-glib.c:10666
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Kunne ikke Еbne fil '%s': %s"
 
-#: gconf/gconf-glib.c:10685
+#: gconf/gconf-glib.c:10683
 #, c-format
 msgid "Error reading file '%s': %s"
 msgstr "Fejl ved lФsing af fil '%s': %s"
 
-#: gconf/gconf-internals.c:100
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Ingen '/' i nЬgle `%s'"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Kunne ikke tolke CORBA vФrdi for listeelement"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Ukorrekt type for listeelement i %s"
 
-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "Modtog liste fra gconfd med en ugyldig listetype"
 
-#: gconf/gconf-internals.c:798
+#: gconf/gconf-internals.c:445
+#, fuzzy
+msgid "Failed to convert object to IOR"
+msgstr "Fejlede ved synkronisering af en eller flere kilder: %s"
+
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Kunne ikke Еbne sti-fil `%s': %s\n"
 
-#: gconf/gconf-internals.c:853
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "TilfЬjer kilde '%s'\n"
 
-#: gconf/gconf-internals.c:865
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "LФsefejl pЕ fil '%s': %s\n"
 
-#: gconf/gconf-internals.c:1307
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Forventede liste, fik %s"
 
-#: gconf/gconf-internals.c:1317
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Forventede liste af %s, fik liste af %s"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Forventede par, fik %s"
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr "Forventede (%s,%s) par, fik par hvor Иn eller begge vФrdier manglede"
 
-#: gconf/gconf-internals.c:1486
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Forventede par af typen (%s,%s) fik type (%s,%s)"
 
-#: gconf/gconf-internals.c:1602
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Tekst i anfЬrselstegn begynder ikke med anfЬrselstegn"
 
-#: gconf/gconf-internals.c:1664
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Tekst i anfЬrselstegn ender ikke pЕ anfЬrselstegn"
 
-#: gconf/gconf-internals.c:2144 gconf/gconf.c:2780
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-fejl: %s"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "forsЬg pЕ at fjerne ikke-listet OAF-objektmappe"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "forsЬg pЕ at tilfЬje allerede-listet OAF-mappe"
 
-#: gconf/gconf-internals.c:2176
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF-fortolkningsfejl: %s"
 
-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Ukendt OAF-fejl"
 
-#: gconf/gconf-internals.c:2264
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Ingen ior-fil i '%s'"
 
-#: gconf/gconf-internals.c:2295
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd overtager lЕs '%s' fra en anden proces"
 
-#: gconf/gconf-internals.c:2306
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Et andet program har lЕs '%s'"
 
-#: gconf/gconf-internals.c:2326
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "kunne ikke kontakte ORB for at pinge eksisterende gconfd"
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -725,42 +754,42 @@ msgstr ""
 "Fjerner udgЕet lЕs `%s' fordi IOR ikke kunne konverteres til "
 "objektreference, IOR `%s'"
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr "Fjerner udgЕet lЕs `%s' pga fejl under pingning af tjener: %s"
 
-#: gconf/gconf-internals.c:2358
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf-konfigurationsdФmon (gconfd) har lЕs '%s'"
 
-#: gconf/gconf-internals.c:2372
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "kunne ikke oprette kataloget '%s': %s"
 
-#: gconf/gconf-internals.c:2407
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Kan ikke oprette lЕs '%s': %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kan ikke skrive til filen '%s': %s"
 
-#: gconf/gconf-internals.c:2486
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "Kan ikke Еbne lЕsefil '%s'; antager det ikke er vores: %s"
 
-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "ьdelagt lЕsefil '%s', fjerner alligevel"
 
-#: gconf/gconf-internals.c:2513
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -769,26 +798,26 @@ msgstr ""
 "Oprettede ikke lЕsefil '%s' (skabers pid %u, vores pid %u; antager at en "
 "anden har overtaget vores lЕs "
 
-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Kunne ikke frigive lЕsekatalog '%s': %s"
 
-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Kunne ikke indlФse kilden `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Skema `%s' specificeret for `%s' lagrer en vФrdi som ikke er for skema"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Navnet '/' kan kun vФre et katalog, ikke en nЬgle"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -797,101 +826,101 @@ msgstr ""
 "VФrdi for `%s' sat i en skrivebeskyttet kilde i begyndelsen af din "
 "konfigurationssti."
 
-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Fejl ved finding af metainfo: %s"
 
-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Fejl under hentning af metainfo: %s"
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr "NЬgle `%s' listet som skema for nЬgle `%s' lagrer faktisk type `%s'"
 
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Forstod ikke `%s' (forventede heltal)"
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Heltal `%s' er for stort eller lille"
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Forstod ikke `%s' (forventet flydendetal)"
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Forstod ikke `%s' (forventede sand eller falsk)"
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "Forstod ikke `%s' (listen skal starte med en '[')"
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "Forstod ikke `%s' (listen skal slutte med en ']')"
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "Forstod ikke `%s' (ekstra \"unescaped\" ']' fundet i listen)"
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "Forstod ikke `%s' (ekstra efterfЬlgende tegn)"
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "Forstod ikke `%s' (par skal starte med en '(')"
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "Forstod ikke `%s' (par skal slutte med en ')')"
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "Forstod ikke `%s' (galt antal elementer)"
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "Forstod ikke `%s' (ekstra \"unescaped\" ')' fundet inde i par)"
 
-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr "'%s': %s"
 
-#: gconf/gconf.c:300
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Server kunne ikke Еbne adressen '%s'"
 
-#: gconf/gconf.c:561
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "Kan ikke tilfЬje notifikationer til en lokal konfigurationskilde"
 
-#: gconf/gconf.c:1626
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Pingning af tjeneren fejlede, CORBA-fejl: %s"
 
-#: gconf/gconf.c:1642
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -901,66 +930,66 @@ msgstr ""
 "fra oaf_activate_from_id() og satte ikke en undtagelse som forklarede "
 "problemet. Venligst udfyld en fejlrapport for OAF."
 
-#: gconf/gconf.c:1909
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Kunne ikke starte GConf, afslutter\n"
 
-#: gconf/gconf.c:1946
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Skal begynde med en skrЕstreg (/)"
 
-#: gconf/gconf.c:1968
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan ikke have to skrЕstreger (/) efter hinanden"
 
-#: gconf/gconf.c:1970
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan ikke have et punktum (.) lige efter en skrЕstreg (/)"
 
-#: gconf/gconf.c:1991
+#: gconf/gconf.c:1962
 #, 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:2005
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "NЬgle/katalog skal ikke ende med en skrЕstreg (/)"
 
-#: gconf/gconf.c:2252
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fejl ved nedlukning af konfigtjener: %s"
 
-#: gconf/gconf.c:2313
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Forventede flydendetal, fik %s"
 
-#: gconf/gconf.c:2348
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Forventede heltal, fik %s"
 
-#: gconf/gconf.c:2383
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Forventede streng, fik %s"
 
-#: gconf/gconf.c:2420
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Forventede boolsk, fik %s"
 
-#: gconf/gconf.c:2453
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Forventede skema, fik %s"
 
-#: gconf/gconfd.c:200
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "NedlukningsforespЬrgsel modtaget"
 
-#: gconf/gconfd.c:232
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -968,7 +997,7 @@ msgstr ""
 "gconfd kompileret med debugning; forsЬger at hente gconf.sh fra "
 "kildekataloget"
 
-#: gconf/gconfd.c:250
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -976,7 +1005,7 @@ msgstr ""
 "Ingen konfigurationsfiler fundet, forsЬger at bruge standard "
 "konfigurationskilde `%s'"
 
-#: gconf/gconfd.c:259
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -984,12 +1013,12 @@ msgstr ""
 "Ingen konfigurationskilder i kildestien, konfigurationen vil ikke blive "
 "gemt; redigИr"
 
-#: gconf/gconfd.c:273
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Fejl ved indlФsning af nogle konfigkilder: %s"
 
-#: gconf/gconfd.c:285
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -997,36 +1026,37 @@ msgstr ""
 "Kunne ikke slЕ nogen adresser op for konfigurationskilde, kan ikke hente "
 "eller gemme konfigurationsdata"
 
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:287
+#, fuzzy
 msgid ""
-"No writeable config sources successfully resolved, may not be able to save "
+"No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 "Ingen skrivbar konfigurationskilde fundet, kan ikke gemme dele af "
 "konfigurationsФndringene"
 
-#: gconf/gconfd.c:327 gconf/gconfd.c:339
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr "Modtog signal %d, lukker ned."
 
-#: gconf/gconfd.c:344
-#, c-format
-msgid "Received signal %d, ignoring"
-msgstr "Modtog signal %d, ignorerer"
+#: gconf/gconfd.c:329
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down cleanly"
+msgstr "Modtog signal %d, lukker ned."
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:390
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "starter (version %s), pid %u bruger '%s'"
 
-#: gconf/gconfd.c:394
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr "GConf er bygget med fejlsЬgningsfunktioner aktiveret"
 
-#: gconf/gconfd.c:417
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -1034,11 +1064,11 @@ msgstr ""
 "Kunne ikke initialisere Object Activation Framework: venligst send en "
 "fejlrapport til OAF udviklerene"
 
-#: gconf/gconfd.c:437
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Kunne ikke hente objektreference for ConfigServer"
 
-#: gconf/gconfd.c:457
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -1046,95 +1076,142 @@ msgstr ""
 "OAF kender ikke vor IID; indikerer fejl i installation; kan ikke\n"
 "registrere; afslutter\n"
 
-#: gconf/gconfd.c:461
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "En anden gconfd er allerede registreret hos OAF; afslutter\n"
 
-#: gconf/gconfd.c:466
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Ukendt fejl ved registrering af gconfd hos OAF, afslutter\n"
 
-#: gconf/gconfd.c:487
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Afslutter"
 
-#: gconf/gconfd.c:811
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Returnerede undtagelse: %s"
 
-#: gconf/gconfd.c:869
+#: gconf/gconfd.c:885
 #, c-format
-msgid "Failed to create ~/.gconfd/saved_state to record gconfd's state: %s"
+msgid ""
+"Failed to open gconfd logfile; won't be able to restore listeners after "
+"gconfd shutdown (%s)"
 msgstr ""
-"Kunne ikke oprette ~/.gconfd/saved_state for at gemme gconfd's tilstand: %s"
 
-#: gconf/gconfd.c:876
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Failed to write ~/.gconfd/saved_state to record gconfd's state: %s"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
-"Kunne ikke skrive til ~/.gconfd/saved_state for at gemme gconfd's tilstand: %s"
 
-#: gconf/gconfd.c:905 gconf/gconfd.c:997
-#, c-format
-msgid "Didn't understand element '%s' in saved state file"
+#: gconf/gconfd.c:966
+#, fuzzy, c-format
+msgid "Could not open saved state file '%s' for writing: %s"
+msgstr "Kunne ikke Еbne gemt tilstandsfil '%s': %s"
+
+#: gconf/gconfd.c:980
+#, fuzzy, c-format
+msgid "Could not write saved state file '%s' fd: %d: %s"
+msgstr "Kunne ikke genoprette gemt tilstandsfil fra fil '%s': %s"
+
+#: gconf/gconfd.c:989
+#, fuzzy, c-format
+msgid "Failed to close new saved state file '%s': %s"
+msgstr "Kunne ikke Еbne gemt tilstandsfil '%s': %s"
+
+#: gconf/gconfd.c:1003
+#, fuzzy, c-format
+msgid "Could not move aside old saved state file '%s': %s"
+msgstr "Kunne ikke Еbne gemt tilstandsfil '%s': %s"
+
+#: gconf/gconfd.c:1013
+#, fuzzy, c-format
+msgid "Failed to move new save state file into place: %s"
+msgstr "Kunne ikke Еbne gemt tilstandsfil '%s': %s"
+
+#: gconf/gconfd.c:1022
+#, fuzzy, c-format
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr "Kunne ikke genoprette gemt tilstandsfil fra fil '%s': %s"
+
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
 msgstr "Forstod ikke elementet '%s' i gemt tilstandsfil"
 
-#: gconf/gconfd.c:916
-msgid "No location attribute on listener element in saved state file"
-msgstr ""
-"Ingen lokationsattribut i lytter-elementet i den gemte tilstandsfil"
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Kunne ikke genoprette gemt tilstandsfil fra fil '%s': %s"
 
-#: gconf/gconfd.c:923
-msgid "No IOR attribute on listener element in saved state file"
-msgstr "Ingen IOR-attribut i lytter-elementet i gemt tilstandsfil"
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr "Kunne ikke genoprette gemt tilstandsfil fra fil '%s': %s"
 
-#: gconf/gconfd.c:930
-msgid "No connection ID attribute on listener element in saved state file"
-msgstr "Ingen forbindelses-ID-attribut i lytter-element i gemt tilstandsfil"
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "Kunne ikke genoprette gemt tilstandsfil fra fil '%s': %s"
 
-#: gconf/gconfd.c:1018
-msgid "Strange non-element node in saved state file"
-msgstr "Underligt ikke-element node i gemt tilstandsfil"
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Kunne ikke genoprette gemt tilstandsfil fra fil '%s': %s"
 
-#: gconf/gconfd.c:1047
-#, c-format
-msgid "Unable to open saved state file '%s': %s"
-msgstr "Kunne ikke Еbne gemt tilstandsfil '%s': %s"
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
 
-#: gconf/gconfd.c:1060
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Failed to restore saved state from file '%s': %s"
-msgstr "Kunne ikke genoprette gemt tilstandsfil fra fil '%s': %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
 
-#: gconf/gconfd.c:1069
-msgid "Root node of saved state file should be an element"
-msgstr "Root-node af gemt tilstandsfil skulle vФrt et element"
+#: gconf/gconfd.c:1377
+#, c-format
+msgid "Unable to open saved state file '%s': %s"
+msgstr "Kunne ikke Еbne gemt tilstandsfil '%s': %s"
 
-#: gconf/gconfd.c:1079
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Root node of saved state file should be 'gconfd_logfile', not '%s'"
+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 ""
-"Root-node i gemt tilstandsfil skulle vФre 'gconfd_logfile', ikke '%s'"
 
-#: gconf/gconfd.c:1092
-msgid "Funny non-element node under <gconfd_logfile> in saved state file"
+#: gconf/gconfd.c:1481
+#, 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 ""
-"Underligt ikke-element node under <gconfd_logfile> i gemt tilstandsfil"
 
-#: gconf/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "HjФlpeindstillinger"
 
-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 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. Brug med --type."
 
-#: gconf/gconftool.c:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Udskriv vФrdien for en nЬgle til standard ud."
 
-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -1142,36 +1219,36 @@ msgstr ""
 "SФt et skema og synkroniser. Brug --short-desc, --long-desc, --owner, og "
 "--type."
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "Nulstil nЬglerne fra kommandolinien"
 
-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Udskriv alle nЬgle/vФrdi-par i et katalog."
 
-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Udskriv alle underkataloger i et katalog."
 
-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Udskriv alle underunderkataloger og indgange under et katalog, rekursivt."
 
-#: gconf/gconftool.c:149
+#: gconf/gconftool.c:135
 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:158
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Luk gconfd ned. BRUG IKKE DETTE VALG UDEN GOD GRUND."
 
-#: gconf/gconftool.c:167
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "ReturnИr 0 hvis gconfd kЬrer, 2 hvis ikke."
 
-#: gconf/gconftool.c:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1179,7 +1256,7 @@ msgstr ""
 "Start konfigurationstjeneren (gconfd). (Sker normalt automatisk nЕr det er "
 "nЬdvendigt.)"
 
-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1187,11 +1264,11 @@ msgstr ""
 "SpecificИr typen af vФrdien som sФttes, eller typen af vФrdien som et skema "
 "beskriver. Unikke forkortelser er OK."
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|liste|par"
 
-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1199,11 +1276,11 @@ msgstr ""
 "SpecificИr type listevФrdi som sФttes, eller typen for vФrdien som et skema "
 "beskriver. Unikke forkortelser er OK."
 
-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "heltal|boolsk|flydende|streng"
 
-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1211,7 +1288,7 @@ msgstr ""
 "SpecificИr car-type vФrdi som sФttes, eller typen for vФrdien som et skema "
 "beskriver. Unikke forkortelser er OK."
 
-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1219,44 +1296,44 @@ msgstr ""
 "SpecificИr type vФrdi for cdr-par som sФttes, eller typen for vФrdien som et "
 "skema beskriver. Unikke forkortelser er OK."
 
-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "SpecificИr en kort beskrivelse pЕ en halv linie som skal bruges i et skema."
 
-#: gconf/gconftool.c:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "SpecificИr en beskrivelse pЕ flere linjer som skal bruges i et skema."
 
-#: gconf/gconftool.c:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "Angiv ejeren af et skema"
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "OWNER"
 
-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "Angiv en skemafil som skal installeres"
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "FILENAME"
 
-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "Angiv en konfigurationskilde som skal bruges i stedet for standard sti"
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "SOURCE"
 
-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1264,7 +1341,7 @@ msgstr ""
 "AcceptИr konfigurationsdatabasen direkte, gЕr udenom tjeneren. Det krФves at "
 "gconfd ikke kЬrer."
 
-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1275,7 +1352,7 @@ msgstr ""
 "standardvФrdien for konfigurationskilde eller vФre tom for at "
 "standardvФrdien skal bruges."
 
-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1283,7 +1360,7 @@ msgstr ""
 "UdfЬr en torturtest af en applikation ved at sФtte og tЬmme en rФkke vФrdier "
 "af forskellige typer for nЬgler fra kommandolinjen."
 
-#: gconf/gconftool.c:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1291,7 +1368,7 @@ msgstr ""
 "UdfЬr en torturtest af en applikation ved at sФtte og tЬmme en rФkke nЬgler "
 "inde i katalogerne fra kommandolinien."
 
-#: gconf/gconftool.c:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1301,23 +1378,23 @@ msgstr ""
 "KЬr '%s --help' for at se en fuld liste over tilgФngelige "
 "kommandolinieflag.\n"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Kan ikke hente og sФtte/nulstille samtidig\n"
 
-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Kan ikke sФtte og hente/nulstille samtidig\n"
 
-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "Kan ikke bruge --all-pairs med --get eller --set\n"
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 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:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1325,7 +1402,7 @@ msgstr ""
 "--recursive-list bЬr ikke bruges med --get, --set, --unset, --all-pairs, "
 "eller --all-dirs\n"
 
-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1333,58 +1410,58 @@ msgstr ""
 "--set_schema bЬr ikke bruges med --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
 
-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "VФrdi type er kun interessant nЕr en vФrdi skal sФttes\n"
 
-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:393
 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:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping flaget skal bruges alene.\n"
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists flaget skal bruges alene.\n"
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file skal bruges alene.\n"
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule skal bruges alene.\n"
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key skal bruges alene.\n"
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory skal bruges alene.\n"
 
-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 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:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Kunne ikke starte GConf: %s\n"
 
-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Skal sФtte GCONF_CONFIG_SOURCE miljЬvariablen\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1396,245 +1473,245 @@ msgstr ""
 "kЬrer nogen applikationer\n"
 "(selvom ting virker i teorien selv nЕr applikationer kЬrer).\n"
 
-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Kunne ikke fЕ fat i konfigurationskilde(r): %s\n"
 
-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Nedlukningsfejl: %s\n"
 
-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Du skal angive en eller flere kataloger som skal vises rekursivt.\n"
 
-#: gconf/gconftool.c:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "Fejl under listning af par i `%s': %s"
 
-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(ingen vФrdi sat)"
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Fejl under splitning af konfigurationstjeneren (gconfd): %s\n"
 
-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 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:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Type: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listetype: %s\n"
 
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car-type: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr-type: %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Ejer: %s\n"
 
-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Nulstil"
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kort beskriv.: %s\n"
 
-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Lang beskriv.: %s\n"
 
-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Ingen vФrdi sat for '%s'\n"
 
-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Kunne ikke fЕ vФrdi for '%s': %s\n"
 
-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "ForstЕr ikke type `%s'\n"
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Skal angive skiftevis nЬgler/vФrdier som argumenter\n"
 
-#: gconf/gconftool.c:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Ingen vФrdi sat for nЬgle: `%s'\n"
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Kan ikke sФtte skema som vФrdi\n"
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 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 liste-type\n"
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1043
 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:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fejl: %s\n"
 
-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Fejl under sФtning af vФrdi: %s"
 
-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Fejl ved synkronisering: %s"
 
-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Du skal angive nЬgle (skemanavn) som eneste argument\n"
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1149
 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:1181
+#: gconf/gconftool.c:1169
 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:1201
+#: gconf/gconftool.c:1189
 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:1245
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Der skal angives en eller flere kataloger der kan hentes nЬgle/vФrdi-par "
 "fra.\n"
 
-#: gconf/gconftool.c:1259
+#: gconf/gconftool.c:1247
 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:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Fejl under nulstilling af `%s': %s\n"
 
-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Der skal specificeres et eller flere kataloger som der skal hentes "
 "underkataloger fra.\n"
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Fejl ved visning af kataloger: %s\n"
 
-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, 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:1378
+#: gconf/gconftool.c:1366
 #, 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:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, 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:1407
+#: gconf/gconftool.c:1395
 #, 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:1432
+#: gconf/gconftool.c:1420
 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:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "ADVARSEL: gconftool, intern fejl, ukendt GConfValueType\n"
 
-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ADVARSEL: kunne ikke tolke typenavn '%s'\n"
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, 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:1547
+#: gconf/gconftool.c:1535
 #, 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:1568
+#: gconf/gconftool.c:1556
 #, 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:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "ADVARSEL: tom <applyto> node"
 
-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ADVARSEL: node <%s> ikke forstЕet under <skema>\n"
 
-#: gconf/gconftool.c:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "ADVARSEL: ingen nЬgle angivet for skema\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "ADVARSEL: <lokale> node har ingen 'navn=\"lokale\" attribut, ignorerer\n"
 
-#: gconf/gconftool.c:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1642,51 +1719,51 @@ msgstr ""
 "ADVARSEL: flere <lokale> noder for lokale '%s', ignorerer alle andre end den "
 "fЬrste\n"
 
-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "ADVARSEL: Ugyldig node <%s> i en <lokale> node\n"
 
-#: gconf/gconftool.c:1757
+#: gconf/gconftool.c:1745
 #, 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:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Installerede skema '%s' for lokale '%s'\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "ADVARSEL: kunne ikke associere skema `%s' med nЬgle `%s': %s\n"
 
-#: gconf/gconftool.c:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "VedhФftede skema '%s' til nЬgle '%s'\n"
 
-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Du skal have mindst et <lokale> i et <skema>\n"
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "ADVARSEL: node <%s> ikke forstЕet under <skemaliste>\n"
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Kunne ikke Еbne '%s': %s\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokumentet '%s' er tomt?\n"
 
-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1695,26 +1772,26 @@ msgstr ""
 "Dokument `%s' har forkert type rod-node (<%s>, skulle vФre "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokument `%s' har ingen top niveau <gconfskemafil> node\n"
 
-#: gconf/gconftool.c:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ADVARSEL: node <%s> herunder <gconfskemafil> ikke forstЕet\n"
 
-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Fejl ved synkronisering af konfigdata: %s"
 
-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Skal angive nogen skema-filer til installering\n"
 
-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1723,16 +1800,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Kunne ikke fjerne afbrydelsesnЬgle %s: %s\n"
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "Skal angive en eller flere nЬgler for afbrydelse.\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1742,11 +1819,11 @@ msgstr ""
 "nЬgle:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "Skal angive nogle kataloger som skal knФkkes\n"
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1762,7 +1839,42 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf advarsel: fejl ved listning af par i `%s': %s"
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Forventede %s, fik %s for nЬgle %s"
+
+#~ msgid "Received signal %d, ignoring"
+#~ msgstr "Modtog signal %d, ignorerer"
+
+#~ msgid "Failed to create ~/.gconfd/saved_state to record gconfd's state: %s"
+#~ msgstr ""
+#~ "Kunne ikke oprette ~/.gconfd/saved_state for at gemme gconfd's tilstand: %s"
+
+#~ msgid "Failed to write ~/.gconfd/saved_state to record gconfd's state: %s"
+#~ msgstr ""
+#~ "Kunne ikke skrive til ~/.gconfd/saved_state for at gemme gconfd's tilstand: "
+#~ "%s"
+
+#~ msgid "No location attribute on listener element in saved state file"
+#~ msgstr "Ingen lokationsattribut i lytter-elementet i den gemte tilstandsfil"
+
+#~ msgid "No IOR attribute on listener element in saved state file"
+#~ msgstr "Ingen IOR-attribut i lytter-elementet i gemt tilstandsfil"
+
+#~ msgid "No connection ID attribute on listener element in saved state file"
+#~ msgstr "Ingen forbindelses-ID-attribut i lytter-element i gemt tilstandsfil"
+
+#~ msgid "Strange non-element node in saved state file"
+#~ msgstr "Underligt ikke-element node i gemt tilstandsfil"
+
+#~ msgid "Root node of saved state file should be an element"
+#~ msgstr "Root-node af gemt tilstandsfil skulle vФrt et element"
+
+#~ msgid "Root node of saved state file should be 'gconfd_logfile', not '%s'"
+#~ msgstr ""
+#~ "Root-node i gemt tilstandsfil skulle vФre 'gconfd_logfile', ikke '%s'"
+
+#~ msgid "Funny non-element node under <gconfd_logfile> in saved state file"
+#~ msgstr ""
+#~ "Underligt ikke-element node under <gconfd_logfile> i gemt tilstandsfil"
diff --git a/po/de.po b/po/de.po
index 4f10417e..5a9cac52 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gConf 0.5\n"
-"POT-Creation-Date: 2000-09-08 19:22+0200\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-09-08 19:21+0200\n"
 "Last-Translator: Christian Meyer <linux@chrisime.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -14,47 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Entferne XML-Backend-Modul aus dem Speicher."
 
-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Konnte das XML-Rootverzeichnis nicht an der Adresse `%s' finden"
 
-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Konnte Verzeichnis `%s' nicht erstellen: %s"
 
-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr "Kann nicht in XML-Verzeichnis an Adresse `%s' lesen oder schreiben"
 
-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 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:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr "Initialisiere XML-Backend-Modul"
 
-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Konnte Sperre auf XML-Verzeichnis `%s' nicht lЖsen: %s"
 
-#: backends/xml-cache.c:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 "Unsynchronisiertes Verzeichnis wird gelЖscht, wenn das XML-Backend beendet "
 "wird"
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -63,7 +63,7 @@ msgstr ""
 "Kann das Verzeichnis %s nicht vom XML-Backand-Cache entfernen, weil es nicht "
 "erfolgreich synchronisiert werden konnte"
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -72,84 +72,84 @@ msgstr ""
 "%u Elemente bleiben im Cache, wenn alle bereits synchronisierten Elemente, "
 "die Дlter als %u Sekunden sind gelЖscht werden"
 
-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "Konnte '%s' nicht Жffnen: %s"
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "XML-Dateiname %s ist ein Verzeichnis"
 
-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "LЖschen von %s gescheitert: %s"
 
-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Schreiben von %s gescheitert: %s"
 
-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "umbenennen von %s gescheitert: %s"
 
-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "wiederherstellen von %s aus %s gescheitert: %s"
 
-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "lЖschen der alten Datei %s gescheitert: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:802
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Konnte `%s' nicht Жffnen: %s"
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "doppelter Eintrag %s in %s, ignoriere"
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Eintrag ohne Namen in der XML-Datei %s, ignoriere"
 
-#: backends/xml-dir.c:975
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Oberstes Element in der XML-Datei ist kein <entry>, ignoriere"
 
-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Erstellen von Datei %s gescheitert: %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2455
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Konnte Datei `%s' nicht schlieъen: %s"
 
 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignoriere XML-Element mit Namen %s: %s"
 
-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2159
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "ignoriere Schema mit Namen %s, ungЭltig: %s"
@@ -157,253 +157,277 @@ msgstr "ignoriere Schema mit Namen %s, ungЭltig: %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "Ignoriere XML-Element %s, auъer fЭr das mЖgliche Schema: %s"
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr "<local_schema> ohne lokale Einstellungen gefunden"
 
-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Konnte voreingestellten Wert fЭr Schema (%s) nicht lesen"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Kein \"type\"-Attribut fЭr <%s>-Element"
 
-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Ein Element hat unbekanntes \"type\"-Attribut, ignoriere"
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "Kein \"value\"-Attribut fЭr Element"
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Verstehe XML-Element <%s> in einem XML-Listen-Element nicht"
 
-#: backends/xml-entry.c:1055
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "UngЭltiger Typ (Liste, Paar oder unbekannt) in einem Listen-Element"
 
-#: backends/xml-entry.c:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Schlechtes XML-Element: %s"
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 "Liste beinhaltet ein schlecht-geschriebenes Element (%s, sollte %s sein)"
 
-#: backends/xml-entry.c:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorierie schlechtes car vom XML-Paar: %s"
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "parse XML-Datei: Liste und Paare sollen nicht in einem Paar sein"
 
-#: backends/xml-entry.c:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorierie schlechtes cdr vom XML-Paar: %s"
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Verstehe XML-Element <%s> in einem XML-Paar-Element nicht"
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "konnte car und cdr vom XML-Paar nicht finden"
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "cdr vom XML-Wertepaar fehlt"
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "car vom XML-Wertepaar fehlt"
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "car und cdr vom XML-Wertepaar fehlen"
 
 #. -- end debug only
-#: gconf/gconf-backend.c:182
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "Keine Datei `%s'\n"
 
-#: gconf/gconf-backend.c:210
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "UngЭltige Adresse `%s'"
 
-#: gconf/gconf-backend.c:235
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr ""
 "GConf funktioniert nicht ohne UnterstЭtzung fЭr dynamische Module (gmodule)"
 
-#: gconf/gconf-backend.c:245
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr "Fehler beim жffnen von Modul `%s': %s\n"
 
-#: gconf/gconf-backend.c:277
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr "Konnte Backend-Modul fЭr `%s' nicht finden"
 
-#: gconf/gconf-backend.c:314
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr "Konnte Backend nicht herunterfahren"
 
-#: gconf/gconf-database.c:209
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Habe ungЭltigen Wert in Einstellungsanfrage erhalten"
 
-#: gconf/gconf-database.c:217
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Konnte Sinn des CORBA-Wertes in Einstellungsanfrage fЭr SchlЭssel `%s' nicht "
 "ausmachen"
 
-#: gconf/gconf-database.c:432
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "Habe Anfrage zum Fallenlassen aller Daten im Cache erhalten"
 
-#: gconf/gconf-database.c:446
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Habe Anfrage zum synchronen Synchronisieren erhalten"
 
-#: gconf/gconf-database.c:511
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Schwere Fehler: Konnte Objektreferenz fЭr ConfigServer nicht erhalten"
 
-#: gconf/gconf-database.c:629
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Konnte ein oder mehrere Quellen nicht synchronisieren: %s"
 
-#: gconf/gconf-database.c:806 gconf/gconf-sources.c:1205
+#. 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:699
+#, c-format
+msgid ""
+"Failed to log addition of listener (%s); will not be able to restore this "
+"listener on gconfd restart, resulting in unreliable notification of "
+"configuration changes."
+msgstr ""
+
+#: gconf/gconf-database.c:724
+#, c-format
+msgid "Listener ID %lu doesn't exist"
+msgstr ""
+
+#: gconf/gconf-database.c:733
+#, 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:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fehler beim Erhalten des Wertes fЭr `%s': %s"
 
-#: gconf/gconf-database.c:843
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Fehler beim Einstellen des Wertes fЭr `%s': %s"
 
-#: gconf/gconf-database.c:878
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Fehler beim LЖschen von `%s': %s"
 
-#: gconf/gconf-database.c:899
+#: gconf/gconf-database.c:931
 #, 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:937
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Fehler beim PrЭfen der Existenz von `%s': %s"
 
-#: gconf/gconf-database.c:961
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Fehler beim Entfernen von Verzeichnis `%s': %s"
 
-#: gconf/gconf-database.c:987
+#: gconf/gconf-database.c:1019
 #, 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:1013
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Fehler beim Auflisten der Verzeichnisse in `%s': %s"
 
-#: gconf/gconf-database.c:1034
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Fehler beim Einstellen des Schemas fЭr `%s': %s"
 
-#: gconf/gconf-error.c:39
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr "Erfolg"
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr "Gescheitert"
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr "Konfigurationsserver kann nicht kontaktiert werden"
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr "Zugriff verweigert"
 
-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
 msgstr "Kann Adresse fЭr konfigurations-Quelle nicht auflЖsen"
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr "Schlechter SchlЭssel oder Ordnername"
 
-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 msgid "Parse error"
 msgstr "Parserfehler"
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr "BeschДdigte Daten in der Konfigurations-Quell-Datenbank"
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr "Typ passt nicht"
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr "SchlЭsseloperation auf ein Verzeichnis"
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr "Verzeichnisoperation auf einen SchlЭssel"
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr "Kan bestehenden schreibgeschЭtzten Wert nicht Эberschreiben"
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr "OAF-Fehler"
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr "Operation ohne Konfigurationsserver nicht erlaubt"
 
-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 msgid "Failed to get a lock"
 msgstr "Konnte nicht sichern"
 
-#: gconf/gconf-glib.c:631
+#: gconf/gconf-glib.c:629
 #, c-format
 msgid ""
 "Error on line %d char %d: %s\n"
@@ -412,7 +436,7 @@ msgstr ""
 "Fehler in Zeile %d Zeichen %d: %s\n"
 "(Der umgebende Text war '%s')\n"
 
-#: gconf/gconf-glib.c:751
+#: gconf/gconf-glib.c:749
 #, fuzzy
 msgid ""
 "Text ended in the middle of an entity, or entity name too long to be valid "
@@ -421,7 +445,7 @@ msgstr ""
 "Text endete mitten in einem Objekts, oder Objektname ist zu lang, um gЭltig "
 "zu sein ('&' sollte am Anfang eines Objekt mit '&quot;' stehen)"
 
-#: gconf/gconf-glib.c:803
+#: gconf/gconf-glib.c:801
 #, fuzzy, c-format
 msgid ""
 "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
@@ -429,12 +453,12 @@ msgstr ""
 "Unbekanntes Objekt '%s' ('&' muss am Anfang eines Objekt mit &amp; &quot; "
 "&lt; &gt; &apos; starten)"
 
-#: gconf/gconf-glib.c:843
+#: gconf/gconf-glib.c:841
 msgid ""
 "Markup text ended in the middle of a character reference, just after '&#'"
 msgstr "Markierter Text endete mitten in einer Zeichenreferenz, bei '&#'"
 
-#: gconf/gconf-glib.c:869
+#: gconf/gconf-glib.c:867
 #, c-format
 msgid ""
 "Character reference contained non-digit '%s' ('&#' should begin a reference "
@@ -443,7 +467,7 @@ msgstr ""
 "Zeichenreferenz enhielt `non-digit' '%s' ('&#' sollte am Anfang einer "
 "Referenz mit einem Unicode Zeichen stehen, z.B. '&#2342;')"
 
-#: gconf/gconf-glib.c:893
+#: gconf/gconf-glib.c:891
 msgid ""
 "Text ended in the middle of an character reference ('&#' should begin a "
 "character reference such as '&#2342;')"
@@ -451,7 +475,7 @@ msgstr ""
 "Text endete in der Mitte einer Zeichenreferenz ('&#' sollte am Anfang einer "
 "Zeichenreferenz stehen, z.B. '&#2342;')"
 
-#: gconf/gconf-glib.c:918
+#: gconf/gconf-glib.c:916
 #, c-format
 msgid ""
 "Couldn't parse character reference '%s' ('&#' must begin a character "
@@ -460,7 +484,7 @@ msgstr ""
 "Konnte Zeichenreferenz '%s' nicht parsen ('&#' muss am Anfang einer "
 "Zeichenreferenz stehen, z.B. '&#2342;')"
 
-#: gconf/gconf-glib.c:940
+#: gconf/gconf-glib.c:938
 #, c-format
 msgid ""
 "Character code %#lx is not allowed in XML documents or is not a valid "
@@ -469,7 +493,7 @@ msgstr ""
 "Zeichen Code %#lx ist in XML-Dokumenten nicht erlaubt oder ist kein gЭltiges "
 "Unicode Zeichen"
 
-#: gconf/gconf-glib.c:1015
+#: gconf/gconf-glib.c:1013
 #, fuzzy
 msgid ""
 "Documented ended just after an '&', '&' should begin an entity or character "
@@ -478,7 +502,7 @@ msgstr ""
 "Dokument endete genau nach einem '&', '&' sollte mit einem Objekt oder einer "
 "Zeichenreferenz beginnen"
 
-#: gconf/gconf-glib.c:1029
+#: gconf/gconf-glib.c:1027
 msgid ""
 "'<' or '>' character not allowed here; only allowed around tags, for example "
 "<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
@@ -488,26 +512,26 @@ msgstr ""
 "z.B. <bold> oder <paragraph>. Um sie sonst zu verwenden, bitte &lt; and &gt; "
 "benutzen"
 
-#: gconf/gconf-glib.c:1084
+#: gconf/gconf-glib.c:1082
 #, c-format
 msgid "Character '%s' is not valid at the start of an attribute name"
 msgstr "Zeichen '%s' ist am Anfang eines Attributnamens ungЭltig"
 
-#: gconf/gconf-glib.c:1111
+#: gconf/gconf-glib.c:1109
 msgid "Document ended just after attribute name"
 msgstr "Dokument hЖrte genau nach einem Attributnamen auf"
 
-#: gconf/gconf-glib.c:1122
+#: gconf/gconf-glib.c:1120
 msgid "Attribute name must be immediately followed by an '=' character"
 msgstr "Nach einem Attributnamen muss sofort ein '=' Zeichen folgen"
 
-#: gconf/gconf-glib.c:1137
+#: gconf/gconf-glib.c:1135
 msgid ""
 "'=' character after attribute must be immediately followed by an '\"' "
 "character"
 msgstr "'=' Zeichen muss unmittelbar nach einem'\"' Zeichen stehen"
 
-#: gconf/gconf-glib.c:1163
+#: gconf/gconf-glib.c:1161
 #, c-format
 msgid ""
 "Character '%c' found inside an attribute value; perhaps your attribute value "
@@ -516,7 +540,7 @@ msgstr ""
 "Zeichen '%c' wurde in einem Attributwert gefunden; vielleicht fehlt bei "
 "Ihrem Attributwert das schlieъende AnfЭhrungszeichen '\"'"
 
-#: gconf/gconf-glib.c:1183
+#: gconf/gconf-glib.c:1181
 msgid ""
 "Ran out of text before a quote mark ('\"') was seen at the end of an "
 "attribute value"
@@ -524,40 +548,40 @@ msgstr ""
 "Text ging Эber ein AnfЭhrungszeichen ('\"') hinaus. Es wurde kein "
 "AnfЭhrungszeichen gefunden"
 
-#: gconf/gconf-glib.c:1196
+#: gconf/gconf-glib.c:1194
 msgid ""
 "Text ends immediately after an attribute value, before the element was closed"
 msgstr ""
 "Text endete unmittelbar nach einem Attributwert, bevor Эberhaupt das Element "
 "geschlossen wurde"
 
-#: gconf/gconf-glib.c:1510
+#: gconf/gconf-glib.c:1508
 msgid "Missing '<' at start of element"
 msgstr "'<' fehlt am Anfang des Elements"
 
-#: gconf/gconf-glib.c:1521
+#: gconf/gconf-glib.c:1519
 msgid "Document ended just after '<' character"
 msgstr "Dokument endete genau nach einem '<' Zeichen"
 
-#: gconf/gconf-glib.c:1549
+#: gconf/gconf-glib.c:1547
 msgid "No closing '>' found for a <? or <!"
 msgstr "Kein schlieъendes '>' gefunden fЭr <? oder <!"
 
-#: gconf/gconf-glib.c:1578
+#: gconf/gconf-glib.c:1576
 #, c-format
 msgid "Character '%s' is not valid at the start of an element name"
 msgstr "Zeichen '%s' ist am Anfang eines Elementnamens nicht erlaubt"
 
-#: gconf/gconf-glib.c:1602 gconf/gconf-glib.c:1615
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
 msgid "Document ended just after element name, no '>' seen"
 msgstr "Dokument endete genau nach einem Elementnamen, kein '>' gefunden"
 
-#: gconf/gconf-glib.c:1640
+#: gconf/gconf-glib.c:1638
 #, c-format
 msgid "Elements should be closed with '>' or '/>', not with '%s'"
 msgstr "Elemente sollten mit '>' oder '/>' geschlossen werden, nicht mit '%s'"
 
-#: gconf/gconf-glib.c:1657
+#: gconf/gconf-glib.c:1655
 msgid ""
 "Element ended just after '/', no '>' seen; empty elements should end with "
 "'/>'"
@@ -565,40 +589,40 @@ msgstr ""
 "Element endete ganau nach '/', '>' wurde nicht gefunden; leere Elemente "
 "sollten mit einem '/>' geschlossen werden"
 
-#: gconf/gconf-glib.c:1696
+#: gconf/gconf-glib.c:1694
 msgid "Close tag not found at end of element"
 msgstr "Tag zum Schlieъen am Ende des Elements nicht gefunden"
 
-#: gconf/gconf-glib.c:1711
+#: gconf/gconf-glib.c:1709
 msgid "Close tag ends just after '<' character"
 msgstr "Tag zum Schlieъen endet genau nach '<' Zeichen"
 
-#: gconf/gconf-glib.c:1725
+#: gconf/gconf-glib.c:1723
 msgid "Close tag should begin with '</', '/' character is missing"
 msgstr ""
 "Tag zum Schlieъen sollte mit einem '</' Zeichen beginnen, '/' Zeichen fehlt"
 
-#: gconf/gconf-glib.c:1739
+#: gconf/gconf-glib.c:1737
 msgid "Close tag ends just after '/' character"
 msgstr "Tag zum Schlieъen endet genau nach einem '/' Zeichen"
 
-#: gconf/gconf-glib.c:1774
+#: gconf/gconf-glib.c:1772
 msgid "Document ended just after element name in close tag, no '>' seen"
 msgstr ""
 "Dokument endete genau nach Elementnamen im Tag fЭr Schlieъen, '>' wurde "
 "nicht gefunden"
 
-#: gconf/gconf-glib.c:1790
+#: gconf/gconf-glib.c:1788
 msgid "Document ended just after close tag name, no '>' seen"
 msgstr ""
 "Dokument endete genau nach Tag Name fЭr Schlieъen, '>' wurde nicht gefunden"
 
-#: gconf/gconf-glib.c:1809
+#: gconf/gconf-glib.c:1807
 #, c-format
 msgid "Close tag '%s' does not match opening tag '%s'"
 msgstr "Tag fЭr Schlieъen '%s' passt nicht zum Tag fЭr жffnen '%s'"
 
-#: gconf/gconf-glib.c:2147
+#: gconf/gconf-glib.c:2145
 #, c-format
 msgid ""
 "Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
@@ -607,131 +631,136 @@ msgstr ""
 "UngЭltiges UTF-8 Zeichen bei Byte %d im markierten Text. Der Text vor dem "
 "falschen Zeichen war '%s'"
 
-#: gconf/gconf-glib.c:2204
+#: gconf/gconf-glib.c:2202
 msgid "The marked-up text contained nothing but whitespace."
 msgstr "Dieser markierte Text enthielt nicht mehr als nur Leerzeichen."
 
-#: gconf/gconf-glib.c:10668
+#: gconf/gconf-glib.c:10666
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Konnte Datei `%s' nicht Жffnen: %s"
 
-#: gconf/gconf-glib.c:10685
+#: gconf/gconf-glib.c:10683
 #, c-format
 msgid "Error reading file '%s': %s"
 msgstr "Fehler beim Lesen der Datei '%s': %s"
 
-#: gconf/gconf-internals.c:100
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Kein `/' in SchlЭssel `%s'"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Konnte CORBA-Wert fЭr Listenelement nicht interpretieren"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "UngЭltiger Typ fЭr Listenelement in %s"
 
-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "Habe Liste von gconfd mit falschem Listentyp empfangen"
 
-#: gconf/gconf-internals.c:798
+#: gconf/gconf-internals.c:445
+#, fuzzy
+msgid "Failed to convert object to IOR"
+msgstr "Konnte ein oder mehrere Quellen nicht synchronisieren: %s"
+
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Konnte Pfaddatei `%s' nicht Жffnen: %s\n"
 
-#: gconf/gconf-internals.c:853
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "FЭge Quelle `%s' hinzu\n"
 
-#: gconf/gconf-internals.c:865
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Lesefehler auf Datei `%s': %s\n"
 
-#: gconf/gconf-internals.c:1307
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Habe Liste erwartet, erhielt %s"
 
-#: gconf/gconf-internals.c:1317
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Habe Liste von %s erwartet, erhielt Liste von %s"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Habe Paar erwartet, erhielt %s"
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Habe Paar (%s,%s) erwartet, erhielt ein Paar, bei dem ein oder beide Werte "
 "fehlten"
 
-#: gconf/gconf-internals.c:1486
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Habe Paar von Typ (%s,%s) erwartet, erhielt Typ (%s,%s)"
 
-#: gconf/gconf-internals.c:1602
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Zeichenkette in AnfЭhrungszeichen beginnt nicht mit AnfЭhrungszeichen"
 
-#: gconf/gconf-internals.c:1664
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Zeichenkette in AnfЭhrungszeichen endet nicht mit AnfЭhrungszeichen"
 
-#: gconf/gconf-internals.c:2144 gconf/gconf.c:2780
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-Fehler: %s"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "Versuch, nicht aufgelistetes OAF-Objektverzeichnis zu entfernen"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "Versuch, bereits aufgelistetes OAF-Verzeichnis hinzuzufЭgen"
 
-#: gconf/gconf-internals.c:2176
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF-Parserfehler: %s"
 
-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Unbekannter OAF-Fehler"
 
-#: gconf/gconf-internals.c:2264
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Keine ior-Datei in `%s'"
 
-#: gconf/gconf-internals.c:2295
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd erhДlt Sperre `%s' von einem anderen Prozess"
 
-#: gconf/gconf-internals.c:2306
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Ein anderes Programm hat die Sperre `%s'"
 
-#: gconf/gconf-internals.c:2326
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 "Konnte keinen Kontakt mit ORB aufnehmen, um existierenden gconfd zu pingen"
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -740,44 +769,44 @@ msgstr ""
 "Entferne verfallene Sperre `%s', da IOR nicht in Objektreferenz umgewandelt "
 "werden konnte, IOR `%s'"
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "Entferne verfallene Sperre `%s' auf Grund Fehlers beim Pingen des Servers: %s"
 
-#: gconf/gconf-internals.c:2358
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf-KonfigurationsdДmon (gconfd) hat Sperre `%s'"
 
-#: gconf/gconf-internals.c:2372
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "Konnte Verzeichnis `%s' nicht anlegen: %s"
 
-#: gconf/gconf-internals.c:2407
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Kann Sperre `%s' nicht anlegen: %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kann nicht in Datei `%s' schreiben: %s"
 
-#: gconf/gconf-internals.c:2486
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "Kann Sperrdatei `%s' nicht Жffnen; nehme an, dass sie nicht Ihnen gehЖrt: %s"
 
-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "BeschДdigte Sperrdatei `%s', entferne sie sowieso"
 
-#: gconf/gconf-internals.c:2513
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -786,26 +815,26 @@ msgstr ""
 "Habe Sperrdatei `%s' (Erzeuger-PID %u, unsere PID %u) nicht angelegt; nehme "
 "an, dass uns jemand die Sperre weggenommen hat"
 
-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Konnte Sperrverzeichnis `%s' nicht freigeben: %s"
 
-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Fehler beim Laden der Quelle %s: %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Schema %s, abgegeben fЭr %s speichert einen nicht-schematischen Wert"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Der Name '/' kann nur ein Verzeichnis sein, kein SchlЭssel"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -814,105 +843,105 @@ msgstr ""
 "Wert fЭr '%s' gesetzt in einem Read-Only Bereich am Anfang des "
 "Konfigurationspfades."
 
-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Fehler beim Finden der Meta-Informationen: %s"
 
-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Fehler beim Ermitteln der Meta-Informationen: %s"
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 "SchlЭssel '%s', gelistet als Schema fЭr SchlЭssel '%s' hat aktuell Typ '%s'"
 
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Verstehe %s nicht (erwarte Ganzzahl)"
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Ganzzahl %s ist zu gross oder zu klein"
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Verstehe %s nicht (erwalte Zahl)"
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "verstehe %s nicht (erwarte Wahr oder Falsch)"
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "verstehe %s nicht (Liste muss mit einem '[' beginnen)"
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "Verstehe %s nicht (Liste muss mit einem ']' enden)"
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 "Verstehe %s nicht (zusДtzliches, uncodiertes ']' in der Liste gefunden)"
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "Verstehe %s nicht (zusДtzliche fЭhrende Zeichen)"
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "verstehe %s nicht (ein Paar muss mit einem '(' beginnen)"
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "verstehe %s nicht (ein Paar muss mit einem ')' enden)"
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "Verstehe %s nicht (falsch Anzahl von Elementen)"
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "Verstehe %s nicht (zusДtzliches Uncodiertes ')' im Paar gefunden)"
 
-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:300
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Server konnte Adresse `%s' nicht auflЖsen"
 
-#: gconf/gconf.c:561
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 "Kann keine Benachrichtigungen zu einer lokalen Konfigurationsquelle "
 "hinzufЭgen"
 
-#: gconf/gconf.c:1626
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Pingen des Servers fehlgeschlagen, CORBA-Fehler: %s"
 
-#: gconf/gconf.c:1642
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -923,66 +952,66 @@ msgstr ""
 "das Problem erklДren wЭrde. Bitte schicken Sie einen Fehlerbericht zu OAF "
 "ein."
 
-#: gconf/gconf.c:1909
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Konnte GConf nicht initialisieren, breche ab\n"
 
-#: gconf/gconf.c:1946
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Muss mit einem SchrДgstrich beginnen (/)"
 
-#: gconf/gconf.c:1968
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kann keine zwei SchrДgstriche (/) hintereinander haben"
 
-#: gconf/gconf.c:1970
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kann keinen Punkt (.) direkt hinter einem SchrДgstrich (/) haben"
 
-#: gconf/gconf.c:1991
+#: gconf/gconf.c:1962
 #, 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:2005
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "SchlЭssel/Verzeichnis darf nicht mit einem SchrДgstrich (/) enden"
 
-#: gconf/gconf.c:2252
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fehler beim Herunterfahren des Konfigurationsservers: %s"
 
-#: gconf/gconf.c:2313
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Habe float erwartet, erhielt %s"
 
-#: gconf/gconf.c:2348
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Habe int erwartet, erhielt %s"
 
-#: gconf/gconf.c:2383
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Habe Zeichenkette erwartet, erhielt %s"
 
-#: gconf/gconf.c:2420
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Habe bool erwartet, erhielt %s"
 
-#: gconf/gconf.c:2453
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Habe Schema erwartet, erhielt %s"
 
-#: gconf/gconfd.c:200
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Beendigungsanfrage empfangen"
 
-#: gconf/gconfd.c:232
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -990,7 +1019,7 @@ msgstr ""
 "gconfd mit Fehlerdiagnose compiliert; versuche, gconf.path aus dem "
 "Quellverzeichnis zu laden"
 
-#: gconf/gconfd.c:250
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -998,7 +1027,7 @@ msgstr ""
 "Keine Konfigurationsdateien gefunden, versuche, die voreingestellte "
 "Konfigurationsquelle `%s' zu benutzen"
 
-#: gconf/gconfd.c:259
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1006,12 +1035,12 @@ msgstr ""
 "Keine Konfigurationsquellen im Quellpfad, Konfiguration wird nicht "
 "gespeichert werden; "
 
-#: gconf/gconfd.c:273
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Fehler beim Laden von Konfigurationsquellen: %s"
 
-#: gconf/gconfd.c:285
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1019,36 +1048,37 @@ msgstr ""
 "Keine Konfigurations-Quelladressen erfolgreich aufgelЖst, kann "
 "Konfigurationsdaten nicht laden oder speichern"
 
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:287
+#, fuzzy
 msgid ""
-"No writeable config sources successfully resolved, may not be able to save "
+"No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 "Keine schreibbaren Konfigurationsquellen konnten erfolgreich aufgelЖst "
 "werden; werde manche KonfigurationsДnderungen nicht speichern kЖnnen"
 
-#: gconf/gconfd.c:327 gconf/gconfd.c:339
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr "Habe Signal %d erhalten, fahre herunter"
 
-#: gconf/gconfd.c:344
-#, c-format
-msgid "Received signal %d, ignoring"
-msgstr "Habe Signal %d erhalten, ignoriere es"
+#: gconf/gconfd.c:329
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down cleanly"
+msgstr "Habe Signal %d erhalten, fahre herunter"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:390
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "starte (version %s), PID %u, Benutzer `%s'"
 
-#: gconf/gconfd.c:394
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr "GConf wurde mit Debugging Funktionen kompiliert"
 
-#: gconf/gconfd.c:417
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -1056,11 +1086,11 @@ msgstr ""
 "Konnte Object Activation Framework nicht initialisieren; bitte schicken Sie "
 "einen Fehlerbericht an die Paketpfleger von OAf"
 
-#: gconf/gconfd.c:437
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Konnte Objektreferenz fЭr ConfigServer nicht erhalten"
 
-#: gconf/gconfd.c:457
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -1068,101 +1098,150 @@ msgstr ""
 "OAF kennt unsere IID nicht; dies weist auf eine beschДdigte Installation "
 "hin; kann nicht registrieren; breche ab\n"
 
-#: gconf/gconfd.c:461
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Ein anderer gconfd ist bereits im OAF registriert; breche ab\n"
 
-#: gconf/gconfd.c:466
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Unbekannter Fehler beim Registrieren von gconfd im OAF; breche ab\n"
 
-#: gconf/gconfd.c:487
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Breche ab"
 
-#: gconf/gconfd.c:811
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Gebe Ausnahmezustand zurЭck: %s"
 
-#: gconf/gconfd.c:869
+#: gconf/gconfd.c:885
 #, c-format
-msgid "Failed to create ~/.gconfd/saved_state to record gconfd's state: %s"
+msgid ""
+"Failed to open gconfd logfile; won't be able to restore listeners after "
+"gconfd shutdown (%s)"
 msgstr ""
-"~/.gconfd/saved_state konnte nicht erstellt werden, um den gconfd-Status %s "
-"aufzuzeichnen"
 
-#: gconf/gconfd.c:876
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Failed to write ~/.gconfd/saved_state to record gconfd's state: %s"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
-"~/.gconfd/saved_state konnte nicht geschrieben werden, um den gconfd-Status "
-"%s aufzuzeichnen"
 
-#: gconf/gconfd.c:905 gconf/gconfd.c:997
-#, c-format
-msgid "Didn't understand element '%s' in saved state file"
+#: gconf/gconfd.c:966
+#, fuzzy, c-format
+msgid "Could not open saved state file '%s' for writing: %s"
+msgstr "жffnen der gespeicherten Status Datei '%s' nicht mЖglich: %s"
+
+#: gconf/gconfd.c:980
+#, fuzzy, c-format
+msgid "Could not write saved state file '%s' fd: %d: %s"
+msgstr ""
+"Wiederherstellen des gespeicherten Status aus Datei '%s' gescheitert: %s"
+
+#: gconf/gconfd.c:989
+#, fuzzy, c-format
+msgid "Failed to close new saved state file '%s': %s"
+msgstr "жffnen der gespeicherten Status Datei '%s' nicht mЖglich: %s"
+
+#: gconf/gconfd.c:1003
+#, fuzzy, c-format
+msgid "Could not move aside old saved state file '%s': %s"
+msgstr "жffnen der gespeicherten Status Datei '%s' nicht mЖglich: %s"
+
+#: gconf/gconfd.c:1013
+#, fuzzy, c-format
+msgid "Failed to move new save state file into place: %s"
+msgstr "жffnen der gespeicherten Status Datei '%s' nicht mЖglich: %s"
+
+#: gconf/gconfd.c:1022
+#, fuzzy, c-format
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr ""
+"Wiederherstellen des gespeicherten Status aus Datei '%s' gescheitert: %s"
+
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
 msgstr "verstehe Element '%s' in gespeichertem Status nicht"
 
-#: gconf/gconfd.c:916
-msgid "No location attribute on listener element in saved state file"
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
 msgstr ""
+"Wiederherstellen des gespeicherten Status aus Datei '%s' gescheitert: %s"
 
-#: gconf/gconfd.c:923
-msgid "No IOR attribute on listener element in saved state file"
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
 msgstr ""
+"Wiederherstellen des gespeicherten Status aus Datei '%s' gescheitert: %s"
 
-#: gconf/gconfd.c:930
-msgid "No connection ID attribute on listener element in saved state file"
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
 msgstr ""
+"Wiederherstellen des gespeicherten Status aus Datei '%s' gescheitert: %s"
 
-#: gconf/gconfd.c:1018
-msgid "Strange non-element node in saved state file"
-msgstr "Seltsames nich-Element `Node' in gespeicherter Status Datei"
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr ""
+"Wiederherstellen des gespeicherten Status aus Datei '%s' gescheitert: %s"
 
-#: gconf/gconfd.c:1047
-#, c-format
-msgid "Unable to open saved state file '%s': %s"
-msgstr "жffnen der gespeicherten Status Datei '%s' nicht mЖglich: %s"
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
 
-#: gconf/gconfd.c:1060
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Failed to restore saved state from file '%s': %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
-"Wiederherstellen des gespeicherten Status aus Datei '%s' gescheitert: %s"
 
-#: gconf/gconfd.c:1069
-msgid "Root node of saved state file should be an element"
-msgstr "`Root node' der gespeicherten Status Datei sollte ein Element sein"
+#: gconf/gconfd.c:1377
+#, c-format
+msgid "Unable to open saved state file '%s': %s"
+msgstr "жffnen der gespeicherten Status Datei '%s' nicht mЖglich: %s"
 
-#: gconf/gconfd.c:1079
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Root node of saved state file should be 'gconfd_logfile', not '%s'"
+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 ""
-"`Root node' der gespeicherten Status Datei sollte 'gconfd_logfile' sein, "
-"nicht '%s'"
 
-#: gconf/gconfd.c:1092
-msgid "Funny non-element node under <gconfd_logfile> in saved state file"
+#: gconf/gconfd.c:1481
+#, 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 ""
-"Seltsames nicht-Element `Node' unter <gconfd_logfile> in gespeicherter "
-"Status Datei"
 
-#: gconf/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Hilfeoptionen"
 
-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 "Einen SchlЭsse auf einen Wert einstellen und synchronisieren. Mit --type "
 "benutzen."
 
-#: gconf/gconftool.c:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Den Wert eines SchlЭssels auf der Standardausgabe ausgeben."
 
-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -1170,38 +1249,38 @@ msgstr ""
 "Ein Schema einstellen und synchronisieren. Mit --short-desc, --long-desc, "
 "--owner und --type benutzen."
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "Die SchlЭssel auf der Kommandozeile lЖschen"
 
-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Alle SchlЭssel/Wert-Paare in einem Verzeichnis ausgeben."
 
-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Alle Unterverzeichnisse in einem Verzeichnis ausgeben."
 
-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Alle Unterverzeichnisse und EintrДge unterhalb eines Verzeichnisses rekursiv "
 "ausgeben."
 
-#: gconf/gconftool.c:149
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "0 zurЭckgeben, wenn Verzeichnis existiert, andernfalls 2."
 
-#: gconf/gconftool.c:158
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 "gconfd herunterfahren. DIESE OPTION NICHT OHNE EINEN GUTEN GRUND BENUTZEN."
 
-#: gconf/gconftool.c:167
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "0 zurЭckgeben, wenn gconfd lДuft, andernfalls 2."
 
-#: gconf/gconftool.c:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1209,7 +1288,7 @@ msgstr ""
 "Den Konfigurationsserver (gconfd) starten. (Passiert normalerweise "
 "automatisch wenn nЖtig.)"
 
-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1217,11 +1296,11 @@ msgstr ""
 "Gibt den Typ des einzustellenden Wertes ein, oder aber den Typ eines Wertes, "
 "den ein Schema beschreibt. Eindeutige AbkЭrzungen werden akzeptiert."
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1229,11 +1308,11 @@ msgstr ""
 "Gibt den Typ des einzustellenden Wertes ein, oder aber den Typ eines Wertes, "
 "den ein Schema beschreibt. Eindeutige AbkЭrzungen werden akzeptiert."
 
-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1241,7 +1320,7 @@ msgstr ""
 "Gibt den Typ des car Paares ein, oder aber den Typ eines Wertes, den ein "
 "Schema beschreibt. Eindeutige AbkЭrzungen werden akzeptiert."
 
-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1249,46 +1328,46 @@ msgstr ""
 "Gibt den Typ des cdr Paares ein, oder aber den Typ eines Wertes, den ein "
 "Schema beschreibt. Eindeutige AbkЭrzungen werden akzeptiert."
 
-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "Gibt eine kurze, halbzeile Beschreibung an, die in ein Schema einflieъt."
 
-#: gconf/gconftool.c:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "BESCHREIBUNG"
 
-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "Gibt eine vielzeilige Beschreibung an, die in ein Schema einflieъt."
 
-#: gconf/gconftool.c:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "Gibt den Besitzer eines Schemas an"
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "BESITZER"
 
-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "Gibt die zu installierende Schemadatei an"
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "DATEINAME"
 
-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Gibt eine Konfigurationsquelle an, die statt des voreingestellten Pfades zu "
 "verwenden ist"
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "QUELLE"
 
-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1296,7 +1375,7 @@ msgstr ""
 "Direkt auf die Konfigurationsdatenbank zugreifen, ohne den Server zu "
 "verwenden. Setzt voraus, dass gconfd nicht lДuft."
 
-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1307,7 +1386,7 @@ msgstr ""
 "Konfigurationsquelle als die voreingestellte gesetzt sein oder zur "
 "Verwendung der Voreinstellung die leere Zeichenkette enthalten."
 
-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1315,7 +1394,7 @@ msgstr ""
 "Eine Anwendung foltern, indem ein Haufen Werte verschiedener Typen fЭr die "
 "SchlЭssel auf der Kommandozeile gesetzt und gelЖscht wird."
 
-#: gconf/gconftool.c:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1323,7 +1402,7 @@ msgstr ""
 "Eine Anwendung foltern, indem ein Haufen SchlЭssel in den auf der "
 "Kommandozeile angegebenen Verzeichnissen gesetzt und gelЖscht wird."
 
-#: gconf/gconftool.c:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1333,23 +1412,23 @@ msgstr ""
 "`%s --help' auffЭhren, um eine vollstДndige Liste verfЭgbarer\n"
 "Kommandozeilenoptionen auszugeben.\n"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Kann nicht gleichzeitig abrufen und setzen/lЖschen\n"
 
-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Kann nicht gleichzeitig setzen und abrufen/lЖschen\n"
 
-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "Kann --all-pairs nicht mit --get oder --set verwenden\n"
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Kann --all-dirs nicht mit --get oder --set verwenden\n"
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1357,7 +1436,7 @@ msgstr ""
 "--recursive-list sollte nicht mit --get, --set, --unset, --all-pairs oder "
 "--all-dirs verwendet werden\n"
 
-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1365,58 +1444,58 @@ msgstr ""
 "--set_schema sollte nicht mit --get, --set, --unset, --all-pairs oder "
 "--all-dirs verwendet werden\n"
 
-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Werttyp ist nur beim Setzen eines Wertes von Belang\n"
 
-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "Beim Setzen eines Wertes muss ein Typ angegeben werden\n"
 
-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping-Option muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "Option --dir-exists muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "Option --install-schema-file muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "Option --makefile-install-rule muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "Option --break-key muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "Option --break-directory muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 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:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Konnte GConf nicht initialisieren: %s\n"
 
-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Umgebungsvariable GCONF_CONFIG_SOURCE muss gesetzt sein\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1429,212 +1508,212 @@ msgstr ""
 "sichersten geschieht dies, wenn keine Anwendungen laufen\n"
 "(auch, wenn theoretisch auch alles funktioniert, wenn welche laufen).\n"
 
-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Konnte nicht auf Konfigurationsquelle(n) zugreifen: %s\n"
 
-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Fehler beim Herunterfahren: %s\n"
 
-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 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:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "Fehler beim Auflisten von Paaren in `%s': %s"
 
-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(kein Wert eingestellt)"
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Konnte den Konfigurationsserver (gconfd) nicht starten: %s\n"
 
-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 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:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listen-Typ: %s\n"
 
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "car-Typ: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "cdr.Typ: %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Besitzer: %s\n"
 
-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "GelЖscht"
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kurzbeschr.: %s\n"
 
-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Langbeschr.: %s\n"
 
-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Kein Wert eingestellt fЭr `%s'\n"
 
-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Konnte Wert fЭr `%s' nicht abrufen: %s\n"
 
-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Verstehe Typ `%s' nicht\n"
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 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:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Kein einzustellender Wert fЭr SchlЭssel `%s'\n"
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Kann kein Schema als Wert setzen\n"
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Wenn eine Liste gesetzt wird, muss man eine einfache Liste angeben\n"
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Wenn eine Liste gesetzt wird, muss man einfache car- und cdr-Typen angeben\n"
 
-#: gconf/gconftool.c:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fehler: %s\n"
 
-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Fehler beim Einstellen des Wertes: %s"
 
-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Fehler beim Synchronisieren: %s"
 
-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 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:1161
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Listen-Typ muss ein einfacher Typ sein: string, int, float oder bool\n"
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1169
 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:1201
+#: gconf/gconftool.c:1189
 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:1245
+#: gconf/gconftool.c:1233
 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/Wert-Paare angeben.\n"
 
-#: gconf/gconftool.c:1259
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Sie mЭssen ein oder mehrere zu lЖschende SchlЭssel angeben.\n"
 
-#: gconf/gconftool.c:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Fehler beim LЖschen von `%s': %s\n"
 
-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 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:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Fehler beim Auflisten der Verzeichnisse. %s\n"
 
-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, 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:1378
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "WARNUNG: ungЭltiger oder fehlender Listen-Typ fЭr Schema (%s)\n"
 
-#: gconf/gconftool.c:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "WARNUNG: Konnte voreingestellten Wert `%s' fЭr Schema (%s) nicht parsen\n"
 
-#: gconf/gconftool.c:1407
+#: gconf/gconftool.c:1395
 #, 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:1432
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "WARNUNG: Sie kЖnnen keinen Standardwert fЭr ein Schema angeben\n"
 
-#: gconf/gconftool.c:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "WARNUNG: interner gconftool-Fehler, unbekannter GConfValueType\n"
 
-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "WARNUNG: konnte Typname `%s' nicht parsen\n"
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1642,38 +1721,38 @@ msgstr ""
 "Warnung: Listen-Typ can nur int, float, string oder bool sein, aber nicht "
 "%s\n"
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "Warnung: car-Typ can nur int, float, string oder bool sein, aber nicht %s\n"
 
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "Warnung: cdr-Typ can nur int, float, string oder bool sein, aber nicht %s\n"
 
-#: gconf/gconftool.c:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "WARNUNG: leerer <applyto>-Knoten"
 
-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, 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:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "WARNUNG: kein SchlЭssel fЭr Schema angegeben\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "WARNUNG: Knoten <locale> hat kein Attribut `name=\"locale\"', ignoriere "
 "dies\n"
 
-#: gconf/gconftool.c:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1681,51 +1760,51 @@ msgstr ""
 "WARNUNG: Mehrere <locale>-Knoten fЭr Locale `%s', ignoriere alle hinter dem "
 "ersten\n"
 
-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, 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:1757
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "WARNUNG: Konnte Schema `%s', Locale `%s', nicht installieren: %s\n"
 
-#: gconf/gconftool.c:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Habe Schema `%s' fЭr Locale `%s' installiert\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "WARNUNG: konnte Schema `%s' nicht mit SchlЭssel `%s' verknЭpfen: %s\n"
 
-#: gconf/gconftool.c:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Habe Schema `%s' an SchlЭssel `%s' gekoppelt\n"
 
-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 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:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "WARNUNG: Knoten <%s> ist unterhalb von <schemalist> unverstДndlich\n"
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Konnte `%s' nicht Жffnen. %s\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument `%s' ist leer?\n"
 
-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1734,27 +1813,27 @@ msgstr ""
 "Dokument `%s' hat den falschen Typ von Wurzelknoten (<%s>, sollte "
 "<gconfschemafile> sein)\n"
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, 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:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 "WARNUNG: Knoten <%s> ist unverstДndlich unterhalb von <gconfschemafile>\n"
 
-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Fehler beim Synchronisieren von Konfigurationsdaten: %s"
 
-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Sie mЭssen Schemadateien zum Installieren angeben\n"
 
-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1763,16 +1842,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Konnte zu beschДdigenden SchlЭssel %s nicht lЖschen: %s\n"
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "Sie mЭssen zu beschДdigende SchlЭssel angeben\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1782,11 +1861,11 @@ msgstr ""
 "beschДdigen:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "Sie mЭssen zu beschДdigende Verzeichnisse angeben\n"
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1802,7 +1881,36 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf-Warnung: Fehler beim Auflisten von Paaren in `%s': %s"
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Erwartete %s, erhielt %s fЭr den SchlЭssel %s"
+
+#~ msgid "Received signal %d, ignoring"
+#~ msgstr "Habe Signal %d erhalten, ignoriere es"
+
+#~ msgid "Failed to create ~/.gconfd/saved_state to record gconfd's state: %s"
+#~ msgstr ""
+#~ "~/.gconfd/saved_state konnte nicht erstellt werden, um den gconfd-Status %s "
+#~ "aufzuzeichnen"
+
+#~ msgid "Failed to write ~/.gconfd/saved_state to record gconfd's state: %s"
+#~ msgstr ""
+#~ "~/.gconfd/saved_state konnte nicht geschrieben werden, um den gconfd-Status "
+#~ "%s aufzuzeichnen"
+
+#~ msgid "Strange non-element node in saved state file"
+#~ msgstr "Seltsames nich-Element `Node' in gespeicherter Status Datei"
+
+#~ msgid "Root node of saved state file should be an element"
+#~ msgstr "`Root node' der gespeicherten Status Datei sollte ein Element sein"
+
+#~ msgid "Root node of saved state file should be 'gconfd_logfile', not '%s'"
+#~ msgstr ""
+#~ "`Root node' der gespeicherten Status Datei sollte 'gconfd_logfile' sein, "
+#~ "nicht '%s'"
+
+#~ msgid "Funny non-element node under <gconfd_logfile> in saved state file"
+#~ msgstr ""
+#~ "Seltsames nicht-Element `Node' unter <gconfd_logfile> in gespeicherter "
+#~ "Status Datei"
diff --git a/po/el.po b/po/el.po
index 3285c6d6..bd7c149d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 0.3\n"
-"POT-Creation-Date: 2000-08-19 16:51-0400\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-02-02 15:00+0200\n"
 "Last-Translator: Sarantis Paskalis <paskalis@di.uoa.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -14,31 +14,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # backends/xml-backend.c:247

-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "еЙЖОЯТЧМЕТАИ Г ЛОМэДА УПОСТчЯИНГР XML"
 
 # backends/xml-backend.c:300

-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "еЩЯЕСГ ЯИФИЙОЩ ЙАТАКЭЦОУ XML АДЩМАТГ СТГ ДИЕЩХУМСГ `%s'"
 
 # backends/xml-backend.c:315

-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "дГЛИОУЯЦъА ЙАТАКЭЦОУ АДЩМАТГ `%s': %s"
 
 # backends/xml-backend.c:400

-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 "аДЩМАТГ Г АМэЦМЫСГ ч ЕЦЦЯАЖч СТО ЯИФИЙЭ ЙАТэКОЦО XML СТГ ДИЕЩХУМСГ `%s'"
 
 # backends/xml-backend.c:410

-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
@@ -46,28 +46,28 @@ msgstr ""
 "ЕъМАИ: %o%o"
 
 # backends/xml-backend.c:694

-#: backends/xml-backend.c:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr "аЯВИЙОПОИЕъТАИ Г ЛОМэДА УПОСТчЯИНГР XML"
 
 # backends/xml-backend.c:759

-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "аДЩМАТГ Г ПАЯэДОСГ ЙКЕИДЧЛАТОР СТОМ ЙАТэКОЦО XML `%s': %s"
 
-#: backends/xml-cache.c:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -75,95 +75,95 @@ msgid ""
 msgstr ""
 
 # backends/xml-backend.c:315

-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, fuzzy, c-format
 msgid "Could not stat `%s': %s"
 msgstr "дГЛИОУЯЦъА ЙАТАКЭЦОУ АДЩМАТГ `%s': %s"
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr ""
 
 # gconf/gconftool.c:1639

-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, fuzzy, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "аПОТУВъА АМОъЦЛАТОР `%s': %s\n"
 
 # gconf/gconf-internals.c:2416

-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, fuzzy, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "аДЩМАТО ТО ЙКЕъСИЛО ТОУ АЯВЕъОУ `%s': %s"
 
 # gconf/gconftool.c:1639

-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, fuzzy, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "аПОТУВъА АМОъЦЛАТОР `%s': %s\n"
 
 # gconf/gconftool.c:881

-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, fuzzy, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "аПОТУВъА КчЬГР ТИЛчР ЦИА `%s': %s\n"
 
 # gconf/gconf-internals.c:2416

-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, fuzzy, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "аДЩМАТО ТО ЙКЕъСИЛО ТОУ АЯВЕъОУ `%s': %s"
 
 # gconf/gconftool.c:1639

 #. These are all fatal errors
-#: backends/xml-dir.c:802
+#: backends/xml-dir.c:788
 #, fuzzy, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "аПОТУВъА АМОъЦЛАТОР `%s': %s\n"
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:975
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
 # gconf/gconf-internals.c:2416

-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, fuzzy, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "аДЩМАТО ТО ЙКЕъСИЛО ТОУ АЯВЕъОУ `%s': %s"
 
 # gconf/gconf-internals.c:2416

-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2455
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "аДЩМАТО ТО ЙКЕъСИЛО ТОУ АЯВЕъОУ `%s': %s"
 
 # gconf/gconfd.c:1745

 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, fuzzy, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "сЖэКЛА АМэХЕСГР СВчЛАТОР ЦИА `%s': %s"
 
 # gconf/gconf-internals.c:2120

-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2159
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 # gconf/gconfd.c:1745

-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, fuzzy, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "сЖэКЛА АМэХЕСГР СВчЛАТОР ЦИА `%s': %s"
@@ -171,256 +171,560 @@ msgstr "сЖэКЛА АМэХЕСГР СВчЛАТОР ЦИА `%s': %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr ""
 
 # gconf/gconftool.c:1243

-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, fuzzy, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr ""
 "пяоеидопоигсг: аПОТУВъА СТГМ ЦЯАЛЛАТИЙч АМэКУСГ ТГР ТИЛчР `%s' ЦИА ТО СВчЛА "
 "(%s)\n"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
 # gconf/gconftool.c:1373

-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, fuzzy, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 "пяоеидопоигсг: о ЙЭЛБОР <locale> ДЕМ щВЕИ ТГМ ИДИЭТГТА `name=\"locale\", "
 "АЦМОЕъТАИ\n"
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1055
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
 # gconf/gconf-backend.c:180

 #. -- end debug only
-#: gconf/gconf-backend.c:180
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "дЕМ УПэЯВЕИ АЯВЕъО `%s'\n"
 
 # gconf/gconf-backend.c:208

-#: gconf/gconf-backend.c:208
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "кэХОР ДИЕЩХУМСГ `%s'"
 
 # gconf/gconf-backend.c:233

-#: gconf/gconf-backend.c:233
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr ""
 "тО GConf ДЕ ХА КЕИТОУЯЦчСЕИ ВЫЯъР УПОСТчЯИНГ ДУМАЛИЙЧМ ЛОМэДЫМ (gmodule)"
 
 # gconf/gconf-backend.c:243

-#: gconf/gconf-backend.c:243
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr "сЖэКЛА СТО эМОИЦЛА ТГР ЛОМэДАР `%s': %s\n"
 
 # gconf/gconf-backend.c:275

-#: gconf/gconf-backend.c:275
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr "аДЩМАТОР О ЕМТОПИСЛЭР ЛОМэДАР УПОСТчЯИНГР ЦИА `%s'"
 
 # gconf/gconf-backend.c:312

-#: gconf/gconf-backend.c:312
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr "аДУМАЛъА ЙКЕИСъЛАТОР ТГР УПОСТчЯИНГР (backend)"
 
-#: gconf/gconf-error.c:39
+# gconf/gconfd.c:511

+#: gconf/gconf-database.c:193
+msgid "Received invalid value in set request"
+msgstr "кчЖХГЙЕ эЙУЯГ ТИЛч СТГМ АъТГСГ ЙАТАВЧЯГСГР"
+
+# gconf/gconfd.c:519

+#: gconf/gconf-database.c:201
+#, c-format
+msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
+msgstr ""
+"аДЩМАТОР О ПЯОСДИОЯИСЛЭР ТГР ТИЛчР CORBA ПОУ КчЖХГЙЕ СТГМ АъТГСГ ЙАТАВЧЯГСГР "
+"ЦИА ТО ЙКЕИДъ `%s"
+
+# gconf/gconfd.c:802

+#: gconf/gconf-database.c:416
+msgid "Received request to drop all cached data"
+msgstr "кчЖХГЙЕ АъТГСГ АПЭЯЯИЬГР ЭКЫМ ТЫМ ЕМТАЛИЕУЛщМЫМ ДЕДОЛщМЫМ"
+
+# gconf/gconfd.c:822

+#: gconf/gconf-database.c:430
+msgid "Received request to sync synchronously"
+msgstr "кчЖХГЙЕ АъТГСГ ЦИА СЩЦВЯОМО СУЦВЯОМИСЛЭ"
+
+# gconf/gconfd.c:1056

+#: gconf/gconf-database.c:495
+#, fuzzy
+msgid "Fatal error: failed to get object reference for ConfigDatabase"
+msgstr "аДЩМАТГ Г КчЬГ АМАЖОЯэР АМТИЙЕИЛщМОУ ЦИА ТОМ еНУПГЯщТГ дИАЛЭЯЖЫСГР"
+
+# gconf/gconfd.c:1194

+#: gconf/gconf-database.c:617
+#, c-format
+msgid "Failed to sync one or more sources: %s"
+msgstr "аПОТУВъА СУЦВЯОМИСЛОЩ ЛъАР ч ПЕЯИССОТщЯЫМ ПГЦЧМ: %s"
+
+#. 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:699
+#, c-format
+msgid ""
+"Failed to log addition of listener (%s); will not be able to restore this "
+"listener on gconfd restart, resulting in unreliable notification of "
+"configuration changes."
+msgstr ""
+
+#: gconf/gconf-database.c:724
+#, c-format
+msgid "Listener ID %lu doesn't exist"
+msgstr ""
+
+#: gconf/gconf-database.c:733
+#, c-format
+msgid ""
+"Failed to log removal of listener to logfile (most likely harmless, may "
+"result in a notification weirdly reappearing): %s"
+msgstr ""
+
+# gconf/gconfd.c:1523

+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#, c-format
+msgid "Error getting value for `%s': %s"
+msgstr "сЖэКЛА ЙАТэ ТГ КчЬГ ТИЛчР ЦИА `%s': %s"
+
+# gconf/gconfd.c:1561

+#: gconf/gconf-database.c:875
+#, c-format
+msgid "Error setting value for `%s': %s"
+msgstr "сЖэКЛА ЙАТэ ТГМ АМэХЕСГ ТИЛчР ЦИА `%s': %s"
+
+# gconf/gconfd.c:1593

+#: gconf/gconf-database.c:910
+#, c-format
+msgid "Error unsetting `%s': %s"
+msgstr "сЖэКЛА ДИАЦЯАЖчР `%s': %s"
+
+# gconf/gconfd.c:1614

+#: gconf/gconf-database.c:931
+#, c-format
+msgid "Error getting default value for `%s': %s"
+msgstr "сЖэКЛА ЙАТэ ТГ КчЬГ ЕН ОЯИСЛОЩ ТИЛчР ЦИА `%s': %s"
+
+# gconf/gconfd.c:1652

+#: gconf/gconf-database.c:969
+#, c-format
+msgid "Error checking existence of `%s': %s"
+msgstr "сЖэКЛА ЕКщЦВОУ ЩПАЯНГР `%s': %s"
+
+# gconf/gconfd.c:1676

+#: gconf/gconf-database.c:993
+#, c-format
+msgid "Error removing dir `%s': %s"
+msgstr "сЖэКЛА АЖАъЯЕСГР ЙАТАКЭЦОУ `%s': %s"
+
+# gconf/gconfd.c:1701

+#: gconf/gconf-database.c:1019
+#, c-format
+msgid "Failed to get all entries in `%s': %s"
+msgstr "аПОТУВъА КчЬГР ЭКЫМ ТЫМ ЕЦЦЯАЖЧМ СТО `%s': %s"
+
+# gconf/gconfd.c:1725

+#: gconf/gconf-database.c:1045
+#, c-format
+msgid "Error listing dirs in `%s': %s"
+msgstr "сЖэКЛА АПАЯъХЛГСГР ЙАТАКЭЦЫМ СТО `%s': %s"
+
+# gconf/gconfd.c:1745

+#: gconf/gconf-database.c:1066
+#, c-format
+msgid "Error setting schema for `%s': %s"
+msgstr "сЖэКЛА АМэХЕСГР СВчЛАТОР ЦИА `%s': %s"
+
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr ""
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr ""
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr ""
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr ""
 
 # gconf/gconftool.c:510

-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 #, fuzzy
 msgid "Couldn't resolve address for configuration source"
 msgstr "аПОТУВъА ПЯЭСБАСГР СТГМ(ИР) ПГЦч(щР) ДИАЛЭЯЖЫСГР: %s\n"
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr ""
 
 # gconf/gconf-internals.c:2137

-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 #, fuzzy
 msgid "Parse error"
 msgstr "сЖэКЛА ЦЯАЛЛАТИЙчР АМэКУСГР OAF: %s"
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr ""
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr ""
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr ""
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr ""
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr ""
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr ""
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr ""
 
 # gconf/gconftool.c:881

-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 #, fuzzy
 msgid "Failed to get a lock"
 msgstr "аПОТУВъА КчЬГР ТИЛчР ЦИА `%s': %s\n"
 
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+# gconf/gconf-internals.c:2416

+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "аДЩМАТО ТО ЙКЕъСИЛО ТОУ АЯВЕъОУ `%s': %s"
+
+# gconf/gconfd.c:1676

+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "сЖэКЛА АЖАъЯЕСГР ЙАТАКЭЦОУ `%s': %s"
+
 # gconf/gconf-internals.c:100

-#: gconf/gconf-internals.c:100
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "дЕМ УПэЯВЕИ '/' СТО ЙКЕИДъ `%s'"
 
 # gconf/gconf-internals.c:264

-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "аДЩМАТГ Г ДИЕЯЛГМЕъА ТГР ТИЛчР CORBA ЦИА ТО СТОИВЕъО ТГР КъСТАР"
 
 # gconf/gconf-internals.c:266

-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "кэХОР ТЩПОР ЦИА ТО СТОИВЕъО ТГР КъСТАР СТО %s"
 
 # gconf/gconf-internals.c:279

-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "пАЯАКГЖХЕъСА КъСТА АПЭ ТО gconfd ЛЕ КАМХАСЛщМО ТЩПО КъСТАР"
 
+# gconf/gconfd.c:1194

+#: gconf/gconf-internals.c:445
+#, fuzzy
+msgid "Failed to convert object to IOR"
+msgstr "аПОТУВъА СУЦВЯОМИСЛОЩ ЛъАР ч ПЕЯИССОТщЯЫМ ПГЦЧМ: %s"
+
 # gconf/gconf-internals.c:789

-#: gconf/gconf-internals.c:798
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "аДЩМАТО ТО эМОИЦЛА ТОУ АЯВЕъОУ ДИАДЯОЛчР `%s': %s\n"
 
 # gconf/gconf-internals.c:844

-#: gconf/gconf-internals.c:853
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "пЯОСТъХЕТАИ ПГЦАъОР ЙЧДИЙАР `%s'\n"
 
 # gconf/gconf-internals.c:856

-#: gconf/gconf-internals.c:865
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "сЖэКЛА АМэЦМЫСГР СТО АЯВЕъО `%s': %s\n"
 
 # gconf/gconf-internals.c:1282

-#: gconf/gconf-internals.c:1307
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "аМАЛЕМЭТАМ КъСТА, КчЖХГЙЕ %s"
 
 # gconf/gconf-internals.c:1292

-#: gconf/gconf-internals.c:1317
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "аМАЛЕМЭТАМ КъСТА АПЭ %s, КчЖХГЙЕ КъСТА АПЭ %s"
 
 # gconf/gconf-internals.c:1431

-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "аМАЛЕМЭТАМ ФЕЩЦОР, КчЖХГЙЕ %s"
 
 # gconf/gconf-internals.c:1445

-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
@@ -428,73 +732,73 @@ msgstr ""
 "ТИЛщР"
 
 # gconf/gconf-internals.c:1461

-#: gconf/gconf-internals.c:1486
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "аМАЛЕМЭТАМ ФЕЩЦОР ТЩПОУ (%s,%s), КчЖХГЙЕ ТЩПОР (%s,%s)"
 
 # gconf/gconf-internals.c:1577

-#: gconf/gconf-internals.c:1602
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "тО ПАЯАТИХщЛЕМО АКЖАЯИХЛГТИЙЭ ДЕМ АЯВъФЕИ ЛЕ ЕИСАЦЫЦИЙЭ СГЛЕъО"
 
 # gconf/gconf-internals.c:1639

-#: gconf/gconf-internals.c:1664
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "тО ПАЯАТИХщЛЕМО АКЖАЯИХЛГТИЙЭ ДЕМ ТЕКЕИЧМЕИ ЛЕ ЕИСАЦЫЦИЙЭ СГЛЕъО"
 
 # gconf/gconf-internals.c:2105 gconf/gconf.c:2607

-#: gconf/gconf-internals.c:2144 gconf/gconf.c:2643
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "сЖэКЛА CORBA: %s"
 
 # gconf/gconf-internals.c:2125

-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "ПЯОСПэХЕИА АЖАъЯЕСГР ЛГ ЙАТАВЫЯГЛщМОУ ЙАТАКЭЦОУ АМТИЙЕИЛщМЫМ OAF"
 
 # gconf/gconf-internals.c:2130

-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "ПЯОСПэХЕИА ПЯЭСХЕСГР чДГ ЙАТАВЫЯГЛщМОУ ЙАТАКЭЦОУ OAF"
 
 # gconf/gconf-internals.c:2137

-#: gconf/gconf-internals.c:2176
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "сЖэКЛА ЦЯАЛЛАТИЙчР АМэКУСГР OAF: %s"
 
 # gconf/gconf-internals.c:2142

-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "╤ЦМЫСТО СЖэКЛА OAF"
 
 # gconf/gconf-internals.c:2225

-#: gconf/gconf-internals.c:2264
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "дЕМ УПэЯВЕИ АЯВЕъО ior СТО `%s'"
 
 # gconf/gconf-internals.c:2256

-#: gconf/gconf-internals.c:2295
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "ТО gconfd ПАъЯМЕИ ТО ЙКЕъДЫЛА `%s' АПЭ ЙэПОИА эККГ ДИЕЯЦАСъА"
 
 # gconf/gconf-internals.c:2267

-#: gconf/gconf-internals.c:2306
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "йэПОИО эККО ПЯЭЦЯАЛЛА щВЕИ ТО ЙКЕъДЫЛА `%s'"
 
 # gconf/gconf-internals.c:2287

-#: gconf/gconf-internals.c:2326
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "АДЩМАТГ Г ЕПАЖч ЛЕ ТО ORB ЦИА АМъВМЕУСГ УПэЯВОМТОР gconfd"
 
 # gconf/gconf-internals.c:2295

-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -504,38 +808,38 @@ msgstr ""
 "АМАЖОЯэ АМТИЙЕИЛщМОУ, IOR `%s'"
 
 # gconf/gconf-internals.c:2307

-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "аЖАИЯЕъТАИ ТО ПАКИЭ ЙКЕъДЫЛА `%s' КЭЦЫ СЖэКЛАТОР АМъВМЕУСГР ЕНУПГЯщТГ: %s"
 
 # gconf/gconf-internals.c:2319

-#: gconf/gconf-internals.c:2358
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "о ДАъЛОМАР ДИАЛЭЯЖЫСГР GConf (gconfd) щВЕИ ТО ЙКЕъДЫЛА `%s'"
 
 # gconf/gconf-internals.c:2333

-#: gconf/gconf-internals.c:2372
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "АДЩМАТГ Г ДГЛИОУЯЦъА ЙАТАКЭЦОУ `%s': %s"
 
 # gconf/gconf-internals.c:2368

-#: gconf/gconf-internals.c:2407
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "аДЩМАТГ Г ДГЛИОУЯЦъА ЙКЕИДЧЛАТОР `%s': %s"
 
 # gconf/gconf-internals.c:2404

-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "аДЩМАТГ Г ЕЦЦЯАЖч СТО АЯВЕъО `%s': %s"
 
 # gconf/gconf-internals.c:2447

-#: gconf/gconf-internals.c:2486
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
@@ -543,13 +847,13 @@ msgstr ""
 "ДИЙЭ ЛАР: %s"
 
 # gconf/gconf-internals.c:2464

-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "жХАЯЛщМО АЯВЕъО ЙКЕИДЧЛАТОР `%s', АЖАИЯЕъТАИ ОЩТЫР ч эККЫР"
 
 # gconf/gconf-internals.c:2474

-#: gconf/gconf-internals.c:2513
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -559,27 +863,27 @@ msgstr ""
 "%u╥ УПОХщТОУЛЕ ЭТИ ЙэПОИОР ПчЯЕ ТО ЙКЕъДЫЛА ЛАР"
 
 # gconf/gconf-internals.c:2491

-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "аДЩМАТГ Г АПОДщСЛЕУСГ ЙКЕИДЧЛАТОР ЙАТАКЭЦОУ `%s': %s"
 
 # gconf/gconf-internals.c:2416

-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, fuzzy, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "аДЩМАТО ТО ЙКЕъСИЛО ТОУ АЯВЕъОУ `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -587,113 +891,107 @@ msgid ""
 msgstr ""
 
 # gconf/gconftool.c:1181

-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, fuzzy, c-format
 msgid "Error finding metainfo: %s"
 msgstr "сЖэКЛА СТГМ АПАЯъХЛГСГ ЙАТАКЭЦЫМ: %s\n"
 
 # gconf/gconftool.c:964 gconf/gconftool.c:1070

-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, fuzzy, c-format
 msgid "Error getting metainfo: %s"
 msgstr "сЖэКЛА ЙАТэ ТГМ АМэХЕСГ ТИЛчР: %s"
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 
-# gconf/gconfd.c:1523

-#: gconf/gconf-sources.c:1205 gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr "сЖэКЛА ЙАТэ ТГ КчЬГ ТИЛчР ЦИА `%s': %s"
-
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr ""
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr ""
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr ""
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr ""
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr ""
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr ""
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
 
 # gconf/gconf.c:69

-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
 # gconf/gconf.c:261

-#: gconf/gconf.c:271
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "о ЕНУПГЯщТГР ДЕМ ЛПЭЯЕСЕ МА АМАКЩСЕИ ТГ ДИЕЩХУМСГ `%s'"
 
 # gconf/gconf.c:391

-#: gconf/gconf.c:408
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "аДЩМАТГ Г ПЯЭСХЕСГ ЕИДОПОИчСЕЫМ СЕ щМА ТОПИЙЭ ПГЦАъО ДИАЛЭЯЖЫСГР"
 
 # gconf/gconf.c:1449

-#: gconf/gconf.c:1466
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "аДЩМАТГ Г АМъВМЕУСГ ТОУ ЕНУПГЯщТГ, СЖэКЛА CORBA: %s"
 
 # gconf/gconf.c:1463

-#: gconf/gconf.c:1482
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -704,103 +1002,80 @@ msgstr ""
 "ПЯЭБКГЛА. пАЯАЙАКЧ СТЕъКТЕ ЛИА АМАЖОЯэ СЖэКЛАТОР OAF"
 
 # gconf-editor/gconf-editor.c:69 gconf/gconftool.c:447

-#: gconf/gconf.c:1677
+#: gconf/gconf.c:1880
 #, fuzzy
 msgid "Failed to init GConf, exiting\n"
 msgstr "аПОТУВъА АЯВИЙОПОъГСГР GConf: %s\n"
 
 # gconf/gconf.c:1689

-#: gconf/gconf.c:1714
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "пЯщПЕИ МА АЯВъФЕИ ЛЕ ЛИА ЙэХЕТО (/)"
 
 # gconf/gconf.c:1711

-#: gconf/gconf.c:1736
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "дЕ ЦъМЕТАИ МА УПэЯВОУМ ДЩО ЙэХЕТОИ (/) СТГ СЕИЯэ"
 
 # gconf/gconf.c:1713

-#: gconf/gconf.c:1738
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "дЕ ЦъМЕТАИ МА УПэЯВЕИ ЛИА ТЕКЕъА (.) АЛщСЫР ЛЕТэ АПЭ ЛъА ЙэХЕТО (/)"
 
 # gconf/gconf.c:1734

-#: gconf/gconf.c:1759
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' ДЕМ ЕъМАИ щЦЙУЯОР ВАЯАЙТчЯАР СЕ ОМЭЛАТА ЙКЕИДИЧМ/ЙАТАКЭЦЫМ"
 
 # gconf/gconf.c:1748

-#: gconf/gconf.c:1773
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "тО ЙКЕИДъ/ЙАТэКОЦОР ДЕМ ЛПОЯЕъ МА ТЕКЕИЧМЕИ ЛЕ ЙэХЕТО (/)"
 
 # gconf/gconf.c:2079

-#: gconf/gconf.c:2115
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "аДЩМАТО ТО ЙКЕъСИЛО ТОУ ЕНУПГЯщТГ ДИАЛЭЯЖЫСГР: %s"
 
 # gconf/gconf.c:2140

-#: gconf/gconf.c:2176
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "аМАЛЕМЭТАМ АЯИХЛЭР ЙИМГТчР УПОДИАСТОКчР, КчЖХГЙЕ %s"
 
 # gconf/gconf.c:2175

-#: gconf/gconf.c:2211
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "аМАЛЕМЭТАМ АЙщЯАИОР, КчЖХГЙЕ %s"
 
 # gconf/gconf.c:2210

-#: gconf/gconf.c:2246
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "аМАЛЕМЭТАМ АКЖАЯИХЛГТИЙЭ, КчЖХГЙЕ %s"
 
 # gconf/gconf.c:2247

-#: gconf/gconf.c:2283
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "аМАЛЕМЭТАМ ДУАДИЙч ТИЛч, КчЖХГЙЕ %s"
 
 # gconf/gconf.c:2280

-#: gconf/gconf.c:2316
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "аМАЛЕМЭТАМ СВчЛА, КчЖХГЙЕ %s"
 
-# gconf/gconfd.c:511

-#: gconf/gconfd.c:511
-msgid "Received invalid value in set request"
-msgstr "кчЖХГЙЕ эЙУЯГ ТИЛч СТГМ АъТГСГ ЙАТАВЧЯГСГР"
-
-# gconf/gconfd.c:519

-#: gconf/gconfd.c:519
-#, c-format
-msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
-msgstr ""
-"аДЩМАТОР О ПЯОСДИОЯИСЛЭР ТГР ТИЛчР CORBA ПОУ КчЖХГЙЕ СТГМ АъТГСГ ЙАТАВЧЯГСГР "
-"ЦИА ТО ЙКЕИДъ `%s"
-
 # gconf/gconfd.c:789

-#: gconf/gconfd.c:789
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "кчЖХГЙЕ АъТГСГ ЙКЕИСъЛАТОР"
 
-# gconf/gconfd.c:802

-#: gconf/gconfd.c:802
-msgid "Received request to drop all cached data"
-msgstr "кчЖХГЙЕ АъТГСГ АПЭЯЯИЬГР ЭКЫМ ТЫМ ЕМТАЛИЕУЛщМЫМ ДЕДОЛщМЫМ"
-
-# gconf/gconfd.c:822

-#: gconf/gconfd.c:822
-msgid "Received request to sync synchronously"
-msgstr "кчЖХГЙЕ АъТГСГ ЦИА СЩЦВЯОМО СУЦВЯОМИСЛЭ"
-
 # gconf/gconfd.c:861

-#: gconf/gconfd.c:861
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -809,7 +1084,7 @@ msgstr ""
 "ЖОЯТЫХЕъ ТО gconf.path АПЭ ТОМ ПГЦАъО ЙАТэКОЦО"
 
 # gconf/gconfd.c:879

-#: gconf/gconfd.c:879
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -818,7 +1093,7 @@ msgstr ""
 "ДИАЛЭЯЖЫСГР `%s'"
 
 # gconf/gconfd.c:888

-#: gconf/gconfd.c:888
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -827,13 +1102,13 @@ msgstr ""
 "АПОХГЙЕУТЕъ╥ ЕПЕНЕЯЦАСъА "
 
 # gconf/gconfd.c:901

-#: gconf/gconfd.c:901
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "сЖэКЛА ЙАТэ ТО ЖЭЯТЫЛА ЙэПОИЫМ ПГЦАъЫМ ДИАЛОЯЖЧСЕЫМ: %s"
 
 # gconf/gconfd.c:913

-#: gconf/gconfd.c:913
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -842,36 +1117,41 @@ msgstr ""
 "АПОХчЙЕУСГ ДЕДОЛщМЫМ ДИАЛЭЯЖЫСГР"
 
 # gconf/gconfd.c:930

-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:287
+#, fuzzy
 msgid ""
-"No writeable config sources successfully resolved, may not be able to save "
+"No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 "дЕМ АМАКЩХГЙАМ ЕПИТУВЧР ЕЦЦЯэЬИЛЕР ПГЦАъЕР ДИАЛОЯЖЧСЕИР, ПИХАМЭ МА ЛГМ "
 "ЛПОЯОЩМ МА АПОХГЙЕУТОЩМ ЛЕЯИЙщР АККАЦщР ДИАЛЭЯЖЫСГР"
 
 # gconf/gconfd.c:955 gconf/gconfd.c:967

-#: gconf/gconfd.c:955 gconf/gconfd.c:967
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr "кчЖХГЙЕ СчЛА %d, ЙКЕъСИЛО."
 
-# gconf/gconfd.c:972

-#: gconf/gconfd.c:972
-#, c-format
-msgid "Received signal %d, ignoring"
-msgstr "кчЖХГЙЕ СчЛА %d, АЦМОЕъТАИ"
+# gconf/gconfd.c:955 gconf/gconfd.c:967

+#: gconf/gconfd.c:329
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down cleanly"
+msgstr "кчЖХГЙЕ СчЛА %d, ЙКЕъСИЛО."
 
 # gconf/gconfd.c:1013

 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:1013
-#, c-format
-msgid "starting, pid %u user `%s'"
+#: gconf/gconfd.c:376
+#, fuzzy, c-format
+msgid "starting (version %s), pid %u user '%s'"
 msgstr "ЕЙЙИМЕъТАИ, pid %u ВЯчСТГР `%s' "
 
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
 # gconf/gconfd.c:1036

-#: gconf/gconfd.c:1036
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -880,12 +1160,12 @@ msgstr ""
 "СТЕъКЕТЕ АМАЖОЯэ ПЯОБКчЛАТОР СТОУР СУМТГЯГТщР ТОУ пеа (OAF)"
 
 # gconf/gconfd.c:1056

-#: gconf/gconfd.c:1056
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "аДЩМАТГ Г КчЬГ АМАЖОЯэР АМТИЙЕИЛщМОУ ЦИА ТОМ еНУПГЯщТГ дИАЛЭЯЖЫСГР"
 
 # gconf/gconfd.c:1075

-#: gconf/gconfd.c:1075
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -894,126 +1174,155 @@ msgstr ""
 "ЙКЕъСИЛО\n"
 
 # gconf/gconfd.c:1079

-#: gconf/gconfd.c:1079
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "╦МА эККО gconfd ЕъМАИ чДГ ЙАТАВЫЯГЛщМО СТО пеа (OAF)╥ ЙКЕъСИЛО\n"
 
 # gconf/gconfd.c:1084

-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "╤ЦМЫСТО КэХОР ЙАТАВЧЯГСГР ТОУ gconfd СТО пеа (OAF)╥ ЙКЕъСИЛО\n"
 
 # gconf/gconfd.c:1100

-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "йКЕъСИЛО"
 
-# gconf/gconfd.c:1194

-#: gconf/gconfd.c:1194
+# gconf/gconfd.c:2115

+#: gconf/gconfd.c:818
 #, c-format
-msgid "Failed to sync one or more sources: %s"
-msgstr "аПОТУВъА СУЦВЯОМИСЛОЩ ЛъАР ч ПЕЯИССОТщЯЫМ ПГЦЧМ: %s"
+msgid "Returning exception: %s"
+msgstr "еПИСТЯщЖЕТАИ ЕНАъЯЕСГ: %s"
 
-# gconf/gconfd.c:1561

-#: gconf/gconfd.c:1561
+#: gconf/gconfd.c:885
 #, c-format
-msgid "Error setting value for `%s': %s"
-msgstr "сЖэКЛА ЙАТэ ТГМ АМэХЕСГ ТИЛчР ЦИА `%s': %s"
+msgid ""
+"Failed to open gconfd logfile; won't be able to restore listeners after "
+"gconfd shutdown (%s)"
+msgstr ""
 
-# gconf/gconfd.c:1593

-#: gconf/gconfd.c:1593
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Error unsetting `%s': %s"
-msgstr "сЖэКЛА ДИАЦЯАЖчР `%s': %s"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgstr ""
 
-# gconf/gconfd.c:1614

-#: gconf/gconfd.c:1614
-#, c-format
-msgid "Error getting default value for `%s': %s"
-msgstr "сЖэКЛА ЙАТэ ТГ КчЬГ ЕН ОЯИСЛОЩ ТИЛчР ЦИА `%s': %s"
+# gconf/gconf-internals.c:789

+#: gconf/gconfd.c:966
+#, fuzzy, c-format
+msgid "Could not open saved state file '%s' for writing: %s"
+msgstr "аДЩМАТО ТО эМОИЦЛА ТОУ АЯВЕъОУ ДИАДЯОЛчР `%s': %s\n"
 
-# gconf/gconfd.c:1652

-#: gconf/gconfd.c:1652
-#, c-format
-msgid "Error checking existence of `%s': %s"
-msgstr "сЖэКЛА ЕКщЦВОУ ЩПАЯНГР `%s': %s"
+# gconf/gconf-internals.c:2404

+#: gconf/gconfd.c:980
+#, fuzzy, c-format
+msgid "Could not write saved state file '%s' fd: %d: %s"
+msgstr "аДЩМАТГ Г ЕЦЦЯАЖч СТО АЯВЕъО `%s': %s"
 
-# gconf/gconfd.c:1676

-#: gconf/gconfd.c:1676
-#, c-format
-msgid "Error removing dir `%s': %s"
-msgstr "сЖэКЛА АЖАъЯЕСГР ЙАТАКЭЦОУ `%s': %s"
+# gconf/gconf-internals.c:2416

+#: gconf/gconfd.c:989
+#, fuzzy, c-format
+msgid "Failed to close new saved state file '%s': %s"
+msgstr "аДЩМАТО ТО ЙКЕъСИЛО ТОУ АЯВЕъОУ `%s': %s"
 
-# gconf/gconfd.c:1701

-#: gconf/gconfd.c:1701
-#, c-format
-msgid "Failed to get all entries in `%s': %s"
-msgstr "аПОТУВъА КчЬГР ЭКЫМ ТЫМ ЕЦЦЯАЖЧМ СТО `%s': %s"
+# gconf/gconf-internals.c:789

+#: gconf/gconfd.c:1003
+#, fuzzy, c-format
+msgid "Could not move aside old saved state file '%s': %s"
+msgstr "аДЩМАТО ТО эМОИЦЛА ТОУ АЯВЕъОУ ДИАДЯОЛчР `%s': %s\n"
 
-# gconf/gconfd.c:1725

-#: gconf/gconfd.c:1725
+# gconf/gconf-internals.c:2416

+#: gconf/gconfd.c:1013
+#, fuzzy, c-format
+msgid "Failed to move new save state file into place: %s"
+msgstr "аДЩМАТО ТО ЙКЕъСИЛО ТОУ АЯВЕъОУ `%s': %s"
+
+#: gconf/gconfd.c:1022
 #, c-format
-msgid "Error listing dirs in `%s': %s"
-msgstr "сЖэКЛА АПАЯъХЛГСГР ЙАТАКЭЦЫМ СТО `%s': %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr ""
 
-# gconf/gconfd.c:1745

-#: gconf/gconfd.c:1745
+#: gconf/gconfd.c:1110
 #, c-format
-msgid "Error setting schema for `%s': %s"
-msgstr "сЖэКЛА АМэХЕСГР СВчЛАТОР ЦИА `%s': %s"
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr ""
 
-# gconf/gconfd.c:1911

-#: gconf/gconfd.c:1913
-msgid "Attempt to unregister invalid context ID"
-msgstr "пЯОСПэХЕИА ДИАЦЯАЖчР эЙУЯОУ context ID"
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
+msgstr ""
 
-# gconf/gconfd.c:1918

-#: gconf/gconfd.c:1920
+#: gconf/gconfd.c:1140
 #, c-format
-msgid "Bad context ID %lu, request ignored"
-msgstr "кэХОР context ID %lu, АъТГСГ АЦМОЕъТАИ"
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr ""
 
-# gconf/gconfd.c:1926

-#: gconf/gconfd.c:1928
+#: gconf/gconfd.c:1160
 #, c-format
-msgid "Already-unregistered context ID %lu, request ignored"
-msgstr "Context ID %lu чДГ АПОЙАТАВЫЯГЛщМО, АъТГСГ АЦМОЕъТАИ"
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr ""
 
-# gconf/gconfd.c:1951

-#: gconf/gconfd.c:1953
+# gconf/gconf-internals.c:2416

+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "аДЩМАТО ТО ЙКЕъСИЛО ТОУ АЯВЕъОУ `%s': %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Attempt to use invalid context ID %lu"
-msgstr "пЯОСПэХЕИА ВЯчСГР эЙУЯОУ context ID %lu"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
 
-# gconf/gconfd.c:1961

-#: gconf/gconfd.c:1963
+# gconf/gconf-internals.c:2416

+#: gconf/gconfd.c:1377
+#, fuzzy, c-format
+msgid "Unable to open saved state file '%s': %s"
+msgstr "аДЩМАТО ТО ЙКЕъСИЛО ТОУ АЯВЕъОУ `%s': %s"
+
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Attempt to use already-unregistered context ID %lu"
-msgstr "пЯОСПэХЕИА ВЯчСГР чДГ АПОЙАТАВЫЯГЛщМОУ context ID %lu"
+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:2115

-#: gconf/gconfd.c:2123
+#: gconf/gconfd.c:1481
 #, c-format
-msgid "Returning exception: %s"
-msgstr "еПИСТЯщЖЕТАИ ЕНАъЯЕСГ: %s"
+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/gconftool.c:73

-#: gconf/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "еПИКОЦщР БОчХЕИАР"
 
 # gconf/gconftool.c:82

-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "аМэХЕСГ ЛИАР ТИЛчР СЕ щМА ЙКЕИДъ ЙАИ СУЦВЯОМИСЛЭР. вЯчСГ ЛЕ --type."
 
 # gconf/gconftool.c:91

-#: gconf/gconftool.c:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "еЙТЩПЫСГ ТГР ТИЛчР ЕМЭР ЙКЕИДИОЩ СТГМ ЙАМОМИЙч  щНОДО"
 
 # gconf/gconftool.c:100

-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -1022,44 +1331,44 @@ msgstr ""
 "--owner, ЙАИ --type."
 
 # gconf/gconftool.c:110

-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "аПОЙАТАВЧЯГСГ ЙКЕИДИЧМ СТГ ЦЯАЛЛч ЕМТОКЧМ"
 
 # gconf/gconftool.c:119

-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "еЙТЩПЫСГ ЭКЫМ ТЫМ ФЕУЦЧМ ЙКЕИДИЧМ/ТИЛЧМ СЕ щМА ЙАТэКОЦО."
 
 # gconf/gconftool.c:128

-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "еЙТЩПЫСГ ЭКЫМ ТЫМ УПОЙАТАКЭЦЫМ ЙэТЫ АПЭ щМА ЙАТэКОЦО."
 
 # gconf/gconftool.c:137

-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "еЙТЩПЫСГ ЭКЫМ ТЫМ УПОЙАТАКЭЦЫМ ЙАИ ЕЦЦЯАЖЧМ ЙэТЫ АПЭ щМА ЙАТэКОЦО, "
 "АМАДЯОЛИЙэ."
 
 # gconf/gconftool.c:146

-#: gconf/gconftool.c:149
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "еПИСТЯщЖЕИ 0 АМ О ЙАТэКОЦОР УПэЯВЕИ, 2 АМ ДЕМ УПэЯВЕИ."
 
 # gconf/gconftool.c:155

-#: gconf/gconftool.c:158
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "йКЕъСИЛО gconfd. лг вягсилопоиеите аутгм тгм епикоцг асйопа."
 
 # gconf/gconftool.c:164

-#: gconf/gconftool.c:167
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "еПИСТЯщЖЕИ 0 АМ ТО gconfd ЕЙТЕКЕъТАИ, 2 АМ ЭВИ"
 
 # gconf/gconftool.c:173

-#: gconf/gconftool.c:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1068,7 +1377,7 @@ msgstr ""
 "АУТЭЛАТА ЭТАМ ВЯЕИэФЕТАИ)."
 
 # gconf/gconftool.c:182

-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1077,13 +1386,13 @@ msgstr ""
 "ПЕЯИЦЯэЖЕИ щМА СВчЛА. лОМОСчЛАМТЕР СУМТОЛЕЩСЕИР OK."
 
 # gconf/gconftool.c:183

-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 #, fuzzy
 msgid "int|bool|float|string|list|pair"
 msgstr "АЙщЯАИОР|ДУАДИЙЭР|ЙИМГТчР УПОДИАСТОКчР|АКЖАЯИХЛГТИЙЭ"
 
 # gconf/gconftool.c:182

-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 #, fuzzy
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
@@ -1093,12 +1402,12 @@ msgstr ""
 "ПЕЯИЦЯэЖЕИ щМА СВчЛА. лОМОСчЛАМТЕР СУМТОЛЕЩСЕИР OK."
 
 # gconf/gconftool.c:183

-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "АЙщЯАИОР|ДУАДИЙЭР|ЙИМГТчР УПОДИАСТОКчР|АКЖАЯИХЛГТИЙЭ"
 
 # gconf/gconftool.c:182

-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 #, fuzzy
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
@@ -1108,7 +1417,7 @@ msgstr ""
 "ПЕЯИЦЯэЖЕИ щМА СВчЛА. лОМОСчЛАМТЕР СУМТОЛЕЩСЕИР OK."
 
 # gconf/gconftool.c:182

-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 #, fuzzy
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
@@ -1118,53 +1427,53 @@ msgstr ""
 "ПЕЯИЦЯэЖЕИ щМА СВчЛА. лОМОСчЛАМТЕР СУМТОЛЕЩСЕИР OK."
 
 # gconf/gconftool.c:191

-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr "йАХОЯъСТЕ ЛИА ЛИЙЯч ПЕЯИЦЯАЖч ЛИСчР ЦЯАЛЛчР ЦИА щМА СВчЛА."
 
 # gconf/gconftool.c:192 gconf/gconftool.c:201

-#: gconf/gconftool.c:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "пеяицяажг"
 
 # gconf/gconftool.c:200

-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "йАХОЯъСТЕ ЛИА ПЕЯИЦЯАЖч АЯЙЕТЧМ ЦЯАЛЛЧМ ЦИА щМА СВчЛА."
 
 # gconf/gconftool.c:209

-#: gconf/gconftool.c:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "йАХОЯъСТЕ ТОМ ИДИОЙТчТГ ЕМЭР СВчЛАТОР"
 
 # gconf/gconftool.c:210

-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "идиойтгтгс"
 
 # gconf/gconftool.c:218

-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "йАХОЯъСТЕ щМА СВчЛА ПЯОР ЕЦЙАТэСТАСГ"
 
 # gconf/gconftool.c:219

-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "омола аявеиоу"
 
 # gconf/gconftool.c:227

-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "йАХОЯъСТЕ ЛИА ПГЦАъА ДИАЛЭЯЖЫСГ ПЯОР ВЯчСГ АМТъ ЦИА ТГМ ЕН ОЯИСЛОЩ ДИАДЯОЛч"
 
 # gconf/gconftool.c:228

-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "пгцг"
 
 # gconf/gconftool.c:236

-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1173,7 +1482,7 @@ msgstr ""
 "ЕНУПГЯщТГ. аПАИТЕъТАИ ЭТИ ТО gconfd ДЕМ ЕЙТЕКЕъТАИ."
 
 # gconf/gconftool.c:245

-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1185,7 +1494,7 @@ msgstr ""
 "ЕН ОЯИСЛОЩ."
 
 # gconf/gconftool.c:254

-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1194,7 +1503,7 @@ msgstr ""
 "ДИАЖОЯЕТИЙЧМ ТЩПЫМ ЦИА ЙКЕИДИэ СТГ ЦЯАЛЛч ЕМТОКЧМ."
 
 # gconf/gconftool.c:263

-#: gconf/gconftool.c:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1203,7 +1512,7 @@ msgstr ""
 "ЛщСА СТОУР ЙАТАКЭЦОУР СТГ ЦЯАЛЛч ЕМТОКЧМ."
 
 # gconf/gconftool.c:310

-#: gconf/gconftool.c:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1214,27 +1523,27 @@ msgstr ""
 "ЕМТОКЧМ.\n"
 
 # gconf/gconftool.c:322

-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "аДЩМАТГ Г ТАУТЭВЯОМГ КчЬГ ЙАИ Г АМэХЕСГ/АЖАъЯЕСГ\n"
 
 # gconf/gconftool.c:329

-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "аДЩМАТГ Г ТАУТЭВЯОМГ АМэХЕСГ ЙАИ Г КчЬГ/АЖАъЯЕСГ\n"
 
 # gconf/gconftool.c:337

-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "аДЩМАТГ Г ВЯчСГ ТГР --all-pairs ЛЕ ТИР --get ч --set\n"
 
 # gconf/gconftool.c:345

-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "аДЩМАТГ Г ВЯчСГ ТГР --all-dirs ЛЕ ТИР --get ч --set\n"
 
 # gconf/gconftool.c:355

-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1243,7 +1552,7 @@ msgstr ""
 "--set, --unset, --all-pairs, ч --all-dirs\n"
 
 # gconf/gconftool.c:365

-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1252,48 +1561,48 @@ msgstr ""
 "--all-pairs, ч --all-dirs\n"
 
 # gconf/gconftool.c:371

-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "о ТЩПОР ТИЛчР ЕъМАИ СВЕТИЙЭР ЛЭМО ЙАТэ ТГМ АМэХЕСГ ЛИАР ТИЛчР\n"
 
 # gconf/gconftool.c:377

-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "пЯщПЕИ МА ЙАХОЯъФЕТАИ щМАР ТЩПОР ЭТАМ ТъХЕТАИ ЛИА ТИЛч\n"
 
 # gconf/gconftool.c:386

-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "г ЕПИКОЦч АМъВМЕУСГР (ping) ПЯщПЕИ МА ВЯГСИЛОПОИЕъТАИ ЛЭМГ ТГР.\n"
 
 # gconf/gconftool.c:395

-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "г ЕПИКОЦч --dir-exists ПЯщПЕИ МА ВЯГСИЛОПОИЕъТАИ ЛЭМГ ТГР.\n"
 
 # gconf/gconftool.c:404

-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "г ЕПИКОЦч --install-schema-file ПЯщПЕИ МА ВЯГСИЛОПОИЕъТАИ ЛЭМГ ТГР.\n"
 
 # gconf/gconftool.c:414

-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 "г ЕПИКОЦч --makefile-install-rule ПЯщПЕИ МА ВЯГСИЛОПОИЕъТАИ ЛЭМГ ТГР.\n"
 
 # gconf/gconftool.c:424

-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "г ЕПИКОЦч --break-key ПЯщПЕИ МА ВЯГСИЛОПОИЕъТАИ ЛЭМГ ТГР.\n"
 
 # gconf/gconftool.c:434

-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "г ЕПИКОЦч --break-directory ПЯщПЕИ МА ВЯГСИЛОПОИЕъТАИ ЛЭМГ ТГР.\n"
 
 # gconf/gconftool.c:441

-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
@@ -1301,13 +1610,13 @@ msgstr ""
 "ВЯГСИЛОПОИЕъТЕ ТГМ --direct\n"
 
 # gconf-editor/gconf-editor.c:69 gconf/gconftool.c:447

-#: gconf/gconftool.c:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "аПОТУВъА АЯВИЙОПОъГСГР GConf: %s\n"
 
 # gconf/gconftool.c:472

-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "пЯщПЕИ МА ТЕХЕъ Г ЛЕТАБКГТч ПЕЯИБэККОМТОР GCONF_CONFIG_SOURCE\n"
 
@@ -1315,7 +1624,7 @@ msgstr "пЯщПЕИ МА ТЕХЕъ Г ЛЕТАБКГТч ПЕЯИБэККОМТОР GCONF_CONFIG_SOURCE\n"
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1329,215 +1638,215 @@ msgstr ""
 "(АМ ЙАИ ХЕЫЯГТИЙэ ХА щПЯЕПЕ МА ДОУКщЬЕИ АМ ЕЙТЕКОЩМТАИ ЕЖАЯЛОЦщР).\n"
 
 # gconf/gconftool.c:510

-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "аПОТУВъА ПЯЭСБАСГР СТГМ(ИР) ПГЦч(щР) ДИАЛЭЯЖЫСГР: %s\n"
 
 # gconf/gconftool.c:670

-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "сЖэКЛА ЙКЕИСъЛАТОР: %s\n"
 
 # gconf/gconftool.c:715

-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "пЯщПЕИ МА ЙАХОЯИСТЕъ щМАР ч ПЕЯИССЭТЕЯОИ ЙАТэКОЦОИ ЦИА АМАДЯОЛИЙч "
 "АПАЯъХЛГСГ.\n"
 
 # gconf/gconftool.c:749

-#: gconf/gconftool.c:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "аПОТУВъА АПАЯъХЛГСГР ФЕУЦЧМ СТО `%s': %s"
 
 # gconf/gconftool.c:767

-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(ДЕМ щВЕИ ТЕХЕъ ТИЛч)"
 
 # gconf/gconftool.c:820

-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "аПОТУВъА ПОККАПКАСИАСЛОЩ ЕНУПГЯщТГ ДИАЛЭЯЖЫСГР: %s\n"
 
 # gconf/gconftool.c:834

-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "пЯщПЕИ МА ЙАХОЯИСТЕъ щМА ЙКЕИДъ ч ЙКЕИДИэ ЦИА КчЬГ\n"
 
 # gconf/gconftool.c:865

-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "тЩПОР: %s\n"
 
 # gconf/gconftool.c:865

-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, fuzzy, c-format
 msgid "List Type: %s\n"
 msgstr "тЩПОР: %s\n"
 
 # gconf/gconftool.c:865

-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, fuzzy, c-format
 msgid "Car Type: %s\n"
 msgstr "тЩПОР: %s\n"
 
 # gconf/gconftool.c:865

-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, fuzzy, c-format
 msgid "Cdr Type: %s\n"
 msgstr "тЩПОР: %s\n"
 
 # gconf/gconftool.c:866

-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "иДИОЙТчТГР: %s\n"
 
 # gconf/gconftool.c:866 gconf/gconftool.c:867 gconf/gconftool.c:868

-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "аЖАъЯЕСГ"
 
 # gconf/gconftool.c:867

-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "сЩМТОЛГ пЕЯИЦЯАЖч: %s\n"
 
 # gconf/gconftool.c:868

-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "лАЙЯэ пЕЯИЦЯАЖч: %s\n"
 
 # gconf/gconftool.c:877

-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "дЕМ щВЕИ ТЕХЕъ ТИЛч ЦИА `%s'\n"
 
 # gconf/gconftool.c:881

-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "аПОТУВъА КчЬГР ТИЛчР ЦИА `%s': %s\n"
 
 # gconf/gconftool.c:940 gconf/gconftool.c:1052 gconf/gconftool.c:1056

-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "дЕМ ЕъМАИ ЙАТАМОГТЭР О ТЩПОР `%s'\n"
 
 # gconf/gconftool.c:900

-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "пЯщПЕИ МА ЙАХОЯИСТОЩМ ЕМАККАССЭЛЕМА ЙКЕИДИэ/ТИЛщР ЫР ОЯъСЛАТА\n"
 
 # gconf/gconftool.c:917

-#: gconf/gconftool.c:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "дЕМ щВЕИ ТЕХЕъ ТИЛч ЦИА ТО ЙКЕИДъ: `%s'\n"
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
 # gconf/gconftool.c:951

-#: gconf/gconftool.c:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "сЖэКЛА: %s\n"
 
 # gconf/gconftool.c:964 gconf/gconftool.c:1070

-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "сЖэКЛА ЙАТэ ТГМ АМэХЕСГ ТИЛчР: %s"
 
 # gconf/gconftool.c:982 gconf/gconftool.c:1084

-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "сЖэКЛА СТО СУЦВЯОМИСЛЭ: %s"
 
 # gconf/gconftool.c:1000

-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "пЯщПЕИ МА ЙАХОЯИСТЕъ ЙКЕИДъ (ЭМОЛА СВчЛАТОР) ЫР ЛОМАДИЙЭ ЭЯИСЛА\n"
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1201
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
 # gconf/gconftool.c:1099

-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "пЯщПЕИ МА ЙАХОЯИСТОЩМ щМАР ч ПЕЯИССЭТЕЯОИ ЙАТэКОЦОИ АПЭ ЭПОУ МА КГЖХОЩМ ТА "
 "ФЕЩЦГ ЙКЕИДИЧМ/ТИЛЧМ.\n"
 
 # gconf/gconftool.c:1113

-#: gconf/gconftool.c:1259
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "пЯщПЕИ МА ЙАХОЯИСТОЩМ щМА ч ПЕЯИССЭТЕЯА ЙКЕИДИэ ПЯОР АЖАъЯЕСГ.\n"
 
 # gconf/gconftool.c:1124

-#: gconf/gconftool.c:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "сЖэКЛА СТГМ АЖАъЯЕСГ `%s': %s\n"
 
 # gconf/gconftool.c:1147

-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "пЯщПЕИ МА ЙАХОЯИСТОЩМ щМАР ч ПЕЯИССЭТЕЯОИ ЙАТэКОЦОИ АПЭ ЭПОУ МА КГЖХОЩМ ОИ "
 "УПОЙАТэКОЦОИ.\n"
 
 # gconf/gconftool.c:1181

-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "сЖэКЛА СТГМ АПАЯъХЛГСГ ЙАТАКЭЦЫМ: %s\n"
 
 # gconf/gconftool.c:1220

-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "пяоеидопоигсг: ╤ЙУЯОР ч АПЧМ ТЩПОР ЦИА ТО СВчЛА (%s)\n"
 
 # gconf/gconftool.c:1220

-#: gconf/gconftool.c:1378
+#: gconf/gconftool.c:1366
 #, fuzzy, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "пяоеидопоигсг: ╤ЙУЯОР ч АПЧМ ТЩПОР ЦИА ТО СВчЛА (%s)\n"
 
 # gconf/gconftool.c:1243

-#: gconf/gconftool.c:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
@@ -1545,13 +1854,13 @@ msgstr ""
 "(%s)\n"
 
 # gconf/gconftool.c:1220

-#: gconf/gconftool.c:1407
+#: gconf/gconftool.c:1395
 #, fuzzy, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "пяоеидопоигсг: ╤ЙУЯОР ч АПЧМ ТЩПОР ЦИА ТО СВчЛА (%s)\n"
 
 # gconf/gconftool.c:1243

-#: gconf/gconftool.c:1432
+#: gconf/gconftool.c:1420
 #, fuzzy
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
@@ -1559,41 +1868,41 @@ msgstr ""
 "(%s)\n"
 
 # gconf/gconftool.c:1256

-#: gconf/gconftool.c:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 "пяоеидопоигсг: еСЫТЕЯИЙЭ СЖэКЛА ТОУ gconftool, эЦМЫСТО GConfValueType\n"
 
 # gconf/gconftool.c:1304

-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "пяоеидопоигсг: аПОТУВъА ЦЯАЛЛАТИЙчР АМэКУСГР ОМЭЛАТОР ТЩПОУ `%s'\n"
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
 # gconf/gconftool.c:1327

-#: gconf/gconftool.c:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "пяоеидопоигсг: ЙЕМЭР ЙЭЛБОР <applyto>"
 
 # gconf/gconftool.c:1330 gconf/gconftool.c:1575

-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
@@ -1601,19 +1910,19 @@ msgstr ""
 "<schema>\n"
 
 # gconf/gconftool.c:1340

-#: gconf/gconftool.c:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "пяоеидопоигсг: ДЕМ щВЕИ ЙАХОЯИСТЕъ ЙКЕИДъ ЦИА ТО СВчЛА\n"
 
 # gconf/gconftool.c:1373

-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "пяоеидопоигсг: о ЙЭЛБОР <locale> ДЕМ щВЕИ ТГМ ИДИЭТГТА `name=\"locale\", "
 "АЦМОЕъТАИ\n"
 
 # gconf/gconftool.c:1379

-#: gconf/gconftool.c:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1622,13 +1931,13 @@ msgstr ""
 "АЦМООЩМТАИ ЭКОИ ЛЕТэ ТОМ ПЯЧТО\n"
 
 # gconf/gconftool.c:1451

-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "пяоеидопоигсг: ╤ЙУЯОР ЙЭЛБОР <%s> СЕ щМА ЙЭЛБО <locale>\n"
 
 # gconf/gconftool.c:1480

-#: gconf/gconftool.c:1757
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
@@ -1636,32 +1945,32 @@ msgstr ""
 "%s\n"
 
 # gconf/gconftool.c:1488

-#: gconf/gconftool.c:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "еЦЙАТЕСТГЛщМО СВчЛА `%s' ЦИА ТГМ ТОПИЙч ЯЩХЛИСГ `%s'\n"
 
 # gconf/gconftool.c:1510

-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 "пяоеидопоигсг: аПОТУВъА СУСВщТИСГР СВчЛАТОР `%s' ЛЕ ТО ЙКЕИДъ `%s': %s\n"
 
 # gconf/gconftool.c:1518

-#: gconf/gconftool.c:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "сВчЛА `%s' ЕПИСУМэЖТГЙЕ СТО ЙКЕИДъ `%s'\n"
 
 # gconf/gconftool.c:1588

-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 "пЯщПЕИ МА УПэЯВЕИ ТОУКэВИСТОМ ЛъА ЙАТАВЧЯГСГ <locale> СЕ щМА <schema>\n"
 
 # gconf/gconftool.c:1617

-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
@@ -1669,19 +1978,19 @@ msgstr ""
 "<schemalist>\n"
 
 # gconf/gconftool.c:1639

-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "аПОТУВъА АМОъЦЛАТОР `%s': %s\n"
 
 # gconf/gconftool.c:1646

-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "тО щЦЦЯАЖО `%s' ЕъМАИ ЙЕМЭ;\n"
 
 # gconf/gconftool.c:1658

-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1691,13 +2000,13 @@ msgstr ""
 "ЕъМАИ <gconfschemafile>)\n"
 
 # gconf/gconftool.c:1671

-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "тО щЦЦЯАЖО `%s' ДЕМ щВЕИ ЙЭЛБО <gconfschemafile> ЙОЯУЖАъОУ ЕПИПщДОУ\n"
 
 # gconf/gconftool.c:1685

-#: gconf/gconftool.c:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
@@ -1705,18 +2014,18 @@ msgstr ""
 "<gconfschemafile>\n"
 
 # gconf/gconftool.c:1696 gconf/gconftool.c:1728

-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "сЖэКЛА СТО СУЦВЯОМИСЛЭ ДЕДОЛщМЫМ ДИАЛЭЯЖЫСГР: %s"
 
 # gconf/gconftool.c:1712

-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "пЯщПЕИ МА ЙАХОЯИСТОЩМ ЛЕЯИЙэ АЯВЕъА СВчЛАТОР ПЯОР ЕЦЙАТэСТАСГ\n"
 
 # gconf/gconftool.c:1749

-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1726,18 +2035,18 @@ msgstr ""
 "%s\n"
 
 # gconf/gconftool.c:1769

-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "аПОТУВъА СТГМ АЖАъЯЕСГ ЙКЕИДИОЩ СПАСъЛАТОР %s: %s\n"
 
 # gconf/gconftool.c:1895

-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "пЯщПЕИ МА ЙАХОЯИСТОЩМ ЛЕЯИЙэ ЙКЕИДИэ ЦИА СПэСИЛО\n"
 
 # gconf/gconftool.c:1901

-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1748,12 +2057,12 @@ msgstr ""
 "  %s\n"
 
 # gconf/gconftool.c:1919

-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "пЯщПЕИ МА ЙАХОЯИСТОЩМ ЛЕЯИЙОъ ЙАТэКОЦОИ ПЯОР СПэСИЛО\n"
 
 # gconf/gconftool.c:1938

-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1771,11 +2080,35 @@ msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "аПОТУВъА АПАЯъХЛГСГР ФЕУЦЧМ СТО `%s': %s"
 
 # gconf/gconf-internals.c:1292

-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, fuzzy, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "аМАЛЕМЭТАМ КъСТА АПЭ %s, КчЖХГЙЕ КъСТА АПЭ %s"
 
+# gconf/gconfd.c:972

+#~ msgid "Received signal %d, ignoring"
+#~ msgstr "кчЖХГЙЕ СчЛА %d, АЦМОЕъТАИ"
+
+# gconf/gconfd.c:1911

+#~ msgid "Attempt to unregister invalid context ID"
+#~ msgstr "пЯОСПэХЕИА ДИАЦЯАЖчР эЙУЯОУ context ID"
+
+# gconf/gconfd.c:1918

+#~ msgid "Bad context ID %lu, request ignored"
+#~ msgstr "кэХОР context ID %lu, АъТГСГ АЦМОЕъТАИ"
+
+# gconf/gconfd.c:1926

+#~ msgid "Already-unregistered context ID %lu, request ignored"
+#~ msgstr "Context ID %lu чДГ АПОЙАТАВЫЯГЛщМО, АъТГСГ АЦМОЕъТАИ"
+
+# gconf/gconfd.c:1951

+#~ msgid "Attempt to use invalid context ID %lu"
+#~ msgstr "пЯОСПэХЕИА ВЯчСГР эЙУЯОУ context ID %lu"
+
+# gconf/gconfd.c:1961

+#~ msgid "Attempt to use already-unregistered context ID %lu"
+#~ msgstr "пЯОСПэХЕИА ВЯчСГР чДГ АПОЙАТАВЫЯГЛщМОУ context ID %lu"
+
 # gconf/gconftool.c:1227

 #~ msgid ""
 #~ "WARNING: For now gconftool only knows how to install default values for "
diff --git a/po/fi.po b/po/fi.po
index 7a539f32..2925e444 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 0.5\n"
-"POT-Creation-Date: 2000-08-19 16:51-0400\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-30-03 11:25+0300\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
 "Language-Team: fi, out-of-team <fi@li.org>\n"
@@ -25,137 +25,137 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Poistetaan XML-moduuli muistista"
 
-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "XML:n juurihakemistoa ei voitu lЖytДД osoitteesta '%s'"
 
-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Hakemistoa '%s' ei voitu luoda: %s"
 
-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 "XML:n juurihakemistosta osoitteessa '%s' ei voi lukea, eikД sinne voi "
 "kirjoittaa"
 
-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 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:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr "KДynnistetДДn XML-moduuli"
 
-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "XML-hakemiston '%s' lukitusta ei voitu poistaa: %s"
 
-#: backends/xml-cache.c:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
 "%u seconds"
 msgstr ""
 
-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, fuzzy, c-format
 msgid "Could not stat `%s': %s"
 msgstr "Hakemistoa '%s' ei voitu luoda: %s"
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr ""
 
-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, fuzzy, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "'%s':n avaaminen epДonnistui: %s\n"
 
-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, fuzzy, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Tiedoston '%s' sulkeminen epДonnistui: %s"
 
-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, fuzzy, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "'%s':n avaaminen epДonnistui: %s\n"
 
-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, fuzzy, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "'%s':n arvon hakeminen epДonnistui: %s\n"
 
-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, fuzzy, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Tiedoston '%s' sulkeminen epДonnistui: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:802
+#: backends/xml-dir.c:788
 #, fuzzy, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "'%s':n avaaminen epДonnistui: %s\n"
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:975
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, fuzzy, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Tiedoston '%s' sulkeminen epДonnistui: %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2455
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Tiedoston '%s' sulkeminen epДonnistui: %s"
 
 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, fuzzy, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Virhe asetettaessa schemaa '%s':lle: %s"
 
-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2159
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, fuzzy, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Virhe asetettaessa schemaa '%s':lle: %s"
@@ -163,293 +163,577 @@ msgstr "Virhe asetettaessa schemaa '%s':lle: %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr ""
 
-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, fuzzy, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "VAROITUS: Oletusarvon '%s' jДsennys schemalle (%s) epДonnistui\n"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, fuzzy, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 "VAROITUS: <locale> osiolla ei ole 'name=\\\"locale\\\"' ominaisuutta: "
 "ohitetaan\n"
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1055
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
 #. -- end debug only
-#: gconf/gconf-backend.c:180
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "Tiedostoa '%s' ei lЖydy\n"
 
-#: gconf/gconf-backend.c:208
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "Virheellinen osoite '%s'"
 
-#: gconf/gconf-backend.c:233
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr "GConf ei toimi ilman tukea dynaamisille moduuleille (gmodule)"
 
-#: gconf/gconf-backend.c:243
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr "Virhe avattaessa moduulia '%s': %s\n"
 
-#: gconf/gconf-backend.c:275
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr "Moduulia '%s' ei lЖytynyt"
 
-#: gconf/gconf-backend.c:312
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr "Moduulia ei onnistuttu sulkemaan"
 
-#: gconf/gconf-error.c:39
+#: gconf/gconf-database.c:193
+msgid "Received invalid value in set request"
+msgstr "AsetuspyyntЖЖn vastaanotettiin virheellinen arvo."
+
+#: gconf/gconf-database.c:201
+#, 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:416
+msgid "Received request to drop all cached data"
+msgstr "PyyntЖ kaiken vДlivarastoidun tiedon hylkДДmiseen vastaanotettu"
+
+#: gconf/gconf-database.c:430
+msgid "Received request to sync synchronously"
+msgstr "SynkronointipyyntЖ vastaanotettu"
+
+#: gconf/gconf-database.c:495
+#, fuzzy
+msgid "Fatal error: failed to get object reference for ConfigDatabase"
+msgstr "Olioon ConfigServer ei saatu viittausta"
+
+#: gconf/gconf-database.c:617
+#, c-format
+msgid "Failed to sync one or more sources: %s"
+msgstr "YhtД tai useampaa lДhdettД ei voitu synkronoida: %s"
+
+#. 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:699
+#, c-format
+msgid ""
+"Failed to log addition of listener (%s); will not be able to restore this "
+"listener on gconfd restart, resulting in unreliable notification of "
+"configuration changes."
+msgstr ""
+
+#: gconf/gconf-database.c:724
+#, c-format
+msgid "Listener ID %lu doesn't exist"
+msgstr ""
+
+#: gconf/gconf-database.c:733
+#, 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:838 gconf/gconf-sources.c:1189
+#, c-format
+msgid "Error getting value for `%s': %s"
+msgstr "Virhe haettaessa '%s':n arvoa: %s"
+
+#: gconf/gconf-database.c:875
+#, c-format
+msgid "Error setting value for `%s': %s"
+msgstr "Virhe asetettaessa '%s':n arvoa: %s"
+
+#: gconf/gconf-database.c:910
+#, c-format
+msgid "Error unsetting `%s': %s"
+msgstr "Virhe poistettaessa '%s':aa: %s"
+
+#: gconf/gconf-database.c:931
+#, c-format
+msgid "Error getting default value for `%s': %s"
+msgstr "Virhe haettaessa oletusarcia '%s':lle: %s"
+
+#: gconf/gconf-database.c:969
+#, c-format
+msgid "Error checking existence of `%s': %s"
+msgstr "Virhe tutkittaessa '%s':n olemassaoloa: %s"
+
+#: gconf/gconf-database.c:993
+#, c-format
+msgid "Error removing dir `%s': %s"
+msgstr "Virhe poistettaessa hakemistoa '%s': %s"
+
+#: gconf/gconf-database.c:1019
+#, c-format
+msgid "Failed to get all entries in `%s': %s"
+msgstr "Kaikkien '%s':n osien saaminen ei onnistunut: %s"
+
+#: gconf/gconf-database.c:1045
+#, c-format
+msgid "Error listing dirs in `%s': %s"
+msgstr "Virhe luetteloidessa hakemistoja '%s':ssД: %s"
+
+#: gconf/gconf-database.c:1066
+#, c-format
+msgid "Error setting schema for `%s': %s"
+msgstr "Virhe asetettaessa schemaa '%s':lle: %s"
+
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr ""
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr ""
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr ""
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr ""
 
-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 #, fuzzy
 msgid "Couldn't resolve address for configuration source"
 msgstr "AsetuslДhdettД tai lДhteitД ei voitu kДyttДД: %s\n"
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr ""
 
-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 #, fuzzy
 msgid "Parse error"
 msgstr "OAF-jДsennysvirhe: %s"
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr ""
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr ""
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr ""
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr ""
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr ""
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr ""
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr ""
 
-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 #, fuzzy
 msgid "Failed to get a lock"
 msgstr "'%s':n arvon hakeminen epДonnistui: %s\n"
 
-#: gconf/gconf-internals.c:100
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Tiedoston '%s' sulkeminen epДonnistui: %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Virhe poistettaessa hakemistoa '%s': %s"
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Ei merkkiД '/' avaimessa '%s'"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "CORBA-arvoa ei voitu muuntaa luettelon osaksi"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "VДДrДntyyppinen luettelon osa %s"
 
-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "VДДrДntyyppinen luettelo vastaanotettu gconfd:ltД"
 
-#: gconf/gconf-internals.c:798
+#: gconf/gconf-internals.c:445
+#, fuzzy
+msgid "Failed to convert object to IOR"
+msgstr "YhtД tai useampaa lДhdettД ei voitu synkronoida: %s"
+
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Polkutiedostoa '%s' ei voitu avata: %s\n"
 
-#: gconf/gconf-internals.c:853
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "LisДtДДn lДhde '%s'\n"
 
-#: gconf/gconf-internals.c:865
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Virhe luettaessa tiedostoa '%s': %s\n"
 
-#: gconf/gconf-internals.c:1307
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Odotettiin luetteloa, saatiin %s"
 
-#: gconf/gconf-internals.c:1317
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Odotettiin %s:n listaa, mutta saatiin %s:n lista"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Odotettiin paria, saatiin %s"
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Odotettiin (%s,%s) -paria, mutta saatiin pari, josta toinen tai molemmat "
 "osat puuttuvat"
 
-#: gconf/gconf-internals.c:1486
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Odotettiin (%s,%s) -tyyppistД paria, saatiin tyyppiД (%s,%s) oleva"
 
-#: gconf/gconf-internals.c:1602
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Lainattu merkkijono ei ala lainausmerkillД"
 
-#: gconf/gconf-internals.c:1664
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Lainattu merkkijono ei lopu lainausmerkkiin"
 
-#: gconf/gconf-internals.c:2144 gconf/gconf.c:2643
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-virhe: %s"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "yritettiin poistaa luetteloimaton OAF-olio hakemistosta"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "yritettiin lisДtД jo luetteloitu OAF hakemisto"
 
-#: gconf/gconf-internals.c:2176
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF-jДsennysvirhe: %s"
 
-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Tuntematon OAF-virhe"
 
-#: gconf/gconf-internals.c:2264
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Ei IOR-tiedostoa hakemistossa '%s'"
 
-#: gconf/gconf-internals.c:2295
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd vei lukituksen '%s' toiselta prosessilta"
 
-#: gconf/gconf-internals.c:2306
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Toinen ohjelma on jo lukinnut '%s':n"
 
-#: gconf/gconf-internals.c:2326
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 "ORB:iin ei saatu yhteyttД yritettДessД ping:iД olemassa olevaan gconfd:hen"
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -458,43 +742,43 @@ msgstr ""
 "Poistetaan tyhjД lukitus '%s', koska IOR:ia ei voitu muuntaa "
 "olioviittaukseksi. IOR '%s'"
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr "Poistetaan tyhjД lukitus '%s' ping:in epДonnistuttua palvelimeen: %s"
 
-#: gconf/gconf-internals.c:2358
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf asetusdemoni (gconfd) omistaa lukituksen '%s'"
 
-#: gconf/gconf-internals.c:2372
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "hakemistoa '%s' ei voitu luoda: %s"
 
-#: gconf/gconf-internals.c:2407
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Lukitusta '%s' ei voitu luoda: %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Tiedostoon '%s' ei voi kirjoittaa: %s"
 
-#: gconf/gconf-internals.c:2486
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "Lukitustiedostoa '%s' ei voi avata; oletetaan ettei se kuulu meille: %s"
 
-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Virheellinen lukitustiedosto '%s': poistetaan"
 
-#: gconf/gconf-internals.c:2513
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -503,132 +787,127 @@ msgstr ""
 "Lukitustiedostoa '%s' ei luotu. (luojan pid %u, oma pid %u; oletetaan jonkin "
 "vieneen lukituksen)"
 
-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Lukitushakemistoa '%s' ei voitu vapauttaa: %s"
 
-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, fuzzy, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Tiedoston '%s' sulkeminen epДonnistui: %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, fuzzy, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Virhe luetteloitaessa hakemistoja: %s\n"
 
-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, fuzzy, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Virhe asetettaesa arvoa: %s"
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 
-#: gconf/gconf-sources.c:1205 gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr "Virhe haettaessa '%s':n arvoa: %s"
-
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr ""
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr ""
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr ""
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr ""
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr ""
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr ""
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
 
-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr "'%s': %s"
 
-#: gconf/gconf.c:271
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Palvelin ei voinut selvittДД osoitetta '%s'"
 
-#: gconf/gconf.c:408
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "Ei voitu lisДtД huomautuksia paikalliseen asetuslДhteeseen"
 
-#: gconf/gconf.c:1466
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Palvelimen ping epДonnistui, CORBA-virhe: %s"
 
-#: gconf/gconf.c:1482
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -638,83 +917,66 @@ msgstr ""
 "oaf_activate_from_id() ja ei asettanut virhekeskeytystД. Olkaa hyvД, ja "
 "tehkДД OAF:ista virheilmoitus."
 
-#: gconf/gconf.c:1677
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConfia ei voitu kДynnistДД, lopetetaan\n"
 
-#: gconf/gconf.c:1714
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "TДytyy alkaa kauttaviivalla (/)"
 
-#: gconf/gconf.c:1736
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kahta kauttaviivaa (/) ei voi olla perДkkДin"
 
-#: gconf/gconf.c:1738
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "PistettД (.) ei voi olla heti kauttaviivan (/) jДlkeen"
 
-#: gconf/gconf.c:1759
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' on virheellinen merkki avaimien ja hakemistojen nimissД"
 
-#: gconf/gconf.c:1773
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Avaimen tai hakemiston nimi ei voi pДДttyД kauttaviivaan (/)"
 
-#: gconf/gconf.c:2115
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Asetuspalvelinta ei voitu sulkea: %s"
 
-#: gconf/gconf.c:2176
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Odotettiin liukulukua, saatiin %s"
 
-#: gconf/gconf.c:2211
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Odotettiin kokonaislukua, mutta saatiin %s"
 
-#: gconf/gconf.c:2246
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Odotettiin merkkijonoa, mutta saatiin %s"
 
-#: gconf/gconf.c:2283
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Odotettiin totuusarvoa, mutta saatiin %s"
 
-#: gconf/gconf.c:2316
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Odotettiin schemaa, mutta saatiin %s"
 
-#: gconf/gconfd.c:511
-msgid "Received invalid value in set request"
-msgstr "AsetuspyyntЖЖn vastaanotettiin virheellinen arvo."
-
-#: gconf/gconfd.c:519
-#, 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/gconfd.c:789
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "SulkemispyyntЖ vastaanotettu"
 
-#: gconf/gconfd.c:802
-msgid "Received request to drop all cached data"
-msgstr "PyyntЖ kaiken vДlivarastoidun tiedon hylkДДmiseen vastaanotettu"
-
-#: gconf/gconfd.c:822
-msgid "Received request to sync synchronously"
-msgstr "SynkronointipyyntЖ vastaanotettu"
-
-#: gconf/gconfd.c:861
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -722,25 +984,25 @@ msgstr ""
 "gconfd kДДnnetty debug-tietojen kanssa. YritetДДn ladata gconf.path "
 "lДhdekoodihakemistosta"
 
-#: gconf/gconfd.c:879
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 "Asetustiedostoja ei lЖytynyt: yritetДДn kДyttДД oletusasetuslДhdettД '%s'"
 
-#: gconf/gconfd.c:888
+#: gconf/gconfd.c:244
 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:901
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Virhe ladattaessa asetuslДhteitД: %s"
 
-#: gconf/gconfd.c:913
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -748,32 +1010,37 @@ msgstr ""
 "LДhdehakemistoja ei saatu selville: asetustietoja ei voi ladata eikД "
 "tallentaa"
 
-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:287
+#, fuzzy
 msgid ""
-"No writeable config sources successfully resolved, may not be able to save "
+"No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 "Kirjoitettavissa olevia asetuslДhteitД ei saatu selville: joitakin asetusten "
 "muutoksia ei saateta voida tallentaa "
 
-#: gconf/gconfd.c:955 gconf/gconfd.c:967
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr "Signaali %d vastaanotettu: lopetetaan"
 
-#: gconf/gconfd.c:972
-#, c-format
-msgid "Received signal %d, ignoring"
-msgstr "Signaali %d vastaanotetty: ohitetaan"
+#: gconf/gconfd.c:329
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down cleanly"
+msgstr "Signaali %d vastaanotettu: lopetetaan"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:1013
-#, c-format
-msgid "starting, pid %u user `%s'"
+#: gconf/gconfd.c:376
+#, fuzzy, c-format
+msgid "starting (version %s), pid %u user '%s'"
 msgstr "KДynnistetДДn: pid %u, kДyttДjД '%s'"
 
-#: gconf/gconfd.c:1036
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -781,11 +1048,11 @@ msgstr ""
 "Object Activation Frameworkin kДynnistys epДonnistui: olkaa hyvД ja "
 "lДhettДkДД virheilmoitus OAF:in yllДpitДjille"
 
-#: gconf/gconfd.c:1056
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Olioon ConfigServer ei saatu viittausta"
 
-#: gconf/gconfd.c:1075
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -793,105 +1060,141 @@ msgstr ""
 "OAF ei tunne IID:tДmme, joten asennus on virheellinen. Ei voitu "
 "rekisterЖityД: poistutaan\n"
 
-#: gconf/gconfd.c:1079
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Toinen gconfd on jo rekisterЖitynyt OAF:iin: poistutaan\n"
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Tuntematon virhe rekisterЖitДessД gconfd:tД OAF:iin: poistutaan\n"
 
-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Poistutaan"
 
-#: gconf/gconfd.c:1194
+#: gconf/gconfd.c:818
 #, c-format
-msgid "Failed to sync one or more sources: %s"
-msgstr "YhtД tai useampaa lДhdettД ei voitu synkronoida: %s"
+msgid "Returning exception: %s"
+msgstr "Palautetaan poikkeus: %s"
 
-#: gconf/gconfd.c:1561
+#: gconf/gconfd.c:885
 #, c-format
-msgid "Error setting value for `%s': %s"
-msgstr "Virhe asetettaessa '%s':n arvoa: %s"
+msgid ""
+"Failed to open gconfd logfile; won't be able to restore listeners after "
+"gconfd shutdown (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:1593
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Error unsetting `%s': %s"
-msgstr "Virhe poistettaessa '%s':aa: %s"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:1614
-#, c-format
-msgid "Error getting default value for `%s': %s"
-msgstr "Virhe haettaessa oletusarcia '%s':lle: %s"
+#: gconf/gconfd.c:966
+#, fuzzy, c-format
+msgid "Could not open saved state file '%s' for writing: %s"
+msgstr "Polkutiedostoa '%s' ei voitu avata: %s\n"
 
-#: gconf/gconfd.c:1652
-#, c-format
-msgid "Error checking existence of `%s': %s"
-msgstr "Virhe tutkittaessa '%s':n olemassaoloa: %s"
+#: gconf/gconfd.c:980
+#, fuzzy, c-format
+msgid "Could not write saved state file '%s' fd: %d: %s"
+msgstr "Tiedostoon '%s' ei voi kirjoittaa: %s"
 
-#: gconf/gconfd.c:1676
-#, c-format
-msgid "Error removing dir `%s': %s"
-msgstr "Virhe poistettaessa hakemistoa '%s': %s"
+#: gconf/gconfd.c:989
+#, fuzzy, c-format
+msgid "Failed to close new saved state file '%s': %s"
+msgstr "Tiedoston '%s' sulkeminen epДonnistui: %s"
 
-#: gconf/gconfd.c:1701
-#, c-format
-msgid "Failed to get all entries in `%s': %s"
-msgstr "Kaikkien '%s':n osien saaminen ei onnistunut: %s"
+#: gconf/gconfd.c:1003
+#, fuzzy, c-format
+msgid "Could not move aside old saved state file '%s': %s"
+msgstr "Polkutiedostoa '%s' ei voitu avata: %s\n"
 
-#: gconf/gconfd.c:1725
+#: gconf/gconfd.c:1013
+#, fuzzy, c-format
+msgid "Failed to move new save state file into place: %s"
+msgstr "Tiedoston '%s' sulkeminen epДonnistui: %s"
+
+#: gconf/gconfd.c:1022
 #, c-format
-msgid "Error listing dirs in `%s': %s"
-msgstr "Virhe luetteloidessa hakemistoja '%s':ssД: %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr ""
 
-#: gconf/gconfd.c:1745
+#: gconf/gconfd.c:1110
 #, c-format
-msgid "Error setting schema for `%s': %s"
-msgstr "Virhe asetettaessa schemaa '%s':lle: %s"
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr ""
 
-#: gconf/gconfd.c:1913
-msgid "Attempt to unregister invalid context ID"
-msgstr "Yritys poistaa virheellisen context ID:n rekisterЖintiД"
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
+msgstr ""
 
-#: gconf/gconfd.c:1920
+#: gconf/gconfd.c:1140
 #, c-format
-msgid "Bad context ID %lu, request ignored"
-msgstr "Virheellinen context ID %lu, pyyntЖ ohitettiin"
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr ""
 
-#: gconf/gconfd.c:1928
+#: gconf/gconfd.c:1160
 #, c-format
-msgid "Already-unregistered context ID %lu, request ignored"
-msgstr "Jo rekisteristД poistettu context ID %lu, pyyntЖ ohitettiin"
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr ""
 
-#: gconf/gconfd.c:1953
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Tiedoston '%s' sulkeminen epДonnistui: %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Attempt to use invalid context ID %lu"
-msgstr "Yritys kДyttДД virheellistД context ID:tД %lu"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
+
+#: gconf/gconfd.c:1377
+#, fuzzy, c-format
+msgid "Unable to open saved state file '%s': %s"
+msgstr "Tiedoston '%s' sulkeminen epДonnistui: %s"
 
-#: gconf/gconfd.c:1963
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Attempt to use already-unregistered context ID %lu"
-msgstr "Yritys kДyttДД jo rekisteristД poistettua context ID:tД %lu"
+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:2123
+#: gconf/gconfd.c:1481
 #, c-format
-msgid "Returning exception: %s"
-msgstr "Palautetaan poikkeus: %s"
+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/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Ohjeasetukset"
 
-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 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:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Tulosta avaimen arvo stdout:iin"
 
-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -899,35 +1202,35 @@ msgstr ""
 "Aseta schema ja synkronoi. KДytД asetusten --short-desc, --long-desc, "
 "--owner ja --type kanssa."
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "Poista annetut avaimet."
 
-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Tulosta hakemiston kaikki avain+arvo -parit."
 
-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Tulosta hakemiston kaikki alihakemistot."
 
-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "Tulosta hakemiston kaikki alihakemistot ja tiedot rekursiivisesti."
 
-#: gconf/gconftool.c:149
+#: gconf/gconftool.c:135
 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:158
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Sulje gconfd. дLд KдYTд TдTд ASETUSTA ILMAN HYVдд SYYTд."
 
-#: gconf/gconftool.c:167
+#: gconf/gconftool.c:153
 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:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -935,7 +1238,7 @@ msgstr ""
 "KДynnistД asetuspalvelin (gconfd). (MikД yleensД tehdДДn tarvittaessa "
 "automaattisesti.)"
 
-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -943,12 +1246,12 @@ msgstr ""
 "MДДritД asetettavan arvon, tai scheman arvon, tyyppi. SelvДt lyhenteet "
 "kelpaavat."
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 #, fuzzy
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 #, fuzzy
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
@@ -957,11 +1260,11 @@ msgstr ""
 "MДДritД asetettavan arvon, tai scheman arvon, tyyppi. SelvДt lyhenteet "
 "kelpaavat."
 
-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 #, fuzzy
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
@@ -970,7 +1273,7 @@ msgstr ""
 "MДДritД asetettavan arvon, tai scheman arvon, tyyppi. SelvДt lyhenteet "
 "kelpaavat."
 
-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 #, fuzzy
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
@@ -979,43 +1282,43 @@ msgstr ""
 "MДДritД asetettavan arvon, tai scheman arvon, tyyppi. SelvДt lyhenteet "
 "kelpaavat."
 
-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Kirjoita lyhyt puolen rivin selostus schemaan laitettavaksi"
 
-#: gconf/gconftool.c:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "SELOSTUS"
 
-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "Kirjoita useamman rivin selostus schemaan laitettavaksi"
 
-#: gconf/gconftool.c:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "MДДritД scheman omistaja"
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "OMISTAJA"
 
-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "MДДritД asennettava schematiedosto"
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "TIEDOSTO"
 
-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 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:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "LдHDE"
 
-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1023,7 +1326,7 @@ msgstr ""
 "KДytД asetustietokantaa suoraan, ei palvelimen kautta. TДmД vaatii, ettД "
 "gconfd ei ole kДynnissД."
 
-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1034,7 +1337,7 @@ msgstr ""
 "osoittamaan ei-oletusasetuslДhteeseen, tai, jos halutaan kДyttДД oletusta, "
 "tyhjДksi."
 
-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1042,7 +1345,7 @@ msgstr ""
 "Rasitustestaa sovellusta asettamalla ja poistamalla joukkoa erityyppisiД "
 "komentorivillД mДДriteltyjД arvoja."
 
-#: gconf/gconftool.c:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1050,7 +1353,7 @@ msgstr ""
 "Rasitustestaa sovellusta asettamalla ja poistamalla joukkoa avaimia "
 "komentorivillД mДДritellyissД hakemistoissa."
 
-#: gconf/gconftool.c:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1060,24 +1363,24 @@ msgstr ""
 "Aja '%s --help' nДhdДksesi tДydellisen luettelon kДytettДvissД olevista\n"
 "komentoriviasetuksista\n"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Ei voida hakea ja poistaa tai asettaa samanaikaisesti\n"
 
-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Ei voida asettaa ja hakea tai poistaa samanaikaisesti\n"
 
-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr ""
 "--all-pairs -asetusta ei voi kДyttДД --get tai --set asetuksen kanssa\n"
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "--all-dirs asetusta ei voi kДyttДД --get tai --set asetuksen kanssa\n"
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1085,7 +1388,7 @@ msgstr ""
 "--recursive-list asetusta ei pitДisi kДyttДД --get, --set, --unset,\n"
 "--all-pairs tai --all-dirs asetusten kanssa\n"
 
-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1093,58 +1396,58 @@ msgstr ""
 "--set_schema asetusta ei pitДisi kДyttДД --get, --set, --unset, --all-pairs\n"
 "tai --all-dirs asetusten kanssa\n"
 
-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "ArvotyypillД on merkitystД vain arvoa asetettaessa\n"
 
-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "Arvoa asetettaessa sen tyyppi tДytyy mДДritellД\n"
 
-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping-asetusta voi kДyttДД vain yksinДДn.\n"
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exist asetusta voi kДyttДД vain yksinДДn.\n"
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file asetusta voi kДyttДД vain yksinДДn.\n"
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule asetusta voi kДyttДД vain yksinДДn.\n"
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key asetusta voi kДyttДД vain yksinДДn.\n"
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory asetusta voi kДyttДД vain yksinДДn.\n"
 
-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "--direct asetusta kДytettДessД tДytyy mДДritellД asetuslДhde asetuksella "
 "--config-source\n"
 
-#: gconf/gconftool.c:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConfin kДynnistys epДonnistui: %s\n"
 
-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE ympДriistЖmuuttuja pitДД asettaa\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1156,240 +1459,240 @@ msgstr ""
 "muita sovelluksia ei ole kДynnissД. (vaikka sen pitДisi toimia teoriassa\n"
 "ohjelmien kДynnissД ollessakin)\n"
 
-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "AsetuslДhdettД tai lДhteitД ei voitu kДyttДД: %s\n"
 
-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Sulkemisvirhe: %s\n"
 
-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 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:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "Virhe luetteloitaessa pareja '%s':ssa: %s"
 
-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(ei arvoa)"
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Asetuspalvelimen (gconfd) kДynnistys epДonnistui: %s\n"
 
-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "TДytyy mДДritellД haettavat avaimet\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tyyppi: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, fuzzy, c-format
 msgid "List Type: %s\n"
 msgstr "Tyyppi: %s\n"
 
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, fuzzy, c-format
 msgid "Car Type: %s\n"
 msgstr "Tyyppi: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, fuzzy, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Tyyppi: %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Omistaja: %s\n"
 
-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Poista"
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Lyhyt seloste: %s\n"
 
-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "PitkД seloste: %s\n"
 
-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Ei arvoa '%s':lle\n"
 
-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "'%s':n arvon hakeminen epДonnistui: %s\n"
 
-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Tyyppi '%s' ei ole tuettu\n"
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "TДytyy mДДritellД avain+arvo -pari parametreina\n"
 
-#: gconf/gconftool.c:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Avaimella '%s' ei arvoa\n"
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Virhe: %s\n"
 
-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Virhe asetettaesa arvoa: %s"
 
-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Virhe synkronoitaessa: %s"
 
-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Arvo (scheman nimi) tДytyy olla ainoana parametrina\n"
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1201
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1233
 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:1259
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "TДytyy mДДritellД poistettavat avaimet.\n"
 
-#: gconf/gconftool.c:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Virhe poistettaessa '%s':aa: %s\n"
 
-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 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:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Virhe luetteloitaessa hakemistoja: %s\n"
 
-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "VAROITUS: virheellinen tai puuttuva tyyppi schema:lle (%s)\n"
 
-#: gconf/gconftool.c:1378
+#: gconf/gconftool.c:1366
 #, fuzzy, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "VAROITUS: virheellinen tai puuttuva tyyppi schema:lle (%s)\n"
 
-#: gconf/gconftool.c:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "VAROITUS: Oletusarvon '%s' jДsennys schemalle (%s) epДonnistui\n"
 
-#: gconf/gconftool.c:1407
+#: gconf/gconftool.c:1395
 #, fuzzy, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "VAROITUS: virheellinen tai puuttuva tyyppi schema:lle (%s)\n"
 
-#: gconf/gconftool.c:1432
+#: gconf/gconftool.c:1420
 #, fuzzy
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "VAROITUS: Oletusarvon '%s' jДsennys schemalle (%s) epДonnistui\n"
 
-#: gconf/gconftool.c:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "VAROITUS: gconftool:in sisДinen virhe: tuntematon GConfValueType\n"
 
-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "VAROITUS: tyypin '%s' nimen jДsennys epДonnistui\n"
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "VAROITUS: tyhjД <applyto> osio"
 
-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "VAROITUS: osio <%s> ei ole ymmДrrettДvissД <schema>:n alapuolella\n"
 
-#: gconf/gconftool.c:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "VAROITUS: schemalle ei ole mДДritelty avainta\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "VAROITUS: <locale> osiolla ei ole 'name=\\\"locale\\\"' ominaisuutta: "
 "ohitetaan\n"
 
-#: gconf/gconftool.c:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1397,51 +1700,51 @@ msgstr ""
 "VAROITUS: useita <locale> osioita localelle '%s': ohitetaan kaikki paitsi "
 "ensimmДinen\n"
 
-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "VAROITUS: virheellinen osio <%s> osiossa <locale>\n"
 
-#: gconf/gconftool.c:1757
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "VAROITUS: scheman '%s' asennus localeen '%s' epДonnistui: %s\n"
 
-#: gconf/gconftool.c:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Asennettiin schema '%s' localelle '%s'\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "VAROITUS: ei voitu kytkeД schemaa '%s' avaimeen '%s': %s\n"
 
-#: gconf/gconftool.c:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Kytkettiin schema '%s' avaimeen '%s'\n"
 
-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 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> -osio\n"
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "VAROITUS: osio <%s> ei ole ymmДrrettДvissД <schemalist>:in alla\n"
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "'%s':n avaaminen epДonnistui: %s\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Asiakirja '%s' on tyhjД?\n"
 
-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1450,27 +1753,27 @@ msgstr ""
 "Asiakirjalla '%s' on vДДrДntyyppinen juuriosio (<%s>, pitДisi olla "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Asiakirjalla '%s' ei ole pДДtason <gconschemafile> -osiota\n"
 
-#: gconf/gconftool.c:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 "VAROITUS: osio <%s> <gconfschemafilen> alapuolella ei ole ymmДrrettДvissД\n"
 
-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Virhe synkronoitaessa asetustietoja: %s"
 
-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "TДytyy mДДritellД asennettavat schema-tiedostot\n"
 
-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1479,16 +1782,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Rikkomisavainta %s ei voitu poistaa: %s\n"
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "TДytyy mДДritellД rikottavat avaimet\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1497,11 +1800,11 @@ msgstr ""
 "YritetДДn rikkoa sovellus asettamalla virheellisiД arvoja avaimelle:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "TДytyy mДДritellД rikottavat hakemistot\n"
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1517,11 +1820,29 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Virhe luetteloitaessa pareja '%s':ssa: %s"
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, fuzzy, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Odotettiin %s:n listaa, mutta saatiin %s:n lista"
 
+#~ msgid "Received signal %d, ignoring"
+#~ msgstr "Signaali %d vastaanotetty: ohitetaan"
+
+#~ msgid "Attempt to unregister invalid context ID"
+#~ msgstr "Yritys poistaa virheellisen context ID:n rekisterЖintiД"
+
+#~ msgid "Bad context ID %lu, request ignored"
+#~ msgstr "Virheellinen context ID %lu, pyyntЖ ohitettiin"
+
+#~ msgid "Already-unregistered context ID %lu, request ignored"
+#~ msgstr "Jo rekisteristД poistettu context ID %lu, pyyntЖ ohitettiin"
+
+#~ msgid "Attempt to use invalid context ID %lu"
+#~ msgstr "Yritys kДyttДД virheellistД context ID:tД %lu"
+
+#~ msgid "Attempt to use already-unregistered context ID %lu"
+#~ msgstr "Yritys kДyttДД jo rekisteristД poistettua context ID:tД %lu"
+
 #~ msgid ""
 #~ "WARNING: For now gconftool only knows how to install default values for "
 #~ "simple types (int, string, bool, float)\n"
diff --git a/po/fr.po b/po/fr.po
index ceb58bf3..d0258c66 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 0.8\n"
-"POT-Creation-Date: 2000-08-19 16:51-0400\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-08-14 09:59+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <christophe@merlet.net>\n"
 "Language-Team: French\n"
@@ -14,49 +14,49 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "DИchargement du module XML."
 
-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Impossible de trouver le rИpertoire racine XML Ю l'adresse `%s'"
 
-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Impossible de crИer le rИpertoire `%s' : %s"
 
-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 "Impossible de lire ou d'Иcrire vers le rИpertoire racine XML Ю l'adresse `%s'"
 
-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "Les permissions du rИpertoire/fichier pour la source XML Ю la racine %s sont "
 ": %o/%o"
 
-#: backends/xml-backend.c:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr "Initialisation du module XML"
 
-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "иchec pour donner le verrou sur le rИpertoire XML `%s' : %s"
 
-#: backends/xml-cache.c:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 "Suppressions de rИpertoire non synchronisИes durant l'extinction du module "
 "XML"
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -65,7 +65,7 @@ msgstr ""
 "Impossible de supprimer le rИpertoire `%s' depuis le cache XML, parce qu'il "
 "n'a pas ИtИ convenablement synchronisИ sur le disque"
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -74,84 +74,84 @@ msgstr ""
 "%u ИlИments restent dans le cache aprИs avoir nettoyИ les ИlИments dИjЮ "
 "synchronisИs plus vieux que %u secondes"
 
-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "Impossible d'avoir les statistiques `%s' : %s"
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "Le nom de fichier XML `%s' est un rИpertoire"
 
-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Impossible de supprimer `%s' : %s"
 
-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Impossible d'Иcrire le fichier `%s' : %s"
 
-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Impossible de renommer `%s' vers `%s' : %s"
 
-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Impossible de restaurer `%s' depuis `%s' : %s"
 
-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Impossible de supprimer l'ancien fichier `%s' : %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:802
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "иchec de statistiques `%s' : %s"
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Ignore l'entrИe `%s' dupliquИe dans `%s'"
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Ignore l'entrИe sans nom dans le fichier XML `%s'"
 
-#: backends/xml-dir.c:975
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Le noeud racine dans le fichier XML `%s' n'est pas une <entry>, ignore"
 
-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Impossible de crИer le fichier `%s' : %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2455
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Impossible de fermer le fichier `%s' : %s"
 
 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignore le noeud XML nommИ `%s' : %s"
 
-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2159
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignore le nom de schema `%s', invalide : %s"
@@ -159,293 +159,579 @@ msgstr "Ignore le nom de schema `%s', invalide : %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "Ignore le noeud XML `%s', Ю part pour le nom possible de schema : %s"
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr "a trouvИ <local_schema> avec aucun rИglage de locale"
 
-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "иchec durant la lecture de la valeur par dИfaut pour le schema : %s"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Aucun attribut \"type\" pour le noeud <%s>"
 
-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Un noeud a un attribut \"type\" `%s' inconnu, ignore"
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "Aucun attribut \"value\" pour le noeud"
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 "Impossible de comprendre le noeud XML <%s> Ю l'intИrieur d'un noeud XML list"
 
-#: backends/xml-entry.c:1055
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Type invalide (list, pair, ou inconnu) dans un noeud liste"
 
-#: backends/xml-entry.c:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Mauvais noeud XML : %s"
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "La liste contient un noeud mal formИ (%s, devrait Йtre %s)"
 
-#: backends/xml-entry.c:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignore le mauvais car de la paire XML : %s"
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "analyse le fichier XML : listes et paires ne doivent pas Йtre situИes Ю "
 "l'intИrieur d'une paire"
 
-#: backends/xml-entry.c:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignore le mauvais cdr de la paire XML : %s"
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 "Impossible de comprendre le noeud XML <%s> Ю l'intИrieur du noeud de paire "
 "XML"
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 "Impossible de trouver les valeurs car et cdr pour le noeud de paire XML"
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Il manque la valeur cdr de la paire de valeur dans le fichier XML"
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "Il manque la valeur car de la paire de valeur dans le fichier XML"
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Il manque les valeurs car et cdr de la paire dans le fichier XML"
 
 #. -- end debug only
-#: gconf/gconf-backend.c:180
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "Aucun fichier `%s'\n"
 
-#: gconf/gconf-backend.c:208
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "Mauvaise addresse `%s'"
 
-#: gconf/gconf-backend.c:233
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr ""
 "GConf ne peut fonctionner sans le support des modules dynamiques (gmodule)"
 
-#: gconf/gconf-backend.c:243
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr "Erreur durant l'ouverture du module `%s' : %s\n"
 
-#: gconf/gconf-backend.c:275
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr "Impossible de trouver le module pour `%s'"
 
-#: gconf/gconf-backend.c:312
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr "Impossible d'etteindre le module"
 
-#: gconf/gconf-error.c:39
+#: gconf/gconf-database.c:193
+msgid "Received invalid value in set request"
+msgstr "RИception d'une valeur invalide dans la requХte de dИfinition"
+
+#: gconf/gconf-database.c:201
+#, c-format
+msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
+msgstr ""
+"Impossible de comprendre le sens de la valeur CORBA reГu dans la requХte de "
+"dИfinition de la clИ `%s'"
+
+#: gconf/gconf-database.c:416
+msgid "Received request to drop all cached data"
+msgstr "RИception de la requХte d'abandonner toutes les donnИes cachИes"
+
+#: gconf/gconf-database.c:430
+msgid "Received request to sync synchronously"
+msgstr "RИception de la requХte de synchronisation synchrone"
+
+#: gconf/gconf-database.c:495
+#, fuzzy
+msgid "Fatal error: failed to get object reference for ConfigDatabase"
+msgstr "Impossible d'obtenir la rИfИrence de l'objet pour ConfigServer"
+
+#: gconf/gconf-database.c:617
+#, c-format
+msgid "Failed to sync one or more sources: %s"
+msgstr "Impossible de synchroniser une ou plusieurs sources : %s"
+
+#. 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:699
+#, c-format
+msgid ""
+"Failed to log addition of listener (%s); will not be able to restore this "
+"listener on gconfd restart, resulting in unreliable notification of "
+"configuration changes."
+msgstr ""
+
+#: gconf/gconf-database.c:724
+#, c-format
+msgid "Listener ID %lu doesn't exist"
+msgstr ""
+
+#: gconf/gconf-database.c:733
+#, 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:838 gconf/gconf-sources.c:1189
+#, c-format
+msgid "Error getting value for `%s': %s"
+msgstr "Erreur durant l'obtention de la valeur de `%s' : %s"
+
+#: gconf/gconf-database.c:875
+#, c-format
+msgid "Error setting value for `%s': %s"
+msgstr "Erreur durant la dИfinition de la valeur de `%s' : %s"
+
+#: gconf/gconf-database.c:910
+#, c-format
+msgid "Error unsetting `%s': %s"
+msgstr "Erreur durant l'annulation de `%s' : %s"
+
+#: gconf/gconf-database.c:931
+#, c-format
+msgid "Error getting default value for `%s': %s"
+msgstr "Erreur durant l'obtention de la valeur par dИfaut de `%s' : %s"
+
+#: gconf/gconf-database.c:969
+#, c-format
+msgid "Error checking existence of `%s': %s"
+msgstr "Erreur durant la vИrification de l'existence de `%s': %s"
+
+#: gconf/gconf-database.c:993
+#, c-format
+msgid "Error removing dir `%s': %s"
+msgstr "Erreur durant la suppression du rИpertoire `%s' : %s"
+
+#: gconf/gconf-database.c:1019
+#, c-format
+msgid "Failed to get all entries in `%s': %s"
+msgstr "Impossible d'obtenir toutes les entrИes dans `%s' : %s"
+
+#: gconf/gconf-database.c:1045
+#, c-format
+msgid "Error listing dirs in `%s': %s"
+msgstr "Erreur durant le listage des rИpertoires dans `%s' : %s"
+
+#: gconf/gconf-database.c:1066
+#, c-format
+msgid "Error setting schema for `%s': %s"
+msgstr "Erreur durant la definition du schema pour `%s' : %s"
+
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr "SuccИs"
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr "иchec"
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr "Le serveur de configuration ne peut Йtre contactИ"
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr "Permission refusИe"
 
-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
 msgstr "Impossible de rИsoudre l'adresse de la source de configuration"
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr "Mauvais nom de clИ ou de rИpertoire"
 
-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 msgid "Parse error"
 msgstr "Erreur d'analyse"
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr "DonnИe corrompu dans la base de donnИes de configuration source"
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr "Type non correspondant"
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr "OpИration de clИ sur un rИpertoire"
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr "OpИration de rИpertoire sur une clИ"
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr "Impossible d'Иcraser une valeur existante en lecture seule"
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr "Erreur Object Activation Framework"
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr "OpИration interdite sans un serveur de configuration"
 
-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 msgid "Failed to get a lock"
 msgstr "Impossible d'obtenir un verrou"
 
-#: gconf/gconf-internals.c:100
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Impossible de fermer le fichier `%s' : %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Erreur durant la suppression du rИpertoire `%s' : %s"
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Pas de '/' dans la clИ `%s'"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Impossible d'interprИter la valeur CORBA pour l'ИlИment de liste"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Type incorrect pour un ИlИment de liste dans %s"
 
-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "RИception d'une liste depuis gconfd avec un mauvais type de liste"
 
-#: gconf/gconf-internals.c:798
+#: gconf/gconf-internals.c:445
+#, fuzzy
+msgid "Failed to convert object to IOR"
+msgstr "Impossible de synchroniser une ou plusieurs sources : %s"
+
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Imposiible d'ouvrir le chemin d'accХs des fichiers `%s' : %s\n"
 
-#: gconf/gconf-internals.c:853
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Ajout de la source `%s'\n"
 
-#: gconf/gconf-internals.c:865
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Erreur lu dans le fichier `%s' : %s\n"
 
-#: gconf/gconf-internals.c:1307
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Attend une liste, obtient %s"
 
-#: gconf/gconf-internals.c:1317
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Attend une liste de %s, obtient une liste de %s"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Attend une paire, obtient %s"
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Attend une paire (%s,%s), obtient une paire avec une ou deux valeur manquante"
 
-#: gconf/gconf-internals.c:1486
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Attend une paire de type (%s,%s), obtient type (%s,%s)"
 
-#: gconf/gconf-internals.c:1602
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "La chaine quotИe ne commence pas avec une marque de quotation"
 
-#: gconf/gconf-internals.c:1664
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "La chaine quotИe ne se finit pas avec une marque de quotation"
 
-#: gconf/gconf-internals.c:2144 gconf/gconf.c:2643
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Erreur CORBA : %s"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "tentative de supprimer un objet rИpertoire OAF non listИ"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "tentative d'ajouter un rИpertoire OAF dИjЮ listИ"
 
-#: gconf/gconf-internals.c:2176
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Erreur OAF d'analyse : %s"
 
-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Erreur OAF inconnu"
 
-#: gconf/gconf-internals.c:2264
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Pas de fichier ior dans `%s'"
 
-#: gconf/gconf-internals.c:2295
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd a pris le verrou `%s' d'un autre processus"
 
-#: gconf/gconf-internals.c:2306
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Un autre programme a le verrou `%s'"
 
-#: gconf/gconf-internals.c:2326
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "impossible de contacter ORB pour 'pinger' le gconfd existant"
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -454,46 +740,46 @@ msgstr ""
 "Suppression du verrrou pИrimИ `%s' parce que IOR ne peut Йtre converti vers "
 "une rИfИrence d'objet, IOR `%s'"
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "Suppression du verrou pИrimИ `%s' Ю cause d'une erreur de contact du serveur "
 ": %s"
 
-#: gconf/gconf-internals.c:2358
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "Le dИmon de configuration GConf (gconfd) a le verrou `%s'"
 
-#: gconf/gconf-internals.c:2372
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "impossible de crИer le rИpertoire `%s' : %s"
 
-#: gconf/gconf-internals.c:2407
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Impossible de crИer le verrou `%s' : %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Impossible d'Иcrire vers le fichier `%s' : %s"
 
-#: gconf/gconf-internals.c:2486
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "Impossible d'ouvrir le verrou de fichier `%s'; prИsume que ce n'est pas le "
 "notre : %s"
 
-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Verrou de fichier `%s' corrompu, supprimИ"
 
-#: gconf/gconf-internals.c:2513
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -502,26 +788,26 @@ msgstr ""
 "Impossible de crИer le verrou de fichier `%s' (pid du crИateur %u, votre pid "
 "%u; prИsume que quelqu'un Ю pris votre verrou"
 
-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Impossible de libИrer le verrou de rИpertoire `%s' : %s"
 
-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Impossible de charger la source `%s' : %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Le schema `%s' spИcifiИ pour `%s' ne contient pas une valeur de schema"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Le nom '/' peut seulement Йtre un rИpertoire, pas une clИ"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -530,112 +816,107 @@ msgstr ""
 "La valeur pour `%s' est dИfini dans une source en lecture seulement en "
 "premier dans votre chemin d'accХs de configuration."
 
-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Erreur lors de la recherche de la metainfo : %s"
 
-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Erreur durant l'obtention de la metainfo : %s"
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 "ClИ `%s' listИ comme schema pour la clИ `%s' est actuellement de type `%s'"
 
-#: gconf/gconf-sources.c:1205 gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr "Erreur durant l'obtention de la valeur de `%s' : %s"
-
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Impossible de comprendre `%s' (entier attendu)"
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "L'entier `%s' est trop grand ou trop petit"
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Impossible de comprendre `%s' (nombre rИИl attendu"
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Impossible de comprendre `%s' (true ou false attendu)"
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "Impossible de comprendre `%s' (une liste doit commencer avec un '[')"
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "Impossible de comprendre `%s' (une liste doit terminer avec un ']')"
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 "Impossible de comprendre `%s' (un ']' non ИchappИ a ИtИ trouvИ Ю l'intИrieur "
 "de la liste)"
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "Impossible de comprendre `%s' (caractХres superflus)"
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "Impossible de comprendre `%s' (une paire doit commencer avec une '(')"
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "Impossible de comprendre `%s' (une paire doit terminer avec une ')')"
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "Impossible de comprendre `%s' (mauvais nombre d'ИlИments)"
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
 "Impossible de comprendre `%s' (une ')' non ИchappИe trouvИe Ю l'intИrieur "
 "d'une paire)"
 
-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr "`%s' : %s"
 
-#: gconf/gconf.c:271
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Le serveur ne peut rИsoudre l'adresse `%s'"
 
-#: gconf/gconf.c:408
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 "Impossible d'ajouter des notifications Ю une source de configuration locale"
 
-#: gconf/gconf.c:1466
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Impossible de contacter le serveur, erreur CORBA : %s"
 
-#: gconf/gconf.c:1482
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -645,85 +926,66 @@ msgstr ""
 "oaf_activate_from_id() et ne dИfini pas une exception expliquant le "
 "problХme. Envoyer par mail un rapport de bug, SVP."
 
-#: gconf/gconf.c:1677
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Impossible d'initialiser GConf, quitte\n"
 
-#: gconf/gconf.c:1714
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Doit commencer avec un slash (/)"
 
-#: gconf/gconf.c:1736
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Impossible d'avoir deux slashs (/) dans une rangИe"
 
-#: gconf/gconf.c:1738
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Impossible d'avoir un point (.) juste aprИs un slash (/)"
 
-#: gconf/gconf.c:1759
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' est un caractХre invalide dans un nom de clИ/rИpertoire"
 
-#: gconf/gconf.c:1773
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Une clИ/rИpertoire ne peut se finir avec un slash (/)"
 
-#: gconf/gconf.c:2115
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "иchec d'extinction du serveur de configuration : %s"
 
-#: gconf/gconf.c:2176
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Flottant attendu, obtenu %s"
 
-#: gconf/gconf.c:2211
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Entier attendu, obtenu %s"
 
-#: gconf/gconf.c:2246
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Chaine attendu, obtenu %s"
 
-#: gconf/gconf.c:2283
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "BoolИain attendu, obtenu %s"
 
-#: gconf/gconf.c:2316
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Schema attendu, obtenu %s"
 
-#: gconf/gconfd.c:511
-msgid "Received invalid value in set request"
-msgstr "RИception d'une valeur invalide dans la requХte de dИfinition"
-
-#: gconf/gconfd.c:519
-#, c-format
-msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
-msgstr ""
-"Impossible de comprendre le sens de la valeur CORBA reГu dans la requХte de "
-"dИfinition de la clИ `%s'"
-
-#: gconf/gconfd.c:789
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "RИception de la requХte d'extinction"
 
-#: gconf/gconfd.c:802
-msgid "Received request to drop all cached data"
-msgstr "RИception de la requХte d'abandonner toutes les donnИes cachИes"
-
-#: gconf/gconfd.c:822
-msgid "Received request to sync synchronously"
-msgstr "RИception de la requХte de synchronisation synchrone"
-
-#: gconf/gconfd.c:861
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -731,7 +993,7 @@ msgstr ""
 "gconfd compilИ avec deboggage; tente de charger gconf.path depuis le "
 "rИpertoire de source"
 
-#: gconf/gconfd.c:879
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -739,7 +1001,7 @@ msgstr ""
 "Aucuns fichiers de configuration trouvИs, tente d'utiliser la source de "
 "configuration par dИfaut `%s'"
 
-#: gconf/gconfd.c:888
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -747,12 +1009,12 @@ msgstr ""
 "Aucunes sources de configuration dans le chemin d'accХs des sources, "
 "configuration ne seront pas sauvИes; Иditez "
 
-#: gconf/gconfd.c:901
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Erreur lors du chargement de quelques sources de configuration : %s"
 
-#: gconf/gconfd.c:913
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -760,33 +1022,38 @@ msgstr ""
 "Aucunes adresses de source de configuration correctement rИsolues, "
 "impossible de charger ou d'enregistrer de donnИes de configuration."
 
-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:287
+#, fuzzy
 msgid ""
-"No writeable config sources successfully resolved, may not be able to save "
+"No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 "Aucunes sources de configuration d'accХs en Иcriture correctement rИsolues, "
 "il est possible que quelques changements de configuration ne puissent Йtre "
 "sauvИs"
 
-#: gconf/gconfd.c:955 gconf/gconfd.c:967
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr "RИception du signal %d, acheve."
 
-#: gconf/gconfd.c:972
-#, c-format
-msgid "Received signal %d, ignoring"
-msgstr "RИception du signal %d, ignore"
+#: gconf/gconfd.c:329
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down cleanly"
+msgstr "RИception du signal %d, acheve."
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:1013
-#, c-format
-msgid "starting, pid %u user `%s'"
+#: gconf/gconfd.c:376
+#, fuzzy, c-format
+msgid "starting (version %s), pid %u user '%s'"
 msgstr "dИmarrage, pid %u utilisateur `%s'"
 
-#: gconf/gconfd.c:1036
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -794,11 +1061,11 @@ msgstr ""
 "Impossible d'initialiser 'Object Activation Framework' : envoyer un rapport "
 "de bug par mail aux mainteneurs d'OAF, SVP."
 
-#: gconf/gconfd.c:1056
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Impossible d'obtenir la rИfИrence de l'objet pour ConfigServer"
 
-#: gconf/gconfd.c:1075
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -806,106 +1073,142 @@ msgstr ""
 "OAF ne connait rien de votre IID; surement une mauvaise installation; "
 "impossible de s'enregistrer; quitte\n"
 
-#: gconf/gconfd.c:1079
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Un autre gconfd est dИjЮ enregistrИ auprИs de OAF; quitte\n"
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr ""
 "Erreur inconnu durant l'enregistrement de gconfd auprИs de OAF; quitte\n"
 
-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Quitte"
 
-#: gconf/gconfd.c:1194
+#: gconf/gconfd.c:818
 #, c-format
-msgid "Failed to sync one or more sources: %s"
-msgstr "Impossible de synchroniser une ou plusieurs sources : %s"
+msgid "Returning exception: %s"
+msgstr ""
 
-#: gconf/gconfd.c:1561
+#: gconf/gconfd.c:885
 #, c-format
-msgid "Error setting value for `%s': %s"
-msgstr "Erreur durant la dИfinition de la valeur de `%s' : %s"
+msgid ""
+"Failed to open gconfd logfile; won't be able to restore listeners after "
+"gconfd shutdown (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:1593
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Error unsetting `%s': %s"
-msgstr "Erreur durant l'annulation de `%s' : %s"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:1614
-#, c-format
-msgid "Error getting default value for `%s': %s"
-msgstr "Erreur durant l'obtention de la valeur par dИfaut de `%s' : %s"
+#: gconf/gconfd.c:966
+#, fuzzy, c-format
+msgid "Could not open saved state file '%s' for writing: %s"
+msgstr "Imposiible d'ouvrir le chemin d'accХs des fichiers `%s' : %s\n"
 
-#: gconf/gconfd.c:1652
-#, c-format
-msgid "Error checking existence of `%s': %s"
-msgstr "Erreur durant la vИrification de l'existence de `%s': %s"
+#: gconf/gconfd.c:980
+#, fuzzy, c-format
+msgid "Could not write saved state file '%s' fd: %d: %s"
+msgstr "Impossible d'Иcrire vers le fichier `%s' : %s"
 
-#: gconf/gconfd.c:1676
-#, c-format
-msgid "Error removing dir `%s': %s"
-msgstr "Erreur durant la suppression du rИpertoire `%s' : %s"
+#: gconf/gconfd.c:989
+#, fuzzy, c-format
+msgid "Failed to close new saved state file '%s': %s"
+msgstr "Impossible de fermer le fichier `%s' : %s"
 
-#: gconf/gconfd.c:1701
-#, c-format
-msgid "Failed to get all entries in `%s': %s"
-msgstr "Impossible d'obtenir toutes les entrИes dans `%s' : %s"
+#: gconf/gconfd.c:1003
+#, fuzzy, c-format
+msgid "Could not move aside old saved state file '%s': %s"
+msgstr "Imposiible d'ouvrir le chemin d'accХs des fichiers `%s' : %s\n"
 
-#: gconf/gconfd.c:1725
-#, c-format
-msgid "Error listing dirs in `%s': %s"
-msgstr "Erreur durant le listage des rИpertoires dans `%s' : %s"
+#: gconf/gconfd.c:1013
+#, fuzzy, c-format
+msgid "Failed to move new save state file into place: %s"
+msgstr "Impossible de crИer le fichier `%s' : %s"
 
-#: gconf/gconfd.c:1745
+#: gconf/gconfd.c:1022
 #, c-format
-msgid "Error setting schema for `%s': %s"
-msgstr "Erreur durant la definition du schema pour `%s' : %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr ""
+
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Impossible de comprendre `%s' (une liste doit commencer avec un '[')"
 
-#: gconf/gconfd.c:1913
-msgid "Attempt to unregister invalid context ID"
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
 msgstr ""
 
-#: gconf/gconfd.c:1920
+#: gconf/gconfd.c:1140
 #, c-format
-msgid "Bad context ID %lu, request ignored"
+msgid "Failed to unquote config source address from saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1928
+#: gconf/gconfd.c:1160
 #, c-format
-msgid "Already-unregistered context ID %lu, request ignored"
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr ""
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Impossible de crИer le fichier `%s' : %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
 msgstr ""
 
-#: gconf/gconfd.c:1953
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Attempt to use invalid context ID %lu"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1963
+#: gconf/gconfd.c:1377
+#, fuzzy, c-format
+msgid "Unable to open saved state file '%s': %s"
+msgstr "Impossible de crИer le fichier `%s' : %s"
+
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Attempt to use already-unregistered context ID %lu"
+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:2123
+#: gconf/gconfd.c:1481
 #, c-format
-msgid "Returning exception: %s"
+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/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Options d'aide"
 
-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "DИfini une valeur Ю une clИ et synchronise. ю utiliser avec --type."
 
-#: gconf/gconftool.c:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Affiche la valeeur d'une clИ sur la sortie standard."
 
-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -913,36 +1216,36 @@ msgstr ""
 "DИfini un schema et synchronise. ю utiliser avec --short-desc, --long-desc, "
 "--owner, et --type."
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "Annule les clИs prИsentes sur la ligne de commande."
 
-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Affiche toutes les paires clИ/valeur d'un rИpertoire."
 
-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Affiche tous les sous-rИpertoires d'un rИpertoire."
 
-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Affiche tous les sous-rИpertoires et entrИes d'un rИpertoire, recursivement."
 
-#: gconf/gconftool.c:149
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Retourne 0 si le rИpertoire existe, sinon 2."
 
-#: gconf/gconftool.c:158
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "AchХve gconfd. N'UTILISEZ PAS CETTE OPTION SANS UNE BONNE RAISON."
 
-#: gconf/gconftool.c:167
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Retourne 0 si gconfd fonctionne, sinon 2."
 
-#: gconf/gconftool.c:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -950,7 +1253,7 @@ msgstr ""
 "ExИcute le serveur de configuration (gconfd). (Normallement cela ce fait "
 "automatiquement quand c'est nИcessaire.)"
 
-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -958,11 +1261,11 @@ msgstr ""
 "SpИcifie le type d'une valeur Ю dИfinir, ou le type d'une valeur que dИcrit "
 "un schema.  AbbrИviation unique OK."
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -970,11 +1273,11 @@ msgstr ""
 "SpИcifie le type d'une liste de valeur Ю dИfinir, ou le type d'une valeur "
 "que dИcrit un schema. AbbrИviation unique OK."
 
-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -982,7 +1285,7 @@ msgstr ""
 "SpИcifie le type de la valeur du premier ИlИment d'une paire Ю dИfinir, ou "
 "le type d'une valeur que dИcrit un schema. AbbrИviation unique OK."
 
-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -990,46 +1293,46 @@ msgstr ""
 "SpИcifie le type de la valeur du second ИlИment d'une paire Ю dИfinir, ou le "
 "type d'une valeur que dИcrit un schema. AbbrИviation unique OK."
 
-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "SpИcifie une courte description d'une demi-ligne allant dans un schema."
 
-#: gconf/gconftool.c:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "SpИcifie une description de plusieurs ligne allant dans un schema."
 
-#: gconf/gconftool.c:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "SpИcifie le propriИtaire d'un schema."
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "PROPRIиTAIRE"
 
-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "SpИcifie le fichier du schema Ю installer."
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "NOMDUFICHIER"
 
-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "SpИcifie une source de configuration Ю utiliser plutot que le chemin par "
 "dИfaut."
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "SOURCE"
 
-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1037,7 +1340,7 @@ msgstr ""
 "AccХde directement Ю la base de donnИes de configuration, outrepassant le "
 "serveur. Il est nИcessaire que gconfd ne fonctionne pas."
 
-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1048,7 +1351,7 @@ msgstr ""
 "Йtre dИfini sur la source de configuration par dИfaut ou doit Йtre dИfini Ю "
 "une chaine vide pour utiliser la valeur par dИfaut."
 
-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1056,7 +1359,7 @@ msgstr ""
 "Torture-test une application en dИfinissant et annulant un ensemble de "
 "valeurs de diffИrents types pour les clИs de la ligne de commande."
 
-#: gconf/gconftool.c:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1064,7 +1367,7 @@ msgstr ""
 "Torture-test une application en dИfinissant et annulant un ensemble de clИs "
 "Ю l'intИrieur des rИpertoires de la ligne de commande."
 
-#: gconf/gconftool.c:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1074,23 +1377,23 @@ msgstr ""
 "Executez '%s --help' pour voir la liste complХte des options en ligne de "
 "commande disponibles.\n"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Impossible d'obtenir ou dИfinir/annuler simultanement\n"
 
-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Impossible de dИfinir ou d'obtenir/annuler simultanИment\n"
 
-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "Impossible d'utiliser --all-pairs avec --get ou --set\n"
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Impossible d'utiliser --all-dirs avec --get ou --set\n"
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1098,7 +1401,7 @@ msgstr ""
 "--recursive-list ne devrait pas Йtre utilisИ avec --get, --set, --unset, "
 "--all-pairs, ou --all-dirs\n"
 
-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1106,59 +1409,59 @@ msgstr ""
 "--set_schema ne devrait pas Йtre utilisИ avec --get, --set, --unset, "
 "--all-pairs, et --all-dirs\n"
 
-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 "Le type de valeur est nИcessaire seulement lorsque l'on dИfinie une valeur\n"
 
-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "Vous devez spИcifier un type lorsque vous dИfinissez une valeur\n"
 
-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "L'option ping doit Йtre utilisИe seule.\n"
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "L'option --dir-exists doit Йtre utilisИe seule.\n"
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "L'option --install-schema-file doit Йtre utilisИe seule.\n"
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "L'option --makefile-install-rule doit Йtre utilisИe seule.\n"
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "L'option --break-key doit Йtre utilisИe seule.\n"
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "L'option --break-directory doit Йtre utilisИe seule.\n"
 
-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "You devez spИcifier une source de configuration avec --config-source quand "
 "vous utilisez --direct\n"
 
-#: gconf/gconftool.c:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Echec Ю l'initialisation de GConf : %s\n"
 
-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Vous devez dИfinir la variable d'environnement GCONF_CONFIG_SOURCE\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1171,218 +1474,218 @@ msgstr ""
 "qu'aucune applications ne fonctionne (cepandant, thИoriquement, cela devrait "
 "fonctionner meme si des applications sont en cours de fonctionnement).\n"
 
-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Impossible d'accИder a(ux) source(s) de configuration : %s\n"
 
-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Erreur d'extinction : %s\n"
 
-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "Vous devez spИcifier un ou plusieurs rИpertoires Ю lister rИcursivement.\n"
 
-#: gconf/gconftool.c:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "иchec lors du listage des paires dans `%s' : %s"
 
-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(aucune valeur dИfini)"
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Impossible de 'spawner' le serveur de configuration (gconfd) : %s\n"
 
-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "Vous devez spИcifier une ou plusieurs clИs Ю dИfinir\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Type : %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Type Liste : %s\n"
 
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Type Car : %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Type Cdr : %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "PropriИtaire : %s\n"
 
-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "IndИfini"
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Courte desc. : %s\n"
 
-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Longue desc. : %s\n"
 
-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Aucune valeur dИfinie pour `%s'\n"
 
-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Impossible d'obtenir de valeur pour `%s' : %s\n"
 
-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Ne comprend pas le type `%s'\n"
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Vous devez spИcifier au choix des clИs/valeurs comme paramХtres\n"
 
-#: gconf/gconftool.c:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Aucune valeur Ю dИfinir pour la clИ : `%s'\n"
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Impossible de dИfinir le schema comme valeur\n"
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 "Quand vous dИfinissez une liste vous devez spИcifier une primitive "
 "list-type\n"
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Quand vous dИfinissez une paire vous devez spИcifier une primitive car-type "
 "et cdr-type\n"
 
-#: gconf/gconftool.c:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erreur : %s\n"
 
-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Erreur Ю l'attribution de la valeur : %s"
 
-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Erreur de synchronisation : %s"
 
-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Vous devez spИcifier un clИ (nom du schema) comme seul paramХtre\n"
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Le type de la liste doit Йtre un type primitif : string, int, float ou bool\n"
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Le type car de la paire doit Йtre un type primitif : string, int, float ou "
 "bool\n"
 
-#: gconf/gconftool.c:1201
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Le type cdr de la paire doit Йtre un type primitif : string, int, float ou "
 "bool\n"
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Vous devez spИcifier un ou plusieurs rИpertoires pour en obtenir les paires "
 "clИs/valeurs.\n"
 
-#: gconf/gconftool.c:1259
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Vous devez spИcifier une ou plusieurs clИs Ю annuler.\n"
 
-#: gconf/gconftool.c:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Erreur d'annulation de `%s' : %s\n"
 
-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Vous devez spИcifier un ou plusieurs rИpertoires pour en obtenir les "
 "sous-rИpertoires.\n"
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Erreur lors du listage des rИpertoires : %s\n"
 
-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "AVERT. : type invalide ou manquant pour le schema (%s)\n"
 
-#: gconf/gconftool.c:1378
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "AVERT. : list_type invalide ou manquant pour le schema (%s)\n"
 
-#: gconf/gconftool.c:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "AVERT. : иchec d'analyse de la valeur par dИfaut `%s' pour le schema (%s)\n"
 
-#: gconf/gconftool.c:1407
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "AVERT. : car_type ou cdr_type invalide ou manquant pour le schema (%s)\n"
 
-#: gconf/gconftool.c:1432
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "AVERT. : Vous ne pouvez dИfinir une valeur par dИfaut pour un schema\n"
 
-#: gconf/gconftool.c:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "AVERT. : erreur interne gconftool, GConfValueType inconnu\n"
 
-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "AVERT. : impossible d'analyser le nom du type `%s'\n"
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1390,39 +1693,39 @@ msgstr ""
 "AVERT. : list_type peur seulement Йtre int, float, string ou bool et non "
 "`%s'\n"
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVERT. : car_type peur seulement Йtre int, float, string ou bool et non "
 "`%s'\n"
 
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVERT. : cdr_type peur seulement Йtre int, float, string ou bool et non "
 "`%s'\n"
 
-#: gconf/gconftool.c:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "AVERT. : noeud <applyto> vide"
 
-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "AVERT. : le noeud <%s> n'est pas compris sous <schema>\n"
 
-#: gconf/gconftool.c:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "AVERT. : aucune clИ spИcifiИ pour le schema\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "AVERT. : le noeud <locale> n'a aucun attribut `name=\"locale\"', ignorИ\n"
 
-#: gconf/gconftool.c:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1430,52 +1733,52 @@ msgstr ""
 "AVERT. : plusieurs noeuds <locale> pour la locale `%s', ignore tous sauf le "
 "premier\n"
 
-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "AVERT. : Noeud <%s> invalide dans un noeud <locale>\n"
 
-#: gconf/gconftool.c:1757
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 "AVERT. : impossible d'installer le schema `%s' pour la locale `%s' : %s\n"
 
-#: gconf/gconftool.c:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Schema `%s' installИ pour la locale `%s'\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "AVERT. : impossible d'associer le schema `%s' avec la clИ `%s' : %s\n"
 
-#: gconf/gconftool.c:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Schema `%s' attachИ Ю la clИ `%s'\n"
 
-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Vous devez avoir au moins une entrИe <locale> dans un <schema>\n"
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "AVERT. : le noeud <%s> n'est pas compris sous <schemalist>\n"
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Impossible d'ouvrir `%s' : %s\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Le document `%s' est vide ?\n"
 
-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1484,26 +1787,26 @@ msgstr ""
 "Le document `%s' a le mauvais type de noeud racine (<%s>, devrait Йtre "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Le document `%s' n'a pas de noeud racine <gconfschemafile>\n"
 
-#: gconf/gconftool.c:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "AVERT. : le noeud <%s> sous <gconfschemafile> n'est pas compris\n"
 
-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Erreur de synchronisation des donnИes de configuration : %s"
 
-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Vous devez spИcifier quelques fichiers de schema Ю installer\n"
 
-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1512,16 +1815,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "иchec de l'annulation de la clИ de torture %s : %s\n"
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "Vous devez spИcifier quelques clИs Ю torturer\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1531,11 +1834,11 @@ msgstr ""
 "valeurs pour les clИs :\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "Vous devez spИcifier quelques rИpertoires Ю torturer\n"
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1551,11 +1854,14 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Avertissement GConf : Иchec lors du listage des paires dans `%s' : %s"
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "`%s' attendu, obtenu `%s' pour la clИ %s"
 
+#~ msgid "Received signal %d, ignoring"
+#~ msgstr "RИception du signal %d, ignore"
+
 #~ msgid "Key"
 #~ msgstr "ClИ"
 
diff --git a/po/ga.po b/po/ga.po
index ce2e7535..e80eec95 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf.pot\n"
-"POT-Creation-Date: 2000-08-19 16:51-0400\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-03-13 18:23+0000\n"
 "Last-Translator:  Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -13,135 +13,135 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr ""
 
-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr ""
 
-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/xml-backend.c:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr ""
 
-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr ""
 
-#: backends/xml-cache.c:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
 "%u seconds"
 msgstr ""
 
-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr ""
 
-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr ""
 
 #. These are all fatal errors
-#: backends/xml-dir.c:802
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:975
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2455
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr ""
 
 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2159
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr ""
@@ -149,925 +149,1225 @@ msgstr ""
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr ""
 
-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr ""
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1055
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
 #. -- end debug only
-#: gconf/gconf-backend.c:180
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr ""
 
-#: gconf/gconf-backend.c:208
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "Droch seoladh '%s'"
 
-#: gconf/gconf-backend.c:233
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr ""
 
-#: gconf/gconf-backend.c:243
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-backend.c:275
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr ""
 
-#: gconf/gconf-backend.c:312
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr ""
 
-#: gconf/gconf-error.c:39
+#: gconf/gconf-database.c:193
+msgid "Received invalid value in set request"
+msgstr ""
+
+#: gconf/gconf-database.c:201
+#, c-format
+msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
+msgstr ""
+
+#: gconf/gconf-database.c:416
+msgid "Received request to drop all cached data"
+msgstr ""
+
+#: gconf/gconf-database.c:430
+msgid "Received request to sync synchronously"
+msgstr ""
+
+#: gconf/gconf-database.c:495
+msgid "Fatal error: failed to get object reference for ConfigDatabase"
+msgstr ""
+
+#: gconf/gconf-database.c:617
+#, c-format
+msgid "Failed to sync one or more sources: %s"
+msgstr ""
+
+#. 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:699
+#, c-format
+msgid ""
+"Failed to log addition of listener (%s); will not be able to restore this "
+"listener on gconfd restart, resulting in unreliable notification of "
+"configuration changes."
+msgstr ""
+
+#: gconf/gconf-database.c:724
+#, c-format
+msgid "Listener ID %lu doesn't exist"
+msgstr ""
+
+#: gconf/gconf-database.c:733
+#, 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:838 gconf/gconf-sources.c:1189
+#, c-format
+msgid "Error getting value for `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:875
+#, c-format
+msgid "Error setting value for `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:910
+#, c-format
+msgid "Error unsetting `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:931
+#, c-format
+msgid "Error getting default value for `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:969
+#, c-format
+msgid "Error checking existence of `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:993
+#, c-format
+msgid "Error removing dir `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:1019
+#, c-format
+msgid "Failed to get all entries in `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:1045
+#, c-format
+msgid "Error listing dirs in `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:1066
+#, c-format
+msgid "Error setting schema for `%s': %s"
+msgstr ""
+
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr ""
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr ""
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr ""
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr ""
 
-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
 msgstr ""
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr ""
 
-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 msgid "Parse error"
 msgstr ""
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr ""
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr ""
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr ""
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr ""
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr ""
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr ""
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr ""
 
-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 msgid "Failed to get a lock"
 msgstr ""
 
-#: gconf/gconf-internals.c:100
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr ""
+
+#: gconf/gconf-glib.c:10683
+#, c-format
+msgid "Error reading file '%s': %s"
+msgstr ""
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:798
+#: gconf/gconf-internals.c:445
+msgid "Failed to convert object to IOR"
+msgstr ""
+
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:853
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:865
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:1307
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1317
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1486
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1602
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1664
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2144 gconf/gconf.c:2643
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2176
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2264
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2295
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2306
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2326
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2358
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2372
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2407
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2486
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2513
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
 
-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 
-#: gconf/gconf-sources.c:1205 gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr ""
-
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr ""
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr ""
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr ""
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr ""
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr ""
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr ""
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
 
-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:271
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:408
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1466
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1482
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
 "Please file an OAF bug report."
 msgstr ""
 
-#: gconf/gconf.c:1677
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:1714
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1736
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:1738
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1759
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:1773
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2115
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2176
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2211
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2246
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2283
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2316
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:511
-msgid "Received invalid value in set request"
-msgstr ""
-
-#: gconf/gconfd.c:519
-#, c-format
-msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
-msgstr ""
-
-#: gconf/gconfd.c:789
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:802
-msgid "Received request to drop all cached data"
-msgstr ""
-
-#: gconf/gconfd.c:822
-msgid "Received request to sync synchronously"
-msgstr ""
-
-#: gconf/gconfd.c:861
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:879
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:888
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:901
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:913
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:287
 msgid ""
-"No writeable config sources successfully resolved, may not be able to save "
+"No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:955 gconf/gconfd.c:967
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr ""
 
-#: gconf/gconfd.c:972
+#: gconf/gconfd.c:329
 #, c-format
-msgid "Received signal %d, ignoring"
+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:1013
+#: gconf/gconfd.c:376
 #, c-format
-msgid "starting, pid %u user `%s'"
+msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:1036
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:1056
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:1075
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:1079
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Ag eirigh as"
 
-#: gconf/gconfd.c:1194
+#: gconf/gconfd.c:818
 #, c-format
-msgid "Failed to sync one or more sources: %s"
+msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1561
+#: gconf/gconfd.c:885
 #, c-format
-msgid "Error setting value for `%s': %s"
+msgid ""
+"Failed to open gconfd logfile; won't be able to restore listeners after "
+"gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1593
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Error unsetting `%s': %s"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1614
+#: gconf/gconfd.c:966
 #, c-format
-msgid "Error getting default value for `%s': %s"
+msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1652
+#: gconf/gconfd.c:980
 #, c-format
-msgid "Error checking existence of `%s': %s"
+msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1676
+#: gconf/gconfd.c:989
 #, c-format
-msgid "Error removing dir `%s': %s"
+msgid "Failed to close new saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1701
+#: gconf/gconfd.c:1003
 #, c-format
-msgid "Failed to get all entries in `%s': %s"
+msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1725
+#: gconf/gconfd.c:1013
 #, c-format
-msgid "Error listing dirs in `%s': %s"
+msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1745
+#: gconf/gconfd.c:1022
 #, c-format
-msgid "Error setting schema for `%s': %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr ""
+
+#: gconf/gconfd.c:1110
+#, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr ""
+
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
 msgstr ""
 
-#: gconf/gconfd.c:1913
-msgid "Attempt to unregister invalid context ID"
+#: gconf/gconfd.c:1140
+#, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr ""
+
+#: gconf/gconfd.c:1160
+#, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1920
+#: gconf/gconfd.c:1180
 #, c-format
-msgid "Bad context ID %lu, request ignored"
+msgid "Failed to unquote IOR from saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1928
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Already-unregistered context ID %lu, request ignored"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1953
+#: gconf/gconfd.c:1377
 #, c-format
-msgid "Attempt to use invalid context ID %lu"
+msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1963
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Attempt to use already-unregistered context ID %lu"
+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:2123
+#: gconf/gconfd.c:1481
 #, c-format
-msgid "Returning exception: %s"
+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/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Roghnachais Cabhair"
 
-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr ""
 
-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
 msgstr ""
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 
-#: gconf/gconftool.c:149
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr ""
 
-#: gconf/gconftool.c:158
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 
-#: gconf/gconftool.c:167
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr ""
 
-#: gconf/gconftool.c:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 
-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr ""
 
-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr ""
 
-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr ""
 
-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr ""
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "зINEAR"
 
-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr ""
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "AINMCOMHAD"
 
-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr ""
 
-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
 "config source or set to the empty string to use the default."
 msgstr ""
 
-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr ""
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1075,311 +1375,311 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr ""
 
-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Saghas: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, fuzzy, c-format
 msgid "List Type: %s\n"
 msgstr "Saghas: %s\n"
 
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, fuzzy, c-format
 msgid "Car Type: %s\n"
 msgstr "Saghas: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, fuzzy, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Saghas: %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "зinИar: %s\n"
 
-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "EarrАid: %s\n"
 
-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1201
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1259
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1378
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1407
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1432
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1757
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Is CapИis '`%s' folamh?\n"
 
-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1388,27 +1688,27 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1421,7 +1721,7 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index e0194b12..75c841e0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 0.7\n"
-"POT-Creation-Date: 2000-08-19 16:51-0400\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-08-02 18:14+09:00\n"
 "Last-Translator: Takeshi Aihana <aihana@muc.biglobe.ne.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -13,46 +13,46 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "XML ╔п╔ц╔╞╔╗╔С╔и╔Б╔╦╔Е║╪╔К╓Р╡РйЭцФ╓г╓╧║ё"
 
-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "╔╒╔и╔Л╔╧ '%s' цФ╓н XML ╔К║╪╔х╔г╔ё╔Л╔╞╔х╔Й╓╛╦╚╓д╓╚╓Й╓ч╓╩╓С╓г╓╥╓©║ё"
 
-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "╔г╔ё╔Л╔╞╔х╔Й '%s' ╓Р╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 "╔╒╔и╔Л╔╧ '%s' цФ╓н XML ╔К║╪╔х╔г╔ё╔Л╔╞╔х╔Й╓ь╓нфи╓ъ╪Х╓Й/╫Я╓╜╧Ч╓ъ╓╛╓г╓╜╓ч╓╩╓С║ё"
 
-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "╔К║╪╔х╓к╓╒╓К %s ╓н XML ╔╫║╪╔╧мя╓н╔г╔ё╔Л╔╞╔х╔Й/╔у╔║╔╓╔К╦╒╦б: %o/%o"
 
-#: backends/xml-backend.c:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr "XML ╔п╔ц╔╞╔╗╔С╔и╔Б╔╦╔Е║╪╔К╓н╫И╢Э╡╫цФ╓г╓╧║ё"
 
-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "XML ╬Е╓н╔г╔ё╔Л╔╞╔х╔Й '%s' ╓н╔М╔ц╔╞╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: backends/xml-cache.c:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 "XML ╔п╔ц╔╞╔╗╔С╔и╔Б╔╦╔Е║╪╔К╓Р╫╙н╩╓╥╓©╬Л╧Г║╒ф╠╢Э╓╥╓©╔г╔ё╔Л╔╞╔х╔Й╓Р╨О╫Э╓╥╓ч╓╧║ё"
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -61,7 +61,7 @@ msgstr ""
 "╔г╔ё╔╧╔╞╓х╓нф╠╢Э╓к╪╨гт╓╥╓©╓©╓А║╒XML ╔п╔ц╔╞╔╗╔С╔и╓н╔╜╔Ц╔ц╔╥╔Е╓╚╓И "
 "╔г╔ё╔Л╔╞╔х╔Й '%s' ╓Р╨О╫Э╓г╓╜╓ч╓╩╓С║ё"
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -70,87 +70,87 @@ msgstr ""
 "%u ╦д╓н╔╒╔╓╔ф╔Ю╓╛ %u иц╓Х╓Й╓Б╦е╓╓ф╠╢Э╓╥╓©╔╒╔╓╔ф╔Ю╓Р╨О╫Э╓╥╓©╦Е╓н "
 "╔╜╔Ц╔ц╔╥╔Е╓к╩д╓ц╓ф╓╓╓ч╓╧║ё"
 
-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "'%s' ╓н╬Убж╓Р╪Хфю╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "XML ╔у╔║╔╓╔Кл╬ '%s' ╓о╔г╔ё╔Л╔╞╔х╔Й╓г╓╧║ё"
 
-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "'%s' ╓н╨О╫Э╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "╔у╔║╔╓╔К '%s' ╓ь╓н╫Я╓╜╧Ч╓ъ╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "л╬а╟ '%s' ╓╚╓И '%s' ╓нйя╧╧╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "'%s' ╓╚╓И '%s' ╓ниЭ╣╒╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "╦е╓╓╔у╔║╔╓╔К '%s' ╓н╨О╫Э╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:802
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "'%s' ╓н╬Убж╓╛╪Хфю╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "'%s' ╓╛ '%s' ╓нцФ╓г╫ейё╓╥╓ф╓╓╓ч╓╧║ёл╣╩К╓╥╓ч╓╧║ё"
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 "XML ╔у╔║╔╓╔К '%s' ╓нцФ╓кл╬а╟╓нл╣╓╓╔╗╔С╔х╔Й╓╛╢ч╓ч╓Л╓ф╓╓╓ч╓╧║ёл╣╩К╓╥╓ч╓╧║ё"
 
-#: backends/xml-dir.c:975
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 "XML ╔у╔║╔╓╔К '%s' ╓нцФ╓н╔х╔ц╔в╔Л╔ы╔К╔н║╪╔и╓╛ 1 ╓д╓н <entry> ╓г╓о╓╒╓Й╓ч╓╩╓С║ё "
 "л╣╩К╓╥╓ч╓╧║ё"
 
-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "╔у╔║╔╓╔К '%s' ╓н╨Ню╝╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2455
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "╔у╔║╔╓╔К '%s' ╓Рйд╓╦╓К╓н╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "л╬а╟ '%s' ╓н XML ╔н║╪╔и╓Рл╣╩К╓╥╓ч╓╧: %s"
 
-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2159
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "╔╧╔╜║╪╔Юл╬ '%s' ╓Рл╣╩К╓╥╓ч╓╧║ёитю╣╓й╔╧╔╜║╪╔Ю: %s"
@@ -158,293 +158,578 @@ msgstr "╔╧╔╜║╪╔Юл╬ '%s' ╓Рл╣╩К╓╥╓ч╓╧║ёитю╣╓й╔╧╔╜║╪╔Ю: %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "XML ╔н║╪╔и '%s' ╓Рл╣╩К╓╥╓ч╓╧║ём╜╦З╓й╔╧╔╜║╪╔Юл╬ '%s' ╓онЦЁ╟╓г╓╧║ё"
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr "╔М║╪╔╠╔КюъдЙл╣╓╥╓н <local_schema> ╓Рх╞╦╚╓╥╓ч╓╥╓©║ё"
 
-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "╔╧╔╜║╪╔Ю╓н╔г╔у╔╘╔К╔хцм╓нфи╓ъ╧Ч╓ъ╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "<%s> ╔н║╪╔и╓н \"type\" б╟ю╜╓╛╓╒╓Й╓ч╓╩╓С║ё"
 
-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "╔н║╪╔и╓╛итлю╓й \"type\" б╟ю╜ '%s' ╓Р╩Щ╓ц╓ф╓╓╓ч╓╧║ёл╣╩К╓╥╓ч╓╧║ё"
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "╔н║╪╔и╓к \"value\" б╟ю╜╓╛╓╒╓Й╓ч╓╩╓С║ё"
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "XML ╔Й╔╧╔х╔н║╪╔и╓нцФ╓к╓╒╓К XML ╔н║╪╔и <%s> ╓Р╡Р╪А╓╥╓ч╓╩╓С╓г╓╥╓©║ё"
 
-#: backends/xml-entry.c:1055
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 "╔Й╔╧╔х╔н║╪╔и╓нцФ╓китю╣╓й╥© (╔Й╔╧╔х║╒╔╜║╪╓хцм╓н╔з╔╒║╒╓Б╓╥╓╞╓оитлю╓й╥©) "
 "╓╛╓╒╓Й╓ч╓╧║ё"
 
-#: backends/xml-entry.c:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "╩хмя╓г╓╜╓й╓╓ XML ╔н║╪╔и: %s"
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "╔Й╔╧╔х╓о╩хмя╓г╓╜╓й╓╓╥©╓н╔н║╪╔и╓Р╢ч╓С╓г╓╓╓ч╓╧║ё(%s ╓о %s ╓г╓╒╓К╓ы╓╜)"
 
-#: backends/xml-entry.c:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "XML (╔╜║╪╓хцм╓н)╔з╔╒╓╚╓И╩хмя╓г╓╜╓й╓╓ car ╓Рл╣╩К╓╥╓ч╓╧: %s"
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "XML ╔у╔║╔╓╔К╓Р╡РюоцФ: ╔Й╔╧╔х╓х(╔╜║╪╓хцм╓н)╔з╔╒╓о(╔╜║╪╓хцм╓н)╔з╔╒╓н "
 "╡╪╟л╔Л╔ы╔К╓кл╣╓╓╓╚╓Б╓╥╓Л╓ч╓╩╓С║ё"
 
-#: backends/xml-entry.c:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "XML (╔╜║╪╓хцм╓н)╔з╔╒╓╚╓И╩хмя╓г╓╜╓й╓╓ cdr ╓Рл╣╩К╓╥╓ч╓╧: %s"
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "XML ╔з╔╒╔н║╪╔и╓н╡╪╟л╓к╓╒╓К XML ╔н║╪╔и <%s> ╓Р╡Р╪А╓╥╓ч╓╩╓С╓г╓╥╓©║ё"
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "XML ╔з╔╒╔н║╪╔и╓н car ╓х cdr ╓Р╦╚╓д╓╠╓И╓Л╓ч╓╩╓С╓г╓╥╓©║ё"
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "XML ╔у╔║╔╓╔К╓нцФ╓к╓╒╓Кцм╓н╔з╔╒╓к cdr ╓╛╓╒╓Й╓ч╓╩╓С║ё"
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "XML ╔у╔║╔╓╔К╓нцФ╓к╓╒╓Кцм╓н╔з╔╒╓к cdr ╓╛╓╒╓Й╓ч╓╩╓С║ё"
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "XML ╔у╔║╔╓╔К╓нцФ╓к╓╒╓К╔з╔╒╓к car ╓х cdr ╓нцм╓╛╓╒╓Й╓ч╓╩╓С║ё"
 
 #. -- end debug only
-#: gconf/gconf-backend.c:180
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "'%s' ╓х╓╓╓╕╔у╔║╔╓╔К╓о╓╒╓Й╓ч╓╩╓С║ё\n"
 
-#: gconf/gconf-backend.c:208
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "╔╒╔и╔Л╔╧ '%s' ╓о╩х╓╗╓ч╓╩╓С║ё"
 
-#: gconf/gconf-backend.c:233
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr "GConf ╓о╔ю╔╓╔й╔ъ╔ц╔╞╔Б╔╦╔Е║╪╔К╔╣╔щ║╪╔х(gmodule)л╣╓╥╓г╓оф╟╨Н╓╥╓ч╓╩╓С║ё"
 
-#: gconf/gconf-backend.c:243
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr "╔Б╔╦╔Е║╪╔К '%s' ╓Р╔М║╪╔ицФ╓к╔╗╔И║╪: %s\n"
 
-#: gconf/gconf-backend.c:275
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr "'%s' мя╓н╔п╔ц╔╞╔╗╔С╔и╔Б╔╦╔Е║╪╔К╓╛фцдЙ╓г╓╜╓ч╓╩╓С║ё"
 
-#: gconf/gconf-backend.c:312
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr "╔п╔ц╔╞╔╗╔С╔и╔Б╔╦╔Е║╪╔К╓н╔╥╔Ц╔ц╔х╔ю╔╕╔С╓к╪╨гт╓╥╓ч╓╥╓©║ё"
 
-#: gconf/gconf-error.c:39
+#: gconf/gconf-database.c:193
+msgid "Received invalid value in set request"
+msgstr "юъдЙ╓╥╓©мв╣А╓нцФ╓китю╣╓йцм╓Р╪У╓╠╪Х╓Й╓ч╓╥╓©║ё"
+
+#: gconf/gconf-database.c:201
+#, c-format
+msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
+msgstr ""
+"╔╜║╪ '%s' мя╓кюъдЙ╓╣╓Л╓©мв╣А╓г╪У╓╠╪Х╓ц╓© CORBA цм╓Р╡Р╪А╓г╓╜╓ч╓╩╓С╓г╓╥╓©║ё"
+
+#: gconf/gconf-database.c:416
+msgid "Received request to drop all cached data"
+msgstr "а╢╓ф╓н╔╜╔Ц╔ц╔╥╔Е╔г║╪╔©╓Р╪н╓ф╓Кмв╣А╓Р╪У╓╠╪Х╓Й╓ч╓╥╓©║ё"
+
+#: gconf/gconf-database.c:430
+msgid "Received request to sync synchronously"
+msgstr "ф╠╢Э╓╧╓Кмв╣А╓Р╪У╓╠╪Х╓Й╓ч╓╥╓©║ё"
+
+#: gconf/gconf-database.c:495
+#, fuzzy
+msgid "Fatal error: failed to get object reference for ConfigDatabase"
+msgstr "юъдЙ╔╣║╪╔п║╪мя╓н╔╙╔ж╔╦╔╖╔╞╔х╔Й╔у╔║╔Л╔С╔╧╓н╪Хфю╓к╪╨гт╓╥╓ч╓╥╓©║ё"
+
+#: gconf/gconf-database.c:617
+#, c-format
+msgid "Failed to sync one or more sources: %s"
+msgstr "1 ╓д╟й╬Е╓н╔у╔║╔╓╔К╓нф╠╢Э╓г╔╗╔И║╪: %s"
+
+#. 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:699
+#, c-format
+msgid ""
+"Failed to log addition of listener (%s); will not be able to restore this "
+"listener on gconfd restart, resulting in unreliable notification of "
+"configuration changes."
+msgstr ""
+
+#: gconf/gconf-database.c:724
+#, c-format
+msgid "Listener ID %lu doesn't exist"
+msgstr ""
+
+#: gconf/gconf-database.c:733
+#, 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:838 gconf/gconf-sources.c:1189
+#, c-format
+msgid "Error getting value for `%s': %s"
+msgstr "'%s' ╓нцм╓н╪Хфю╓г╔╗╔И║╪: %s"
+
+#: gconf/gconf-database.c:875
+#, c-format
+msgid "Error setting value for `%s': %s"
+msgstr "'%s' ╓нцм╓н╔╩╔ц╔х╓г╔╗╔И║╪: %s"
+
+#: gconf/gconf-database.c:910
+#, c-format
+msgid "Error unsetting `%s': %s"
+msgstr "'%s' ╓нл╣╦З╡╫╓г╔╗╔И║╪: %s"
+
+#: gconf/gconf-database.c:931
+#, c-format
+msgid "Error getting default value for `%s': %s"
+msgstr "'%s' ╓н╔г╔у╔╘╔К╔хцм╓н╪Хфю╓г╔╗╔И║╪: %s"
+
+#: gconf/gconf-database.c:969
+#, c-format
+msgid "Error checking existence of `%s': %s"
+msgstr "'%s' ╓нб╦╨ъЁнг╖╓г╔╗╔И║╪: %s"
+
+#: gconf/gconf-database.c:993
+#, c-format
+msgid "Error removing dir `%s': %s"
+msgstr "╔г╔ё╔Л╔╞╔х╔Й '%s' ╓н╨О╫Э╓г╔╗╔И║╪: %s"
+
+#: gconf/gconf-database.c:1019
+#, c-format
+msgid "Failed to get all entries in `%s': %s"
+msgstr "'%s' ╓га╢╓ф╓н╔╗╔С╔х╔Й╓н╪Хфю╓к╪╨гт: %s"
+
+#: gconf/gconf-database.c:1045
+#, c-format
+msgid "Error listing dirs in `%s': %s"
+msgstr "'%s' ╓нцФ╓н╔г╔ё╔Л╔╞╔х╔Й╓н╔Й╔╧╔х╡╫╓г╔╗╔И║╪: %s"
+
+#: gconf/gconf-database.c:1066
+#, c-format
+msgid "Error setting schema for `%s': %s"
+msgstr "'%s'мя╓н╔╧╔╜║╪╔ЮюъдЙ╓г╔╗╔И║╪: %s"
+
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr "ю╝╦Ы"
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr "╪╨гт"
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr "юъдЙ╔╣║╪╔п║╪╓кюэбЁ╓г╓╜╓ч╓╩╓С╓г╓╥╓©║ё"
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr "╔я║╪╔ъ╔ц╔╥╔Г╔С╓╛╓╒╓Й╓ч╓╩╓С║ё"
 
-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
 msgstr "юъдЙ╔у╔║╔╓╔К╓н╔╒╔и╔Л╔╧╓╛╡Р╥Х╓г╓╜╓ч╓╩╓С╓г╓╥╓©║ё"
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr "╩хмя╓г╓╜╓й╓╓╔╜║╪╓ч╓©╓о╔г╔ё╔Л╔╞╔х╔Йл╬"
 
-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 msgid "Parse error"
 msgstr "╡Рюо╔╗╔И║╪"
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr "юъдЙ╔у╔║╔╓╔К╔г║╪╔©╔ы║╪╔╧╓нцФ╓китю╣╓й╔г║╪╔©╓╛╓╒╓Й╓ч╓╧║ё"
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr "╥©╓╛╢ж╟Ц╓ц╓ф╓╓╓ч╓╧║ё"
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr "╔г╔ё╔Л╔╞╔х╔Й╬Е╓г╓н╔╜║╪аЮ╨Н"
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr "╔╜║╪╬Е╓г╓н╔г╔ё╔Л╔╞╔х╔ЙаЮ╨Н"
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr "б╦╨ъ╓╥╓ф╓╓╓Кфи╓ъ╧Ч╓ъюЛмя╓нцм╓к╓о╬Е╫Я╓╜╓г╓╜╓ч╓╩╓С║ё"
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr "╔╙╔ж╔╦╔╖╔╞╔хЁХю╜╡╫╔у╔Л║╪╔Ю╔О║╪╔╞╔╗╔И║╪"
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr "юъдЙ╔╣║╪╔п║╪л╣╓╥╓г╓наЮ╨Н╓о╓г╓╜╓ч╓╩╓С║ё"
 
-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 msgid "Failed to get a lock"
 msgstr "╔М╔ц╔╞╓н╪Хфю╓к╪╨гт╓╥╓ч╓╥╓©║ё"
 
-#: gconf/gconf-internals.c:100
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "╔у╔║╔╓╔К '%s' ╓Рйд╓╦╓К╓н╓к╪╨гт╓╥╓ч╓╥╓©: %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "╔г╔ё╔Л╔╞╔х╔Й '%s' ╓н╨О╫Э╓г╔╗╔И║╪: %s"
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "╔╜║╪ '%s' ╓нцФ╓к '/' ╓╛╓╒╓Й╓ч╓╩╓С║ё"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "╔Й╔╧╔х╔╒╔╓╔ф╔Юмя╓н CORBA ╓нцм╓╛╡Р╪А╓г╓╜╓ч╓╩╓С║ё"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "%s ╓нцФ╓н╔Й╔╧╔х╔╒╔╓╔ф╔Ю╓н╥©╓╛итю╣╓г╓╧║ё"
 
-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "gconfd ╓╚╓И╓╙╓╚╓╥╓й╔Й╔╧╔х╔©╔╓╔в╓Р╪У╓╠╪Х╓Й╓ч╓╥╓©║ё"
 
-#: gconf/gconf-internals.c:798
+#: gconf/gconf-internals.c:445
+#, fuzzy
+msgid "Failed to convert object to IOR"
+msgstr "1 ╓д╟й╬Е╓н╔у╔║╔╓╔К╓нф╠╢Э╓г╔╗╔И║╪: %s"
+
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "╔у╔║╔╓╔К '%s' ╓╛Ё╚╓╠╓ч╓╩╓С╓г╓╥╓©: %s\n"
 
-#: gconf/gconf-internals.c:853
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "╔╫║╪╔╧ '%s' ╓Рди╡ц╓╥╓ф╓╓╓ч╓╧║ё\n"
 
-#: gconf/gconf-internals.c:865
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "╔у╔║╔╓╔К '%s' ╬Е╓к╔╗╔И║╪╓╛╓╒╓Й╓ч╓╧: %s\n"
 
-#: gconf/gconf-internals.c:1307
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "╔Й╔╧╔х╓Р╢Эбт╓╣╓Л╓©╓╛║╒фю╓И╓Л╓©╓н╓о %s ╓г╓╧║ё"
 
-#: gconf/gconf-internals.c:1317
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "%s ╓н╔Й╔╧╔х╓Р╢Эбт╓╣╓Л╓©╓╛║╒фю╓И╓Л╓©╓н╓о %s ╓н╔Й╔╧╔х╓г╓╧║ё"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "(╔╜║╪╓хцм╓н)╔з╔╒╓Р╢Эбт╓╣╓Л╓©╓╛║╒фю╓И╓Л╓©╓н╓о %s ╓г╓╧║ё"
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "(%s ╓х "
 "%s)╓н╔з╔╒╓Р╢Эбт╓╣╓Л╓©╓╛║╒фю╓И╓Л╓©╓н╓оё╠╓д╓й╓╓╓╥н╬йЩ╓нцм╓╛л╣╓╓╔з╔╒╓г╓╧║ё"
 
-#: gconf/gconf-internals.c:1486
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 "(%s ╓х %s)╓н╔©╔╓╔в╓н╔з╔╒╓Р╢Эбт╓╣╓Л╓©╓╛║╒фю╓И╓Л╓©╓н╓о(%s ╓х %s)╓н╔©╔╓╔в╓г╓╧║ё"
 
-#: gconf/gconf-internals.c:1602
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "╟Змя╓╣╓Л╓©й╦╩ЗнС╓о╔╞╔╘║╪╔ф║╪╔╥╔Г╔С╣╜╧Ф(')╓г╩о╓ч╓ц╓ф╓╓╓ч╓╩╓С║ё"
 
-#: gconf/gconf-internals.c:1664
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "╟Змя╓╣╓Л╓©й╦╩ЗнС╓о╔╞╔╘║╪╔ф║╪╔╥╔Г╔С╣╜╧Ф(')╓г╫╙╓О╓ц╓ф╓╓╓ч╓╩╓С║ё"
 
-#: gconf/gconf-internals.c:2144 gconf/gconf.c:2643
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA ╔╗╔И║╪: %s"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 "╔Й╔╧╔х╡╫╓╣╓Л╓ф╓╓╓й╓╓ OAF ╔╙╔ж╔╦╔╖╔╞╔х╔г╔ё╔Л╔╞╔х╔Й╓Р╨О╫Э╓╥╓Х╓╕╓х╓╥╓ф╓╓╓ч╓╧║ё"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "╢Ш╓к╔Й╔╧╔х╡╫╓╣╓Л╓© OAF ╔г╔ё╔Л╔╞╔х╔Й╓Рди╡ц╓╥╓Х╓╕╓х╓╥╓ф╓╓╓ч╓╧║ё"
 
-#: gconf/gconf-internals.c:2176
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF ╡Рюо╔╗╔И║╪: %s"
 
-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "итлю╓й OAF ╔╗╔И║╪"
 
-#: gconf/gconf-internals.c:2264
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "'%s' ╓нцФ╓к╓о ior ╔у╔║╔╓╔К╓╛╓╒╓Й╓ч╓╩╓С║ё"
 
-#: gconf/gconf-internals.c:2295
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd ╓об╬╓н╔в╔М╔╩╔╧╓╚╓И ╔М╔ц╔╞ '%s' ╓Р╪ХфюцФ╓г╓╧║ё"
 
-#: gconf/gconf-internals.c:2306
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "╓╫╓нб╬╓н╔в╔М╔╟╔И╔Ю╓о╔М╔ц╔╞ '%s' ╓Р╩Щ╓ц╓ф╓╓╓ч╓╧║ё"
 
-#: gconf/gconf-internals.c:2326
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "б╦╨ъ╓╥╓ф╓╓╓К gconfd ╓к╔т╔С╔╟╓╧╓К╓©╓А╓н ORB ╓кюэбЁ╓г╓╜╓ч╓╩╓С╓г╓╥╓©║ё"
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -453,45 +738,45 @@ msgstr ""
 "╦е╓╓╔М╔ц╔╞ '%s' ╓Р╨О╫Э╓╥╓ч╓╥╓©║ё(IOR ╓╛╔╙╔ж╔╦╔╖╔╞╔х╔Й╔у╔║╔Л╔С╔╧║╒IOR '%s' "
 "╓кйя╢╧╓г╓╜╓й╓╚╓ц╓©╓©╓А)"
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "╦е╓╓╔М╔ц╔╞ '%s' ╓Р╨О╫Э╓╥╓ч╓╥╓©║ё(Ping╔╣║╪╔п║╪╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓©╓©╓А: %s)"
 
-#: gconf/gconf-internals.c:2358
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf юъдЙ╔г║╪╔Б╔С(gconfd)╓╛╔М╔ц╔╞ '%s' ╓Р╩Щ╓ц╓ф╓╓╓ч╓╧║ё"
 
-#: gconf/gconf-internals.c:2372
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "╔г╔ё╔Л╔╞╔х╔Й '%s' ╓╛╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: gconf/gconf-internals.c:2407
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "╔М╔ц╔╞ '%s' ╓╛╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "╔у╔║╔╓╔К '%s' ╓╛╫Я╓╜╧Ч╓А╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: gconf/gconf-internals.c:2486
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "╔М╔ц╔╞╔у╔║╔╓╔К '%s' ╓╛Ё╚╓╠╓ч╓╩╓С╓г╓╥╓©║ё╓╫╓н╔М╔ц╔╞╓о GConf ╓нй╙╓г╓ол╣╓╓╓г╓╧: "
 "%s"
 
-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "итю╣╓й╔М╔ц╔╞╔у╔║╔╓╔К '%s'╓г╓╧║ё╨О╫Э╓╥╓ф╓╓╓ч╓╧║ё"
 
-#: gconf/gconf-internals.c:2513
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -500,135 +785,130 @@ msgstr ""
 "╔М╔ц╔╞╔у╔║╔╓╔К '%s' ╓╛╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©║ё (╨Ню╝╦╣PID: %u GConf PID: %u "
 "ц╞╓╚╓╛╡Ф║╧╓н╔М╔ц╔╞╓Р╡Р╫Э╓╥╓©╓х╡╬дЙ╓╥╓©╬Л╧Г)"
 
-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "╔М╔ц╔╞╔г╔ё╔Л╔╞╔х╔Й '%s' ╓н╡РйЭ╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "╔у╔║╔╓╔К '%s' ╓нфи╓ъ╧Ч╓ъ╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 "╔╧╔╜║╪╔Ю '%s' ╓о╔╧╔╜║╪╔Ю╓г╓ол╣╓╓цм '%s' ╓Рйщб╦╓╧╓К╓©╓А╓к╩ьдЙ╓╣╓Л╓ч╓╥╓©║ё"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "л╬а╟ '/' ╓о╔г╔ё╔Л╔╞╔х╔Й╓н╬Л╧Г╓ю╓╠╓г║╒╔╜║╪╓к╓о╩х╓╗╓ч╓╩╓С║ё"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr "'%s' ╓нцм╓оюъдЙ╔я╔╧╓на╟╓кфи╓ъ╧Ч╓ъюЛмя╓г╔╩╔ц╔х╓╥╓ч╓╧║ё"
 
-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "╔А╔©╬ПйС╓н╦║╨ВцФ╓к╔╗╔И║╪: %s"
 
-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "╔А╔©╬ПйС╓н╪ХфюцФ╓к╔╗╔И║╪: %s"
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 "╔╜║╪ '%s' ╓о╔╜║╪ '%s'(╪б╨щ╓о '%s' ╓н╥©╓гйщб╦╓╣╓Л╓©╓Б╓н)мя╓к╔╧╔╜║╪╔Ю╓х╓╥╓ф "
 "╔Й╔╧╔х╓╥╓ч╓╥╓©║ё"
 
-#: gconf/gconf-sources.c:1205 gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr "'%s' ╓нцм╓н╪Хфю╓г╔╗╔И║╪: %s"
-
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "'%s' ╓Р╡Р╪А╓╥╓ч╓╩╓С╓г╓╥╓©║ё(ю╟©Т╓х╢Эбт╓╣╓Л╓©)"
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "ю╟©Т '%s' ╓обГ╓╜╓╧╓╝╓К╓╚║╒╓Б╓╥╓╞╓о╬╝╓╣╓╧╓╝╓ч╓╧║ё"
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "'%s' ╓Р╡Р╪А╓╥╓ч╓╩╓С╓г╓╥╓©║ё(╪б©Т╓х╢Эбт╓╣╓Л╓©)"
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "'%s' ╓Р╡Р╪А╓╥╓ч╓╩╓С╓г╓╥╓©║ё(©©╓ч╓©╓о╣╤╓х╢Эбт╓╣╓Л╓©)"
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, fuzzy, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "'%s' ╓Р╡Р╪А╓╥╓ч╓╩╓С╓г╓╥╓©║ё(©©╓ч╓©╓о╣╤╓х╢Эбт╓╣╓Л╓©)"
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, fuzzy, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "'%s' ╓Р╡Р╪А╓╥╓ч╓╩╓С╓г╓╥╓©║ё(ю╟©Т╓х╢Эбт╓╣╓Л╓©)"
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, fuzzy, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "'%s' ╓Р╡Р╪А╓╥╓ч╓╩╓С╓г╓╥╓©║ё(ю╟©Т╓х╢Эбт╓╣╓Л╓©)"
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, fuzzy, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "'%s' ╓Р╡Р╪А╓╥╓ч╓╩╓С╓г╓╥╓©║ё(ю╟©Т╓х╢Эбт╓╣╓Л╓©)"
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, fuzzy, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "'%s' ╓Р╡Р╪А╓╥╓ч╓╩╓С╓г╓╥╓©║ё(©©╓ч╓©╓о╣╤╓х╢Эбт╓╣╓Л╓©)"
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, fuzzy, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "'%s' ╓Р╡Р╪А╓╥╓ч╓╩╓С╓г╓╥╓©║ё(ю╟©Т╓х╢Эбт╓╣╓Л╓©)"
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, fuzzy, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "'%s' ╓Р╡Р╪А╓╥╓ч╓╩╓С╓г╓╥╓©║ё(╪б©Т╓х╢Эбт╓╣╓Л╓©)"
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, fuzzy, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "'%s' ╓Р╡Р╪А╓╥╓ч╓╩╓С╓г╓╥╓©║ё(ю╟©Т╓х╢Эбт╓╣╓Л╓©)"
 
-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr "'%s' : %s"
 
-#: gconf/gconf.c:271
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "╔╣║╪╔п║╪╓о╔╒╔и╔Л╔╧ '%s' ╓н╡Р╥Х╓╛╓г╓╜╓ч╓╩╓С╓г╓╥╓©║ё"
 
-#: gconf/gconf.c:408
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "╔М║╪╔╚╔КюъдЙ╓кдлцн╓Рди╡ц╓г╓╜╓ч╓╩╓С║ё"
 
-#: gconf/gconf.c:1466
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "╔╣║╪╔п║╪╓нPing╓к╪╨гт╓╥╓ч╓╥╓©║ёCORBA╔╗╔И║╪: %s"
 
-#: gconf/gconf.c:1482
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -638,84 +918,66 @@ msgstr ""
 "╓Рйж╓╥╓ф╓╜╓ч╓╥╓©║ё╧╧╓к╓╫╓нлДбЙ╓РюБлю╓╧╓КнЦЁ╟╓Р╔╩╔ц╔х╓╥╓ч╓╩╓С╓г╓╥╓©║ё "
 "╓Ё╓н╔у╔║╔╓╔К╓Р OAF ╔п╔╟╔Л╔щ║╪╔х╓каВиу╓╥╓ф╡╪╓╣╓╓║ё"
 
-#: gconf/gconf.c:1677
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConf ╓н╫И╢Э╡╫╓к╪╨гт╓╥╓ч╓╥╓©║ё╫╙н╩╓╥╓ч╓╧║ё\n"
 
-#: gconf/gconf.c:1714
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "╔╧╔И╔ц╔╥╔Е '/' ╓г╩о╓А╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё"
 
-#: gconf/gconf.c:1736
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "╧тцФ╓кё╡╓д╓н╔╧╔И╔ц╔╥╔Е '/' ╓╛╓╒╓Й╓ч╓╩╓С║ё"
 
-#: gconf/gconf.c:1738
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "╔╧╔И╔ц╔╥╔Е '/' ╓н╠╕б╕╓к╔т╔Й╔╙╔и '.' ╓╛╓╒╓Й╓ч╓╩╓С║ё"
 
-#: gconf/gconf.c:1759
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' ╓о ╔╜║╪/╔г╔ё╔Л╔╞╔х╔Йл╬╓нцФ╓г╓оитю╣╓йй╦╩З╓г╓╧║ё"
 
-#: gconf/gconf.c:1773
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "╔╜║╪/╔г╔ё╔Л╔╞╔х╔Й╓о╔╧╔И╔ц╔╥╔Е '/' ╓г╫╙н╩╓╥╓ф╓╓╓й╓╓╓╚╓Б╓╥╓Л╓ч╓╩╓С║ё"
 
-#: gconf/gconf.c:2115
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "юъдЙ╔╣║╪╔п║╪╓н╔╥╔Ц╔ц╔х╔ю╔╕╔С╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: gconf/gconf.c:2176
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "'float' ╥©╓Р╢Эбт╓╣╓Л╓©╓╛║╒фю╓И╓Л╓©╓н╓о %s ╓г╓╧║ё"
 
-#: gconf/gconf.c:2211
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "'int' ╥©╓Р╢Эбт╓╣╓Л╓©╓╛║╒фю╓И╓Л╓©╓н╓о %s ╓г╓╧║ё"
 
-#: gconf/gconf.c:2246
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "'string' ╥©╓Р╢Эбт╓╣╓Л╓©╓╛║╒фю╓И╓Л╓©╓н╓о %s ╓г╓╧║ё"
 
-#: gconf/gconf.c:2283
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "'bool' ╥©╓Р╢Эбт╓╣╓Л╓©╓╛║╒фю╓И╓Л╓©╓н╓о %s ╓г╓╧║ё"
 
-#: gconf/gconf.c:2316
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "'schema' ╥©╓Р╢Эбт╓╣╓Л╓©╓╛║╒фю╓И╓Л╓©╓н╓о %s ╓г╓╧║ё"
 
-#: gconf/gconfd.c:511
-msgid "Received invalid value in set request"
-msgstr "юъдЙ╓╥╓©мв╣А╓нцФ╓китю╣╓йцм╓Р╪У╓╠╪Х╓Й╓ч╓╥╓©║ё"
-
-#: gconf/gconfd.c:519
-#, c-format
-msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
-msgstr ""
-"╔╜║╪ '%s' мя╓кюъдЙ╓╣╓Л╓©мв╣А╓г╪У╓╠╪Х╓ц╓© CORBA цм╓Р╡Р╪А╓г╓╜╓ч╓╩╓С╓г╓╥╓©║ё"
-
-#: gconf/gconfd.c:789
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "╔╥╔Ц╔ц╔х╔ю╔╕╔Смв╣А╓Р╪У╓╠╪Х╓Й╓ч╓╥╓©║ё"
 
-#: gconf/gconfd.c:802
-msgid "Received request to drop all cached data"
-msgstr "а╢╓ф╓н╔╜╔Ц╔ц╔╥╔Е╔г║╪╔©╓Р╪н╓ф╓Кмв╣А╓Р╪У╓╠╪Х╓Й╓ч╓╥╓©║ё"
-
-#: gconf/gconfd.c:822
-msgid "Received request to sync synchronously"
-msgstr "ф╠╢Э╓╧╓Кмв╣А╓Р╪У╓╠╪Х╓Й╓ч╓╥╓©║ё"
-
-#: gconf/gconfd.c:861
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -723,7 +985,7 @@ msgstr ""
 "╔г╔п╔ц╔╟╬ПйСиу╓╜╓г╔Ё╔С╔я╔╓╔К╓╣╓Л╓© gconfd; ╔╫║╪╔╧╔г╔ё╔Л╔╞╔х╔Й╓╚╓И gconf.path "
 "╓Рфи╓ъ╧Ч╓Б╓╕╓х╓╥╓ф╓╓╓ч╓╧║ё"
 
-#: gconf/gconfd.c:879
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -731,18 +993,18 @@ msgstr ""
 "юъдЙ╔у╔║╔╓╔К╓╛╦╚╓д╓╚╓Й╓ч╓╩╓С║ё╔г╔у╔╘╔К╔хюъдЙ╔у╔║╔╓╔К '%s' ╓Р╩х╓╙╓╕╓х╓╥╓ф "
 "╓╓╓ч╓╧║ё"
 
-#: gconf/gconfd.c:888
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr "╔╫║╪╔╧╔я╔╧╓нцФ╓кюъдЙ╔у╔║╔╓╔К╓╛╓╒╓Й╓ч╓╩╓С║ёюъдЙ╓ойщб╦╓╣╓Л╓ч╓╩╓С║ё;йт╫╦"
 
-#: gconf/gconfd.c:901
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "╢Ж╓д╓╚╓нюъдЙ╔у╔║╔╓╔К╓нфи╓ъ╧Ч╓ъ╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: gconf/gconfd.c:913
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -750,32 +1012,37 @@ msgstr ""
 "юъдЙ╔у╔║╔╓╔К╓о╔╒╔и╔Л╔╧╓Р╩щ╓╞╡Р╥Х╓╥╓ф╓╓╓ч╓╩╓С║ё╔г║╪╔©╓нфи╓ъ╧Ч╓ъ╓ч╓©╓ойщб╦╓╛ "
 "╓г╓╜╓ч╓╩╓С║ё"
 
-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:287
+#, fuzzy
 msgid ""
-"No writeable config sources successfully resolved, may not be able to save "
+"No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 "╩щ╓╞╡Р╥Х╓╣╓Л╓©╫Я╓╜╧Ч╓ъ╡дг╫╓йюъдЙ╔у╔║╔╓╔К╓о "
 "╢Ж╓д╓╚╓нюъдЙ╓Рйщб╦╓г╓╜╓К╓╚╓Б╓╥╓Л╓ч╓╩╓С║ё"
 
-#: gconf/gconfd.c:955 gconf/gconfd.c:967
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr "╔╥╔╟╔й╔К %d ╓Р╪У╓╠╪Х╓Й╓ч╓╥╓©║ё╔╥╔Ц╔ц╔х╔ю╔╕╔С╓╥╓ч╓╧║ё"
 
-#: gconf/gconfd.c:972
-#, c-format
-msgid "Received signal %d, ignoring"
-msgstr "╔╥╔╟╔й╔К %d ╓Р╪У╓╠╪Х╓Й╓ч╓╥╓©╓╛║╒л╣╩К╓╥╓ч╓╧║ё"
+#: gconf/gconfd.c:329
+#, fuzzy, 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:1013
-#, c-format
-msgid "starting, pid %u user `%s'"
+#: gconf/gconfd.c:376
+#, fuzzy, c-format
+msgid "starting (version %s), pid %u user '%s'"
 msgstr "PID: %u ╔Ф║╪╔╤║╪ '%s' ╓г╣╞ф╟цФ╓г╓╧║ё"
 
-#: gconf/gconfd.c:1036
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -783,11 +1050,11 @@ msgstr ""
 "╔╙╔ж╔╦╔╖╔╞╔хЁХю╜╡╫╔у╔Л║╪╔Ю╔О║╪╔╞╓н╫И╢Э╡╫╓к╪╨гт╓╥╓ч╓╥╓©: OAF "
 "╔А╔С╔ф╔й║╪╓к╔п╔╟йС╧П╓Р╓╥╓ф╓╞╓ю╓╣╓╓║ё"
 
-#: gconf/gconfd.c:1056
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "юъдЙ╔╣║╪╔п║╪мя╓н╔╙╔ж╔╦╔╖╔╞╔х╔Й╔у╔║╔Л╔С╔╧╓н╪Хфю╓к╪╨гт╓╥╓ч╓╥╓©║ё"
 
-#: gconf/gconfd.c:1075
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -795,105 +1062,141 @@ msgstr ""
 "OAF ╓о GConf ╓н IID ╓к╓д╓╓╓ф╓о╡Р╓И╓й╓╓╓г╓╧║ё; ╔╓╔С╔╧╔х║╪╔К╓╛╪╨гт╓╥╓©╓Ё╓х╓Р "
 "╪╗╓╥╓ч╓╧║ё; епо©╓г╓╜╓ч╓╩╓С║ё; ╫╙н╩╓╥╓ч╓╧║ё\n"
 
-#: gconf/gconfd.c:1079
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "б╬╓н gconfd ╓╛╢Ш╓к OAF ╓кепо©╓╣╓Л╓ф╓╓╓ч╓╧║ё; ╫╙н╩╓╥╓ч╓╧║ё\n"
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "OAF ╓кепо©цФ╓н gconfd ╓нитлю╓й╔╗╔И║╪╓г╓╧║ё; ╫╙н╩╓╥╓ч╓╧║ё\n"
 
-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "╫╙н╩╓╥╓ч╓╧║ё"
 
-#: gconf/gconfd.c:1194
+#: gconf/gconfd.c:818
 #, c-format
-msgid "Failed to sync one or more sources: %s"
-msgstr "1 ╓д╟й╬Е╓н╔у╔║╔╓╔К╓нф╠╢Э╓г╔╗╔И║╪: %s"
+msgid "Returning exception: %s"
+msgstr "йж╓╣╓Л╓©нЦЁ╟: %s"
 
-#: gconf/gconfd.c:1561
+#: gconf/gconfd.c:885
 #, c-format
-msgid "Error setting value for `%s': %s"
-msgstr "'%s' ╓нцм╓н╔╩╔ц╔х╓г╔╗╔И║╪: %s"
+msgid ""
+"Failed to open gconfd logfile; won't be able to restore listeners after "
+"gconfd shutdown (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:1593
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Error unsetting `%s': %s"
-msgstr "'%s' ╓нл╣╦З╡╫╓г╔╗╔И║╪: %s"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:1614
-#, c-format
-msgid "Error getting default value for `%s': %s"
-msgstr "'%s' ╓н╔г╔у╔╘╔К╔хцм╓н╪Хфю╓г╔╗╔И║╪: %s"
+#: gconf/gconfd.c:966
+#, fuzzy, c-format
+msgid "Could not open saved state file '%s' for writing: %s"
+msgstr "╔у╔║╔╓╔К '%s' ╓╛Ё╚╓╠╓ч╓╩╓С╓г╓╥╓©: %s\n"
 
-#: gconf/gconfd.c:1652
-#, c-format
-msgid "Error checking existence of `%s': %s"
-msgstr "'%s' ╓нб╦╨ъЁнг╖╓г╔╗╔И║╪: %s"
+#: gconf/gconfd.c:980
+#, fuzzy, c-format
+msgid "Could not write saved state file '%s' fd: %d: %s"
+msgstr "╔у╔║╔╓╔К '%s' ╓╛╫Я╓╜╧Ч╓А╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: gconf/gconfd.c:1676
-#, c-format
-msgid "Error removing dir `%s': %s"
-msgstr "╔г╔ё╔Л╔╞╔х╔Й '%s' ╓н╨О╫Э╓г╔╗╔И║╪: %s"
+#: gconf/gconfd.c:989
+#, fuzzy, c-format
+msgid "Failed to close new saved state file '%s': %s"
+msgstr "╔у╔║╔╓╔К '%s' ╓Рйд╓╦╓К╓н╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: gconf/gconfd.c:1701
-#, c-format
-msgid "Failed to get all entries in `%s': %s"
-msgstr "'%s' ╓га╢╓ф╓н╔╗╔С╔х╔Й╓н╪Хфю╓к╪╨гт: %s"
+#: gconf/gconfd.c:1003
+#, fuzzy, c-format
+msgid "Could not move aside old saved state file '%s': %s"
+msgstr "╔у╔║╔╓╔К '%s' ╓╛Ё╚╓╠╓ч╓╩╓С╓г╓╥╓©: %s\n"
 
-#: gconf/gconfd.c:1725
-#, c-format
-msgid "Error listing dirs in `%s': %s"
-msgstr "'%s' ╓нцФ╓н╔г╔ё╔Л╔╞╔х╔Й╓н╔Й╔╧╔х╡╫╓г╔╗╔И║╪: %s"
+#: gconf/gconfd.c:1013
+#, fuzzy, c-format
+msgid "Failed to move new save state file into place: %s"
+msgstr "╔у╔║╔╓╔К '%s' ╓н╨Ню╝╓к╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: gconf/gconfd.c:1745
+#: gconf/gconfd.c:1022
 #, c-format
-msgid "Error setting schema for `%s': %s"
-msgstr "'%s'мя╓н╔╧╔╜║╪╔ЮюъдЙ╓г╔╗╔И║╪: %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr ""
+
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "'%s' ╓Р╡Р╪А╓╥╓ч╓╩╓С╓г╓╥╓©║ё(©©╓ч╓©╓о╣╤╓х╢Эбт╓╣╓Л╓©)"
 
-#: gconf/gconfd.c:1913
-msgid "Attempt to unregister invalid context ID"
-msgstr "итю╣╓й╔Ё╔С╔ф╔╜╔╧╔хID╓Рл╓епо©╓к╓╥╓ч╓╧"
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
+msgstr ""
 
-#: gconf/gconfd.c:1920
+#: gconf/gconfd.c:1140
 #, c-format
-msgid "Bad context ID %lu, request ignored"
-msgstr "╓╙╓╚╓╥╓й╔Ё╔С╔ф╔╜╔╧╔хID %lu ╓г╓╧║ёмв╣А╓Рл╣╩К╓╥╓ч╓╧║ё"
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr ""
 
-#: gconf/gconfd.c:1928
+#: gconf/gconfd.c:1160
 #, c-format
-msgid "Already-unregistered context ID %lu, request ignored"
-msgstr "╢Ш╓кл╓епо©╓н╔Ё╔С╔ф╔╜╔╧╔хID %lu ╓г╓╧║ёмв╣А╓Рл╣╩К╓╥╓ч╓╧║ё"
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr ""
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "╔у╔║╔╓╔К '%s' ╓н╨Ню╝╓к╪╨гт╓╥╓ч╓╥╓©: %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
 
-#: gconf/gconfd.c:1953
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Attempt to use invalid context ID %lu"
-msgstr "итю╣╓й╔Ё╔С╔ф╔╜╔╧╔хID %lu ╓Р╩хмя╓╥╓ф╓╓╓ч╓╧║ё"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
 
-#: gconf/gconfd.c:1963
+#: gconf/gconfd.c:1377
+#, fuzzy, c-format
+msgid "Unable to open saved state file '%s': %s"
+msgstr "╔у╔║╔╓╔К '%s' ╓н╨Ню╝╓к╪╨гт╓╥╓ч╓╥╓©: %s"
+
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Attempt to use already-unregistered context ID %lu"
-msgstr "╢Ш╓кл╓епо©╓н╔Ё╔С╔ф╔╜╔╧╔хID %lu ╓Р╩хмя╓╥╓ф╓╓╓ч╓╧║ё"
+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:2123
+#: gconf/gconfd.c:1481
 #, c-format
-msgid "Returning exception: %s"
-msgstr "йж╓╣╓Л╓©нЦЁ╟: %s"
+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/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "╔ь╔К╔в╔╙╔в╔╥╔Г╔С"
 
-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "\"--type\" ╓Р╩х╓ц╓ф║╒цм╓кбп╓╧╓К╔╜║╪╓Р╔╩╔ц╔х╓╥ф╠╢Э╓╥╓ч╓╧║ё"
 
-#: gconf/gconftool.c:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "и╦╫Ю╫пно╓к╔╜║╪╓нцм╓Ри╫╪╗╓╥╓ч╓╧║ё"
 
-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -901,43 +1204,43 @@ msgstr ""
 "\"--short-desc, --long-desc, --owner, --type\" ╓Р╩х╓ц╓ф╔╧╔╜║╪╔Ю╓Р╔╩╔ц╔х╓╥╓ф "
 "ф╠╢Э╓╥╓ч╓╧║ё"
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "╔Ё╔ч╔С╔и╔И╔╓╔С╓г╔╜║╪╓Рл╣╦З╓к╓╥╓ч╓╧║ё"
 
-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "╔г╔ё╔Л╔╞╔х╔ЙцФ╓на╢╓ф╓н╔╜║╪╓хцм╓н╔з╔╒╓Ри╫╪╗╓╥╓ч╓╧║ё"
 
-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "╔г╔ё╔Л╔╞╔х╔ЙцФ╓на╢╓ф╓н╔╣╔ж╔г╔ё╔Л╔╞╔х╔Й╓Ри╫╪╗╓╥╓ч╓╧║ё"
 
-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "╔г╔ё╔Л╔╞╔х╔Й╡╪╓н╔╗╔С╔х╔Й╓х╔╣╔ж╔г╔ё╔Л╔╞╔х╔Й╓на╢╓ф╓Р╨ф╣╞е╙╓ки╫╪╗╓╧╓К║ё"
 
-#: gconf/gconftool.c:149
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "╔г╔ё╔Л╔╞╔х╔Й╓╛б╦╨ъ╓╥╓©╓И 0 ╓Рйж╓╥║╒б╦╨ъ╓╥╓й╓╠╓Л╓п 2 ╓Рйж╓╥╓ч╓╧║ё"
 
-#: gconf/gconftool.c:158
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 "gconfd ╓Р╔╥╔Ц╔ц╔х╔ю╔╕╔С╓╥╓ч╓╧║ёмЩмЁл╣╓╥╓к╓Ё╓н╔╙╔в╔╥╔Г╔С╓Р╩хмя╓╥╓й╓╓╓Ё╓х!!"
 
-#: gconf/gconftool.c:167
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "╓Б╓╥ gconfd ╓╛╣╞ф╟цФ╓й╓И╓п 0 ╓Рйж╓╥║╒╓╫╓╕╓г╓й╓╠╓Л╓п 2 ╓Рйж╓╥╓ч╓╧║ё"
 
-#: gconf/gconftool.c:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 "gcnofd юъдЙ╔╣║╪╔п║╪╓Рн╘╓а╬Е╓╡╓ч╓╧║ё(иАдл╓ои╛мв╓к╠Ч╓╦╓ф╪╚ф╟е╙╓к╣╞ф╟╓╥╓ч╓╧)"
 
-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -945,12 +1248,12 @@ msgstr ""
 "╔╩╔ц╔х╓╣╓Л╓ф╓╓╓Кцм╓н╥©╓ч╓©╓о╔╧╔╜║╪╔Ю╓нцм╓н╥©╓Р╩ьдЙ╓╥╓ф╡╪╓╣╓╓║ё "
 "╫ейё╓╥╓й╓╠╓Л╓п╬йн╛╥а╓Б OK ╓г╓╧║ё"
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 #, fuzzy
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 #, fuzzy
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
@@ -959,11 +1262,11 @@ msgstr ""
 "╔╩╔ц╔х╓╣╓Л╓ф╓╓╓Кцм╓н╥©╓ч╓©╓о╔╧╔╜║╪╔Ю╓нцм╓н╥©╓Р╩ьдЙ╓╥╓ф╡╪╓╣╓╓║ё "
 "╫ейё╓╥╓й╓╠╓Л╓п╬йн╛╥а╓Б OK ╓г╓╧║ё"
 
-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 #, fuzzy
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
@@ -972,7 +1275,7 @@ msgstr ""
 "╔╩╔ц╔х╓╣╓Л╓ф╓╓╓Кцм╓н╥©╓ч╓©╓о╔╧╔╜║╪╔Ю╓нцм╓н╥©╓Р╩ьдЙ╓╥╓ф╡╪╓╣╓╓║ё "
 "╫ейё╓╥╓й╓╠╓Л╓п╬йн╛╥а╓Б OK ╓г╓╧║ё"
 
-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 #, fuzzy
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
@@ -981,43 +1284,43 @@ msgstr ""
 "╔╩╔ц╔х╓╣╓Л╓ф╓╓╓Кцм╓н╥©╓ч╓©╓о╔╧╔╜║╪╔Ю╓нцм╓н╥©╓Р╩ьдЙ╓╥╓ф╡╪╓╣╓╓║ё "
 "╫ейё╓╥╓й╓╠╓Л╓п╬йн╛╥а╓Б OK ╓г╓╧║ё"
 
-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr "╔╧╔╜║╪╔Ю╓нцФ╓г╧т╓╞╓©╓А╓нх╬юЧ╓нюБлю╓Р╩ьдЙ╓╥╓ф╡╪╓╣╓╓║ё"
 
-#: gconf/gconftool.c:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "юБлю"
 
-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "╔╧╔╜║╪╔Ю╓нцФ╓г╧т╓╞╓©╓А╓н©Ткэ╓нюБлю╓Р╩ьдЙ╓╥╓ф╡╪╓╣╓╓║ё"
 
-#: gconf/gconftool.c:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "╔╧╔╜║╪╔Ю╓н╔╙║╪╔й║╪╓Р╩ьдЙ╓╥╓ф╡╪╓╣╓╓║ё"
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "╔╙║╪╔й║╪"
 
-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "╔╓╔С╔╧╔х║╪╔К╓╧╓К╔╧╔╜║╪╔Ю╔у╔║╔╓╔К╓Р╩ьдЙ╓╥╓ф╓╞╓ю╓╣╓╓║ё"
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "╔у╔║╔╓╔Кл╬"
 
-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "╔г╔у╔╘╔К╔х╔я╔╧╓Х╓Й╓Б╓Ю╓╥╓М╩хмя╓╧╓К╓©╓А╓нюъдЙ╔╫║╪╔╧╓Р╩ьдЙ╓╥╓ф╡╪╓╣╓╓║ё"
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "╔╫║╪╔╧"
 
-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1025,7 +1328,7 @@ msgstr ""
 "╔п╔╓╔я╔╧╓╥╓ф╓╓╓К╔╣║╪╔п║╪╓нюъдЙ╔г║╪╔©╔ы║╪╔╧╓кд╬юэ╔╒╔╞╔╩╔╧╓╥╓ф╡╪╓╣╓╓║ёgconfd "
 "╓╛╣╞ф╟╓╥╓ф╓╓╓й╓╓╓Ё╓х╓╛╬Р╥О╓г╓╧║ё"
 
-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1036,7 +1339,7 @@ msgstr ""
 "╓╣╓Л╓ф╓╓╓К╓╚║╒╓Б╓╥╓╞╓о╔г╔у╔╘╔К╔х╓х╓╥╓ф╤У╓нй╦╩ЗнС╓╛юъдЙ╓╣╓Л╓ф╓╓╓Ки╛мв╓╛ "
 "╓╒╓Й╓ч╓╧║ё"
 
-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1044,7 +1347,7 @@ msgstr ""
 "╔Ё╔ч╔С╔и╔И╔╓╔С╬Е╓г╔╜║╪╓н╟ш╓й╓К╥©╓нцм╓н╓ч╓х╓ч╓Й╓РюъдЙ/л╓юъдЙ╓╧╓К╩Ж╓к╓Х╓Й "
 "╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╓Р╔ф╔╧╔х╓г╓╜╓ч╓╧║ё"
 
-#: gconf/gconftool.c:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1052,7 +1355,7 @@ msgstr ""
 "╔Ё╔ч╔С╔и╔И╔╓╔С╬Е╓г╔г╔ё╔Л╔╞╔х╔ЙфБиТ╓н╔╜║╪╓н╓ч╓х╓ч╓Й╓РюъдЙ/л╓юъдЙ╓к╓╧╓К "
 "╩Ж╓к╓Х╓Й╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╓Р╔ф╔╧╔х╓г╓╜╓ч╓╧║ё"
 
-#: gconf/gconftool.c:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1062,23 +1365,23 @@ msgstr ""
 "'%s --help' ╓Р╪б╧т╓╥╓ф║╒м╜╦З╓й╔Ё╔ч╔С╔и╔И╔╓╔С║╕╔╙╔в╔╥╔Г╔С╔Й╔╧╔х╓Р╩╡╬х╓╥╓ф "
 "╡╪╓╣╓╓║ё\n"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "╪Хфю╓хюъдЙ/л╓юъдЙ╓Рф╠╩Ч╓к╓о╪б╧т╓г╓╜╓ч╓╩╓С║ё\n"
 
-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "юъдЙ╓х╪Хфю/л╓юъдЙ╓Рф╠╩Ч╓к╓о╪б╧т╓г╓╜╓ч╓╩╓С║ё\n"
 
-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "--get ╓ч╓©╓о --set ╓х╟Л╫О╓к --all-pairs ╓о╩х╓╗╓ч╓╩╓С║ё\n"
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "--get ╓ч╓©╓о --set ╓х╟Л╫О╓к --all-dirs ╓о╩х╓╗╓ч╓╩╓С║ё\n"
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1086,7 +1389,7 @@ msgstr ""
 "--recursive-list ╓о --get, --set, --unset, --all-pairs, --all-dirs "
 "╓х╟Л╫О╓к╩х╓╕╓ы╓╜╓г╓о╓╒╓Й╓ч╓╩╓С║ё\n"
 
-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1094,58 +1397,58 @@ msgstr ""
 "--set_schema ╓о --get, --set, --unset, --all-pairs, --all-dirs "
 "╓х╟Л╫О╓к╩х╓╕╓ы╓╜╓г╓о╓╒╓Й╓ч╓╩╓С║ё\n"
 
-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "цм╓РюъдЙ╓╧╓К╬Л╧Г╓оцм╓н╥©╓╛╢ьо╒╓╥╓ф╓╓╓К╓ю╓╠╓гни╓╓╓г╓╧║ё\n"
 
-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "цм╓РюъдЙ╓╧╓К╬Л╧Г╓о╥©╓Р╩ьдЙ╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping ╔╙╔в╔╥╔Г╔С╓о╓╫╓Л╪╚©х╓г╩х╓О╓Л╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists ╔╙╔в╔╥╔Г╔С╓о ╓╫╓Л╪╚©х╓г╩х╓О╓Л╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file ╓о╓╫╓Л╪╚©х╓г╩х╓О╓Л╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule ╓о╓╫╓Л╪╚©х╓г╩х╓О╓Л╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key ╓о╓╫╓Л╪╚©х╓г╩х╓О╓Л╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directroy ╓о╓╫╓Л╪╚©х╓г╩х╓О╓Л╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "--direct ╓Р╩хмя╓╧╓К╬Л╧Г╓о --config-source "
 "иу╓╜╓нюъдЙ╔у╔║╔╓╔К╓Р╩ьдЙ╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf ╓н╫И╢Э╡╫╓к╪╨гт: %s\n"
 
-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "╢д╤╜йя©Т GCONF_CONFIG_SOURCE ╓Р╔╩╔ц╔х╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1158,291 +1461,291 @@ msgstr ""
 "gconfd╔г║╪╔Б╔С╓Р\n"
 "╔╥╔Ц╔ц╔х╔ю╔╕╔С╓╥╓ф╓╞╓ю╓╣╓╓║ё(нЦ╓╗╔╒╔в╔Й╓╛мЩоюе╙╓кф╟╓╓╓ф╓╓╓©╓х╓╥╓ф╓Б)\n"
 
-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "юъдЙ╔у╔║╔╓╔К╓н╔╒╔╞╔╩╔╧╓к╪╨гт: %s\n"
 
-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "╔╥╔Ц╔ц╔х╔ю╔╕╔С╔╗╔И║╪: %s\n"
 
-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "╨ф╣╒╔Й╔╧╔х╓кё╠╓д╟й╬Е╓н╔г╔ё╔Л╔╞╔х╔Й╓Р╩ьдЙ╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "'%s' ╓н╔з╔╒╓Р╔Й╔╧╔х╡╫цФ╓к╔╗╔И║╪: %s"
 
-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(╡©╓Б╔╩╔ц╔х╓╣╓Л╓ф╓╓╓ч╓╩╓С)"
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "юъдЙ╔╣║╪╔п║╪(gconfd)╓н╣╞ф╟╓к╪╨гт: %s\n"
 
-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "ё╠╓д╓н╔╜║╪╓ч╓©╓о╪Хфю╓╧╓К╓©╓А╓н╔╜║╪╓Р╩ьдЙ╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "╥©: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, fuzzy, c-format
 msgid "List Type: %s\n"
 msgstr "╥©: %s\n"
 
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, fuzzy, c-format
 msgid "Car Type: %s\n"
 msgstr "╥©: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, fuzzy, c-format
 msgid "Cdr Type: %s\n"
 msgstr "╥©: %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "╔╙║╪╔й║╪: %s\n"
 
-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "л╓юъдЙ"
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "╔╥╔Г║╪╔хDesc: %s\n"
 
-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "╔М╔С╔╟Desc: %s\n"
 
-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "'%s' ╓к╡©╓Бцм╓╛юъдЙ╓╣╓Л╓ф╓╓╓ч╓╩╓С║ё\n"
 
-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "'%s' ╓нцм╓н╪Хфю╓к╪╨гт: %s\n"
 
-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "'%s' ╓н╥©╓╛итлю╓г╓╧║ё\n"
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "╟З©Т╓г╔╜║╪/цм╓н╦Р╢╧╓Р╩ьдЙ╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "╔╜║╪╓к╡©╓Бцм╓╛╔╩╔ц╔х╓╣╓Л╓ф╓╓╓ч╓╩╓С: '%s'\n"
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "╔╗╔И║╪: %s\n"
 
-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "цм╓нюъдЙ╔╗╔И║╪: %s"
 
-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "ф╠╢ЭцФ╓к╔╗╔И║╪: %s"
 
-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "╟З©Т╓г╓н╓ъ╔╜║╪(╔╧╔╜║╪╔Юл╬)╓Р╩ьдЙ╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1201
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "╔╜║╪/цм╓н╔з╔╒╓Р╪Хфю╓╧╓К╓©╓А╓к╓оё╠╟й╬Е╓н╔г╔ё╔Л╔╞╔х╔Й╓н╩ьдЙ╓╛и╛мв╓г╓╧║ё\n"
 
-#: gconf/gconftool.c:1259
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "л╣╦З╓к╓╧╓К╓©╓А╓кё╠╦д╟й╬Е╓н╔╜║╪╓Р╩ьдЙ╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "'%s' л╓юъдЙцФ╓к╔╗╔И║╪: %s\n"
 
-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "╔╣╔ж╔г╔ё╔Л╔╞╔х╔Й╓Р╪Хфю╓╧╓К╓©╓А╓кё╠╓д╟й╬Е╓н╔г╔ё╔Л╔╞╔х╔Й╓н╩ьдЙ╓╛и╛мв╓г╓╧║ё\n"
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "╔г╔ё╔Л╔╞╔х╔Й╓н╔Й╔╧╔х╡╫цФ╓к╔╗╔И║╪: %s\n"
 
-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "╥ы╧П: итю╣╓Б╓╥╓╞╓о╥©╓нл╣╓╓╔╧╔╜║╪╔Ю(%s)╓г╓╧║ё\n"
 
-#: gconf/gconftool.c:1378
+#: gconf/gconftool.c:1366
 #, fuzzy, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "╥ы╧П: итю╣╓Б╓╥╓╞╓о╥©╓нл╣╓╓╔╧╔╜║╪╔Ю(%s)╓г╓╧║ё\n"
 
-#: gconf/gconftool.c:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "╥ы╧П: ╔г╔у╔╘╔К╔хцм '%s' ╓н╡Рюо╓к╪╨гт: (╔╧╔╜║╪╔Ю╓о %s)\n"
 
-#: gconf/gconftool.c:1407
+#: gconf/gconftool.c:1395
 #, fuzzy, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "╥ы╧П: итю╣╓Б╓╥╓╞╓о╥©╓нл╣╓╓╔╧╔╜║╪╔Ю(%s)╓г╓╧║ё\n"
 
-#: gconf/gconftool.c:1432
+#: gconf/gconftool.c:1420
 #, fuzzy
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "╥ы╧П: ╔г╔у╔╘╔К╔хцм '%s' ╓н╡Рюо╓к╪╨гт: (╔╧╔╜║╪╔Ю╓о %s)\n"
 
-#: gconf/gconftool.c:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "╥ы╧П: gconftool ╓нфБиТ╔╗╔И║╪╓г╓╧║ёитлю╓й GConfValueType ╓г╓╧║ё\n"
 
-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "╥ы╧П: ╥©л╬ '%s' ╓н╡Рюо╓к╪╨гт╓╥╓ч╓╥╓©\n"
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "╥ы╧П: ╤У╓н╔н║╪╔и"
 
-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "╥ы╧П: ╔н║╪╔и <%s> ╓о╔╧╔╜║╪╔Ю╓г╓о╡Рфи╓г╓╜╓ч╓╩╓С║ё\n"
 
-#: gconf/gconftool.c:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "╥ы╧П: ╔╧╔╜║╪╔Ю╓к╩ьдЙ╓╣╓Л╓©╔╜║╪╓о╓╒╓Й╓ч╓╩╓С║ё\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "╥ы╧П: <locale> ╔н║╪╔и╓к╓о б╟ю╜ 'name = \"╔М╔╠║╪╔Кл╬\"╓╛╓╒╓Й╓ч╓╩╓С║ё "
 "л╣╩К╓╥╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 "╥ы╧П: ╔М║╪╔╠╔К '%s' мя╓нб©╫е <locale> ╔н║╪╔и╓г╓╧║ёа╢╓ф╓н╨г╫И╓Рл╣╩К╓╥╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "╥ы╧П: <locale>╔н║╪╔ицФ╓китю╣╓й╔н║╪╔и <%s> ╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:1757
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "╥ы╧П: ╔╧╔╜║╪╔Ю '%s' ╓н╔╓╔С╔╧╔х║╪╔К╓к╪╨гт(╔М╔╠║╪╔К╓о '%s'): %s\n"
 
-#: gconf/gconftool.c:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "╔╧╔╜║╪╔Ю '%s' ╓н╔╓╔С╔╧╔х║╪╔К (╔М║╪╔╠╔К '%s'мя)\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "╥ы╧П: ╔╧╔╜║╪╔Ю '%s' ╓но╒╥К╓к╪╨гт(╔╜║╪╓о'%s'): %s\n"
 
-#: gconf/gconftool.c:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "╔╧╔╜║╪╔Ю '%s' ╓но╒╥К (╔╜║╪╓о '%s')\n"
 
-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "ё╠╓д╓н <schema> ╓киу╓╜ё╠╓д╓н <locale> ╔╗╔С╔х╔Й╓╛и╛мв╓г╓╧║ё\n"
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "╥ы╧П: ╔н║╪╔и <%s> ╓о <schemalist> ╓г╓о╡Рюо╓г╓╜╓ч╓╩╓С╓г╓╥╓©║ё\n"
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "'%s' ╓╛Ё╚╓╠╓ч╓╩╓С╓г╓╥╓©: %s\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "╔и╔╜╔Е╔А╔С╔х '%s' ╓о╤У╓г╓╧╓╚?\n"
 
-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1451,28 +1754,28 @@ msgstr ""
 "╔и╔╜╔Е╔А╔С╔х '%s' ╓н╔К║╪╔х╔н║╪╔и╓н╥©╓╛╢ж╟Ц╓ц╓ф╓╓╓ч╓╧║ё( "
 "<%s>╓о<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 "╔и╔╜╔Е╔А╔С╔х '%s' ╓к╓о╔х╔ц╔в╔Л╔ы╔К <gconfshemafile> ╔н║╪╔и╓╛╓╒╓Й╓ч╓╩╓С║ё\n"
 
-#: gconf/gconftool.c:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "╥ы╧П: <gconfshemafile> ╡╪╓н╔н║╪╔и <%s> ╓о╡Рюо╓г╓╜╓ч╓╩╓С╓г╓╥╓©║ё\n"
 
-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "юъдЙ╔г║╪╔©╓нф╠╢Э╓г╔╗╔И║╪: %s"
 
-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr ""
 "╔╓╔С╔╧╔х║╪╔К╓╧╓К╓©╓А╓к╢Ж╓д╓╚╓н╔╧╔╜║╪╔Ю╔у╔║╔╓╔К╓Р╩ьдЙ╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1481,16 +1784,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "ит╢╟а╢╓й╔╜║╪ '%s' ╓нл╣╦З╡╫╓к╪╨гт: %s\n"
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "╫╙н╩╓╧╓К╓©╓А╓к╓о╢Ж╓д╓╚╓н╔╜║╪╓Р╩ьдЙ╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1500,11 +1803,11 @@ msgstr ""
 "╓╓╓ч╓╧:\n"
 " %s\n"
 
-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "╫╙н╩╓╧╓К╓©╓А╓к╓о╢Ж╓д╓╚╓н╔г╔ё╔Л╔╞╔х╔Й╓Р╩ьдЙ╓╧╓Ки╛мв╓╛╓╒╓Й╓ч╓╧║ё\n"
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1520,11 +1823,29 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf ╓╚╓И╥ы╧П: '%s' ╓нцФ╓н╔з╔╒╓н╔Й╔╧╔х╡╫╓к╪╨гт: %s"
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "'%s' ╓Р╢Эбт╓╣╓Л╓©╓╛║╒фю╓И╓Л╓©╓н╓о '%s'(╔╜║╪╓о'%s')╓г╓╧║ё"
 
+#~ msgid "Received signal %d, ignoring"
+#~ msgstr "╔╥╔╟╔й╔К %d ╓Р╪У╓╠╪Х╓Й╓ч╓╥╓©╓╛║╒л╣╩К╓╥╓ч╓╧║ё"
+
+#~ msgid "Attempt to unregister invalid context ID"
+#~ msgstr "итю╣╓й╔Ё╔С╔ф╔╜╔╧╔хID╓Рл╓епо©╓к╓╥╓ч╓╧"
+
+#~ msgid "Bad context ID %lu, request ignored"
+#~ msgstr "╓╙╓╚╓╥╓й╔Ё╔С╔ф╔╜╔╧╔хID %lu ╓г╓╧║ёмв╣А╓Рл╣╩К╓╥╓ч╓╧║ё"
+
+#~ msgid "Already-unregistered context ID %lu, request ignored"
+#~ msgstr "╢Ш╓кл╓епо©╓н╔Ё╔С╔ф╔╜╔╧╔хID %lu ╓г╓╧║ёмв╣А╓Рл╣╩К╓╥╓ч╓╧║ё"
+
+#~ msgid "Attempt to use invalid context ID %lu"
+#~ msgstr "итю╣╓й╔Ё╔С╔ф╔╜╔╧╔хID %lu ╓Р╩хмя╓╥╓ф╓╓╓ч╓╧║ё"
+
+#~ msgid "Attempt to use already-unregistered context ID %lu"
+#~ msgstr "╢Ш╓кл╓епо©╓н╔Ё╔С╔ф╔╜╔╧╔хID %lu ╓Р╩хмя╓╥╓ф╓╓╓ч╓╧║ё"
+
 #~ msgid ""
 #~ "WARNING: For now gconftool only knows how to install default values for "
 #~ "simple types (int, string, bool, float)\n"
diff --git a/po/ko.po b/po/ko.po
index f8e14435..54c29b80 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf CVS-20000906\n"
-"POT-Creation-Date: 2000-09-06 18:05+0900\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-09-06 18:05+0900\n"
 "Last-Translator: Chideok Hwang <hwang@mizi.co.kr>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -13,135 +13,135 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr ""
 
-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "`%s'╣П╥╨еД╦╝╦╕ ╦╦╣И╪Ж╟║ ╬Ь╫ю╢о╢ы: %s"
 
-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/xml-backend.c:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr ""
 
-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr ""
 
-#: backends/xml-cache.c:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
 "%u seconds"
 msgstr ""
 
-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "`%s'юг а╓╨╦╦╕ ╬Р╬НЁ╬╪Ж╟║ ╬Ь╫ю╢о╢ы: %s"
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "XML фдюоюл╦╖ `%s`╟║ ╣П╥╨еД╦╝ют╢о╢ы"
 
-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "`%s'аЖ©Л╠Б╦╕ ╫гфпгъ╫ю╢о╢ы: %s"
 
-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "`%s`фдюо ╬╡╠Б╟║ ╫гфпгъ╫ю╢о╢ы: %s"
 
-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "╠Ба╦ фдюо `%s` аЖ©Л╠Б╟║ ╫гфпгъ╫ю╢о╢ы: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:802
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "`%s'юг а╓╨╦╦╕ ╬Рю╩╪Ж╟║ ╬Ь╫ю╢о╢ы: %s"
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "©ёф╝╦╝ `%s'╟║ `%s'©║╪╜ аъ╨╧╣г╬Нюж╫ю╢о╢ы. ╧╚╫ц"
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:975
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "`%s'фдюою╩ ╩Щ╪╨го╢б╣╔ ╫гфпгъ╫ю╢о╢ы: %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2455
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "`%s'фдюою╩ ╢щ╢б╣╔ ╫гфпгъ╫ю╢о╢ы: %s"
 
 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "`%s'╤С╢б юл╦╖ю╩ ╟║аЬ XML ЁК╣Е╦╕ ╧╚╫цгу╢о╢ы: %s"
 
-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2159
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr ""
@@ -149,1146 +149,1225 @@ msgstr ""
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr ""
 
-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "╫╨е╟╦╤©║╢Кгя ╠Б╨╩╟╙ю╩ юп╢б╣╔ ╫гфпгъ╫ю╢о╢ы: %s"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "<%s>ЁК╣Е©║ \"type\"╪с╪╨╟╙юл ╬Ь╫ю╢о╢ы"
 
-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "ЁК╣Е©║ \"value\"╪с╪╨╟╙юл ╬Ь╫ю╢о╢ы"
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1055
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
 #. -- end debug only
-#: gconf/gconf-backend.c:182
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "`%s'©м╟╟ю╨ фдюоюл ╬Ь╫ю╢о╢ы\n"
 
-#: gconf/gconf-backend.c:210
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr ""
 
-#: gconf/gconf-backend.c:235
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr ""
 
-#: gconf/gconf-backend.c:245
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-backend.c:277
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr ""
 
-#: gconf/gconf-backend.c:314
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr ""
 
-#: gconf/gconf-database.c:209
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr ""
 
-#: gconf/gconf-database.c:217
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:432
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr ""
 
-#: gconf/gconf-database.c:446
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:511
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 
-#: gconf/gconf-database.c:629
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr ""
 
-#: gconf/gconf-database.c:806 gconf/gconf-sources.c:1205
+#. 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:699
+#, c-format
+msgid ""
+"Failed to log addition of listener (%s); will not be able to restore this "
+"listener on gconfd restart, resulting in unreliable notification of "
+"configuration changes."
+msgstr ""
+
+#: gconf/gconf-database.c:724
+#, c-format
+msgid "Listener ID %lu doesn't exist"
+msgstr ""
+
+#: gconf/gconf-database.c:733
+#, 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:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "`%s'©║╢Кгя ╟╙ю╩ ╬Р╢б╣╔ ©ю╥Ы ╧ъ╩Щ: %s"
 
-#: gconf/gconf-database.c:843
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "`%s'©║╢Кгя ╟╙ю╩ а╓го╢б╣╔ ©ю╥Ы ╧ъ╩Щ: %s"
 
-#: gconf/gconf-database.c:878
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:899
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "`%s'юг ╠Б╨╩╟╙ю╩ ╬Р╢б╣╔ ©ю╥Ы╧ъ╩Щ: %s"
 
-#: gconf/gconf-database.c:937
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "`%s'юг а╦юГю╞╧╚╦╕ ╟к╩Гго╢б╣╔ ©ю╥Ы╟║ ╧ъ╩Щгъ╫ю╢о╢ы: %s"
 
-#: gconf/gconf-database.c:961
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:987
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "`%s'©║ юж╢б ╦П╣Г ©ёф╝╦╝╦╕ ╬Р╢б╣╔ ╫гфпгъ╫ю╢о╢ы: %s"
 
-#: gconf/gconf-database.c:1013
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1034
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "`%s'ю╩ ю╖гя ╫╨е╟╦╤ ╪Ёа╓©║ ©ю╥Ы: %s"
 
-#: gconf/gconf-error.c:39
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr "╪╨╟Ь"
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr "╫гфп"
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr ""
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr "╠ггяюл ╬Ь╫ю╢о╢ы"
 
-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
 msgstr ""
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr ""
 
-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 msgid "Parse error"
 msgstr "фд╫л ©ю╥Ы"
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr ""
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr "е╦ют ╨рюод║"
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr ""
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr ""
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr ""
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr ""
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr ""
 
-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 msgid "Failed to get a lock"
 msgstr "юА╠шю╩ ╬Р╢б╣╔ ╫гфпгъ╫ю╢о╢ы"
 
-#: gconf/gconf-glib.c:631
+#: gconf/gconf-glib.c:629
 #, c-format
 msgid ""
 "Error on line %d char %d: %s\n"
 "(Some surrounding text was '%s')\n"
 msgstr ""
 
-#: gconf/gconf-glib.c:751
+#: gconf/gconf-glib.c:749
 msgid ""
 "Text ended in the middle of an entity, or entity name too long to be valid "
 "('&' should begin an entity such as '&quot;')"
 msgstr ""
 
-#: gconf/gconf-glib.c:803
+#: gconf/gconf-glib.c:801
 #, c-format
 msgid ""
 "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
 msgstr ""
 
-#: gconf/gconf-glib.c:843
+#: gconf/gconf-glib.c:841
 msgid ""
 "Markup text ended in the middle of a character reference, just after '&#'"
 msgstr ""
 
-#: gconf/gconf-glib.c:869
+#: gconf/gconf-glib.c:867
 #, c-format
 msgid ""
 "Character reference contained non-digit '%s' ('&#' should begin a reference "
 "to a unicode character, such as '&#2342;')"
 msgstr ""
 
-#: gconf/gconf-glib.c:893
+#: gconf/gconf-glib.c:891
 msgid ""
 "Text ended in the middle of an character reference ('&#' should begin a "
 "character reference such as '&#2342;')"
 msgstr ""
 
-#: gconf/gconf-glib.c:918
+#: gconf/gconf-glib.c:916
 #, c-format
 msgid ""
 "Couldn't parse character reference '%s' ('&#' must begin a character "
 "reference such as '&#2343;')"
 msgstr ""
 
-#: gconf/gconf-glib.c:940
+#: gconf/gconf-glib.c:938
 #, c-format
 msgid ""
 "Character code %#lx is not allowed in XML documents or is not a valid "
 "Unicode character"
 msgstr ""
 
-#: gconf/gconf-glib.c:1015
+#: gconf/gconf-glib.c:1013
 msgid ""
 "Documented ended just after an '&', '&' should begin an entity or character "
 "reference."
 msgstr ""
 
-#: gconf/gconf-glib.c:1029
+#: gconf/gconf-glib.c:1027
 msgid ""
 "'<' or '>' character not allowed here; only allowed around tags, for example "
 "<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
 "&lt; and &gt;"
 msgstr ""
 
-#: gconf/gconf-glib.c:1084
+#: gconf/gconf-glib.c:1082
 #, c-format
 msgid "Character '%s' is not valid at the start of an attribute name"
 msgstr "╧╝юз '%s'╢б ╪с╪╨ юл╦╖юг ц╧ юз╥н╢б юШюЩгоаЖ╬й╫ю╢о╢ы"
 
-#: gconf/gconf-glib.c:1111
+#: gconf/gconf-glib.c:1109
 msgid "Document ended just after attribute name"
 msgstr ""
 
-#: gconf/gconf-glib.c:1122
+#: gconf/gconf-glib.c:1120
 msgid "Attribute name must be immediately followed by an '=' character"
 msgstr ""
 
-#: gconf/gconf-glib.c:1137
+#: gconf/gconf-glib.c:1135
 msgid ""
 "'=' character after attribute must be immediately followed by an '\"' "
 "character"
 msgstr ""
 
-#: gconf/gconf-glib.c:1163
+#: gconf/gconf-glib.c:1161
 #, c-format
 msgid ""
 "Character '%c' found inside an attribute value; perhaps your attribute value "
 "is missing the closing quotation mark '\"'"
 msgstr ""
 
-#: gconf/gconf-glib.c:1183
+#: gconf/gconf-glib.c:1181
 msgid ""
 "Ran out of text before a quote mark ('\"') was seen at the end of an "
 "attribute value"
 msgstr ""
 
-#: gconf/gconf-glib.c:1196
+#: gconf/gconf-glib.c:1194
 msgid ""
 "Text ends immediately after an attribute value, before the element was closed"
 msgstr ""
 
-#: gconf/gconf-glib.c:1510
+#: gconf/gconf-glib.c:1508
 msgid "Missing '<' at start of element"
 msgstr "Elementюг ╫цюшю╖д║©║ '<'╟║ ╨Эа╝юж╫ю╢о╢ы"
 
-#: gconf/gconf-glib.c:1521
+#: gconf/gconf-glib.c:1519
 msgid "Document ended just after '<' character"
 msgstr "'<' ╧ы╥н ╣з©║╪╜ ╧╝╪╜╟║ Ё║Ё╙╧Ж╥х╫ю╢о╢ы"
 
-#: gconf/gconf-glib.c:1549
+#: gconf/gconf-glib.c:1547
 msgid "No closing '>' found for a <? or <!"
 msgstr ""
 
-#: gconf/gconf-glib.c:1578
+#: gconf/gconf-glib.c:1576
 #, c-format
 msgid "Character '%s' is not valid at the start of an element name"
 msgstr "'%s'╧╝юз╢б Elementюг ╫цюш╧╝юз╥н юШгугоаЖ╬й╫ю╢о╢ы"
 
-#: gconf/gconf-glib.c:1602 gconf/gconf-glib.c:1615
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
 msgid "Document ended just after element name, no '>' seen"
 msgstr ""
 
-#: gconf/gconf-glib.c:1640
+#: gconf/gconf-glib.c:1638
 #, c-format
 msgid "Elements should be closed with '>' or '/>', not with '%s'"
 msgstr "Element╢б '%s'юл ╬ф╢о╤С '>'Ё╙ '/>'╥н Ё║Ё╙╬ъгу╢о╢ы"
 
-#: gconf/gconf-glib.c:1657
+#: gconf/gconf-glib.c:1655
 msgid ""
 "Element ended just after '/', no '>' seen; empty elements should end with "
 "'/>'"
 msgstr ""
 
-#: gconf/gconf-glib.c:1696
+#: gconf/gconf-glib.c:1694
 msgid "Close tag not found at end of element"
 msgstr ""
 
-#: gconf/gconf-glib.c:1711
+#: gconf/gconf-glib.c:1709
 msgid "Close tag ends just after '<' character"
 msgstr ""
 
-#: gconf/gconf-glib.c:1725
+#: gconf/gconf-glib.c:1723
 msgid "Close tag should begin with '</', '/' character is missing"
 msgstr ""
 
-#: gconf/gconf-glib.c:1739
+#: gconf/gconf-glib.c:1737
 msgid "Close tag ends just after '/' character"
 msgstr ""
 
-#: gconf/gconf-glib.c:1774
+#: gconf/gconf-glib.c:1772
 msgid "Document ended just after element name in close tag, no '>' seen"
 msgstr ""
 
-#: gconf/gconf-glib.c:1790
+#: gconf/gconf-glib.c:1788
 msgid "Document ended just after close tag name, no '>' seen"
 msgstr ""
 
-#: gconf/gconf-glib.c:1809
+#: gconf/gconf-glib.c:1807
 #, c-format
 msgid "Close tag '%s' does not match opening tag '%s'"
 msgstr ""
 
-#: gconf/gconf-glib.c:2147
+#: gconf/gconf-glib.c:2145
 #, c-format
 msgid ""
 "Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
 "bad character was '%s'"
 msgstr ""
 
-#: gconf/gconf-glib.c:2204
+#: gconf/gconf-glib.c:2202
 msgid "The marked-up text contained nothing but whitespace."
 msgstr ""
 
-#: gconf/gconf-glib.c:10668
+#: gconf/gconf-glib.c:10666
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "'%s'фдюою╩ ©╘╢б╣╔ ╫гфпгъ╫ю╢о╢ы: %s"
 
-#: gconf/gconf-glib.c:10685
+#: gconf/gconf-glib.c:10683
 #, c-format
 msgid "Error reading file '%s': %s"
 msgstr "`%s' фдюою╩ юп╢б╣╔ ©ю╥Ы╟║ юж╫ю╢о╢ы: %s"
 
-#: gconf/gconf-internals.c:100
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "е╟ `%s'©║ '/'╟║ ╬Ь╫ю╢о╢ы"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:798
+#: gconf/gconf-internals.c:445
+msgid "Failed to convert object to IOR"
+msgstr ""
+
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:853
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:865
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "`%s'фдюою╩ юп╢б╣╔ ©ю╥Ы╟║ ╧ъ╩Щгъ╫ю╢о╢ы: %s\n"
 
-#: gconf/gconf-internals.c:1307
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "©╧╩С╣г╢б ╦╝╫╨ф╝ ╢К╫е %s╦╕ ╬Р╬З╫ю╢о╢ы"
 
-#: gconf/gconf-internals.c:1317
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "©╧╩С╣г╢б %sюг ╦╝╫╨ф╝╢К╫е %sюг ╦╝╫╨ф╝╦╕ ╬Р╬З╫ю╢о╢ы"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "©╧╩С╣г╢б pair╢К╫е©║ %sю╩ ╬Р╬З╫ю╢о╢ы"
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1486
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "©╧╩С╣г╢б (%s, %s)е╦ютюг pair ╢К╫е©║ (%s, %s)ю╩ ╬Р╬З╫ю╢о╢ы"
 
-#: gconf/gconf-internals.c:1602
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1664
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2144 gconf/gconf.c:2780
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "дз╧ы ©ю╥Ы: %s"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2176
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF фд╫л ©ю╥Ы: %s"
 
-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "╬к╥ааЖаЖ╬йю╨ OAF©ю╥Ы╟║ ╧ъ╩Щ"
 
-#: gconf/gconf-internals.c:2264
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "`%s'╬х©║ ior фдюоюл ╬Ь╫ю╢о╢ы"
 
-#: gconf/gconf-internals.c:2295
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2306
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "╢ы╦╔ га╥н╠в╥╔юл юА╠щ(`%s')ю╩ ╟║аЖ╟М юж╫ю╢о╢ы"
 
-#: gconf/gconf-internals.c:2326
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2358
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2372
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "`%s'╣П╥╨еД╦╝╦╕ ╦╦╣И ╪Ж╟║ ╬Ь╫ю╢о╢ы: %s"
 
-#: gconf/gconf-internals.c:2407
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "`%s' юА╠щ фдюою╩ ╦╦╣И ╪Ж╟║ ╬Ь╫ю╢о╢ы: %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "`%s'фдюо©║ ╬╣╪Ж╟║ ╬Ь╫ю╢о╢ы: %s"
 
-#: gconf/gconf-internals.c:2486
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "юА╠щ фдюо(%s)юл ╠За╝юж╬Н╪╜ а╕╟егу╢о╢ы"
 
-#: gconf/gconf-internals.c:2513
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
 
-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "source `%s'╦╕ ╨р╥╞╣Июл╢б╣╔ ╫гфпгъ╫ю╢о╢ы: %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "╦че╦ а╓╨╦╦╕ цё╢б╣╔ ©ю╥Ы╟║ ╩Щ╟Е╫ю╢о╢ы: %s"
 
-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "╦че╦ а╓╨╦╦╕ ╬Р╬НЁ╩╢б╣╔ ©ю╥Ы╟║ ╩Щ╟Е╫ю╢о╢ы: %s"
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "`%s'╦╕ гь╪╝гр╪Ж╟║ ╬Ь╫ю╢о╢ы (а╓╪Ж╟║ ©м╬ъгу╢о╢ы)"
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "а╓╪Ж╟╙ `%s'╟║ Ёй╧╚ е╘╟еЁ╙ ╬ф╢о╦И Ёй╧╚ юш╫ю╢о╢ы"
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "`%s'╦╕ гь╪╝гр╪Ж╟║ ╬Ь╫ю╢о╢ы (╫г╪Ж╟║ ©м╬ъгу╢о╢ы)"
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "`%s'╦╕ гь╪╝гр╪Ж╟║ ╬Ь╫ю╢о╢ы (trueЁ╙ false╟║ ©м╬ъгу╢о╢ы)"
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "`%s'╦╕ гь╪╝гр╪Ж╟║ ╬Ь╫ю╢о╢ы (╦╝╫╨ф╝╢б '['ю╦╥н ╫цюшгь╬ъгу╢о╢ы)"
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "`%s'╦╕ гь╪╝гр╪Ж╟║ ╬Ь╫ю╢о╢ы (╦╝╫╨ф╝╢б ']'ю╦╥н Ё║Ё╙╬ъгу╢о╢ы)"
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "`%s'╦╕ гь╪╝гр╪Ж╟║ ╬Ь╫ю╢о╢ы (╦╝╫╨ф╝ Ё╩©║ ']'╟║ а╦юГгу╢о╢ы)"
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "`%s'╦╕ гь╪╝гр╪Ж╟║ ╬Ь╫ю╢о╢ы (Ё║ ╨н╨п©║ цъ╟║ ╧╝юз©╜юл юж╫ю╢о╢ы)"
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr ""
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr ""
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr ""
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
 
-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:300
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "╪╜╧Ж╟║ `%s'аж╪р╦╕ гь╪╝гр╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: gconf/gconf.c:561
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1626
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "╪╜╧Ж╦╕ а╒цкго╢б╣╔ ╫гфпго©╢╫ю╢о╢ы. дз╧ы ©ю╥Ы: %s"
 
-#: gconf/gconf.c:1642
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
 "Please file an OAF bug report."
 msgstr ""
 
-#: gconf/gconf.c:1909
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConf╦╕ цй╠Бх╜го╢б╣╔ ╫гфпго©╘ Ё║╦╤д╖╢о╢ы\n"
 
-#: gconf/gconf.c:1946
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "╫╫╥║╫╛(/)╥н ╫цюшгь╬ъгу╢о╢ы"
 
-#: gconf/gconf.c:1968
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:1970
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1991
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:2005
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2252
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "╪Ёа╓ ╪╜╧Ж╦╕ Ё║Ё╩╢б╣╔ ╫гфпгъ╫ю╢о╢ы: %s"
 
-#: gconf/gconf.c:2313
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "╫г╪Ж╟╙юл ©м╬ъгоЁ╙ ╢К╫е©║ %sю╩ ╬Р╬З╫ю╢о╢ы."
 
-#: gconf/gconf.c:2348
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "а╓╪Ж╟╙юл ©м╬ъгоЁ╙ ╢К╫е©║ %sю╩ ╬Р╬З╫ю╢о╢ы."
 
-#: gconf/gconf.c:2383
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "╧╝юз©╜юл ©м╬ъгоЁ╙ ╢К╫е©║ %sю╩ ╬Р╬З╫ю╢о╢ы."
 
-#: gconf/gconf.c:2420
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "bool╟╙юл ©м╬ъгоЁ╙ ╢К╫е©║ %sю╩ ╬Р╬З╫ю╢о╢ы."
 
-#: gconf/gconf.c:2453
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "╫╨е╟╦╤╟║ ©м╬ъгоЁ╙ ╢К╫е©║ %s╦╕ ╬Р╬З╫ю╢о╢ы"
 
-#: gconf/gconfd.c:200
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Ё║Ё╩╤С╢б ©Дц╩ю╩ ╧ч╬р╫ю╢о╢ы"
 
-#: gconf/gconfd.c:232
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:250
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:259
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:273
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "╪Ёа╓ фдюою╩ ╨р╥╞╣Июл╢б╣╔ ©ю╥Ы╟║ ╧ъ╩Щгъ╫ю╢о╢ы: %s"
 
-#: gconf/gconfd.c:285
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:287
 msgid ""
-"No writeable config sources successfully resolved, may not be able to save "
+"No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:327 gconf/gconfd.c:339
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr "╫ц╠вЁ╞ %dю╩ ╧ч╬ф╪╜ Ё║╦╤д╖╢о╢ы"
 
-#: gconf/gconfd.c:344
-#, c-format
-msgid "Received signal %d, ignoring"
-msgstr "╫ц╠вЁ╞ %dю╩ ╧ч╬р╢б╣╔ ╧╚╫цгу╢о╢ы"
+#: gconf/gconfd.c:329
+#, fuzzy, 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:390
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:394
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr "GConf╢б ╣П╧Ж╠Кю╩ ю╖гя ╠Б╢и╦╕ ╟║аЖ╟М ╦╦╣И╬НаЁ╫ю╢о╢ы"
 
-#: gconf/gconfd.c:417
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:437
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:457
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:461
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:466
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:487
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "╨Эа╝Ё╙╟╗"
 
-#: gconf/gconfd.c:811
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "©╧©э╟║ ╧ъ╩Щгъ╫ю╢о╢ы: %s"
 
-#: gconf/gconfd.c:869
+#: gconf/gconfd.c:885
 #, c-format
-msgid "Failed to create ~/.gconfd/saved_state to record gconfd's state: %s"
+msgid ""
+"Failed to open gconfd logfile; won't be able to restore listeners after "
+"gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:876
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Failed to write ~/.gconfd/saved_state to record gconfd's state: %s"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:905 gconf/gconfd.c:997
+#: gconf/gconfd.c:966
 #, c-format
-msgid "Didn't understand element '%s' in saved state file"
+msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:916
-msgid "No location attribute on listener element in saved state file"
-msgstr ""
+#: gconf/gconfd.c:980
+#, fuzzy, c-format
+msgid "Could not write saved state file '%s' fd: %d: %s"
+msgstr "`%s'фдюо©║ ╬╣╪Ж╟║ ╬Ь╫ю╢о╢ы: %s"
+
+#: gconf/gconfd.c:989
+#, fuzzy, c-format
+msgid "Failed to close new saved state file '%s': %s"
+msgstr "`%s'фдюою╩ ╢щ╢б╣╔ ╫гфпгъ╫ю╢о╢ы: %s"
+
+#: gconf/gconfd.c:1003
+#, fuzzy, c-format
+msgid "Could not move aside old saved state file '%s': %s"
+msgstr "`%s'юг а╓╨╦╦╕ ╬Р╬НЁ╬╪Ж╟║ ╬Ь╫ю╢о╢ы: %s"
 
-#: gconf/gconfd.c:923
-msgid "No IOR attribute on listener element in saved state file"
+#: gconf/gconfd.c:1013
+#, fuzzy, c-format
+msgid "Failed to move new save state file into place: %s"
+msgstr "`%s'фдюою╩ ╩Щ╪╨го╢б╣╔ ╫гфпгъ╫ю╢о╢ы: %s"
+
+#: gconf/gconfd.c:1022
+#, c-format
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:930
-msgid "No connection ID attribute on listener element in saved state file"
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "`%s'╦╕ гь╪╝гр╪Ж╟║ ╬Ь╫ю╢о╢ы (╦╝╫╨ф╝╢б '['ю╦╥н ╫цюшгь╬ъгу╢о╢ы)"
+
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
 msgstr ""
 
-#: gconf/gconfd.c:1018
-msgid "Strange non-element node in saved state file"
+#: gconf/gconfd.c:1140
+#, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1047
+#: gconf/gconfd.c:1160
 #, c-format
-msgid "Unable to open saved state file '%s': %s"
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr ""
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "`%s'фдюою╩ ╩Щ╪╨го╢б╣╔ ╫гфпгъ╫ю╢о╢ы: %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
 msgstr ""
 
-#: gconf/gconfd.c:1060
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Failed to restore saved state from file '%s': %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1069
-msgid "Root node of saved state file should be an element"
+#: gconf/gconfd.c:1377
+#, c-format
+msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1079
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Root node of saved state file should be 'gconfd_logfile', not '%s'"
+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:1092
-msgid "Funny non-element node under <gconfd_logfile> in saved state file"
+#: gconf/gconfd.c:1481
+#, 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/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr ""
 
-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr ""
 
-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
 msgstr ""
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 
-#: gconf/gconftool.c:149
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "╣П╥╨еД╦╝╟║ южю╦╦И 0 ╬ф╢о╦И 2╦╕ ╣╧╥аащ╢о╢ы"
 
-#: gconf/gconftool.c:158
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 
-#: gconf/gconftool.c:167
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "gconfd╟║ ╣╧╬ф╟║╟М южю╦╦И 0 ╬ф╢о╦И 2╦╕ ╣╧╥аащ╢о╢ы"
 
-#: gconf/gconftool.c:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 
-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr ""
 
-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr ""
 
-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr ""
 
-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr ""
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr ""
 
-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr ""
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr ""
 
-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr ""
 
-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
 "config source or set to the empty string to use the default."
 msgstr ""
 
-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf╦╕ цй╠Бх╜го╢б╣╔ ╫гфпгъ╫ю╢о╢ы: %s\n"
 
-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE х╞╟Ф╨╞╪Жюг ╟╙ю╩ ╪Ёа╓го╪╪©Д\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1296,314 +1375,319 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Ё║╦╤д║╢б╣╔ ©ю╥Ы ╧ъ╩Щ: %s\n"
 
-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "`%s'©║╪╜ pair╣Ию╩ Ё╙©╜го╢б╣╔ ©ю╥Ы╟║ ╩Щ╟Е╫ю╢о╢ы: %s"
 
-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "╪Ёа╓ ╪╜╧Ж(gconfd)╦╕ ╩Щ╪╨гр╪Ж╟║ ╬Ь╫ю╢о╢ы: %s\n"
 
-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "╬Р╬НЁ╬ е╟Ё╙ е╟╣Ию╩ аЖа╓го©╘╬ъгу╢о╢ы\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "е╦ют: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "List е╦ют: %s\n"
 
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car е╦ют: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr е╦ют: %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "╪рю╞юз: %s\n"
 
-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "╟ё╢эгя ╪Ё╦М: %s\n"
 
-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "╩С╪╪гя ╪Ё╦М: %s\n"
 
-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "`%s'©║╢Кгя ╟╙ю╩ ╬Р╢б╣╔ ╫гфпгъ╫ю╢о╢ы: %s\n"
 
-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "`%s'е╦ютю╩ юн╫дгр╪Ж╟║ ╬Ь╫ю╢о╢ы\n"
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "╟╙ю╦╥н╪╜ ╫╨е╟╦╤╦╕ ╩Г©Кгр╪Ж╢б ╬Ь╫ю╢о╢ы\n"
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "©ю╥Ы: %s\n"
 
-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "╟╙ю╩ ╪Ёа╓го╢б╣╔ ©ю╥Ы╟║ ╧ъ╩Щ: %s"
 
-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "╣©╠Бх╜©║ ╫гфпгъ╫ю╢о╢ы: %s"
 
-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "List е╦ютю╨ ╠Б╨╩е╦ют(╧╝юз©╜, а╓╪Ж, ╫г╪Ж, бЭ/╟еаЧ)юл╬Н╬ъгу╢о╢ы\n"
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr "Pair car е╦ютю╨ ╠Б╨╩е╦ют(╧╝юз©╜, а╓╪Ж, ╫г╪Ж, бЭ/╟еаЧ)юл╬Н╬ъгу╢о╢ы\n"
 
-#: gconf/gconftool.c:1201
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr "Pair cdr е╦ютю╨ ╠Б╨╩е╦ют(╧╝юз©╜, а╓╪Ж, ╫г╪Ж, бЭ/╟еаЧ)юл╬Н╬ъгу╢о╢ы\n"
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1259
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "╣П╥╨еД╦╝╣И╦╕ юп╬Н©ю╢б╣╔ ╫гфп: %s\n"
 
-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "╟Ф╟М: ╫╨е╟╦╤(%s)©║ ╨нюШюЩго╟еЁ╙ ╨ЭаЬ е╦ютюл юж╫ю╢о╢ы\n"
 
-#: gconf/gconftool.c:1378
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "╟Ф╟М: ╫╨е╟╦╤(%s)©║ ╨нюШюЩго╟еЁ╙ ╨ЭаЬ list_typeюл юж╫ю╢о╢ы\n"
 
-#: gconf/gconftool.c:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1407
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1432
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "╟Ф╟М: ╫╨е╟╦╤©║╢Кгя ╠Б╨╩╟╙ю╩ ╪Ёа╓гр ╪Ж╢б ╬Ь╫ю╢о╢ы\n"
 
-#: gconf/gconftool.c:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "╟Ф╟М: gconftool Ё╩╨н ©ю╥Ы, юн╫дгр╪Ж╬Ь╢б GConfValueType\n"
 
-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "╟Ф╟М: е╦ют юл╦╖ `%s'ю╩ фд╫лго╢б╣╔ ╫гфпгъ╫ю╢о╢ы\n"
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
-msgstr "╟Ф╟М: list_typeю╨ а╓╪Ж,╫г╪Ж, ╧╝юз©╜ ╤г╢б boolюо╪Ж╟║ юж╫ю╢о╢ы. `%s'ю╨ ╬х╣к╢о╢ы.\n"
+msgstr ""
+"╟Ф╟М: list_typeю╨ а╓╪Ж,╫г╪Ж, ╧╝юз©╜ ╤г╢б boolюо╪Ж╟║ юж╫ю╢о╢ы. `%s'ю╨ "
+"╬х╣к╢о╢ы.\n"
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
-msgstr "╟Ф╟М: car_typeю╨ а╓╪Ж,╫г╪Ж, ╧╝юз©╜ ╤г╢б boolюо╪Ж╟║ юж╫ю╢о╢ы. `%s'ю╨ ╬х╣к╢о╢ы.\n"
+msgstr ""
+"╟Ф╟М: car_typeю╨ а╓╪Ж,╫г╪Ж, ╧╝юз©╜ ╤г╢б boolюо╪Ж╟║ юж╫ю╢о╢ы. `%s'ю╨ "
+"╬х╣к╢о╢ы.\n"
 
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
-msgstr "╟Ф╟М: cdr_typeю╨ а╓╪Ж,╫г╪Ж, ╧╝юз©╜ ╤г╢б boolюо╪Ж╟║ юж╫ю╢о╢ы. `%s'ю╨ ╬х╣к╢о╢ы.\n"
+msgstr ""
+"╟Ф╟М: cdr_typeю╨ а╓╪Ж,╫г╪Ж, ╧╝юз©╜ ╤г╢б boolюо╪Ж╟║ юж╫ю╢о╢ы. `%s'ю╨ "
+"╬х╣к╢о╢ы.\n"
 
-#: gconf/gconftool.c:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "╟Ф╟М: <applyto>ЁК╣Е╟║ ╨Я©╘юж╫ю╢о╢ы"
 
-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "╟Ф╟М: <schema>╬ф╥║©║╪╜ <%s>ЁК╣Е╢б ╨нюШюЩгу╢о╢ы\n"
 
-#: gconf/gconftool.c:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "╟Ф╟М: <locale>ЁК╣Е╪с©║ юШгугоаЖ╬й╢б <%s>ЁК╣Е╟║ юж╫ю╢о╢ы\n"
 
-#: gconf/gconftool.c:1757
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "╟Ф╟М: ╫╨е╟╦╤ `%s' ╥ндиюо `%s' ╪Ёд║ ╫гфпгъ╫ю╢о╢ы: %s\n"
 
-#: gconf/gconftool.c:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "`%s' ╫╨е╟╦╤╦╕ `%s' ╥ндиюою╩ ю╖гь ╪Ёд║гъ╫ю╢о╢ы\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "╟Ф╟М: ╫╨е╟╦╤ `%s'©║ е╟ `%s'╦╕ гр╢Гго╢б╣╔ ©ю╥Ы╟║ ╩Щ╟Е╫ю╢о╢ы: %s\n"
 
-#: gconf/gconftool.c:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "╫╨е╟╦╤ `%s'©║ е╟ `%s'╦╕ гр╢Ггу╢о╢ы\n"
 
-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "гя <schema>╬х©║╢б ©юаВ гя╟Ёюг <locale>©ёф╝╦╝╦╦ю╩ ╟║аЖ╟М юж╬Н╬ъгу╢о╢ы\n"
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "╟Ф╟М: <schemalist>╬ф╥║╪╜ <%s>ЁК╣Е╢б юШгугоаЖ╬й╫ю╢о╢ы\n"
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "`%s'╦╕ ©╘╢б╣╔ ╫гфпгъ╫ю╢о╢ы: %s\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "`%s' ╧╝╪╜╟║ ╨Я╬НюжаЖ╬йЁ╙©Д?\n"
 
-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
-"`%s'╧╝╪╜╢б ╨нюШюЩгя цж╩Сю╖ ЁК╣Е(<%s>)╦╕ ╟║аЖ╟М юж╫ю╢о╢ы(╧щ╣Е╫ц"
-"<gconfschemafile>юл╬Н╬ъгу╢о╢ы\n"
-
+"`%s'╧╝╪╜╢б ╨нюШюЩгя цж╩Сю╖ ЁК╣Е(<%s>)╦╕ ╟║аЖ╟М "
+"юж╫ю╢о╢ы(╧щ╣Е╫ц<gconfschemafile>юл╬Н╬ъгу╢о╢ы\n"
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "╧╝╪╜ `%s'©║ цж╩Сю╖ ╢э╟Х <gconfschemafile> ЁК╣Е╟║ ╬Ь╫ю╢о╢ы\n"
 
-#: gconf/gconftool.c:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "╟Ф╟М: <gconfschemafile>╬ф╥║©║ юж╢б ЁК╣Е <%s>╢б юШгугоаЖ╬й╫ю╢о╢ы\n"
 
-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "╪Ёа╓ ╣╔юле╦╦╕ ╣©╠Бх╜го╢б╣╔ ©║╥╞╟║ ╧ъ╩Щгъ╫ю╢о╢ы: %s"
 
-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "╪Ёд║гр ╫╨е╟╦╤ фдюо╣Ию╩ ╪Ёа╓го╪е╬ъгу╢о╢ы\n"
 
-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1612,27 +1696,27 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1645,8 +1729,10 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
 
+#~ msgid "Received signal %d, ignoring"
+#~ msgstr "╫ц╠вЁ╞ %dю╩ ╧ч╬р╢б╣╔ ╧╚╫цгу╢о╢ы"
diff --git a/po/no.po b/po/no.po
index 9d7cf803..3d510ab7 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: 2000-09-11 09:58+0200\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-09-11 09:59+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -13,44 +13,44 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Laster ut XML-backend modulen."
 
-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Kunne ikke finne XML-rotkatalogen i adressen `%s'"
 
-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kunne ikke opprette katalogen `%s': %s"
 
-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr "Kunne ikke lese fra eller skrive til XML-rotkatalogen i adressen `%s'"
 
-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 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:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr "Initialiserer XML-backend modulen"
 
-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, 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:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "Usynkronisert sletting av kataloger under nedstenging av XML-backenden"
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -59,7 +59,7 @@ msgstr ""
 "Kunne ikke fjerne katalog `%s' fra XML-backend bufferen, fordi den ikke er "
 "synkronisert til disk"
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -68,84 +68,84 @@ msgstr ""
 "%u oppfЬringer er i bufferen etter fjerning av allerede-synkroniserte "
 "oppfЬringer eldre enn %u sekunder"
 
-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "Kunne ikke kjЬre stat pЕ `%s': %s"
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "XML-filnavn `%s' er en katalog"
 
-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Kunne ikke slette `%s': %s"
 
-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Kunne ikke skrive fil `%s': %s"
 
-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Kunne ikke endre navn `%s' til `%s': %s"
 
-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Kunne ikke gjenopprette `%s' fra `%s': %s"
 
-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, 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:802
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Kunne ikke kjЬre stat pЕ `%s': %s"
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Duplisert oppfЬring `%s' i `%s', ignorerer"
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, 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:975
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "ToppnivЕ-node i XML-fil `%s' er ikke en <oppfЬring>, ignorerer"
 
-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Kunne ikke opprette fil `%s': %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2483
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Kunne ikke lukke filen `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorerer XML-node med navn `%s': %s"
 
-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2187
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignorerer schema-navn `%s', ugyldig: %s"
@@ -153,140 +153,140 @@ msgstr "Ignorerer schema-navn `%s', ugyldig: %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "Ignorerer XML-node `%s', bortsett fra mulig schema navn:: %s"
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr "fant <local_schema> uten lokaleinnstilling"
 
-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Kunne ikke lese standardverdi for schema: %s"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Ingen \"type\" attributt for <%s> node"
 
-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "En node har ukjent \"type\" attributt `%s', ignorerer"
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "Ingen \"verdi\" attributt for node"
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, 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:1055
+#: backends/xml-entry.c:1041
 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:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Ugyldig XML-node: %s"
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, 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:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorerer ugyldig car fra XML-par: %s"
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 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:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorerer ugyldig cdr fra XML-par: %s"
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, 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:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Fant ikke car og cdr for XML-parnode"
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Manglende cdr fra verdipar i XML-fil"
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "Manglende car fra verdipar i XML-fil"
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 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"
 
 #. -- end debug only
-#: gconf/gconf-backend.c:182
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "Ingen slik fil `%s'\n"
 
-#: gconf/gconf-backend.c:210
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "Ugyldig adresse `%s'"
 
-#: gconf/gconf-backend.c:235
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr "GConf virker ikke uten stЬtte for dynmiske moduler (gmodule)"
 
-#: gconf/gconf-backend.c:245
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr "Feil under Еpning av modul `%s': %s\n"
 
-#: gconf/gconf-backend.c:277
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr "Kunne ikke finne backend modul for `%s'"
 
-#: gconf/gconf-backend.c:314
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr "Kunne ikke stenge ned motoren"
 
-#: gconf/gconf-database.c:209
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Mottok ugyldig verdi i sett-forespЬrsel"
 
-#: gconf/gconf-database.c:217
+#: gconf/gconf-database.c:201
 #, 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:432
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "Mottok forespЬrsel om Е slippe alle mellomlagrede data"
 
-#: gconf/gconf-database.c:446
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Mottok forespЬrsel om Е utfЬre synkron synkronisering"
 
-#: gconf/gconf-database.c:511
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Fatal feil: kunne ikke hente objektreferanse for ConfigDatabase"
 
-#: gconf/gconf-database.c:633
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Kunne ikke synkronisere en eller flere kilder: %s"
@@ -295,7 +295,7 @@ msgstr "Kunne ikke synkronisere en eller flere kilder: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:715
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -303,124 +303,124 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:740
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Lytter-ID %lu eksisterer ikke"
 
-#: gconf/gconf-database.c:749
+#: gconf/gconf-database.c:733
 #, 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:854 gconf/gconf-sources.c:1205
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Feil under henting av verdi for `%s': %s"
 
-#: gconf/gconf-database.c:891
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Feil under setting av verdi for `%s': %s"
 
-#: gconf/gconf-database.c:926
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Feil under nullstilling av `%s': %s"
 
-#: gconf/gconf-database.c:947
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Feil under henting av standardverdi for `%s': %s"
 
-#: gconf/gconf-database.c:985
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Feil ved sjekking av eksisterende `%s': %s"
 
-#: gconf/gconf-database.c:1009
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Feil under fjerning av katalog `%s': %s"
 
-#: gconf/gconf-database.c:1035
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Fikk ikke alle oppfЬringene i `%s': %s"
 
-#: gconf/gconf-database.c:1061
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Feil under listing av kataloger i `%s': %s"
 
-#: gconf/gconf-database.c:1082
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Feil under setting av schema for `%s': %s"
 
-#: gconf/gconf-error.c:39
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr "Suksess"
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr "Feilet"
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr "Konfigurasjonstjeneren kunne ikke kontaktes"
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
 msgstr "Kunne ikke finne adresse for konfigurasjonskilde"
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr "Ugyldig nЬkkel eller katalognavn"
 
-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 msgid "Parse error"
 msgstr "Feil i tolking"
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr "Korrupt data i konfigurasjonskildedatabasen"
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr "Typefeil"
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr "NЬkkeloperasjon pЕ katalog"
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr "Katalogoperasjon pЕ nЬkkel"
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr "Kan ikke overskrive eksisterende skrivebeskyttet verdi"
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr "Object Activation Framework feil"
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr "Operasjon ikke tillatt uten konfigurasjonstjener"
 
-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 msgid "Failed to get a lock"
 msgstr "Fikk ingen lЕs"
 
-#: gconf/gconf-glib.c:631
+#: gconf/gconf-glib.c:629
 #, c-format
 msgid ""
 "Error on line %d char %d: %s\n"
@@ -429,7 +429,7 @@ msgstr ""
 "Feil pЕ linje %d tegn %d: %s\n"
 "(Tekst i nФrheten var '%s')\n"
 
-#: gconf/gconf-glib.c:751
+#: gconf/gconf-glib.c:749
 msgid ""
 "Text ended in the middle of an entity, or entity name too long to be valid "
 "('&' should begin an entity such as '&quot;')"
@@ -437,7 +437,7 @@ msgstr ""
 "Teksten sluttet midt i en entitet eller entitetens navn oversteg gyldig "
 "lengde ('&' bЬr vФre begynnelsen pЕ en entitet slik som '&quot;')"
 
-#: gconf/gconf-glib.c:803
+#: gconf/gconf-glib.c:801
 #, c-format
 msgid ""
 "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
@@ -445,12 +445,12 @@ msgstr ""
 "Ukjent entitet '%s' ('&' mЕ vФre begynnelsen pЕ entitetene &amp; &quot; &lt; "
 "&gt; &apos;)"
 
-#: gconf/gconf-glib.c:843
+#: gconf/gconf-glib.c:841
 msgid ""
 "Markup text ended in the middle of a character reference, just after '&#'"
 msgstr "Merket tekst sluttet midt i en tegnreferanse, like etter '&#'"
 
-#: gconf/gconf-glib.c:869
+#: gconf/gconf-glib.c:867
 #, c-format
 msgid ""
 "Character reference contained non-digit '%s' ('&#' should begin a reference "
@@ -459,7 +459,7 @@ msgstr ""
 "Tegnreferansen inneholdt ikke-tall '%s' ('&#' skal vФre begynnelsen pЕ en "
 "referanse til et unicode tegn, slik som '&#2342;')"
 
-#: gconf/gconf-glib.c:893
+#: gconf/gconf-glib.c:891
 msgid ""
 "Text ended in the middle of an character reference ('&#' should begin a "
 "character reference such as '&#2342;')"
@@ -467,7 +467,7 @@ msgstr ""
 "Tekst sluttet i midten av en tegnreferanse ('&#' skal vФre begynnelsen pЕ en "
 "tegnreferanse slik som '&#2342;')"
 
-#: gconf/gconf-glib.c:918
+#: gconf/gconf-glib.c:916
 #, c-format
 msgid ""
 "Couldn't parse character reference '%s' ('&#' must begin a character "
@@ -476,7 +476,7 @@ msgstr ""
 "Kunne ikke tolke tegnreferansen '%s' ('&#' mЕ vФre begynnelsen pЕ en "
 "tegnreferanse slik som '&#2343;')"
 
-#: gconf/gconf-glib.c:940
+#: gconf/gconf-glib.c:938
 #, c-format
 msgid ""
 "Character code %#lx is not allowed in XML documents or is not a valid "
@@ -485,7 +485,7 @@ msgstr ""
 "Tegnkoden %#lx er ikke tillatt i XML-dokumenter eller den er ikke et gyldig "
 "Unicode tegn"
 
-#: gconf/gconf-glib.c:1015
+#: gconf/gconf-glib.c:1013
 msgid ""
 "Documented ended just after an '&', '&' should begin an entity or character "
 "reference."
@@ -493,7 +493,7 @@ msgstr ""
 "Dokumentet sluttet rett etter en '&', '&' skal vФre begynnelsen pЕ en "
 "entitet eller tegnreferanse."
 
-#: gconf/gconf-glib.c:1029
+#: gconf/gconf-glib.c:1027
 msgid ""
 "'<' or '>' character not allowed here; only allowed around tags, for example "
 "<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
@@ -503,27 +503,27 @@ msgstr ""
 "eksempel <bold> eller <paragraph>. Andre steder mЕ disse tegnene kodes som "
 "entitetene &lt; og &gt;"
 
-#: gconf/gconf-glib.c:1084
+#: gconf/gconf-glib.c:1082
 #, c-format
 msgid "Character '%s' is not valid at the start of an attribute name"
 msgstr "Tegn '%s' er ikke gyldig ved starten av et attributtnavn"
 
-#: gconf/gconf-glib.c:1111
+#: gconf/gconf-glib.c:1109
 msgid "Document ended just after attribute name"
 msgstr "Dokumentet sluttet rett etter et attributtnavn"
 
-#: gconf/gconf-glib.c:1122
+#: gconf/gconf-glib.c:1120
 msgid "Attribute name must be immediately followed by an '=' character"
 msgstr "Attributtnavn mЕ vФre direkte etterfulgt av et '='-tegn"
 
-#: gconf/gconf-glib.c:1137
+#: gconf/gconf-glib.c:1135
 msgid ""
 "'=' character after attribute must be immediately followed by an '\"' "
 "character"
 msgstr ""
 "'='-tegnet etter attributten mЕ vФre direkte etterfulgt av et '\"'-tegn"
 
-#: gconf/gconf-glib.c:1163
+#: gconf/gconf-glib.c:1161
 #, c-format
 msgid ""
 "Character '%c' found inside an attribute value; perhaps your attribute value "
@@ -532,7 +532,7 @@ msgstr ""
 "Tegnet '%c' funnet inne i en attributtverdi; kanskje din attributtverdi "
 "mangler avsluttende hermetegn '\"'"
 
-#: gconf/gconf-glib.c:1183
+#: gconf/gconf-glib.c:1181
 msgid ""
 "Ran out of text before a quote mark ('\"') was seen at the end of an "
 "attribute value"
@@ -540,38 +540,38 @@ msgstr ""
 "Tom for tekst fЬr et hermetegn ('\"') ble funnet ved slutten av en "
 "attributtverdi"
 
-#: gconf/gconf-glib.c:1196
+#: gconf/gconf-glib.c:1194
 msgid ""
 "Text ends immediately after an attribute value, before the element was closed"
 msgstr "Teksten slutter rett etter en attributtverdi, fЬr elementet ble lukket"
 
-#: gconf/gconf-glib.c:1510
+#: gconf/gconf-glib.c:1508
 msgid "Missing '<' at start of element"
 msgstr "Manglende '<' ved starten av elementet"
 
-#: gconf/gconf-glib.c:1521
+#: gconf/gconf-glib.c:1519
 msgid "Document ended just after '<' character"
 msgstr "Dokumentet sluttet rett etter '<'-tegnet"
 
-#: gconf/gconf-glib.c:1549
+#: gconf/gconf-glib.c:1547
 msgid "No closing '>' found for a <? or <!"
 msgstr "Ingen avsluttende '>' funnet for en <? eller <!"
 
-#: gconf/gconf-glib.c:1578
+#: gconf/gconf-glib.c:1576
 #, c-format
 msgid "Character '%s' is not valid at the start of an element name"
 msgstr "Tegnet '%s' er ikke gyldig ved starten av et elementnavn"
 
-#: gconf/gconf-glib.c:1602 gconf/gconf-glib.c:1615
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
 msgid "Document ended just after element name, no '>' seen"
 msgstr "Dokumentet sluttet rett etter elementnavnet, ingen '>' sett"
 
-#: gconf/gconf-glib.c:1640
+#: gconf/gconf-glib.c:1638
 #, c-format
 msgid "Elements should be closed with '>' or '/>', not with '%s'"
 msgstr "Elementer mЕ lukkes med '>' eller '/>, ikke med '%s'"
 
-#: gconf/gconf-glib.c:1657
+#: gconf/gconf-glib.c:1655
 msgid ""
 "Element ended just after '/', no '>' seen; empty elements should end with "
 "'/>'"
@@ -579,37 +579,37 @@ msgstr ""
 "Element sluttet rett etter '/', ingen '>' sett; tomme elementer bЬr slutte "
 "med '/>'"
 
-#: gconf/gconf-glib.c:1696
+#: gconf/gconf-glib.c:1694
 msgid "Close tag not found at end of element"
 msgstr "Tag for lukking ble ikke funnet ved slutten av elementet"
 
-#: gconf/gconf-glib.c:1711
+#: gconf/gconf-glib.c:1709
 msgid "Close tag ends just after '<' character"
 msgstr "Lukk-taggen slutter rett etter '<'-tegnet"
 
-#: gconf/gconf-glib.c:1725
+#: gconf/gconf-glib.c:1723
 msgid "Close tag should begin with '</', '/' character is missing"
 msgstr "Lukk-taggen mЕ begynne med '</', '/'-tegnet mangler"
 
-#: gconf/gconf-glib.c:1739
+#: gconf/gconf-glib.c:1737
 msgid "Close tag ends just after '/' character"
 msgstr "Lukk-taggen slutter rett etter '/'-tegnet"
 
-#: gconf/gconf-glib.c:1774
+#: gconf/gconf-glib.c:1772
 msgid "Document ended just after element name in close tag, no '>' seen"
 msgstr ""
 "Dokumentet sluttet rett etter elementnavnet i lukk-taggen, ingen '>' sett"
 
-#: gconf/gconf-glib.c:1790
+#: gconf/gconf-glib.c:1788
 msgid "Document ended just after close tag name, no '>' seen"
 msgstr "Dokumentet sluttet rett etter navnet pЕ lukk-taggen, ingen '>' sett"
 
-#: gconf/gconf-glib.c:1809
+#: gconf/gconf-glib.c:1807
 #, c-format
 msgid "Close tag '%s' does not match opening tag '%s'"
 msgstr "Lukk-taggen '%s' er ikke lik Еpnings-taggen '%s'"
 
-#: gconf/gconf-glib.c:2147
+#: gconf/gconf-glib.c:2145
 #, c-format
 msgid ""
 "Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
@@ -618,133 +618,133 @@ msgstr ""
 "Ugyldig UTF-8-tegn ved byte %d i kodet tekst. Noe av teksten fЬr det "
 "ugyldige tegnet var '%s'"
 
-#: gconf/gconf-glib.c:2204
+#: gconf/gconf-glib.c:2202
 msgid "The marked-up text contained nothing but whitespace."
 msgstr "Den kodete teksten inneholdt kun tomrom."
 
-#: gconf/gconf-glib.c:10668
+#: gconf/gconf-glib.c:10666
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Kunne ikke Еpne fil '%s': %s"
 
-#: gconf/gconf-glib.c:10685
+#: gconf/gconf-glib.c:10683
 #, c-format
 msgid "Error reading file '%s': %s"
 msgstr "Feil under lesing av fil '%s': %s"
 
-#: gconf/gconf-internals.c:100
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Ingen '/' i nЬkkel `%s'"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Kunne ikke fortolke CORBA verdi for listeelement"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Ugyldig type for listeelement i %s"
 
-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "Mottatt liste fra gconfd med ugyldig listetype"
 
-#: gconf/gconf-internals.c:460
+#: gconf/gconf-internals.c:445
 msgid "Failed to convert object to IOR"
 msgstr "Kunne ikke konvertere objekt til IOR"
 
-#: gconf/gconf-internals.c:826
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Kunne ikke Еpne stifilen `%s': %s\n"
 
-#: gconf/gconf-internals.c:881
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Legger til kilde `%s'\n"
 
-#: gconf/gconf-internals.c:893
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Lesefeil pЕ fil `%s': %s\n"
 
-#: gconf/gconf-internals.c:1335
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Forventet liste, mottok %s"
 
-#: gconf/gconf-internals.c:1345
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Forventet liste av %s, mottok liste av %s"
 
-#: gconf/gconf-internals.c:1484
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Forventet par, mottok %s"
 
-#: gconf/gconf-internals.c:1498
+#: gconf/gconf-internals.c:1483
 #, 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:1514
+#: gconf/gconf-internals.c:1499
 #, 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:1630
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Streng i sitattegn begynner ikke med et sitattegn"
 
-#: gconf/gconf-internals.c:1692
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Streng i anfЬrselstegn slutter ikke med et sitattegn"
 
-#: gconf/gconf-internals.c:2172 gconf/gconf.c:2766
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA feil: %s"
 
-#: gconf/gconf-internals.c:2192
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "forsЬk pЕ Е fjerne ikke listet OAF objekt katalog"
 
-#: gconf/gconf-internals.c:2197
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "forsЬk pЕ Е legge til allerede listet OAF katalog"
 
-#: gconf/gconf-internals.c:2204
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF fortolkningsfeil: %s"
 
-#: gconf/gconf-internals.c:2209
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Ukjent OAF feil"
 
-#: gconf/gconf-internals.c:2292
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Ingen ior-fil i `%s'"
 
-#: gconf/gconf-internals.c:2323
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd tar lЕs `%s' fra noen andre prosesser"
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Et annet program holder lЕsen `%s'"
 
-#: gconf/gconf-internals.c:2354
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "kunne ikke kontakte ORB for Е pinge eksisterende gconfd"
 
-#: gconf/gconf-internals.c:2362
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -753,42 +753,42 @@ msgstr ""
 "Fjerner utgЕtt lЕs `%s' fordi IOR ikke kunne koverteres til objektreferanse, "
 "IOR `%s'"
 
-#: gconf/gconf-internals.c:2374
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr "Fjerner utgЕtt lЕs `%s' pga feil under pinging av tjener: %s"
 
-#: gconf/gconf-internals.c:2386
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf konfigurasjonsdaemon (gconfd) holder lЕsen `%s'"
 
-#: gconf/gconf-internals.c:2400
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "kunne ikke opprette katalogen `%s': %s"
 
-#: gconf/gconf-internals.c:2435
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "kunne ikke opprette lЕs `%s': %s"
 
-#: gconf/gconf-internals.c:2471
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kunne ikke skrive til fil `%s': %s"
 
-#: gconf/gconf-internals.c:2514
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "Kan ikke Еpne lЕs-fil `%s'; antar at den ikke er vЕr: %s"
 
-#: gconf/gconf-internals.c:2531
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Korrupt lЕs-fil `%s', fjerner den likevel"
 
-#: gconf/gconf-internals.c:2541
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -797,27 +797,27 @@ msgstr ""
 "Opprettet ikke lЕs-fil `%s' (skapers pid %u, vЕr pid %u; antar at noen tok "
 "vЕr lЕs"
 
-#: gconf/gconf-internals.c:2558
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Kunne ikke slippe lЕs-katalogen `%s': %s"
 
-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Kunne ikke lese kilde `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 "Schema `%s' spesifisert for  `%s' lagrer en verdi som ikke er for schema"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Navnet '/' kan kun vФre en katalog, ikke en nЬkkel"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -826,101 +826,101 @@ msgstr ""
 "Verdi for `%s' satt i en skrivebeskyttet kilde i begynnelsen av din "
 "konfigurasjonssti."
 
-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Feil under sЬk etter metainfo: %s"
 
-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Feil under henting av metainfo: %s"
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr "NЬkkel `%s' listet som schema for nЬkkel `%s' lagrer type `%s'"
 
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Forsto ikke `%s' (forventet heltall)"
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Heltall `%s' er for stort eller lite"
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Forsto ikke `%s' (forventet flyttall)"
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Forsto ikke `%s' (forventet sann eller usann)"
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "Forsto ikke `%s' (listen mЕ starte med en '[')"
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "Forsto ikke `%s' (listen mЕ slutte med en ']')"
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "Forsto ikke `%s' (ekstra \"unescaped\" ']' funnet i listen)"
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "Forsto ikke `%s' (ekstra etterslepende tegn)"
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "Forsto ikke `%s' (par mЕ starte med en '(')"
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "Forsto ikke `%s' (par mЕ slutte med en ')')"
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "Forsto ikke `%s' (feil antall elementer)"
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "Forsto ikke `%s' (ekstra \"unescaped\" ')' funnet inne i par)"
 
-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:303
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Tjener kunne ikke finne adressen `%s'"
 
-#: gconf/gconf.c:557
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "Kan ikke legge til meldinger til en lokal konfigurasjonskilde"
 
-#: gconf/gconf.c:1612
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Pinging av tjeneren feilet, CORBA-feil: %s"
 
-#: gconf/gconf.c:1628
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -930,73 +930,73 @@ msgstr ""
 "fra oaf_activate_from_id() og satte ikke et unntak som forklarte problemet. "
 "Vennligst fyll ut en feilrapport for OAF."
 
-#: gconf/gconf.c:1895
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Kunne ikke initialisere GConf, avslutter\n"
 
-#: gconf/gconf.c:1932
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "MЕ begynne med en skrЕstrek (/)"
 
-#: gconf/gconf.c:1954
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan ikke ha to skrЕstreker (/) pЕ rad"
 
-#: gconf/gconf.c:1956
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan ikke ha punktum (.) rett etter en skrЕstrek (/)"
 
-#: gconf/gconf.c:1977
+#: gconf/gconf.c:1962
 #, 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:1991
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "NЬkkel/katalog kan ikke slutte med en skrЕstrek (/)"
 
-#: gconf/gconf.c:2238
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Feil under nedstenging av konfigurasjonstjeneren: %s"
 
-#: gconf/gconf.c:2299
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Forventet flyttall, mottok %s"
 
-#: gconf/gconf.c:2334
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Forventet heltall, mottok %s"
 
-#: gconf/gconf.c:2369
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Forventet streng, mottok %s"
 
-#: gconf/gconf.c:2406
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Forventet boolsk verdi, mottok %s"
 
-#: gconf/gconf.c:2439
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Forventet schema, mottok %s"
 
-#: gconf/gconfd.c:201
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Anmodning om nedstenging mottatt"
 
-#: gconf/gconfd.c:233
+#: gconf/gconfd.c:217
 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:251
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1004,7 +1004,7 @@ msgstr ""
 "Ingen konfigurasjonsfiler funnet, forsЬker Е bruke standard "
 "konfigurasjonskilde `%s'"
 
-#: gconf/gconfd.c:260
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1012,12 +1012,12 @@ msgstr ""
 "Ingen konfigurasjonskilder i kildestien, konfigurasjonen vil ikke bli "
 "lagret; edit"
 
-#: gconf/gconfd.c:274
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Feil under lasting av noen konfigurasjonskilder: %s"
 
-#: gconf/gconfd.c:286
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1025,34 +1025,36 @@ msgstr ""
 "Kunne ikke slЕ opp noen adresser for konfigurasjonskilde, kan ikke laste "
 "eller lagre konfigurasjonsdata"
 
-#: gconf/gconfd.c:303
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
-msgstr "Ingen skrivbare konfigurasjonskilder funnet, kan ikke lagre deler av konfigurasjonsendringene"
+msgstr ""
+"Ingen skrivbare konfigurasjonskilder funnet, kan ikke lagre deler av "
+"konfigurasjonsendringene"
 
-#: gconf/gconfd.c:328 gconf/gconfd.c:340
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr "Mottok signal %d, stenger ned."
 
-#: gconf/gconfd.c:345
+#: gconf/gconfd.c:329
 #, 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:392
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "starter (versjon %s), pid %u bruker '%s'"
 
-#: gconf/gconfd.c:396
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr "GConf er bygget med feilsЬkingsfunksjoner aktivert"
 
-#: gconf/gconfd.c:419
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -1060,11 +1062,11 @@ msgstr ""
 "Kunne ikke initialisere Object Activation Framework: vennligst send en "
 "feilrapport til OAF utviklerene"
 
-#: gconf/gconfd.c:439
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Kunne ikke hente objektreferanse for ConfigServer"
 
-#: gconf/gconfd.c:459
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -1072,62 +1074,62 @@ msgstr ""
 "OAF vet ikke om vЕr IID; indikerer feil i installasjon; kan ikke\n"
 "registrere; avslutter\n"
 
-#: gconf/gconfd.c:463
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "En annen gconfd er allerede registrert hos OAF; avslutter\n"
 
-#: gconf/gconfd.c:468
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Ukjent feil ved registrering av gconfd hos OAF; avslutter\n"
 
-#: gconf/gconfd.c:492
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Avslutter"
 
-#: gconf/gconfd.c:834
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Returnerer unntak: %s"
 
-#: gconf/gconfd.c:901
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:924
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:982
+#: gconf/gconfd.c:966
 #, 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:996
+#: gconf/gconfd.c:980
 #, 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:1005
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Kunne ikke lukke ny lagret tilstandsfil '%s': %s"
 
-#: gconf/gconfd.c:1019
+#: gconf/gconfd.c:1003
 #, 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:1029
+#: gconf/gconfd.c:1013
 #, 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:1038
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1135,31 +1137,31 @@ msgstr ""
 "Kunne ikke gjenopprette opprinnelig lagret tilstandsfil som har blitt "
 "flyttet til '%s': %s"
 
-#: gconf/gconfd.c:1126
+#: gconf/gconfd.c:1110
 #, c-format
 msgid "Didn't understand line in saved state file: '%s'"
 msgstr "Forsto ikke linje i lagret tilstandsfil: '%s'"
 
-#: gconf/gconfd.c:1141
+#: gconf/gconfd.c:1125
 msgid "Failed to parse connection ID in saved state file"
 msgstr "Kunne ikke tolke forbindelses-ID i lagret tilstandsfil"
 
-#: gconf/gconfd.c:1156
-#, c-format, fuzzy
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
 msgid "Failed to unquote config source address from saved state file: %s"
 msgstr "Kunne ikke gjenopprette lagret tilstandsfil fra fil '%s': %s"
 
-#: gconf/gconfd.c:1176
+#: gconf/gconfd.c:1160
 #, fuzzy, c-format
 msgid "Failed to unquote listener location from saved state file: %s"
 msgstr "Kunne ikke gjenopprette lagret tilstandsfil fra fil '%s': %s"
 
-#: gconf/gconfd.c:1196
+#: gconf/gconfd.c:1180
 #, fuzzy, c-format
 msgid "Failed to unquote IOR from saved state file: %s"
 msgstr "Kunne ikke gjenopprette lagret tilstandsfil fra fil '%s': %s"
 
-#: gconf/gconfd.c:1220
+#: gconf/gconfd.c:1204
 msgid ""
 "Saved state file records the same listener added twice; ignoring the second "
 "instance"
@@ -1167,7 +1169,7 @@ msgstr ""
 "Lagret tilstandsfil viser samme lytter lagt til to ganger; ignorerer instans "
 "nr. 2"
 
-#: gconf/gconfd.c:1241
+#: gconf/gconfd.c:1225
 msgid ""
 "Saved state file had a removal of a listener that wasn't added; ignoring the "
 "removal."
@@ -1175,7 +1177,7 @@ msgstr ""
 "Lagret tilstandsfil fikk fjernet en lytter som ikke var lagt til; ignorerer "
 "fjerning."
 
-#: gconf/gconfd.c:1362
+#: gconf/gconfd.c:1346
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1183,12 +1185,12 @@ msgstr ""
 "Kunne ikke gjenopprette en lytter pЕ adresse '%s', kunne ikke gjЬre "
 "databaseoppslag"
 
-#: gconf/gconfd.c:1393
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Kunne ikke Еpne lagret tilstandsfil '%s': %s"
 
-#: gconf/gconfd.c:1492
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to "
@@ -1197,7 +1199,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:1497
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously "
@@ -1206,19 +1208,19 @@ 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/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Alternativer for hjelp"
 
-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 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:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Skriv ut verdien for en nЬkkel til standard ut."
 
-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -1226,36 +1228,36 @@ msgstr ""
 "Sett et schema og synkroniser. Bruk med --short-desc, --long-desc, --owner, "
 "og --type."
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "Nullstill nЬklene fra kommandolinjen"
 
-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Skriv ut alle nЬkkel/verdi par i en  katalog."
 
-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Skriv ut alle underkataloger i en katalog."
 
-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 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:149
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Returner 0 hvis katalogen eksisterer, 2 hvis ikke."
 
-#: gconf/gconftool.c:158
+#: gconf/gconftool.c:144
 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:167
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Returner 0 hvis gconfd kjЬrer, 2 hvis ikke."
 
-#: gconf/gconftool.c:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1263,7 +1265,7 @@ msgstr ""
 "Start konfigurasjonstjeneren (gconfd). (Skjer normalt automatisk nЕr det er "
 "nЬdvendig.)"
 
-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1271,11 +1273,11 @@ msgstr ""
 "Spesifiser typen verdi som settes, eller typen for verdien et schema "
 "beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|liste|par"
 
-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1283,11 +1285,11 @@ msgstr ""
 "SpesifisИr type listeverdi som settes, eller typen for verdien et schema "
 "beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1295,7 +1297,7 @@ msgstr ""
 "SpesifisИr car-type verdi som settes, eller typen for verdien et schema "
 "beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1303,45 +1305,45 @@ msgstr ""
 "SpesifisИr type verdi for cdr-par som settes, eller typen for verdien et "
 "schema beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 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:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "BESKRIVELSE"
 
-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 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:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "Spesifiser eieren av et schema"
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "EIER"
 
-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "Spesifiser en schema fil som skal installeres"
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "FILNAVN"
 
-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 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:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "KILDE"
 
-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1349,7 +1351,7 @@ msgstr ""
 "Aksepter konfigurasjonsdatabasen direkte, gЕr utenom tjeneren. Det kreves at "
 "gconfd ikke kjЬrer."
 
-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1360,7 +1362,7 @@ msgstr ""
 "standardverdien for konfigurasjonskilde eller vФre tom for at "
 "standardverdien skal brukes."
 
-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1368,7 +1370,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:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1376,7 +1378,7 @@ 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:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1386,23 +1388,23 @@ msgstr ""
 "KjЬr '%s --help' for Е se en full liste over tilgjengelige "
 "kommandolinjeflagg.\n"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Kan ikke hente og sette/nullstille samtidig\n"
 
-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Kan ikke sette og hente/nullstille samtidig\n"
 
-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "Kan ikke bruke --all-pairs sammen med --get eller --set\n"
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 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:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1410,7 +1412,7 @@ msgstr ""
 "--recursive-list bЬr ikke brukes sammen med --get, --set, --unset, "
 "--all-pairs, eller --all-dirs\n"
 
-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1418,58 +1420,58 @@ msgstr ""
 "--set-schema bЬr ikke brukes sammen med --get, --set, --unset, --all-pairs, "
 "eller --all-dirs\n"
 
-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 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:407
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "MЕ spesifisere en type nЕr en verdi settes\n"
 
-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping flagget mЕ brukes alene.\n"
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists flagget mЕ brukes alene.\n"
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file mЕ brukes alene.\n"
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule mЕ brukes alene.\n"
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key mЕ brukes alene.\n"
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory mЕ brukes alene.\n"
 
-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 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:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Kunne ikke initialisere GConf: %s\n"
 
-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE miljЬvariabelen mЕ vФre satt\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1481,244 +1483,244 @@ msgstr ""
 "applikasjoner kjЬrer\n"
 "(selv om ting virker i teorien selv nЕr applikasjoner kjЬrer).\n"
 
-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Kunne ikke aksessere konfigurasjonskilden(e): %s\n"
 
-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Feil ved nedstenging: %s\n"
 
-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 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:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "Feil under listing av par i `%s': %s"
 
-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(ingen verdi satt)"
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Feil under splitting av konfigurasjonstjeneren (gconfd): %s\n"
 
-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 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:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Type: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listetype: %s\n"
 
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car-type: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr-type: %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Eier: %s\n"
 
-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Nullstill"
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kort beskrivelse: %s\n"
 
-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Lang beskrivelse: %s\n"
 
-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Ingen verdi satt for `%s'\n"
 
-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Kunne ikke hente verdi for `%s': %s\n"
 
-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "ForstЕr ikke type `%s'\n"
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "MЕ spesifisere vekselvis nЬkler/verdier som argumenter\n"
 
-#: gconf/gconftool.c:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Ingen verdi satt for nЬkkel: `%s'\n"
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Kan ikke sette schema som verdi\n"
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 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:1055
+#: gconf/gconftool.c:1043
 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:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Feil: %s\n"
 
-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Feil under setting av verdi: %s"
 
-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Feil under synkronisering: %s"
 
-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 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:1161
+#: gconf/gconftool.c:1149
 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:1181
+#: gconf/gconftool.c:1169
 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:1201
+#: gconf/gconftool.c:1189
 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:1245
+#: gconf/gconftool.c:1233
 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:1259
+#: gconf/gconftool.c:1247
 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:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Feil under nullstilling av `%s': %s\n"
 
-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 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:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Feil ved vising av kataloger: %s\n"
 
-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, 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:1378
+#: gconf/gconftool.c:1366
 #, 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:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, 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:1407
+#: gconf/gconftool.c:1395
 #, 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:1432
+#: gconf/gconftool.c:1420
 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:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "ADVARSEL: gconftool, intern feil, ukjent GConfValueType\n"
 
-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ADVARSEL: kunne ikke forstЕ typenavnet `%s'\n"
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, 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:1547
+#: gconf/gconftool.c:1535
 #, 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:1568
+#: gconf/gconftool.c:1556
 #, 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:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "ADVARSEL: tom <applyto> node"
 
-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ADVARSEL: node <%s> ikke forstЕtt under <schema>\n"
 
-#: gconf/gconftool.c:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "ADVARSEL: ingen nЬkkel spesifisert for schema\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 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:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1726,51 +1728,51 @@ msgstr ""
 "ADVARSEL: flere <locale> noder for locale `%s', ignorerer alle etter den "
 "fЬrste\n"
 
-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, 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:1757
+#: gconf/gconftool.c:1745
 #, 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:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Installert schema `%s' for locale `%s'\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, 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:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Lagt ved schema `%s' til nЬkkel `%s'\n"
 
-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 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:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "ADVARSEL: node <%s> ikke forstЕtt under <schemaliste>\n"
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Kunne ikke Еpne `%s': %s\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument `%s' er tomt?\n"
 
-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1779,26 +1781,26 @@ msgstr ""
 "Dokumentet `%s' har feil type rot-node (<%s>, skulle vФrt "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, 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:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ADVARSEL: node <%s> under <gconfschemafile> ikke forstЕtt\n"
 
-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Feil under synkronisering av konfigurasjonsdata: %s"
 
-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Spesifiser schema filer som skal installeres\n"
 
-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1807,16 +1809,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Kunne ikke nullstille brytningsnЬkkel %s: %s\n"
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "MЕ spesifisere nЬkler som skal brytes\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1825,11 +1827,11 @@ msgstr ""
 "PrЬver Е knekke din applikasjon ved Е sette ugyldige verdier for nЬkkel:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "MЕ spesifisere kataloger som skal brytes\n"
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1845,7 +1847,7 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf advarsel: feil under listing av par i `%s': %s"
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Forventet`%s', mottok `%s' for nЬkkel %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0d0184e3..c211b69b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 0.6\n"
-"POT-Creation-Date: 2000-08-05 09:13-0300\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-08-05 09:55-03:00\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -14,45 +14,45 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Descarregando mСdulo XML"
 
-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "NЦo foi possМvel encontrar o diretСrio raiz XML no endereГo `%s'"
 
-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "NЦo foi possМvel criar diretСrio `%s': %s"
 
-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr "NЦo И possМvel ler ou escrever no diretСrio raiz XML no endereГo `%s'"
 
-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "As permissУes de diretСrio/arquivo para a fonte XML com raiz %s sЦo: %o/%o"
 
-#: backends/xml-backend.c:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr "Iniciando mСdulo XML"
 
-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Falha ao liberar bloqueio no diretСrio XML `%s': %s"
 
-#: backends/xml-cache.c:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "RemoГУes de diretСrio nЦo sincronizadas ao desligar o mСdulo XML"
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -61,7 +61,7 @@ msgstr ""
 "NЦo И possМvel remover diretСrio `%s' do cache do mСdulo XML, pois ele nЦo "
 "foi sincronizado com o disco corretamente"
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -70,85 +70,85 @@ msgstr ""
 "%u itens continuam no cache apСs a limpeza dos itens jА sincronizados mais "
 "antigos que %u segundos"
 
-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "NЦo foi possМvel obter status de `%s': %s"
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "Arquivo XML `%s' И um diretСrio"
 
-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Falha ao excluir `%s': %s"
 
-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Falha ao gravar arquivo `%s': %s"
 
-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Falha ao renomear `%s' para `%s': %s"
 
-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Falha ao restaurar `%s' de `%s': %s"
 
-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Falha ao excluir arquivo antigo `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:802
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Falha ao obter status `%s': %s"
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Entrada duplicada `%s' em `%s', ignorando"
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Entrada sem nome no arquivo XML `%s', ignorando"
 
-#: backends/xml-dir.c:975
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 "NС de nМvel principal no arquivo XML `%s' nЦo И uma <entrada>, ignorando"
 
-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Falha ao criar arquivo `%s': %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2455
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Falha ao fechar arquivo `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorando nС XML com nome `%s': %s"
 
-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2159
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignorando nome de schema `%s', invАlido: %s"
@@ -156,288 +156,574 @@ msgstr "Ignorando nome de schema `%s', invАlido: %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "Ignorando nС XML `%s', exceto por possМvel nome de schema: %s"
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr "encontrado <local_schema> sem configuraГЦo de locale"
 
-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Falha ao ler valor padrЦo para schema: %s"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Sem atributo \"type\" para nС <%s>"
 
-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Um nС tem atributo \"type\" desconhecido `%s', ignorando"
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "Sem atributo \"value\" para nС"
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "NЦo foi possМvel entender nС XML <%s> dentro de um nС de lista XML"
 
-#: backends/xml-entry.c:1055
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Tipo invАlido (lista, par ou desconhecido) em um nС de lista"
 
-#: backends/xml-entry.c:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "NС XML defeituoso: %s"
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Lista contИm um nС com tipo invАlido (%s, deveria ser %s)"
 
-#: backends/xml-entry.c:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorando car defeituoso do par XML: %s"
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "analisando arquivo XML: listas e pares nЦo podem ser colocados dentro de um "
 "par"
 
-#: backends/xml-entry.c:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorando cdr defeituoso do par XML: %s"
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "NЦo foi possМvel entender nС XML <%s> dentro de um nС de par XML"
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "NЦo foi possМvel achar car e cdr para o nС de par XML"
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Faltando cdr do par de valores em arquivo XML"
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "Faltando car do par de valores em arquivo XML"
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Faltando car e cdr do par de valores em arquivo XML"
 
 #. -- end debug only
-#: gconf/gconf-backend.c:180
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "Arquivo nЦo encontrado `%s'\n"
 
-#: gconf/gconf-backend.c:208
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "EndereГo invАlido `%s'"
 
-#: gconf/gconf-backend.c:233
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr "GConf nЦo funciona sem suporte a mСdulos dinБmicos (gmodule)"
 
-#: gconf/gconf-backend.c:243
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr "Erro abrindo mСdulo `%s': %s\n"
 
-#: gconf/gconf-backend.c:275
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr "NЦo foi possМvel localizar mСdulo para `%s'"
 
-#: gconf/gconf-backend.c:312
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr "Falha ao desligar mСdulo"
 
-#: gconf/gconf-error.c:39
+#: gconf/gconf-database.c:193
+msgid "Received invalid value in set request"
+msgstr "Valor invАlido recebido na requisiГЦo de atribuiГЦo"
+
+#: gconf/gconf-database.c:201
+#, c-format
+msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
+msgstr ""
+"NЦo foi possМvel interpretar o valor CORBA recebido na requisiГЦo de "
+"atribuiГЦo para chave `%s'"
+
+#: gconf/gconf-database.c:416
+msgid "Received request to drop all cached data"
+msgstr "Recebida requisiГЦo para descartar todos os dados do cache"
+
+#: gconf/gconf-database.c:430
+msgid "Received request to sync synchronously"
+msgstr "Recebida requisiГЦo para sincronizar sincronamente"
+
+#: gconf/gconf-database.c:495
+#, fuzzy
+msgid "Fatal error: failed to get object reference for ConfigDatabase"
+msgstr "Falha ao obter referЙncia de objeto para ConfigServer"
+
+#: gconf/gconf-database.c:617
+#, c-format
+msgid "Failed to sync one or more sources: %s"
+msgstr "Falha ao sincronizar uma ou mais fontes: %s"
+
+#. 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:699
+#, c-format
+msgid ""
+"Failed to log addition of listener (%s); will not be able to restore this "
+"listener on gconfd restart, resulting in unreliable notification of "
+"configuration changes."
+msgstr ""
+
+#: gconf/gconf-database.c:724
+#, c-format
+msgid "Listener ID %lu doesn't exist"
+msgstr ""
+
+#: gconf/gconf-database.c:733
+#, 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:838 gconf/gconf-sources.c:1189
+#, c-format
+msgid "Error getting value for `%s': %s"
+msgstr "Erro ao obter valor para `%s': %s"
+
+#: gconf/gconf-database.c:875
+#, c-format
+msgid "Error setting value for `%s': %s"
+msgstr "Erro ao atribuir valor para `%s': %s"
+
+#: gconf/gconf-database.c:910
+#, c-format
+msgid "Error unsetting `%s': %s"
+msgstr "Erro ao limpar `%s': %s"
+
+#: gconf/gconf-database.c:931
+#, c-format
+msgid "Error getting default value for `%s': %s"
+msgstr "Erro ao obter valor padrЦo para `%s': %s"
+
+#: gconf/gconf-database.c:969
+#, c-format
+msgid "Error checking existence of `%s': %s"
+msgstr "Erro ao verificar existЙncia de `%s': %s"
+
+#: gconf/gconf-database.c:993
+#, c-format
+msgid "Error removing dir `%s': %s"
+msgstr "Erro ao remover diretСrio `%s': %s"
+
+#: gconf/gconf-database.c:1019
+#, 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:1045
+#, c-format
+msgid "Error listing dirs in `%s': %s"
+msgstr "Erro ao listar diretСrios em `%s': %s"
+
+#: gconf/gconf-database.c:1066
+#, c-format
+msgid "Error setting schema for `%s': %s"
+msgstr "Erro ao atribuir schema para `%s': %s"
+
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr "Sucesso"
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr "Falha"
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr "Servidor de configuraГЦo nЦo pode ser contactado"
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr "PermissЦo negada"
 
-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
 msgstr "NЦo foi possМvel resolver endereГo para a fonte de configuraГЦo"
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr "Chave ou diretСrio invАlido"
 
-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 msgid "Parse error"
 msgstr "Erro de anАlise"
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr "Dados corrompidos no banco de dados da fonte de configuraГЦo"
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr "Tipos incompatМveis"
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr "OperaГЦo de chave em diretСrio"
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr "OperaГЦo de diretСrio em chave"
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr "NЦo И possМvel sobreescrever valor somente leitura jА existente"
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr "Erro do Object Activation Framework"
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr "OperaГЦo nЦo permitida sem servidor de configuraГЦo"
 
-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 msgid "Failed to get a lock"
 msgstr "Falha ao obter um bloqueio"
 
-#: gconf/gconf-internals.c:100
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Falha ao fechar arquivo `%s': %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Erro ao remover diretСrio `%s': %s"
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Nenhum '/' na chave `%s'"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Nao foi possМvel interpretar valor CORBA para elemento de lista"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Tipo incorreto para elemento de lista em %s"
 
-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "Lista recebida de gconfd com um tipo de lista invАlido"
 
-#: gconf/gconf-internals.c:798
+#: gconf/gconf-internals.c:445
+#, fuzzy
+msgid "Failed to convert object to IOR"
+msgstr "Falha ao sincronizar uma ou mais fontes: %s"
+
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "NЦo foi possМvel abrir arquivo de caminhos `%s': %s\n"
 
-#: gconf/gconf-internals.c:853
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Incluindo fonte `%s'\n"
 
-#: gconf/gconf-internals.c:865
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Erro de leitura no arquivo `%s': %s\n"
 
-#: gconf/gconf-internals.c:1307
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Lista esperada, recebi %s"
 
-#: gconf/gconf-internals.c:1317
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Lista de %s esperada, recebi lista de %s"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Par esperado, recebi %s"
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Par (%s,%s) esperado, recebi um par com um ou ambos os valores faltando"
 
-#: gconf/gconf-internals.c:1486
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Par do tipo (%s,%s) esperado, recebi tipo (%s,%s)"
 
-#: gconf/gconf-internals.c:1602
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Cadeia entre aspas nЦo comeГa com aspas"
 
-#: gconf/gconf-internals.c:1664
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Cadeia entre aspas nЦo termina com aspas"
 
-#: gconf/gconf-internals.c:2144 gconf/gconf.c:2643
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Erro CORBA: %s"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "tentativa de remover lista de objetos OAF nЦo listada"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "tentativa de incluir lista OAF jА listada"
 
-#: gconf/gconf-internals.c:2176
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Erro de anАlise OAF: %s"
 
-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Erro OAF desconhecido"
 
-#: gconf/gconf-internals.c:2264
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Arquivo ior nЦo encontrado em `%s'"
 
-#: gconf/gconf-internals.c:2295
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd tomando bloqueio `%s' de algum outro processo"
 
-#: gconf/gconf-internals.c:2306
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Outro programa tem bloqueio `%s'"
 
-#: gconf/gconf-internals.c:2326
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "nЦo foi possМvel contactar ORB para enviar ping ao gconfd existente"
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -446,43 +732,43 @@ msgstr ""
 "Removendo bloqueio antigo `%s' porque IOR nЦo pТde ser convertido para "
 "referЙncia Ю objeto, IOR `%s'"
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "Removendo bloqueio antigo `%s' devido a erro ao enviar ping ao servidor: %s"
 
-#: gconf/gconf-internals.c:2358
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "Daemon de configuraГЦo GConf (gconfd) possui bloqueio `%s'"
 
-#: gconf/gconf-internals.c:2372
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "nЦo foi possМvel criar diretСrio `%s': %s"
 
-#: gconf/gconf-internals.c:2407
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "NЦo И possМvel criar bloqueio `%s': %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "NЦo И possМvel escrever no arquivo `%s': %s"
 
-#: gconf/gconf-internals.c:2486
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "NЦo И possМvel arquivo de bloqueio `%s'; supondo que ele nЦo И seu: %s"
 
-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Arquivo de bloqueio `%s' corrompido, removendo mesmo assim"
 
-#: gconf/gconf-internals.c:2513
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -491,26 +777,26 @@ msgstr ""
 "NЦo foi criado arquivo de bloqueio `%s' (criador com pid %u, nosso pid %u; "
 "supondo que alguИm tomou nosso bloqueio"
 
-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Falha ao liberar diretСrio de bloqueios `%s': %s"
 
-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Falha ao carregar fonte `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Schema `%s' especificado para `%s' armazena um valor de nЦo-schema"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "O nome '/' pode ser apenas um diretСrio, nЦo uma chave"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -519,108 +805,103 @@ msgstr ""
 "Valor para `%s' atribuМdo em fonte somente leitura no inМcio do seu caminho "
 "de configuraГЦo."
 
-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Erro ao localizar metainfo: %s"
 
-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Erro ao obter metainfo: %s"
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 "Chave `%s', listada como schema para chave `%s', realmente armazena tipo `%s'"
 
-#: gconf/gconf-sources.c:1205 gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr "Erro ao obter valor para `%s': %s"
-
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "NЦo foi possМvel entender `%s' (inteiro esperado)"
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Inteiro `%s' И muito grande ou pequeno"
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "NЦo foi possМvel entender `%s' (nЗmero real esperado)"
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "NЦo foi possМvel entender `%s' (esperado verdadeiro ou falso)"
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "NЦo foi possМvel entender `%s' (lista deve comeГar com um '[')"
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "NЦo foi possМvel entender `%s' (lista deve terminar com um ']')"
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "NЦo foi possМvel entender `%s' (']' extra encontrado em uma lista)"
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "NЦo foi possМvel entender `%s' (caracteres finais extras)"
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "NЦo foi possМvel entender `%s' (par deve comeГar com um '(')"
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "NЦo foi possМvel entender `%s' (par deve terminar com um ')')"
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "NЦo foi possМvel entender `%s' (nЗmero de elementos errado)"
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "NЦo foi possМvel entender `%s' (')' extra encontrado em um par)"
 
-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:271
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Servidor nЦo conseguiu resolver o endereГo `%s'"
 
-#: gconf/gconf.c:408
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 "NЦo И possМvel incluir notificaГУes para uma fonde de configuraГУes local"
 
-#: gconf/gconf.c:1466
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Falha ao enviar ping ao servidor, erro CORBA: %s"
 
-#: gconf/gconf.c:1482
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -630,85 +911,66 @@ msgstr ""
 "oaf_activate_from_id() e nЦo levantou uma exceГЦo explicando o problema. Por "
 "favor, registre um relatСrio de erros sobre o OAF."
 
-#: gconf/gconf.c:1677
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Falha ao iniciar GConf, terminando\n"
 
-#: gconf/gconf.c:1714
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Deve comeГar com uma barra (/)"
 
-#: gconf/gconf.c:1736
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "NЦo pode ter duas barras (/) em seqЭЙncia"
 
-#: gconf/gconf.c:1738
+#: gconf/gconf.c:1941
 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:1759
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' И um caracter invАlido em nomes de chave/diretСrio"
 
-#: gconf/gconf.c:1773
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Chave/diretСrio nЦo pode terminar com uma barra (/)"
 
-#: gconf/gconf.c:2115
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Falha ao desligar servidor de configuraГЦo: %s"
 
-#: gconf/gconf.c:2176
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Flutuante esperado, recebi %s"
 
-#: gconf/gconf.c:2211
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Inteiro esperado, recebi %s"
 
-#: gconf/gconf.c:2246
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "String esperado, recebi %s"
 
-#: gconf/gconf.c:2283
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Booleano esperado, recebi %s"
 
-#: gconf/gconf.c:2316
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Schema esperado, recebi %s"
 
-#: gconf/gconfd.c:511
-msgid "Received invalid value in set request"
-msgstr "Valor invАlido recebido na requisiГЦo de atribuiГЦo"
-
-#: gconf/gconfd.c:519
-#, c-format
-msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
-msgstr ""
-"NЦo foi possМvel interpretar o valor CORBA recebido na requisiГЦo de "
-"atribuiГЦo para chave `%s'"
-
-#: gconf/gconfd.c:789
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "RequisiГЦo de desligamento recebida"
 
-#: gconf/gconfd.c:802
-msgid "Received request to drop all cached data"
-msgstr "Recebida requisiГЦo para descartar todos os dados do cache"
-
-#: gconf/gconfd.c:822
-msgid "Received request to sync synchronously"
-msgstr "Recebida requisiГЦo para sincronizar sincronamente"
-
-#: gconf/gconfd.c:861
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -716,7 +978,7 @@ msgstr ""
 "gconfd foi compilado com opГЦo de depuraГЦo; tentando carregar gconf.path do "
 "diretСrio de fontes"
 
-#: gconf/gconfd.c:879
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -724,7 +986,7 @@ msgstr ""
 "NЦo foram encontrados arquivos de configuraГЦo, tentando usar a fonte de "
 "configuraГЦo padrЦo `%s'"
 
-#: gconf/gconfd.c:888
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -732,12 +994,12 @@ msgstr ""
 "Nenhuma fonte de configuraГЦo no caminho de fontes, configuraГЦo nЦo serА "
 "salva; edite "
 
-#: gconf/gconfd.c:901
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Erro ao carregar algumas fontes de configuraГЦo: %s"
 
-#: gconf/gconfd.c:913
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -745,33 +1007,38 @@ msgstr ""
 "Nenhum endereГo fonte de configuraГЦo foi resolvido com sucesso, nЦo И "
 "possМvel ler ou armazenar dados de configuraГЦo"
 
-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:287
+#, fuzzy
 msgid ""
-"No writeable config sources successfully resolved, may not be able to save "
+"No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 "Nenhum endereГo fonte de configuraГЦo com permissЦo de escrita foi resolvido "
 "com sucesso, pode nЦo ser possМvel armazenar algumas modificaГУes de "
 "configuraГЦo"
 
-#: gconf/gconfd.c:955 gconf/gconfd.c:967
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr "Recebido sinal %d, desligando."
 
-#: gconf/gconfd.c:972
-#, c-format
-msgid "Received signal %d, ignoring"
-msgstr "Recebido sinal %d, ignorando"
+#: gconf/gconfd.c:329
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down cleanly"
+msgstr "Recebido sinal %d, desligando."
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:1013
-#, c-format
-msgid "starting, pid %u user `%s'"
+#: gconf/gconfd.c:376
+#, fuzzy, c-format
+msgid "starting (version %s), pid %u user '%s'"
 msgstr "iniciando, pid %u usuАrio `%s'"
 
-#: gconf/gconfd.c:1036
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -779,11 +1046,11 @@ msgstr ""
 "Falha ao iniciar Object Activation Framework: por favor, envie relatСrio de "
 "erros para os resposАveis pelo OAF"
 
-#: gconf/gconfd.c:1056
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Falha ao obter referЙncia de objeto para ConfigServer"
 
-#: gconf/gconfd.c:1075
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -791,105 +1058,141 @@ msgstr ""
 "OAF nЦo conhece nosso IID; indica uma instalaГЦo defeituosa; nЦo И possМvel "
 "registrar; terminando\n"
 
-#: gconf/gconfd.c:1079
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Outro gconfd jА registrado com o OAF; terminando\n"
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Erro desconhecido registrado gconfd com o OAF; terminando\n"
 
-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Terminando"
 
-#: gconf/gconfd.c:1194
+#: gconf/gconfd.c:818
 #, c-format
-msgid "Failed to sync one or more sources: %s"
-msgstr "Falha ao sincronizar uma ou mais fontes: %s"
+msgid "Returning exception: %s"
+msgstr "Levantando exceГЦo: %s"
 
-#: gconf/gconfd.c:1561
+#: gconf/gconfd.c:885
 #, c-format
-msgid "Error setting value for `%s': %s"
-msgstr "Erro ao atribuir valor para `%s': %s"
+msgid ""
+"Failed to open gconfd logfile; won't be able to restore listeners after "
+"gconfd shutdown (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:1593
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Error unsetting `%s': %s"
-msgstr "Erro ao limpar `%s': %s"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:1614
-#, c-format
-msgid "Error getting default value for `%s': %s"
-msgstr "Erro ao obter valor padrЦo para `%s': %s"
+#: gconf/gconfd.c:966
+#, fuzzy, c-format
+msgid "Could not open saved state file '%s' for writing: %s"
+msgstr "NЦo foi possМvel abrir arquivo de caminhos `%s': %s\n"
 
-#: gconf/gconfd.c:1652
-#, c-format
-msgid "Error checking existence of `%s': %s"
-msgstr "Erro ao verificar existЙncia de `%s': %s"
+#: gconf/gconfd.c:980
+#, fuzzy, c-format
+msgid "Could not write saved state file '%s' fd: %d: %s"
+msgstr "NЦo И possМvel escrever no arquivo `%s': %s"
 
-#: gconf/gconfd.c:1676
-#, c-format
-msgid "Error removing dir `%s': %s"
-msgstr "Erro ao remover diretСrio `%s': %s"
+#: gconf/gconfd.c:989
+#, fuzzy, c-format
+msgid "Failed to close new saved state file '%s': %s"
+msgstr "Falha ao fechar arquivo `%s': %s"
 
-#: gconf/gconfd.c:1701
-#, c-format
-msgid "Failed to get all entries in `%s': %s"
-msgstr "Falha ao obter todas as entradas em `%s': %s"
+#: gconf/gconfd.c:1003
+#, fuzzy, c-format
+msgid "Could not move aside old saved state file '%s': %s"
+msgstr "NЦo foi possМvel abrir arquivo de caminhos `%s': %s\n"
 
-#: gconf/gconfd.c:1725
-#, c-format
-msgid "Error listing dirs in `%s': %s"
-msgstr "Erro ao listar diretСrios em `%s': %s"
+#: gconf/gconfd.c:1013
+#, fuzzy, c-format
+msgid "Failed to move new save state file into place: %s"
+msgstr "Falha ao criar arquivo `%s': %s"
 
-#: gconf/gconfd.c:1745
+#: gconf/gconfd.c:1022
 #, c-format
-msgid "Error setting schema for `%s': %s"
-msgstr "Erro ao atribuir schema para `%s': %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr ""
 
-#: gconf/gconfd.c:1913
-msgid "Attempt to unregister invalid context ID"
-msgstr "Tentativa de desregistrar uma ID de contexto invАlida"
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "NЦo foi possМvel entender `%s' (lista deve comeГar com um '[')"
 
-#: gconf/gconfd.c:1920
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
+msgstr ""
+
+#: gconf/gconfd.c:1140
 #, c-format
-msgid "Bad context ID %lu, request ignored"
-msgstr "ID de contexto invАlida %lu, requisiГЦo ignorada"
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr ""
 
-#: gconf/gconfd.c:1928
+#: gconf/gconfd.c:1160
 #, c-format
-msgid "Already-unregistered context ID %lu, request ignored"
-msgstr "ID de contexto %lu jА desregistrada, requisiГЦo ignorada"
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr ""
 
-#: gconf/gconfd.c:1953
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Falha ao criar arquivo `%s': %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Attempt to use invalid context ID %lu"
-msgstr "Tentativa de usar uma ID de contexto invАlida %lu"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
+
+#: gconf/gconfd.c:1377
+#, fuzzy, c-format
+msgid "Unable to open saved state file '%s': %s"
+msgstr "Falha ao criar arquivo `%s': %s"
 
-#: gconf/gconfd.c:1963
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Attempt to use already-unregistered context ID %lu"
-msgstr "Tentativa de usar uma ID de contexto jА desregistrada %lu"
+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:2123
+#: gconf/gconfd.c:1481
 #, c-format
-msgid "Returning exception: %s"
-msgstr "Levantando exceГЦo: %s"
+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/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "OpГУes de ajuda"
 
-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Atribui um valor a uma chave e sincroniza. Use com --type."
 
-#: gconf/gconftool.c:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Imprime o valor de uma chave para a saМda padrЦo."
 
-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -897,36 +1200,36 @@ msgstr ""
 "Atribui um schema e sincroniza. Use com --short-desc, --long-desc, --owner e "
 "--type."
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "Limpa as chaves na linha de comando"
 
-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Imprime todos os pares chave/valor em um diretСrio."
 
-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Imprime todos os subdiretСrios de um diretСrio."
 
-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Imprime todos os subdiretСrios e itens sob um diretСrio, recursivamente."
 
-#: gconf/gconftool.c:149
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Retorna 0 se o diretСrio existe, 2 caso contrАrio."
 
-#: gconf/gconftool.c:158
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Desliga gconfd. NцO USE ESTA OPгцO SEM UMA BOA RAZцO."
 
-#: gconf/gconftool.c:167
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Retorna 0 se gconfd estА executando, 2 caso contrАrio."
 
-#: gconf/gconftool.c:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -934,7 +1237,7 @@ msgstr ""
 "Executa o servidor de configuraГЦo (gconfd). (Normalmente acontece "
 "automaticamente quando necessАrio.)"
 
-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -942,70 +1245,76 @@ msgstr ""
 "Especifica o tipo do valor sendo atribuМdo ou o tipo do valor um schema "
 "descreve. AbreviaГУes Зnicas sЦo permitidas."
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
-msgstr "Especifica o tipo do valor de lista sendo atribuМdo ou o tipo do valor um schema descreve. AbreviaГУes Зnicas sЦo permitidas."
+msgstr ""
+"Especifica o tipo do valor de lista sendo atribuМdo ou o tipo do valor um "
+"schema descreve. AbreviaГУes Зnicas sЦo permitidas."
 
-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
-msgstr "Especifica o tipo do valor do car do par sendo atribuМdo ou o tipo do valor um schema descreve. AbreviaГУes Зnicas sЦo permitidas."
+msgstr ""
+"Especifica o tipo do valor do car do par sendo atribuМdo ou o tipo do valor "
+"um schema descreve. AbreviaГУes Зnicas sЦo permitidas."
 
-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
-msgstr "Especifica o tipo do valor do cdr do par sendo atribuМdo ou o tipo do valor um schema descreve. AbreviaГУes Зnicas sЦo permitidas."
+msgstr ""
+"Especifica o tipo do valor do cdr do par sendo atribuМdo ou o tipo do valor "
+"um schema descreve. AbreviaГУes Зnicas sЦo permitidas."
 
-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Especifica uma breve descriГЦo de meia linha para um schema."
 
-#: gconf/gconftool.c:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "DESCRIгцO"
 
-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "Especifica uma descriГЦo com vАrias linhas para um schema."
 
-#: gconf/gconftool.c:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "Especifica o dono de um schema"
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "DONO"
 
-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "Especifica um arquivo de schema a ser instalado"
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "ARQUIVO"
 
-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Especifica uma fonte de configuraГЦo a ser usada no lugar do caminho padrЦo"
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "FONTE"
 
-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1013,7 +1322,7 @@ msgstr ""
 "Acessa o banco de dados de configuraГЦo diretamente, ignorando o servidor. "
 "Exige que gconfd nЦo esteja sendo executado."
 
-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1023,7 +1332,7 @@ msgstr ""
 "dados. A variАvel de ambiente GCONF_CONFIG_SOURCE deve receber uma fonte de "
 "configuraГЦo nЦo-padrЦo ou receber a string vazia para usar o padrЦo."
 
-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1031,7 +1340,7 @@ msgstr ""
 "Testa intensivamente um aplicativo atribuindo e limpando vАrios valores de "
 "tipos diferentes para chaves na linha de comando."
 
-#: gconf/gconftool.c:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1039,7 +1348,7 @@ msgstr ""
 "Testa intensivamente um aplicativo atribuindo e limpando vАrias chaves "
 "dentro de diretСrios na linha de comando."
 
-#: gconf/gconftool.c:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1049,23 +1358,23 @@ msgstr ""
 "Execute '%s --help' para ver a lista completa de opГУes de linha de "
 "comando.\n"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "NЦo И possМvel ler e atribuir/limpar ao mesmo tempo\n"
 
-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "NЦo И possМvel atribuir e ler/limpar ao mesmo tempo\n"
 
-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "NЦo И possМvel usar --all-pairs com --get ou --set\n"
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "NЦo И possМvel usar --all-dirs com --get ou --set\n"
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1073,7 +1382,7 @@ msgstr ""
 "--recursive-list nЦo deve ser usado com --get, --set, --unset, --all-pairs "
 "ou --all-dirs\n"
 
-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1081,58 +1390,58 @@ msgstr ""
 "--set_schema nЦo deve ser usado com --get, --set, --unset, --all-pairs ou "
 "--all-dirs\n"
 
-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Tipo do valor sС И relevante ao atribuir um valor\n"
 
-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "Um tipo deve ser especificado ao atribuir um valor\n"
 
-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "OpГЦo de ping deve ser usada sozinha.\n"
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "OpГЦo --dir-exists deve ser usada sozinha.\n"
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "OpГЦo --install-schema-file deve ser usada sozinha.\n"
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "OpГЦo --makefile-install-rule deve ser usada sozinha.\n"
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "OpГЦo --break-key deve ser usada sozinha.\n"
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "OpГЦo --break-directory deve ser usada sozinha.\n"
 
-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "VocЙ deve especificar uma fonte de configuraГЦo com --config-source ao usar "
 "--direct\n"
 
-#: gconf/gconftool.c:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Falha ao iniciar GConf: %s\n"
 
-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "A variАvel de ambiente GCONF_CONFIG_SOURCE deve ser configurada\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1144,239 +1453,247 @@ msgstr ""
 "existirem aplicativos executando\n"
 "(apesar de na teoria deveria funcionar mesmo com aplicativos executando).\n"
 
-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Falhao ao acessar a(s) fonte(s) de configuraГЦo: %s\n"
 
-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Erro ao desligar: %s\n"
 
-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "Devem ser especificados um ou mais diretСrios para listar recursivamente.\n"
 
-#: gconf/gconftool.c:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "Falha ao listar pares em `%s': %s"
 
-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(sem valor atribuМdo)"
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Falhao ao criar o servidor de configuraГЦo (gconfd): %s\n"
 
-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "Devem ser especificada uma chave ou chaves para ler\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tipo: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Tipo de lista: %s\n"
 
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Tipo do car: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Tipo do cdr: %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Dono: %s\n"
 
-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Limpar"
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Descr. Curta: %s\n"
 
-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Descr. Longa: %s\n"
 
-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Sem valor atribuido para `%s'\n"
 
-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Falha ao ler valor para `%s': %s\n"
 
-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "NЦo И possМvel entender tipo `%s'\n"
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Devem ser especificados chaves/valores alternados como argumentos\n"
 
-#: gconf/gconftool.c:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Sem valor a atribuir para chave: `%s'\n"
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "NЦo И possМvel atribuir um schema como valor\n"
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
-msgstr "Ao atribuir a uma lista vocЙ deve especificar um tipo de lista primitivo\n"
+msgstr ""
+"Ao atribuir a uma lista vocЙ deve especificar um tipo de lista primitivo\n"
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
-msgstr "Ao atribuir a uma par vocЙ deve especificar um tipo de car e de cdr primitivos\n"
+msgstr ""
+"Ao atribuir a uma par vocЙ deve especificar um tipo de car e de cdr "
+"primitivos\n"
 
-#: gconf/gconftool.c:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erro: %s\n"
 
-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Erro ao atribuir valor: %s"
 
-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Erro ao sincronizar: %s"
 
-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Deve ser especificada chave (nome do schema) como Зnico argumento\n"
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Tipo de lista deve ser um tipo primitivo: string, int, float or bool\n"
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
-msgstr "Tipo de car de par deve ser um tipo primitivo: string, int, float or bool\n"
+msgstr ""
+"Tipo de car de par deve ser um tipo primitivo: string, int, float or bool\n"
 
-#: gconf/gconftool.c:1201
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
-msgstr "Tipo de cdr de par deve ser um tipo primitivo: string, int, float or bool\n"
+msgstr ""
+"Tipo de cdr de par deve ser um tipo primitivo: string, int, float or bool\n"
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Devem ser especificados um ou mais diretСrios de onde obter pares "
 "chave/valor.\n"
 
-#: gconf/gconftool.c:1259
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Devem ser especificadas uma ou mais chaves para limpar.\n"
 
-#: gconf/gconftool.c:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Erro ao limpar `%s': %s\n"
 
-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Devem ser especificados um ou mais diretСrios de onde obter subdiretСrios.\n"
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Erro ao listar diretСrios: %s\n"
 
-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "ALERTA: tipo invАlido ou faltante para schema (%s)\n"
 
-#: gconf/gconftool.c:1378
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "ALERTA: tipo de lista invАlido ou faltante para schema (%s)\n"
 
-#: gconf/gconftool.c:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "ALERTA: Falha ao analisar valor padrЦo `%s' para schema (%s)\n"
 
-#: gconf/gconftool.c:1407
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "ALERTA: tipo de car ou de cdr invАlido ou faltante para schema (%s)\n"
 
-#: gconf/gconftool.c:1432
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "ALERTA: VocЙ nЦo pode atribuir uma valor padrЦo a um schema\n"
 
-#: gconf/gconftool.c:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "ALERTA: Erro interno do gconftool, GConfValueType desconhecido\n"
 
-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ALERTA: falha ao analisar nome do tipo `%s'\n"
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
-msgstr "ALERTA: tipo de lista sС pode ser int, float, string ou bool e nЦo `%s'\n"
+msgstr ""
+"ALERTA: tipo de lista sС pode ser int, float, string ou bool e nЦo `%s'\n"
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
-msgstr "ALERTA: tipo de car sС pode ser int, float, string ou bool e nЦo `%s'\n"
+msgstr ""
+"ALERTA: tipo de car sС pode ser int, float, string ou bool e nЦo `%s'\n"
 
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
-msgstr "ALERTA: tipo de cdr sС pode ser int, float, string ou bool e nЦo `%s'\n"
+msgstr ""
+"ALERTA: tipo de cdr sС pode ser int, float, string ou bool e nЦo `%s'\n"
 
-#: gconf/gconftool.c:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "ALERTA: nС <applyto> vazio"
 
-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ALERTA: nС <%s> nЦo entendido sob <schema>\n"
 
-#: gconf/gconftool.c:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "ALERTA: sem chave especificada para schema\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr "ALERTA: nС <locale> nЦo possui atributo `name=\"locale\"', ignorando\n"
 
-#: gconf/gconftool.c:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1384,51 +1701,51 @@ msgstr ""
 "ALERTA: mЗltiplos nСs <locale> para o locale `%s', ignorando todos apСs o "
 "primeiro\n"
 
-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "ALERTA: NС invАlido <%s> em um nС <locale>\n"
 
-#: gconf/gconftool.c:1757
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "ALERTA: falha ao instalar schema `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Instalado schema `%s' para locale `%s'\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "ALERTA: falha ao associar schema `%s' com chave `%s': %s\n"
 
-#: gconf/gconftool.c:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Anexado schema `%s' Ю chave `%s'\n"
 
-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "VocЙ deve ter pelo menos um item <locale> em um <schema>\n"
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "ALERTA: nС <%s> nЦo entendido abaixo de <schemalist>\n"
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Falha ao abrir `%s': %s\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Documento `%s' estА vazio?\n"
 
-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1437,26 +1754,26 @@ msgstr ""
 "Documento `%s' possui o tipo errado de nС raiz (<%s>, deveria ser "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Documento `%s' nЦo possui nС <gconfschemafile> de nМvel principal\n"
 
-#: gconf/gconftool.c:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ALERTA: nС <%s> abaixo de <gconfschemafile> nЦo entendido\n"
 
-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Erro ao sincronizar dados de configuraГЦo: %s"
 
-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Devem ser especificados alguns arquivos de schema a instalar\n"
 
-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1465,16 +1782,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Falha ao limpar chave de quebra %s: %s\n"
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "Devem ser especificadas algumas chaves para serem quebradas\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1483,11 +1800,11 @@ msgstr ""
 "Tentando quebrar o seu aplicativo atribuМndo valores invАlidos para chave:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "Devem ser especificados alguns diretСrios para serem quebrados\n"
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1503,7 +1820,25 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Alerta do GConf: falha ao listar pares em `%s': %s"
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Esperado `%s' recebi `%s' para chave %s"
+
+#~ msgid "Received signal %d, ignoring"
+#~ msgstr "Recebido sinal %d, ignorando"
+
+#~ msgid "Attempt to unregister invalid context ID"
+#~ msgstr "Tentativa de desregistrar uma ID de contexto invАlida"
+
+#~ msgid "Bad context ID %lu, request ignored"
+#~ msgstr "ID de contexto invАlida %lu, requisiГЦo ignorada"
+
+#~ msgid "Already-unregistered context ID %lu, request ignored"
+#~ msgstr "ID de contexto %lu jА desregistrada, requisiГЦo ignorada"
+
+#~ msgid "Attempt to use invalid context ID %lu"
+#~ msgstr "Tentativa de usar uma ID de contexto invАlida %lu"
+
+#~ msgid "Attempt to use already-unregistered context ID %lu"
+#~ msgstr "Tentativa de usar uma ID de contexto jА desregistrada %lu"
diff --git a/po/ru.po b/po/ru.po
index 2e88ce26..ac9cd340 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf\n"
-"POT-Creation-Date: 2000-08-31 15:53+0400\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-08-31 16:50+04:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -12,136 +12,136 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Выгрузка серверного модуля XML."
 
-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Не удалось найти корневой каталог XML по адресу '%s'"
 
-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Не удалось создать каталог '%s': %s"
 
-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 "Невозможно прочитать из или записатьв корневой каталог XML по адресу '%s'"
 
-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/xml-backend.c:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr "Инициализация серверного модуля XML"
 
-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Не удалось заблокировать XML каталог \"%s\": %s"
 
-#: backends/xml-cache.c:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
 "%u seconds"
 msgstr ""
 
-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "Невозможно выполнить stat для \"%s\": %s"
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "XML файл \"%s\" является каталогом"
 
-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Не удалось удалить \"%s\": %s"
 
-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Не удалось записать файл \"%s\": %s"
 
-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Не удалось переименовать \"%s\" в \"%s\": %s"
 
-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Не удалось получить \"%s\" из \"%s\": %s"
 
-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Не удалось удалить старый файл \"%s\": %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:802
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Не удалось выполнить stat для \"%s\": %s"
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Повторная запись \"%s\" в \"%s\", игнорируется"
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Запись без имени в XML-файле \"%s\", игнорируется"
 
-#: backends/xml-dir.c:975
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Узел верхнего уровня в XML-файле \"%s\" не <entry>, игнорируется"
 
-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Не удалось создать файл \"%s\": %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2455
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Не удалось закрыть файл '%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Игнорирование XML-узла с названием \"%s\": %s"
 
-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2159
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Игнорируется имя schema \"%s\", недопустимо: %s"
@@ -149,542 +149,572 @@ msgstr "Игнорируется имя schema \"%s\", недопустимо: %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "Игнорирование XML-узла \"%s\", исключая возможные имена schema: %s"
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr "найдено <local_schema> без установок locale"
 
-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Не удалось прочесть значение по умолчанию для schema: %s"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Нет аттрубута \"type\" для узла <%s>"
 
-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Узел имеет неизвестный аттрибут \"type\" \"%s\", игнорируется"
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "Нет аттрибута \"value\" для узла"
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1055
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Недопустимый тип (список, пара или неизвестный) в узле списка"
 
-#: backends/xml-entry.c:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Неправильный узел XML: %s"
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Список содержит плохой узел (%s, должно быть %s)"
 
-#: backends/xml-entry.c:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "анализ XML-файла: списки и пары не могут быть помещены внутри пары"
 
-#: backends/xml-entry.c:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
 #. -- end debug only
-#: gconf/gconf-backend.c:182
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "Нет такого файла '%s'\n"
 
-#: gconf/gconf-backend.c:210
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "Плохой адрес '%s'"
 
-#: gconf/gconf-backend.c:235
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr "GConf не может работать без поддержки динамических модулей (gmodule)"
 
-#: gconf/gconf-backend.c:245
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr "Ошибка открытия модуля '%s': %s\n"
 
-#: gconf/gconf-backend.c:277
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr "Не удалось найти серверный модуль для '%s'"
 
-#: gconf/gconf-backend.c:314
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr "Не удалось отключить сервер"
 
-#: gconf/gconf-database.c:209
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr ""
 
-#: gconf/gconf-database.c:217
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:432
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "Получен запрос на сброс всех кэшированных данных"
 
-#: gconf/gconf-database.c:446
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:511
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
-msgstr "Фатальная ошибка: Не удалось получить ссылку на объект для ConfigDatabase"
+msgstr ""
+"Фатальная ошибка: Не удалось получить ссылку на объект для ConfigDatabase"
 
-#: gconf/gconf-database.c:629
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Не удалось синхронизировать один или более источников: %s"
 
-#: gconf/gconf-database.c:806 gconf/gconf-sources.c:1205
+#. 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:699
+#, c-format
+msgid ""
+"Failed to log addition of listener (%s); will not be able to restore this "
+"listener on gconfd restart, resulting in unreliable notification of "
+"configuration changes."
+msgstr ""
+
+#: gconf/gconf-database.c:724
+#, c-format
+msgid "Listener ID %lu doesn't exist"
+msgstr ""
+
+#: gconf/gconf-database.c:733
+#, 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:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Ошибка получения значения для \"%s\": %s"
 
-#: gconf/gconf-database.c:843
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Ошибка получения значения для \"%s\": %s"
 
-#: gconf/gconf-database.c:878
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:899
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Ошибка получения значения по умолчанию для \"%s\": %s"
 
-#: gconf/gconf-database.c:937
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Ошибка проверки существования для \"%s\": %s"
 
-#: gconf/gconf-database.c:961
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Ошибка удаления каталога \"%s\": %s"
 
-#: gconf/gconf-database.c:987
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Не удалось получить все записи в \"%s\": %s"
 
-#: gconf/gconf-database.c:1013
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Ошибка перечисления каталогов в \"%s\": %s"
 
-#: gconf/gconf-database.c:1034
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Ошибка установки схемы для \"%s\": %s"
 
-#: gconf/gconf-error.c:39
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr "Успешно"
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr "Сбой"
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr "Невозможно подключение к серверу конфигурации"
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr "В правах отказано"
 
-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
 msgstr "Не удалось распознать адрес для источника конфигурации"
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr "Неправильный ключ или имя каталога"
 
-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 msgid "Parse error"
 msgstr "Ошибка лексического анализа"
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr "Испорченные данные в базе данных источников конфигурации"
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr "Несоответствие типа"
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr "Действие ключа на каталог"
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr "Действие каталога на ключ"
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr ""
 "Невозможно перезаписать существующее значение предназначенное только для "
 "чтения"
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr "Ошибка OAF"
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr "Действие не допустимо без сервера конфигурации"
 
-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 msgid "Failed to get a lock"
 msgstr "Не удалось создать lock"
 
-#: gconf/gconf-glib.c:631
+#: gconf/gconf-glib.c:629
 #, c-format
 msgid ""
 "Error on line %d char %d: %s\n"
 "(Some surrounding text was '%s')\n"
 msgstr ""
 
-#: gconf/gconf-glib.c:751
+#: gconf/gconf-glib.c:749
 msgid ""
 "Text ended in the middle of an entity, or entity name too long to be valid "
 "('&' should begin an entity such as '&quot;')"
 msgstr ""
 
-#: gconf/gconf-glib.c:803
+#: gconf/gconf-glib.c:801
 #, c-format
 msgid ""
 "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
 msgstr ""
 
-#: gconf/gconf-glib.c:843
+#: gconf/gconf-glib.c:841
 msgid ""
 "Markup text ended in the middle of a character reference, just after '&#'"
 msgstr ""
 
-#: gconf/gconf-glib.c:869
+#: gconf/gconf-glib.c:867
 #, c-format
 msgid ""
 "Character reference contained non-digit '%s' ('&#' should begin a reference "
 "to a unicode character, such as '&#2342;')"
 msgstr ""
 
-#: gconf/gconf-glib.c:893
+#: gconf/gconf-glib.c:891
 msgid ""
 "Text ended in the middle of an character reference ('&#' should begin a "
 "character reference such as '&#2342;')"
 msgstr ""
 
-#: gconf/gconf-glib.c:918
+#: gconf/gconf-glib.c:916
 #, c-format
 msgid ""
 "Couldn't parse character reference '%s' ('&#' must begin a character "
 "reference such as '&#2343;')"
 msgstr ""
 
-#: gconf/gconf-glib.c:940
+#: gconf/gconf-glib.c:938
 #, c-format
 msgid ""
 "Character code %#lx is not allowed in XML documents or is not a valid "
 "Unicode character"
 msgstr ""
 
-#: gconf/gconf-glib.c:1015
+#: gconf/gconf-glib.c:1013
 msgid ""
 "Documented ended just after an '&', '&' should begin an entity or character "
 "reference."
 msgstr ""
 
-#: gconf/gconf-glib.c:1029
+#: gconf/gconf-glib.c:1027
 msgid ""
 "'<' or '>' character not allowed here; only allowed around tags, for example "
 "<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
 "&lt; and &gt;"
 msgstr ""
 
-#: gconf/gconf-glib.c:1084
+#: gconf/gconf-glib.c:1082
 #, c-format
 msgid "Character '%s' is not valid at the start of an attribute name"
 msgstr ""
 
-#: gconf/gconf-glib.c:1111
+#: gconf/gconf-glib.c:1109
 msgid "Document ended just after attribute name"
 msgstr ""
 
-#: gconf/gconf-glib.c:1122
+#: gconf/gconf-glib.c:1120
 msgid "Attribute name must be immediately followed by an '=' character"
 msgstr ""
 
-#: gconf/gconf-glib.c:1137
+#: gconf/gconf-glib.c:1135
 msgid ""
 "'=' character after attribute must be immediately followed by an '\"' "
 "character"
 msgstr ""
 
-#: gconf/gconf-glib.c:1163
+#: gconf/gconf-glib.c:1161
 #, c-format
 msgid ""
 "Character '%c' found inside an attribute value; perhaps your attribute value "
 "is missing the closing quotation mark '\"'"
 msgstr ""
 
-#: gconf/gconf-glib.c:1183
+#: gconf/gconf-glib.c:1181
 msgid ""
 "Ran out of text before a quote mark ('\"') was seen at the end of an "
 "attribute value"
 msgstr ""
 
-#: gconf/gconf-glib.c:1196
+#: gconf/gconf-glib.c:1194
 msgid ""
 "Text ends immediately after an attribute value, before the element was closed"
 msgstr ""
 
-#: gconf/gconf-glib.c:1510
+#: gconf/gconf-glib.c:1508
 msgid "Missing '<' at start of element"
 msgstr ""
 
-#: gconf/gconf-glib.c:1521
+#: gconf/gconf-glib.c:1519
 msgid "Document ended just after '<' character"
 msgstr ""
 
-#: gconf/gconf-glib.c:1549
+#: gconf/gconf-glib.c:1547
 msgid "No closing '>' found for a <? or <!"
 msgstr ""
 
-#: gconf/gconf-glib.c:1578
+#: gconf/gconf-glib.c:1576
 #, c-format
 msgid "Character '%s' is not valid at the start of an element name"
 msgstr ""
 
-#: gconf/gconf-glib.c:1602 gconf/gconf-glib.c:1615
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
 msgid "Document ended just after element name, no '>' seen"
 msgstr ""
 
-#: gconf/gconf-glib.c:1640
+#: gconf/gconf-glib.c:1638
 #, c-format
 msgid "Elements should be closed with '>' or '/>', not with '%s'"
 msgstr ""
 
-#: gconf/gconf-glib.c:1657
+#: gconf/gconf-glib.c:1655
 msgid ""
 "Element ended just after '/', no '>' seen; empty elements should end with "
 "'/>'"
 msgstr ""
 
-#: gconf/gconf-glib.c:1696
+#: gconf/gconf-glib.c:1694
 msgid "Close tag not found at end of element"
 msgstr ""
 
-#: gconf/gconf-glib.c:1711
+#: gconf/gconf-glib.c:1709
 msgid "Close tag ends just after '<' character"
 msgstr ""
 
-#: gconf/gconf-glib.c:1725
+#: gconf/gconf-glib.c:1723
 msgid "Close tag should begin with '</', '/' character is missing"
 msgstr ""
 
-#: gconf/gconf-glib.c:1739
+#: gconf/gconf-glib.c:1737
 msgid "Close tag ends just after '/' character"
 msgstr ""
 
-#: gconf/gconf-glib.c:1774
+#: gconf/gconf-glib.c:1772
 msgid "Document ended just after element name in close tag, no '>' seen"
 msgstr ""
 
-#: gconf/gconf-glib.c:1790
+#: gconf/gconf-glib.c:1788
 msgid "Document ended just after close tag name, no '>' seen"
 msgstr ""
 
-#: gconf/gconf-glib.c:1809
+#: gconf/gconf-glib.c:1807
 #, c-format
 msgid "Close tag '%s' does not match opening tag '%s'"
 msgstr ""
 
-#: gconf/gconf-glib.c:2147
+#: gconf/gconf-glib.c:2145
 #, c-format
 msgid ""
 "Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
 "bad character was '%s'"
 msgstr ""
 
-#: gconf/gconf-glib.c:2204
+#: gconf/gconf-glib.c:2202
 msgid "The marked-up text contained nothing but whitespace."
 msgstr ""
 
-#: gconf/gconf-glib.c:10668
+#: gconf/gconf-glib.c:10666
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Не удалось открыть файл '%s': %s"
 
-#: gconf/gconf-glib.c:10685
+#: gconf/gconf-glib.c:10683
 #, c-format
 msgid "Error reading file '%s': %s"
 msgstr "Ошибка чтения файла \"%s\": %s"
 
-#: gconf/gconf-internals.c:100
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Нет '/' в ключе '%s'"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Не удалось интерпретировать CORBA-значение для элемента списка"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Некорректный тип для элемента списка в %s"
 
-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "От gconfd получен список с плохим типом списка"
 
-#: gconf/gconf-internals.c:798
+#: gconf/gconf-internals.c:445
+#, fuzzy
+msgid "Failed to convert object to IOR"
+msgstr "Не удалось синхронизировать один или более источников: %s"
+
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Не удалось открыть файл пути '%s': %s\n"
 
-#: gconf/gconf-internals.c:853
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Добавление источника '%s'\n"
 
-#: gconf/gconf-internals.c:865
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Ошибка чтения файла '%s': %s\n"
 
-#: gconf/gconf-internals.c:1307
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Ожидался список, получен %s"
 
-#: gconf/gconf-internals.c:1317
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Ожидался список %s, получен список %s"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Ожидалась пара, получен %s"
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Ожидалась пара (%s,%s), получена пара с неверными одним или обоими значениями"
 
-#: gconf/gconf-internals.c:1486
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Ожидалась пара типа (%s,%s) получена типа (%s,%s)"
 
-#: gconf/gconf-internals.c:1602
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Строка в кавычках не начинается с кавычки"
 
-#: gconf/gconf-internals.c:1664
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Строка в кавычках не заканчивается кавычкой"
 
-#: gconf/gconf-internals.c:2144 gconf/gconf.c:2780
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Ошибка CORBA: %s"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "попытка удалить не указанный в списке каталог объектов OAF"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "попытка добавить уже указанный в списке каталог OAF"
 
-#: gconf/gconf-internals.c:2176
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Ошибка анализа OAF: %s"
 
-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Неизвестная ошибка OAF"
 
-#: gconf/gconf-internals.c:2264
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Нет ior-файла в '%s'"
 
-#: gconf/gconf-internals.c:2295
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd заблокировал '%s' от некоторых других процессов"
 
-#: gconf/gconf-internals.c:2306
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Другая программа заблокировала '%s'"
 
-#: gconf/gconf-internals.c:2326
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "невозможно подключиться к ORB, чтобы проверить существующий gconfd"
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -693,172 +723,172 @@ msgstr ""
 "Удаление устаревшего lock \"%s\", так как IOR не может быть преобразован в "
 "ссылку на объект, IOR \"%s\""
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "Удаление устаревшего lock \"%s\", в связи с неудачным ping сервера: %s "
 
-#: gconf/gconf-internals.c:2358
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "Демон конфигурации GConf (gconfd) заблокировал '%s'"
 
-#: gconf/gconf-internals.c:2372
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "не удалось создать каталог '%s': %s"
 
-#: gconf/gconf-internals.c:2407
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Невозможно создать блокировку '%s': %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Невозможно записать в файл '%s': %s"
 
-#: gconf/gconf-internals.c:2486
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "Невозможно открыть файл блокировки \"%s\"; возможно он не наш: %s"
 
-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Поврежденный lock-файл \"%s\", удаляется"
 
-#: gconf/gconf-internals.c:2513
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
 
-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Не удалось освободить заблокированный каталог \"%s\": %s"
 
-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Не удалось закрыть источник \"%s\": %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Схема \"%s\" указанная для \"%s\" хранит значение не являющееся схемой"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Имя \"/\" может быть только каталогом, а не ключем"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Ошибка поиска метаинформации: %s"
 
-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Ошибка получения метаинформации: %s"
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 "Ключ \"%s\" указанный как схема для ключа \"%s\" в действительности хранит "
 "тип \"%s\""
 
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Не понято \"%s\" (ожидалось целое)"
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Целое \"%s\" слишком большое или маленькое"
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Не понято \"%s\" (ожидалось реальное число)"
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Не понято \"%s\" (ожидалось логическое значение)"
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "Не понято \"%s\" (список должен начинаться с \"[\")"
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "Не понято \"%s\" (список должен заканчиваться \"]\")"
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "Не понято \"%s\" (найдена лишняя \"]\" в списке)"
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "Не понято \"%s\" (лишний завершающий символ)"
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "Не понято \"%s\" (пара должна начинаться с \"(\")"
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "Не понято \"%s\" (пара должна заканчиваться \")\")"
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "Не понято \"%s\" (ошибочное число элементов)"
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "Не понято \"%s\" (лишняя \")\" найдена внутри пары)"
 
-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:300
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Сервер не смог распознать адрес '%s'"
 
-#: gconf/gconf.c:561
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "Невозможно добавить замечание к локальному источнику конфигурации"
 
-#: gconf/gconf.c:1626
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Сбой проверки сервера, ошибка CORBA: %s"
 
-#: gconf/gconf.c:1642
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -868,66 +898,66 @@ msgstr ""
 "oaf_activate_from_id() и не установил исключения объясняющего проблему. "
 "Пожалуйста, отправьте сообщение об ошибке OAF."
 
-#: gconf/gconf.c:1909
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Не удалось инициализировать GConf, выход\n"
 
-#: gconf/gconf.c:1946
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Должно начинаться с '/'"
 
-#: gconf/gconf.c:1968
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Не должно быть два '/' в строке"
 
-#: gconf/gconf.c:1970
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Недолжно быть точки после '/'"
 
-#: gconf/gconf.c:1991
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' недопустимый символ в названии ключа/каталога"
 
-#: gconf/gconf.c:2005
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Ключ/каталог не может заканчиваться на '/'"
 
-#: gconf/gconf.c:2252
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Сбой выключения конфигурационного сервера: %s"
 
-#: gconf/gconf.c:2313
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Ожидалось с плав.точкой, получено %s"
 
-#: gconf/gconf.c:2348
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Ожидалось целое, получено %s"
 
-#: gconf/gconf.c:2383
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Ожидалась строка, получено %s"
 
-#: gconf/gconf.c:2420
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Ожидалось булево, получено %s"
 
-#: gconf/gconf.c:2453
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Ожидалось schema, получено %s"
 
-#: gconf/gconfd.c:200
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Получен запрос на выключение"
 
-#: gconf/gconfd.c:232
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -935,7 +965,7 @@ msgstr ""
 "gconfd скомпилирован с отладкой; попробуйте загрузить gconf.path из "
 "исходного каталога"
 
-#: gconf/gconfd.c:250
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -943,7 +973,7 @@ msgstr ""
 "Файлы настроек не найдены, попытаемся использовать источник настроек по "
 "умолчанию \"%s\""
 
-#: gconf/gconfd.c:259
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -951,12 +981,12 @@ msgstr ""
 "Нет источников конфигурации в пути источников, конфигурация не была "
 "сохранена; отредактировать "
 
-#: gconf/gconfd.c:273
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Ошибка загрузки некоторых источников настроек: %s"
 
-#: gconf/gconfd.c:285
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -964,36 +994,37 @@ msgstr ""
 "Адрес конфигурации не был успешно распознан, невозможно загрузить или "
 "сохранить конфигурационные данные"
 
-#: gconf/gconfd.c:302
+#: gconf/gconfd.c:287
+#, fuzzy
 msgid ""
-"No writeable config sources successfully resolved, may not be able to save "
+"No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 "Не было успешно распознано записываемых источников конфигурации, возможно "
 "некоторые изменения конфигурации не удастся сохранить"
 
-#: gconf/gconfd.c:327 gconf/gconfd.c:339
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr "Получен сигнал %d, выключение."
 
-#: gconf/gconfd.c:344
-#, c-format
-msgid "Received signal %d, ignoring"
-msgstr "Получен сигнал %d, игнорируется."
+#: gconf/gconfd.c:329
+#, fuzzy, 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:390
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "запуск (версия %s), pid %u пользователь \"%s\""
 
-#: gconf/gconfd.c:394
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr "GConf был собран с включенной поддержкой отладки"
 
-#: gconf/gconfd.c:417
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -1001,103 +1032,152 @@ msgstr ""
 "Не удалось инициализировать Object Activation Framework: пожалуйста, "
 "отправьте сообщение об ошибке разработчикам OAF"
 
-#: gconf/gconfd.c:437
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Не удалось получить ссылку на объект для ConfigServer"
 
-#: gconf/gconfd.c:457
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:461
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Другой gconfd уже зарегистрирован с OAF; выход\n"
 
-#: gconf/gconfd.c:466
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Неизвестная ошибка при регистрации gconfd c OAF; выход\n"
 
-#: gconf/gconfd.c:487
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Завершение"
 
-#: gconf/gconfd.c:811
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Возврат исключения: %s"
 
-#: gconf/gconfd.c:869
+#: gconf/gconfd.c:885
 #, c-format
-msgid "Failed to create ~/.gconfd/saved_state to record gconfd's state: %s"
+msgid ""
+"Failed to open gconfd logfile; won't be able to restore listeners after "
+"gconfd shutdown (%s)"
 msgstr ""
-"Не удалось создать ~/.gconfd/saved_state чтобы записать состояние gconfd: %s"
 
-#: gconf/gconfd.c:876
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Failed to write ~/.gconfd/saved_state to record gconfd's state: %s"
-msgstr "Не удалась запись в ~/.gconfd/saved_state состояния gconfd: %s"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:905 gconf/gconfd.c:997
-#, c-format
-msgid "Didn't understand element '%s' in saved state file"
+#: gconf/gconfd.c:966
+#, fuzzy, c-format
+msgid "Could not open saved state file '%s' for writing: %s"
+msgstr "Не удалось открыть сохраненный файл состояния \"%s\": %s"
+
+#: gconf/gconfd.c:980
+#, fuzzy, c-format
+msgid "Could not write saved state file '%s' fd: %d: %s"
+msgstr "Не удалось восстановить сохраненное состояние из файла \"%s\": %s"
+
+#: gconf/gconfd.c:989
+#, fuzzy, c-format
+msgid "Failed to close new saved state file '%s': %s"
+msgstr "Не удалось открыть сохраненный файл состояния \"%s\": %s"
+
+#: gconf/gconfd.c:1003
+#, fuzzy, c-format
+msgid "Could not move aside old saved state file '%s': %s"
+msgstr "Не удалось открыть сохраненный файл состояния \"%s\": %s"
+
+#: gconf/gconfd.c:1013
+#, fuzzy, c-format
+msgid "Failed to move new save state file into place: %s"
+msgstr "Не удалось открыть сохраненный файл состояния \"%s\": %s"
+
+#: gconf/gconfd.c:1022
+#, fuzzy, c-format
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr "Не удалось восстановить сохраненное состояние из файла \"%s\": %s"
+
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
 msgstr "Не понято \"%s\" в файле сохраненного состояния"
 
-#: gconf/gconfd.c:916
-msgid "No location attribute on listener element in saved state file"
-msgstr ""
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Не удалось восстановить сохраненное состояние из файла \"%s\": %s"
+
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr "Не удалось восстановить сохраненное состояние из файла \"%s\": %s"
 
-#: gconf/gconfd.c:923
-msgid "No IOR attribute on listener element in saved state file"
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "Не удалось восстановить сохраненное состояние из файла \"%s\": %s"
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Не удалось восстановить сохраненное состояние из файла \"%s\": %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
 msgstr ""
 
-#: gconf/gconfd.c:930
-msgid "No connection ID attribute on listener element in saved state file"
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
 msgstr ""
 
-#: gconf/gconfd.c:1018
-msgid "Strange non-element node in saved state file"
-msgstr "Странный узел не являющийся элементом в файле сохраненного состояния"
+#: gconf/gconfd.c:1346
+#, c-format
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
 
-#: gconf/gconfd.c:1047
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Не удалось открыть сохраненный файл состояния \"%s\": %s"
 
-#: gconf/gconfd.c:1060
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Failed to restore saved state from file '%s': %s"
-msgstr "Не удалось восстановить сохраненное состояние из файла \"%s\": %s"
-
-#: gconf/gconfd.c:1069
-msgid "Root node of saved state file should be an element"
-msgstr "Корневой узел в файле сохраненного состояния должен быть элементом"
-
-#: gconf/gconfd.c:1079
-#, c-format
-msgid "Root node of saved state file should be 'gconfd_logfile', not '%s'"
+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 ""
-"Корневой узел в файле сохраненного состояния должен быть \"gconfd_logfile\", "
-"а не \"%s\""
 
-#: gconf/gconfd.c:1092
-msgid "Funny non-element node under <gconfd_logfile> in saved state file"
+#: gconf/gconfd.c:1481
+#, 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/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Параметры справки"
 
-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Установить значение для ключа и синхронизовать. Используется с --type."
 
-#: gconf/gconftool.c:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Печатать значение ключа на стандартный вывод."
 
-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -1105,35 +1185,35 @@ msgstr ""
 "Установить схему и синхронизовать. Используется с --short-desc, --long-desc, "
 "--owner и --type."
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Напечатать все пары ключ/значение в каталоге."
 
-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Напечатать все подкаталоги в каталоге."
 
-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "Напечатать все подкаталоги и строки каталога рекурсивно."
 
-#: gconf/gconftool.c:149
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Возвращает 0 если каталог существует и 2 если нет."
 
-#: gconf/gconftool.c:158
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Выключить gconfd. НЕ ИСПОЛЬЗУЙТЕ ЭТОТ ПАРАМЕТР БЕЗ ВЕСКИХ ПРИЧИН."
 
-#: gconf/gconftool.c:167
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Возвращает 0 если gconfd запущен и 2 если нет."
 
-#: gconf/gconftool.c:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1141,7 +1221,7 @@ msgstr ""
 "Запускает конфигурационный сервер (gconfd). (Обычно случается автоматически "
 "когда надо.)"
 
-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1149,69 +1229,69 @@ msgstr ""
 "Указать тип устанавливаемого значения или тип значения описывается схемой. "
 "Годятся уникальные аббревиатуры."
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr "целое|булево|плав.|строка|список|пара"
 
-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "целое|булево|плав.|строка"
 
-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Указать краткое (полстроки) описание для schema."
 
-#: gconf/gconftool.c:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "ОПИСАНИЕ"
 
-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "Указать описание в несколько строк для schema."
 
-#: gconf/gconftool.c:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "Указать владельца схемы"
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "ВЛАДЕЛЕЦ"
 
-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "Указать устанавливаемый файл схемы"
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "ИМЯ ФАЙЛА"
 
-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "ИСТОЧНИК"
 
-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1219,26 +1299,26 @@ msgstr ""
 "Доступ к базе данных конфигурации напрямую, минуя сервер. Требует, чтобы "
 "gconfd не был запущен."
 
-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
 "config source or set to the empty string to use the default."
 msgstr ""
 
-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1248,23 +1328,23 @@ msgstr ""
 "Запустите '%s --help' чтобы увидеть полный список доступных параметров "
 "команндной строки.\n"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "Невозможно использовать --all-pairs вместе с --get или --set\n"
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Невозможно использовать --all-dirs вместе с --get или --set\n"
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1272,7 +1352,7 @@ msgstr ""
 "--recursive-list не должен использоваться с --get, --set, --unset, "
 "--all-pairs, или --all-dirs\n"
 
-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1280,58 +1360,58 @@ msgstr ""
 "--set_schema не должен использоваться с --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
 
-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Тип значения имеет смысл только при установке значения\n"
 
-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "Надо указывать тип при установке значения\n"
 
-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "параметр --dir-exists должен использоваться сам.\n"
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "параметр --install-schema-file должен использоваться сам.\n"
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "параметр --makefile-install-rule должен использоваться сам.\n"
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "параметр --break-key должен быть использован сам.\n"
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "параметр --break-directory должен быть использован сам.\n"
 
-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "Вы должны указать источник конфигурации с помощью параметра --config-source, "
 "если используете параметр --direct\n"
 
-#: gconf/gconftool.c:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Не удалось инициализировать GConf: %s\n"
 
-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Необходимо установить переменную окружения GCONF_CONFIG_SOURCE\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1339,317 +1419,317 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Сбой доступа к источникам конфигурации: %s\n"
 
-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Ошибка выключения: %s\n"
 
-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Требуется указать один или более каталогов для рекурсивного списка.\n"
 
-#: gconf/gconftool.c:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr ""
 
-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(не установлено значение)"
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Тип: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Тип списка: %s\n"
 
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Тип Car: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Тип Cdr: %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Владелец: %s\n"
 
-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Краткое описание: %s\n"
 
-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Полное описание: %s\n"
 
-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Не установлено значение для '%s'\n"
 
-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Не удалось получить значение для '%s': %s\n"
 
-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Непонятный тип '%s'\n"
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Не установлено значение для ключа: '%s'\n"
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Невозможно установить schema как значение\n"
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Ошибка: %s\n"
 
-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Ошибка установки значения: %s"
 
-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Ошибка синхронизации: %s"
 
-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1201
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1259
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Требуется указать один или более каталогов для получения из них "
 "подкаталогов.\n"
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Ошибка перечисления каталогов: %s\n"
 
-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: неподходящий или ошибочный тип для схемы (%s)\n"
 
-#: gconf/gconftool.c:1378
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: неподходящий или ошибочный тип списка для схемы (%s)\n"
 
-#: gconf/gconftool.c:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: не удалось разобрать исходное значение '%s' для схемы (%s)\n"
 
-#: gconf/gconftool.c:1407
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: неподходящий или ошибочный тип CAR или CDR для схемы (%s)\n"
 
-#: gconf/gconftool.c:1432
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: Вы не можете установить значение по умолчанию для схемы\n"
 
-#: gconf/gconftool.c:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: внутренняя ошибка gconftool, неизвестный GConfValueType\n"
 
-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "ВНИМАНИЕ: пустой узел <applyto>"
 
-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ВНИМАНИЕ: узел <%s> не понят под <schema>\n"
 
-#: gconf/gconftool.c:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "ВНИМАНИЕ: Неправильный узел <%s> в узле <locale>\n"
 
-#: gconf/gconftool.c:1757
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Установлена схема \"%s\" для locale \"%s\"\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Присоединена схема \"%s\" к ключу \"%s\"\n"
 
-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "У вас должна быть хотя бы одна запись <locale> в <schema>\n"
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Не удалось открыть `%s': %s\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Документ `%s' пуст?\n"
 
-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Документ `%s' не имеет верхнего уровня узла <gconfschemafile>\n"
 
-#: gconf/gconftool.c:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: узел <%s> ниже <gconfschemafile> не был понят\n"
 
-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Ошибка синхронизации конфигурационных данных: %s"
 
-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Необходимо указать несколько файлов схемы для установки\n"
 
-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1658,16 +1738,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "Необходимо указать некоторые ключи для прерывания\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1676,11 +1756,11 @@ msgstr ""
 "Попытка прервать ваше приложение установкой плохих значений для ключа:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "Необходимо указать некоторые каталоги для прерывания\n"
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1696,7 +1776,29 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Предупреждение GConf: Ошибка перечисления пар в \"%s\": %s"
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Ожидалось \"%s\" получено \"%s\" для ключа %s"
+
+#~ msgid "Received signal %d, ignoring"
+#~ msgstr "Получен сигнал %d, игнорируется."
+
+#~ msgid "Failed to create ~/.gconfd/saved_state to record gconfd's state: %s"
+#~ msgstr ""
+#~ "Не удалось создать ~/.gconfd/saved_state чтобы записать состояние gconfd: %s"
+
+#~ msgid "Failed to write ~/.gconfd/saved_state to record gconfd's state: %s"
+#~ msgstr "Не удалась запись в ~/.gconfd/saved_state состояния gconfd: %s"
+
+#~ msgid "Strange non-element node in saved state file"
+#~ msgstr ""
+#~ "Странный узел не являющийся элементом в файле сохраненного состояния"
+
+#~ msgid "Root node of saved state file should be an element"
+#~ msgstr "Корневой узел в файле сохраненного состояния должен быть элементом"
+
+#~ msgid "Root node of saved state file should be 'gconfd_logfile', not '%s'"
+#~ msgstr ""
+#~ "Корневой узел в файле сохраненного состояния должен быть \"gconfd_logfile\", "
+#~ "а не \"%s\""
diff --git a/po/sv.po b/po/sv.po
index f3239a00..5019cd4f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf VERSION\n"
-"POT-Creation-Date: 2000-09-12 17:12+0200\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-09-12 23:19+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -323,7 +323,7 @@ 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:838 gconf/gconf-sources.c:1190
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fel vid hДmtning av vДrde fЖr \"%s\": %s"
@@ -816,21 +816,21 @@ msgstr ""
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Misslyckades med att slДppa lЕset pЕ katalogen \"%s\": %s"
 
-#: gconf/gconf-sources.c:319
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Misslyckades med att lДsa kДllkoden \"%s\": %s"
 
-#: gconf/gconf-sources.c:491
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Schemat \"%s\" som Дr angivet fЖr \"%s\" lagrar ett icke-schema-vДrde"
 
-#: gconf/gconf-sources.c:540
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Namnet \"/\" kan bara vara en katalog, inte en nyckel"
 
-#: gconf/gconf-sources.c:569
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -839,17 +839,17 @@ msgstr ""
 "VДrdet fЖr \"%s\" Дr satt i en skrivskyddad kДlla i bЖrjan pЕ din "
 "konfigurationssЖkvДg."
 
-#: gconf/gconf-sources.c:1064
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Fel vid sЖkning av metainformation: %s"
 
-#: gconf/gconf-sources.c:1129
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Fel vid hДmtning av metainformation: %s"
 
-#: gconf/gconf-sources.c:1153
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -1154,8 +1154,8 @@ msgstr "Misslyckades med att flytta den nya tillstЕndsfilen pЕ plats: %s"
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
-"Misslyckades med att Еterskapa den ursprungliga tillstЕndsfilen som "
-"hade flyttats till \"%s\": %s"
+"Misslyckades med att Еterskapa den ursprungliga tillstЕndsfilen som hade "
+"flyttats till \"%s\": %s"
 
 #: gconf/gconfd.c:1110
 #, c-format
@@ -1529,183 +1529,183 @@ msgstr "Misslyckades med att lista par i \"%s\": %s"
 msgid "(no value set)"
 msgstr "(inget vДrde satt)"
 
-#: gconf/gconftool.c:835
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Misslyckades med att starta konfigurationsservern (gconfd): %s\n"
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "MЕste ange en nyckel eller flera att fЕ\n"
 
-#: gconf/gconftool.c:883
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:884
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listtyp: %s\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car-typ: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr-typ: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "дgare: %s\n"
 
-#: gconf/gconftool.c:887 gconf/gconftool.c:888 gconf/gconftool.c:889
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "NollstДll"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kort beskrivning: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "LЕng beskrivning: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Inget vДrde satt fЖr \"%s\"\n"
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:904
 #, 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:945 gconf/gconftool.c:957
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "FЖrstЕr inte typen \"%s\"\n"
 
-#: gconf/gconftool.c:969
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Du mЕste ange alternativa nycklar/vДrden som argument\n"
 
-#: gconf/gconftool.c:989
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Inget vДrde satt fЖr nyckel: \"%s\"\n"
 
-#: gconf/gconftool.c:1017
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Kan inte sДtta schema som vДrde\n"
 
-#: gconf/gconftool.c:1027
+#: gconf/gconftool.c:1029
 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:1041
+#: gconf/gconftool.c:1043
 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:1056
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fel: %s\n"
 
-#: gconf/gconftool.c:1069 gconf/gconftool.c:1202
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Fel nДr vДrde sattes: %s"
 
-#: gconf/gconftool.c:1087 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Fel vid synkronisering: %s"
 
-#: gconf/gconftool.c:1105
+#: gconf/gconftool.c:1107
 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:1147
+#: gconf/gconftool.c:1149
 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:1167
+#: gconf/gconftool.c:1169
 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:1187
+#: gconf/gconftool.c:1189
 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:1231
+#: gconf/gconftool.c:1233
 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:1245
+#: gconf/gconftool.c:1247
 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:1256
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Fel vid nollstДllning av \"%s\": %s\n"
 
-#: gconf/gconftool.c:1279
+#: gconf/gconftool.c:1281
 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:1313
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Fel vid listning av kataloger: %s\n"
 
-#: gconf/gconftool.c:1355
+#: gconf/gconftool.c:1357
 #, 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:1364
+#: gconf/gconftool.c:1366
 #, 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:1375 gconf/gconftool.c:1405 gconf/gconftool.c:1434
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, 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:1393
+#: gconf/gconftool.c:1395
 #, 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:1418
+#: gconf/gconftool.c:1420
 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:1447
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "VARNING: internt fel i gconftool, okДnd GConfValueType\n"
 
-#: gconf/gconftool.c:1495 gconf/gconftool.c:1516 gconf/gconftool.c:1537
-#: gconf/gconftool.c:1558
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "VARNING: misslyckades med att tolka typnamnet \"%s\"\n"
 
-#: gconf/gconftool.c:1512
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1713,39 +1713,39 @@ msgstr ""
 "VARNING: list_type kan bara vara int, float, string eller bool och inte "
 "\"%s\"\n"
 
-#: gconf/gconftool.c:1533
+#: gconf/gconftool.c:1535
 #, 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:1554
+#: gconf/gconftool.c:1556
 #, 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:1581
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "VARNING: tom <applyto>-nod"
 
-#: gconf/gconftool.c:1584 gconf/gconftool.c:1847
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, 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:1594
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "VARNING: ingen nyckel angiven fЖr schema\n"
 
-#: gconf/gconftool.c:1627
+#: gconf/gconftool.c:1629
 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:1633
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1753,53 +1753,53 @@ msgstr ""
 "VARNING: flera <locale>-noder fЖr platsen \"%s\", ignorerar allt fЖregЕende "
 "fЖrst\n"
 
-#: gconf/gconftool.c:1714
+#: gconf/gconftool.c:1716
 #, 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:1743
+#: gconf/gconftool.c:1745
 #, 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:1751
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Installerade schemat \"%s\" fЖr lokalen \"%s\"\n"
 
-#: gconf/gconftool.c:1773
+#: gconf/gconftool.c:1775
 #, 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:1781
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Kopplade ihop schemat \"%s\" med nyckeln \"%s\"\n"
 
-#: gconf/gconftool.c:1860
+#: gconf/gconftool.c:1862
 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:1889
+#: gconf/gconftool.c:1891
 #, 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:1911
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Misslyckades med att Жppna \"%s\": %s\n"
 
-#: gconf/gconftool.c:1918
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument \"%s\" tomt?\n"
 
-#: gconf/gconftool.c:1930
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1808,26 +1808,26 @@ msgstr ""
 "Dokumentet \"%s\" har fel typ av rotnod (<%s>, borde vara "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1943
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokumentet \"%s\" har ingen toppnivЕ <gconfschemafil> nod\n"
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "VARNING: nod <%s> nedan <gconfschemafile> kan inte fЖrstЕs\n"
 
-#: gconf/gconftool.c:1968 gconf/gconftool.c:2000
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Fel vid synkronisering av konfigurationsdata: %s"
 
-#: gconf/gconftool.c:1984
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "MЕste ange nЕgon schemafil att installera\n"
 
-#: gconf/gconftool.c:2021
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1836,16 +1836,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2041
+#: gconf/gconftool.c:2043
 #, 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:2167
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "MЕste ange nЕgra nycklar att knДcka\n"
 
-#: gconf/gconftool.c:2173
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1855,11 +1855,11 @@ msgstr ""
 "nyckeln:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2191
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "MЕste ange nЕgra kataloger att knДcka\n"
 
-#: gconf/gconftool.c:2210
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1875,7 +1875,7 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf-varning: misslyckades med att lista par i \"%s\": %s"
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "FЖrvДntade \"%s\", fick \"%s\" fЖr nyckeln \"%s\""
diff --git a/po/tr.po b/po/tr.po
index ac040923..7e18b2fe 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 0.7\n"
-"POT-Creation-Date: 2000-08-19 16:51-0400\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-08-04 15:04+0200\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -13,45 +13,45 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "XML modЭlЭlЭnЭ ГЩkarЩyorum ."
 
-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "`%s' adresinde XML ana dizinini bulamadЩm ."
 
-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "`%s' dizinini yaratamadЩm : %s"
 
-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr "`%s' adresinde XML ana dizininden okuyamadЩm ve yazamadЩm ."
 
-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "%s kЖkЭndeki XML kaynak dizin/dosya eriЧim haklarЩ : %o/%o"
 
-#: backends/xml-backend.c:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr "XML modЭlЭnЭ ekliyorum"
 
-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "`%s' XML dizininde kilitleme yapamadЩm : %s"
 
-#: backends/xml-cache.c:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 "XML modЭlЭnЭ kapatЩrken eЧitleЧtirilmemiЧ dizin silimleri geriye kalЩyor"
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -60,7 +60,7 @@ msgstr ""
 "XML modЭlЭnЭn arabelleПinden `%s' dizinini silemiyorum, zira bu dizin disk'e "
 "baЧarЩyla eЧitleЧtirilmemiЧ"
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -69,84 +69,84 @@ msgstr ""
 "%u birim arabellekte geriye kaldЩ. %u saniyeden eski eЧitleЧtirilmiЧ "
 "birimlersilinmiЧtir"
 
-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "`%s''yi stat edemedim :%s"
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "XML dosyasЩ `%s' bir dizindir"
 
-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "`%s''yi silemedim : %s"
 
-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "`%s' dosyasЩnЩ yazarken hata oldu : %s"
 
-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "`%s''yi yeniden `%s''ye adlandЩramadЩm : %s"
 
-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "`%s''yi `%s''den kaydedemedim : %s"
 
-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Esi dosya `%s''yi silerken hata oldu : %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:802
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "`%s''yi aГamadЩm : %s"
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "гift `%s' birimleri ( `%s''de ), geГiyorum"
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "`%s' XML dosyasЩnda isimsiz bir birim var, geГiyorum"
 
-#: backends/xml-dir.c:975
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "`%s' XML dosyasЩndaki birinci birim <entry> deПildir, geГiyorum"
 
-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "`%s' dosyasЩnЩ yaratЩrken hata oldu : %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2455
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "`%s' dosyasЩnЩ kapatЩrken hata oldu : %s"
 
 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "`%s' adlЩ XML birimini geГiyorum : %s"
 
-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2159
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "`%s' Чekil ismini atlatЩyorum, zira geГersizdir : %s"
@@ -154,288 +154,572 @@ msgstr "`%s' Чekil ismini atlatЩyorum, zira geГersizdir : %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "`%s' XML birimini geГiyorum, imkani Чekil ismi %s haricen"
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr ""
 "<local_scheme> bir yerelleЧme ayarlarЩyla alakasЩ olmayan bir yerde buldum"
 
-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "чekil iГin ЖnayarlЩ deПer `%s''yi okurken hata oldu"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "<%s> birimi iГin \"type\" ЖzelliПi belirtilmemiЧ"
 
-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 "Bir birimin bilinmeyen bir \"type\" ЖzelliПi `%s''yi barЩndЩrЩyor, geГiyorum"
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "Birim iГin bir deПer yok"
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "XML liste birimdeki <%s> XML birimini anlayamadЩm"
 
-#: backends/xml-entry.c:1055
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Liste birimini tipi geГersizdir ( liste, eЧ yada bilinmeyen olabilir )"
 
-#: backends/xml-entry.c:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "KЖtЭ ЧekillendirilmiЧ XML birimi : %s"
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Liste yanlЩЧ yazЩlmЩЧ bir birim iГeriyor ( %s, amma %s olmasЩ gerek)"
 
-#: backends/xml-entry.c:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "XML eЧi iГin kЖtЭ ЧekillendirilmiЧ `car''Щ : %s"
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "XML dosyasЩnЩ okuyorum : liste ve eЧler beraberen bir eЧ'te olamaz"
 
-#: backends/xml-entry.c:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "XML eЧi iГin kЖtЭ ЧekillendirilmiЧ `cdr''Щ : %s"
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "XML eЧ birimindeki <%s> XML birimini anlayamadЩm"
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "XML eЧ birimi iГin `car' ve `cdr''leri bulamadЩm"
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "XML dosyasЩndaki deПer eЧleri iГin `cdr' eksik"
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "XML dosyasЩndaki deПer eЧleri iГin `car' eksik"
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "XML dosyasЩndaki deПer eЧleri iГin `cdr' ve `cdr' deПerleri eksik"
 
 #. -- end debug only
-#: gconf/gconf-backend.c:180
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "BЖyle bir dosya yoktur : `%s'\n"
 
-#: gconf/gconf-backend.c:208
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "hatalЩ adres `%s'"
 
-#: gconf/gconf-backend.c:233
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr "GConf dinamik modЭl desteПi olmadan ГalЩЧmaz ( -> gmodule ) "
 
-#: gconf/gconf-backend.c:243
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr "`%s' modЭlЭ aГЩlЩrken hata oldu : %s\n"
 
-#: gconf/gconf-backend.c:275
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr "`%s' iГin modЭl bulamadЩm"
 
-#: gconf/gconf-backend.c:312
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr "ModЭlЭ kapatamadЩm"
 
-#: gconf/gconf-error.c:39
+#: gconf/gconf-database.c:193
+msgid "Received invalid value in set request"
+msgstr "Veri oturtma isteПinde geГersiz deПer bulundu"
+
+#: gconf/gconf-database.c:201
+#, c-format
+msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
+msgstr "`%s' anahtarЩnЩn oturtma isteПindeki CORBA deПerine anlam veremedim"
+
+#: gconf/gconf-database.c:416
+msgid "Received request to drop all cached data"
+msgstr "Yekin arabelleklenmiЧ bilgileri silme isteПini aldЩm"
+
+#: gconf/gconf-database.c:430
+msgid "Received request to sync synchronously"
+msgstr "Anen eЧleЧtirme isteПini aldЩm"
+
+#: gconf/gconf-database.c:495
+#, fuzzy
+msgid "Fatal error: failed to get object reference for ConfigDatabase"
+msgstr "Ayarlama sunucusu iГin nesne baПЩnЩ alamadЩm"
+
+#: gconf/gconf-database.c:617
+#, c-format
+msgid "Failed to sync one or more sources: %s"
+msgstr "Bir yada daha fazla kaynaklarЩ eЧleЧtirirken hata oldu : %s"
+
+#. 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:699
+#, c-format
+msgid ""
+"Failed to log addition of listener (%s); will not be able to restore this "
+"listener on gconfd restart, resulting in unreliable notification of "
+"configuration changes."
+msgstr ""
+
+#: gconf/gconf-database.c:724
+#, c-format
+msgid "Listener ID %lu doesn't exist"
+msgstr ""
+
+#: gconf/gconf-database.c:733
+#, 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:838 gconf/gconf-sources.c:1189
+#, c-format
+msgid "Error getting value for `%s': %s"
+msgstr "`%s' iГin deПeri alЩrken hata oldu : %s"
+
+#: gconf/gconf-database.c:875
+#, c-format
+msgid "Error setting value for `%s': %s"
+msgstr "`%s' iГin deПeri oturturken hata oldu : %s"
+
+#: gconf/gconf-database.c:910
+#, c-format
+msgid "Error unsetting `%s': %s"
+msgstr "`%s''yi kaldЩramadЩm : %s"
+
+#: gconf/gconf-database.c:931
+#, c-format
+msgid "Error getting default value for `%s': %s"
+msgstr "`%s' iГin ЖnayarlЩ deПeri alЩrken hata oldu : %s"
+
+#: gconf/gconf-database.c:969
+#, c-format
+msgid "Error checking existence of `%s': %s"
+msgstr "`%s' varlЩПЩnЩ kontrol ederken hata oldu : %s"
+
+#: gconf/gconf-database.c:993
+#, c-format
+msgid "Error removing dir `%s': %s"
+msgstr "`%s' dizini silinirken hata oldu : %s"
+
+#: gconf/gconf-database.c:1019
+#, c-format
+msgid "Failed to get all entries in `%s': %s"
+msgstr "`%s''nin yekin birimlerini alamadЩm : %s"
+
+#: gconf/gconf-database.c:1045
+#, c-format
+msgid "Error listing dirs in `%s': %s"
+msgstr "`%s''deki dizinleri sЩralarken hata oldu : %s"
+
+#: gconf/gconf-database.c:1066
+#, c-format
+msgid "Error setting schema for `%s': %s"
+msgstr "`%s' iГin Чekli oturturken hata oldu : %s"
+
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr "BaЧarЩ"
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr "BaЧarЩsЩz"
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr "Ayarlama sunucusuna baПlanamadЩm"
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr "EriЧime izin verilmedi"
 
-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
 msgstr "Ayarlama kaynaklarЩnЩn yerini bulamadЩm"
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr "HatalЩ anahtar yada dizin adЩ"
 
-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 msgid "Parse error"
 msgstr "Tarama hatasЩ"
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr "Ayarlama kaynak tabanЩndaki bilgi bozuk"
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr "Tipler uymuyor"
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr "Dizin Эzerinde bir anahtar eylemi"
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr "Bir anahtar Эzerinde bir dizin eylemi"
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr "Varolan sЩrf-okunur deПerin ЭstЭne yazamam"
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr "Nesne гalЩЧtЩrma гerГevesi ( OAF ) hatasЩ"
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr "Ayarlama sunucususuz bu iЧlem mЭmkЭn deПildir"
 
-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 msgid "Failed to get a lock"
 msgstr "Kilit yaratamadЩm"
 
-#: gconf/gconf-internals.c:100
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "`%s' dosyasЩnЩ kapatЩrken hata oldu : %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "`%s' dizini silinirken hata oldu : %s"
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "`%s' anahtarЩnda '/' yoktur"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Liste birimi iГin bir CORBA deПerini belirleyemedim"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "%s'deki liste biriminin tipi yanlЩЧ"
 
-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "gconfd sunucu listesinden hatalЩ liste tipini geri aldЩm"
 
-#: gconf/gconf-internals.c:798
+#: gconf/gconf-internals.c:445
+#, fuzzy
+msgid "Failed to convert object to IOR"
+msgstr "Bir yada daha fazla kaynaklarЩ eЧleЧtirirken hata oldu : %s"
+
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Dizin dosyasЩ `%s''yi aГamadЩm : %s\n"
 
-#: gconf/gconf-internals.c:853
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "`%s' kaynaПЩnЩ ekliyorum\n"
 
-#: gconf/gconf-internals.c:865
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "`%s' dosyasЩnda okuma hatasЩ oldu\n"
 
-#: gconf/gconf-internals.c:1307
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Liste beklerken, %s aldЩm"
 
-#: gconf/gconf-internals.c:1317
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "%s lsitesini beklerken, %s lsitesini aldЩm"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "EЧlem beklerken, %s aldЩm"
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "%s,%s eЧlemini beklerken , bir yada iki deПerden yoksun bir eЧlem aldЩm"
 
-#: gconf/gconf-internals.c:1486
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "%s,%s eЧlemini beklerken , %s,%s eЧlemini aldЩm"
 
-#: gconf/gconf-internals.c:1602
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Sorgulama metni bir soru iЧaretiyle baЧlamЩyor"
 
-#: gconf/gconf-internals.c:1664
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Sorgulama metni bir soru iЧaretiyle bitmiyor"
 
-#: gconf/gconf-internals.c:2144 gconf/gconf.c:2643
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA hatasЩ : %s"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "listelenmemiЧ OAF nesne-dizinini silmeye uПraЧЩlЩyor"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "zaten listelenmiЧ OAF dizini eklenmeye uПraЧЩlЩyor"
 
-#: gconf/gconf-internals.c:2176
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF tarama hatasЩ : %s"
 
-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Bilinmeyen OAF hatasЩ"
 
-#: gconf/gconf-internals.c:2264
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "`%s' iГin ior dosyasЩ yok"
 
-#: gconf/gconf-internals.c:2295
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "baЧka bir iЧlemden gconfd sunucusu kilitleme aldЩ"
 
-#: gconf/gconf-internals.c:2306
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "`%s' kilitlemesi baЧka bir uygulamaya aittir"
 
-#: gconf/gconf-internals.c:2326
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "varolan bir gconfd'yi doПrulamak iГin ORB'e baПlanamadЩm"
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -444,42 +728,42 @@ msgstr ""
 "Sert kilit `%s''yi aГЩyorum , zira IOR bir nesne baПЩna dЖnЭЧtЭrЭlenemedi "
 ",IOR `%s'"
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr "Sert kilit `%s''yi aГЩyorum , zira sunucuya ulaЧma sorunlarЩ var : %s"
 
-#: gconf/gconf-internals.c:2358
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf ayarlama sunucusu ( gconfd ) `%s' kilidine sahip oldu "
 
-#: gconf/gconf-internals.c:2372
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "`%s' dizinini yaratamadЩm : %s"
 
-#: gconf/gconf-internals.c:2407
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "`%s' kilidini yaratamadЩm : %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "`%s' dosyasЩna yazamadЩm : %s"
 
-#: gconf/gconf-internals.c:2486
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "`%s' kilit dosyasЩnЩ aГamadЩm ; bizim olmadЩПЩnЩ zannederim : %s"
 
-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "HatalЩ kilit dosyasЩ `%s' ; o'nu siliyorum"
 
-#: gconf/gconf-internals.c:2513
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -488,26 +772,26 @@ msgstr ""
 "`%s' kilit dosyasЩnЩ yaratmadЩm ( \"yaratЩcЩ\" pid %u , bizim pid %u ; "
 "zannederim ki birisi bizim kilidi ГaldЩ "
 
-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "`%s' kilit dizinini aГamadЩm : %s"
 
-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "`%s' kaynaПЩnЩ yЭkleyemedim : %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "`%s' Чekli `%s' iГin bir Чekil deПeri olmayan bir deПer iГeriyor"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "'/' isimleri sadece bir dizin olabilir, kat'iyyen bir anahtar olamaz"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -515,108 +799,103 @@ msgid ""
 msgstr ""
 "`%s' iГin sЩrf-okunur kaynakta senin dizinlemenden Жnce bir deПeroturtulmuЧ"
 
-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Meta bilgileri bulamarken hata oldu : %s"
 
-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Meta bilgileri alЩrken hata oldu : %s"
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 "Anahtar `%s' `%s' anahtarЩ iГin Чekil olarak belirtilmiЧ ve gerГi `%s' "
 "tipini kaydediyor"
 
-#: gconf/gconf-sources.c:1205 gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr "`%s' iГin deПeri alЩrken hata oldu : %s"
-
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "`%s''yi anlayamadЩm ( onlu beklerdim )"
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "`%s' onlusu Гok fazla ufak yada bЭyЭk"
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "`%s''yi anlayamadЩm ( vasat bir rakam beklerdim )"
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "`%s''yi anlayamadЩm (true/false - doПru/yanlЩЧ beklerdim )"
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "`%s''yi anlayamadЩm (satЩr bir '[' ile baЧlamak zorunda)"
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "`%s''yi anlayamadЩm (satЩr bir ']' ile bitmek zorunda)"
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "`%s''yi anlayamadЩm (listenin iГinde bir eklenti ']' buldum)"
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "`%s''yi anlayamadЩm (iЧe yaramaz harfleri buldum)"
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "`%s''yi anlayamadЩm (Гift bir '(' ile baЧlamak zorunda)"
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "`%s''yi anlayamadЩm (Гift bir ')' ile baЧlamak zorunda)"
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "`%s''yi anlayamadЩm (eleman sayЩsЩ yanlЩЧ)"
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "`%s''yi anlayamadЩm (Гiftte eklenti bir ')' var)"
 
-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr "`%s' : %s"
 
-#: gconf/gconf.c:271
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "`%s' adresi ГЖzЭlenemedi"
 
-#: gconf/gconf.c:408
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "Yerel ayarlama kaynaПЩna tanЩmlamalarЩ ekleyemedim"
 
-#: gconf/gconf.c:1466
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Sunucunun doПrulanmasЩ baЧarЩsЩz oldu ( CORBA hatasЩ : %s )"
 
-#: gconf/gconf.c:1482
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -626,83 +905,66 @@ msgstr ""
 "oaf_activate_from_id()'den aldЩ ve bu hatayЩ anlatacak bir geri-veri de yok "
 ".LЭtfen bir OAF hata raporunu gЖnder ."
 
-#: gconf/gconf.c:1677
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConf'u baЧalatamadЩm , bitiriliyorum\n"
 
-#: gconf/gconf.c:1714
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Bir taksimle( '/' ) baЧlamak zorunda"
 
-#: gconf/gconf.c:1736
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Bir sЩrada iki taksim( '/' ) olamaz"
 
-#: gconf/gconf.c:1738
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Bir taksim( '/' )'den sonra bir sЭrЭklem( . ) olamaz"
 
-#: gconf/gconf.c:1759
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' anahtar/dizinler isimlerinde geГersiz bir harfdЩr"
 
-#: gconf/gconf.c:1773
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Anahtar/Dizin bir taksimle( '/' ) bitemez"
 
-#: gconf/gconf.c:2115
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Ayarlama sunucusunu kapatamadЩm : %s"
 
-#: gconf/gconf.c:2176
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Kayan sayЩ beklerken, %s aldЩm"
 
-#: gconf/gconf.c:2211
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "TamsayЩ beklerken, %s aldЩm"
 
-#: gconf/gconf.c:2246
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Metin beklerken, %s aldЩm"
 
-#: gconf/gconf.c:2283
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Boolean beklerken, %s aldЩm"
 
-#: gconf/gconf.c:2316
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "чekil beklerken, %s aldЩm"
 
-#: gconf/gconfd.c:511
-msgid "Received invalid value in set request"
-msgstr "Veri oturtma isteПinde geГersiz deПer bulundu"
-
-#: gconf/gconfd.c:519
-#, c-format
-msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
-msgstr "`%s' anahtarЩnЩn oturtma isteПindeki CORBA deПerine anlam veremedim"
-
-#: gconf/gconfd.c:789
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Kapanma isteПi alЩndЩ"
 
-#: gconf/gconfd.c:802
-msgid "Received request to drop all cached data"
-msgstr "Yekin arabelleklenmiЧ bilgileri silme isteПini aldЩm"
-
-#: gconf/gconfd.c:822
-msgid "Received request to sync synchronously"
-msgstr "Anen eЧleЧtirme isteПini aldЩm"
-
-#: gconf/gconfd.c:861
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -710,7 +972,7 @@ msgstr ""
 "gconfd sunucusu bilgilendirmeyle dentlendirilmiЧ ; kaynak dizininden "
 "gconf.path'ЩyЭklemeye uПraЧЩyorum"
 
-#: gconf/gconfd.c:879
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -718,7 +980,7 @@ msgstr ""
 "Ayarlama dosyalarЩ bulunamadЩ , ЖnayarlЩ ayarlama kaynaПЩ `%s''yi "
 "kullanЩyorum"
 
-#: gconf/gconfd.c:888
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -726,12 +988,12 @@ msgstr ""
 "Kaynak dizininde ayarlama kaynaklarЩ yok, ayarlar kaydedilmeyecektir ; "
 "deПiЧtir "
 
-#: gconf/gconfd.c:901
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "BazЩ ayarlama kaynaklarЩnЩ yЭklerken hata oldu : %s"
 
-#: gconf/gconfd.c:913
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -739,42 +1001,47 @@ msgstr ""
 "Ayarlama kaynaПЩ adresini baЧarЩyla ГЖzemedim, ayarlama bilgilerini "
 "yЭkleyememyada kaydedemem"
 
-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:287
+#, fuzzy
 msgid ""
-"No writeable config sources successfully resolved, may not be able to save "
+"No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 "YazЩlabilinir bir ayarlama kaynaПЩ adresini ГЖzemedim, bazЩ ayar "
 "deПiЧikliklerinikaydedemeyeceПim belli gibi"
 
-#: gconf/gconfd.c:955 gconf/gconfd.c:967
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr "%d sinyalini aldЩm, kapatЩlЩyorum ."
 
-#: gconf/gconfd.c:972
-#, c-format
-msgid "Received signal %d, ignoring"
-msgstr "%d sinyalini aldЩm, bunu atlatЩyorum"
+#: gconf/gconfd.c:329
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down cleanly"
+msgstr "%d sinyalini aldЩm, kapatЩlЩyorum ."
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:1013
-#, c-format
-msgid "starting, pid %u user `%s'"
+#: gconf/gconfd.c:376
+#, fuzzy, c-format
+msgid "starting (version %s), pid %u user '%s'"
 msgstr "baЧlЩyorum, pid %u kullanЩcЩ `%s'"
 
-#: gconf/gconfd.c:1036
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
 msgstr "OAF'Щ baЧlatamadЩm ; lЭtfen OAF yazarlarЩna bir hata raporunu ulaЧtЩr "
 
-#: gconf/gconfd.c:1056
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Ayarlama sunucusu iГin nesne baПЩnЩ alamadЩm"
 
-#: gconf/gconfd.c:1075
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -782,106 +1049,142 @@ msgstr ""
 "OAF bizim IID'mizi tanЩmЩyor ; bu hatalЩ bir yЖklemenin gЖstergesidir ; "
 "kayЩt olamЩyorum ; bitiriliyorum \n"
 
-#: gconf/gconfd.c:1079
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "BaЧka bir gconfd sunucusu OAF'a zaten kayЩtlЩ ; bitiriliyorum\n"
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr ""
 "gconfd sunucusunu OAF'a kaydederken bilinmeyen hata oldu ; bitiriliyorum\n"
 
-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "гЩkЩyorum"
 
-#: gconf/gconfd.c:1194
+#: gconf/gconfd.c:818
 #, c-format
-msgid "Failed to sync one or more sources: %s"
-msgstr "Bir yada daha fazla kaynaklarЩ eЧleЧtirirken hata oldu : %s"
+msgid "Returning exception: %s"
+msgstr "Hata geri-verisi : %s"
 
-#: gconf/gconfd.c:1561
+#: gconf/gconfd.c:885
 #, c-format
-msgid "Error setting value for `%s': %s"
-msgstr "`%s' iГin deПeri oturturken hata oldu : %s"
+msgid ""
+"Failed to open gconfd logfile; won't be able to restore listeners after "
+"gconfd shutdown (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:1593
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Error unsetting `%s': %s"
-msgstr "`%s''yi kaldЩramadЩm : %s"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:1614
-#, c-format
-msgid "Error getting default value for `%s': %s"
-msgstr "`%s' iГin ЖnayarlЩ deПeri alЩrken hata oldu : %s"
+#: gconf/gconfd.c:966
+#, fuzzy, c-format
+msgid "Could not open saved state file '%s' for writing: %s"
+msgstr "Dizin dosyasЩ `%s''yi aГamadЩm : %s\n"
 
-#: gconf/gconfd.c:1652
-#, c-format
-msgid "Error checking existence of `%s': %s"
-msgstr "`%s' varlЩПЩnЩ kontrol ederken hata oldu : %s"
+#: gconf/gconfd.c:980
+#, fuzzy, c-format
+msgid "Could not write saved state file '%s' fd: %d: %s"
+msgstr "`%s' dosyasЩna yazamadЩm : %s"
 
-#: gconf/gconfd.c:1676
-#, c-format
-msgid "Error removing dir `%s': %s"
-msgstr "`%s' dizini silinirken hata oldu : %s"
+#: gconf/gconfd.c:989
+#, fuzzy, c-format
+msgid "Failed to close new saved state file '%s': %s"
+msgstr "`%s' dosyasЩnЩ kapatЩrken hata oldu : %s"
 
-#: gconf/gconfd.c:1701
-#, c-format
-msgid "Failed to get all entries in `%s': %s"
-msgstr "`%s''nin yekin birimlerini alamadЩm : %s"
+#: gconf/gconfd.c:1003
+#, fuzzy, c-format
+msgid "Could not move aside old saved state file '%s': %s"
+msgstr "Dizin dosyasЩ `%s''yi aГamadЩm : %s\n"
 
-#: gconf/gconfd.c:1725
-#, c-format
-msgid "Error listing dirs in `%s': %s"
-msgstr "`%s''deki dizinleri sЩralarken hata oldu : %s"
+#: gconf/gconfd.c:1013
+#, fuzzy, c-format
+msgid "Failed to move new save state file into place: %s"
+msgstr "`%s' dosyasЩnЩ yaratЩrken hata oldu : %s"
 
-#: gconf/gconfd.c:1745
+#: gconf/gconfd.c:1022
 #, c-format
-msgid "Error setting schema for `%s': %s"
-msgstr "`%s' iГin Чekli oturturken hata oldu : %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr ""
 
-#: gconf/gconfd.c:1913
-msgid "Attempt to unregister invalid context ID"
-msgstr "GeГersiz ortam ID'sini ayЩrtmaya uПraЧtЩm"
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "`%s''yi anlayamadЩm (satЩr bir '[' ile baЧlamak zorunda)"
+
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
+msgstr ""
 
-#: gconf/gconfd.c:1920
+#: gconf/gconfd.c:1140
 #, c-format
-msgid "Bad context ID %lu, request ignored"
-msgstr "HatalЩ ortam ID'si %lu, istek gЖzardЩ edilecek"
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr ""
 
-#: gconf/gconfd.c:1928
+#: gconf/gconfd.c:1160
 #, c-format
-msgid "Already-unregistered context ID %lu, request ignored"
-msgstr "Ortam ID'si %lu zaten ayrЩlmЩЧ, istek gЖzardЩ edilecek"
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr ""
 
-#: gconf/gconfd.c:1953
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "`%s' dosyasЩnЩ yaratЩrken hata oldu : %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Attempt to use invalid context ID %lu"
-msgstr "GeГeresiz ortam ID'si %lu kullanЩlmaya uПraЧЩldЩ"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
+
+#: gconf/gconfd.c:1377
+#, fuzzy, c-format
+msgid "Unable to open saved state file '%s': %s"
+msgstr "`%s' dosyasЩnЩ yaratЩrken hata oldu : %s"
 
-#: gconf/gconfd.c:1963
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Attempt to use already-unregistered context ID %lu"
-msgstr "гoktan ayrЩlmЩЧ ortam ID'si %lu kullanЩlmaya uПraЧЩlЩyor"
+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:2123
+#: gconf/gconfd.c:1481
 #, c-format
-msgid "Returning exception: %s"
-msgstr "Hata geri-verisi : %s"
+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/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "YardЩm seГenekleri"
 
-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Bir anahtara bir deПer ver ve eЧleЧtir . --type'le kullanЩlЩr ."
 
-#: gconf/gconftool.c:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Normal dЩЧa-verime bir anahtarЩnЩn deПerini gЖster ."
 
-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -889,35 +1192,35 @@ msgstr ""
 "Bir Чekli oturt ve eЧleЧtir . --short-desc, --long-desc, --owner ve "
 "--type'leberaber kullanЩlЩr ."
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "Komuta satrЩndaki anahtarlarЩ kaldЩr"
 
-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Bir dizindeki anahtar/deПer eЧlerini gЖster ."
 
-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Bir dizindeki altdizinleri gЖster ."
 
-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "Bir dizinin yekin altdizinlerini ve birimlerini derinliПiyle gЖster ."
 
-#: gconf/gconftool.c:149
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Dizin varsa 0'Щ geri-ver, yoksa 2'yi geri-ver ."
 
-#: gconf/gconftool.c:158
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "gconfd'yi kapat . BU SEгNEпI IYI BIR NEDENIN OLMADAN KULLANMA ."
 
-#: gconf/gconftool.c:167
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "gconfd sunucusu ГalЩЧЩyorsa 0'Щ geri-ver, yoksa 2'yi geri-ver ."
 
-#: gconf/gconftool.c:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -925,7 +1228,7 @@ msgstr ""
 "Ayarlama sunucusunu ( gconfd ) baЧlattЩm. ( Bu zaten gerekli olunduПu zaman "
 "yapЩlЩyor . )"
 
-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -933,11 +1236,11 @@ msgstr ""
 "Oturtulacak deПerin tipini belirt, yada Чeklin anlattЩПЩ deПerin tipini "
 "anlat . Hemen anlaЧЩlacak kЩsaltmalar kabul edilir ."
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -945,11 +1248,11 @@ msgstr ""
 "Oturtulacak liste deПerinin tipini belirt, yada Чeklin anlattЩПЩ deПerin "
 "tipini anlat. Hemen anlaЧЩlacak kЩsaltmalar kabul edilir."
 
-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "int | bool | float | string"
 
-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -957,7 +1260,7 @@ msgstr ""
 "Oturtulacak car Гiftinin tipini belirt, yada Чeklin anlattЩПЩ deПerin tipini "
 "anlat. Hemen anlaЧЩlacak kЩsaltmalar kabul edilir."
 
-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -965,45 +1268,45 @@ msgstr ""
 "Oturtulacak cdr Гiftinin tipini belirt, yada Чeklin anlattЩПЩ deПerin tipini "
 "anlat. Hemen anlaЧЩlacak kЩsaltmalar kabul edilir."
 
-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "чekille iyi gЖzЭkecek tipte , kЩsa ve yarЩm-satЩr uzunluПunda bir anlatЩmЩ "
 "belirt ."
 
-#: gconf/gconftool.c:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "ANLATIM"
 
-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "чekile eklenecek tipte bir anlatЩmЩ ver ."
 
-#: gconf/gconftool.c:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "чeklin iyesini belirle"
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "IYE"
 
-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "YЭklenecek bir Чekil dosyasЩnЩ belirle"
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "DOSYA"
 
-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "жnayarlЩ dizin harici kullanЩlacak bir ayarlama kaynaПЩnЩ belirle"
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "KAYNAK"
 
-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1011,7 +1314,7 @@ msgstr ""
 "Ayarlama tabanЩna direkmen eriЧ ve sunucuyu geГ . gconfd'nin "
 "ГalЩЧmamasЩnЩgerektirir ."
 
-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1021,7 +1324,7 @@ msgstr ""
 "verisi ЖnayarlЩ ayar kaynaПЩ haricindeki bir yere gЖstermesi lazЩm veya "
 "ЖnayarlЩ yeri kullanmak iГin boЧ olmasЩ gerek ."
 
-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1029,7 +1332,7 @@ msgstr ""
 "Bir uygulamaya cef'a-testini uygula ( bu komutada belirlenen deПiЧik tipli "
 "deПiЧik deПerlerin oturtulup kaldЩrЩlmasЩyla oluyor ) ."
 
-#: gconf/gconftool.c:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1037,7 +1340,7 @@ msgstr ""
 "Bir uygulamaya cef'a-testini uygula ( bu komutada belirlenen dizinler "
 "iГindeki deПiЧik anahtarlarЩn oturtulup kaldЩrЩlmasЩyla oluyor ) ."
 
-#: gconf/gconftool.c:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1046,23 +1349,23 @@ msgstr ""
 "`%s' seГeneПendi hata var : %s .\n"
 "LЭtfen `%s --help' ile mЭmkЭn olan seГenekleri gЖrebilirsin .\n"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "AynЩ anda veri alЩp, oturtamam\n"
 
-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "AynЩ anda veri orturtup, alamam\n"
 
-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "--get veya --set'le beraber --all-pairs kullanЩlamaz\n"
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "--get veya --set'le beraber --all-dirs kullanЩlamaz\n"
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1070,7 +1373,7 @@ msgstr ""
 "--recursive-list --get, --set, --unset, --all-pairs, veya --all-dirs'le "
 "beraber kullanЩlamaz .\n"
 
-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1078,58 +1381,58 @@ msgstr ""
 "--set_schema --get, --set, --unset, --all-pairs veya --all-dirs'leberaber "
 "kullanЩlamaz .\n"
 
-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "DeПer tipi sadece deПeri oturturken Жnemlidir\n"
 
-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "Bir deПeri oturturken tipini belirlemek zorundasЩn\n"
 
-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "Sorgulama( ping ) seГeneПi kendiliПinden kullanЩlmak zorunda .\n"
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists kendiliПinden kullanЩlmak zorunda .\n"
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file kendiliПinden kullanЩlmak zorunda .\n"
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule kendiliПinden kullanЩlmak zorunda .\n"
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key kendiliПinden kullanЩlmak zorunda .\n"
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory kendiliПinden kullanЩlmak zorunda .\n"
 
-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "--direct'le --config-source kullanЩldЩПЩ zaman bir ayarlama kaynaПЩnЩ "
 "belirle \n"
 
-#: gconf/gconftool.c:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf'un baЧlamasЩ baЧarЩsЩz oldu : %s\n"
 
-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE verisi belirlenmiЧ olmak zorunda\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1143,250 +1446,250 @@ msgstr ""
 "doПaldЩr ) .\n"
 "( teoride hiГ bir fark olmamasЩ lazЩm ) .\n"
 
-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Ayarlama dosyalarЩna ulaЧЩrken hata oldu : %s\n"
 
-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "KapatЩlma hatasЩ : %s\n"
 
-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "Altdizinlerle gЖsterilecek bir dizini yada dizinleri belirlemek zorundasЩm \n"
 
-#: gconf/gconftool.c:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "`%s''deki eЧleri sЩralarken hata oldu : %s"
 
-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "( deПeri yok )"
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Ayarlama sunucusunu ( gconfd ) aГtЩramadЩm : %s\n"
 
-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "AlЩnacak anahtar(lar)Щ belirlemek zorundasЩm\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tip : %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Liste tipi : %s\n"
 
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car tipi : %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr tipi : %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Iye : %s\n"
 
-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "KaldЩr"
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "KЩsa anlatЩm : %s\n"
 
-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Uzun anlatЩm : %s\n"
 
-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "`%s' iГin bir deПer belirlenmemiЧ\n"
 
-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "`%s' iГin bir deПer alamadЩm : %s\n"
 
-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "`%s' tipini anlayamЩyorum\n"
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "ArgЭman olarak deПiЧken anahtar/deПerler vermek zorundasЩm\n"
 
-#: gconf/gconftool.c:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "`%s' anahtarЩ iГin orturtulacak bir deПer yok\n"
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Bir Чekli bir deПer olarak oturtamam\n"
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Bir listeyi belirtirken liste tipini belirtmek zorundasЩn\n"
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "Bir Гifti belirtirken car tipini ve cdr tipini belirtmek zorundasЩn\n"
 
-#: gconf/gconftool.c:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Hata : %s\n"
 
-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "DeПeri oturturken hata oldu : %s"
 
-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "EЧleЧirken hata oldu : %s"
 
-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Tek argЭman olarak bir anahtarЩ ( Чekli ) belirlemek zorundasЩn\n"
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Liste tipi bu temel tiplerinden oluЧmak zorunda : string, int, float yada "
 "bool\n"
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "гiftin car tipi bu temel tiplerinden oluЧmak zorunda : string, int, float "
 "yada bool\n"
 
-#: gconf/gconftool.c:1201
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "гiftin cdr tipi bu temel tiplerinden oluЧmak zorunda : string, int, float "
 "yada bool\n"
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Anahtar/deПer eЧlemlerini gЖsterilecek bir yada daha fazla dizinleri "
 "belirlemek zorundasЩn .\n"
 
-#: gconf/gconftool.c:1259
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "KaldЩrЩlacak bir yada daha fazla anahtar vermek zorundasЩn .\n"
 
-#: gconf/gconftool.c:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "`%s''yi kaldЩrЩrken hata oldu : %s\n"
 
-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Altdizinleri gЖsterilecek bir yada daha fazla dizinleri belirlemek "
 "zorundasЩn .\n"
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Dizinleri sЩralarken hata oldu : %s\n"
 
-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "IKAZ : %s Чekli iГin geГersiz yada eksik tip\n"
 
-#: gconf/gconftool.c:1378
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "IKAZ : %s Чekli iГin geГersiz yada eksik liste tipi\n"
 
-#: gconf/gconftool.c:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "IKAZ : Чekil %s iГin ЖnayarlЩ deПer `%s''yi taramakta hata oldu\n"
 
-#: gconf/gconftool.c:1407
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "IKAZ : %s Чekli iГin geГersiz yada eksik cdr tipi\n"
 
-#: gconf/gconftool.c:1432
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "IKAZ : Чekil iгin ЖnayarlЩ deПeri oturtamadЩm\n"
 
-#: gconf/gconftool.c:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "IKAZ : gconftool'd iГ bir hata oldu , bilinmeyen GConfValueType\n"
 
-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "IKAZ : tip ismi `%s''yi tarayamadЩm\n"
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "IKAZ : liste tipi int, float, string yada bool olabilir, fakat `%s' olamaz\n"
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "IKAZ : car tipi int, float, string yada bool olabilir, fakat `%s' olamaz\n"
 
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "IKAZ : cdr tipi int, float, string yada bool olabilir, fakat `%s' olamaz\n"
 
-#: gconf/gconftool.c:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "IKAZ : boЧ <applyto> noktasЩ"
 
-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "IKAZ : <schema>'nЩn altЩndaki <%s> noktasЩnЩ anlayamadЩm\n"
 
-#: gconf/gconftool.c:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "IKAZ : bu Чekil iГin anahtar belirlenmedi\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "IKAZ : <locale> noktasЩnЩn `name=\"locale\"' ЖzelleПi yok, atlatЩyorum\n"
 
-#: gconf/gconftool.c:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1394,53 +1697,53 @@ msgstr ""
 "IKAZ : `%s' yerelleЧmesi iГin Гoklu <locale> noktalarЩ var, eski ilkleri "
 "atlatЩyorum\n"
 
-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "IKAZ : <locale> noktasЩnda geГersiz <%s> noktasЩ\n"
 
-#: gconf/gconftool.c:1757
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 "IKAZ : `%s' Чekil dosyasЩnЩn `%s' yerelleЧmesinin yЭklemesinden hata var : "
 "%s\n"
 
-#: gconf/gconftool.c:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "`%s' Чeklinde `%s' yerelleЧmesi yЭklendi\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "IKAZ : `%s' Чekil dosyasЩnЩ `%s' anahtarЩyla baПdaЧtЩramadЩm : %s\n"
 
-#: gconf/gconftool.c:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "`%s' Чekilni `%s' anahtarЩna ekledim\n"
 
-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Bir <schema>'da en azЩndan bir <locale> noktasЩ olmak zorunda\n"
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "IKAZ : <schemalist>'in altЩndaki <%s> noktasЩ anlaЧЩlanamadЩ\n"
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "`%s''yi aГamadЩm : %s\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "`%s' dokЭmanЩ acaba boЧ mu ?\n"
 
-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1449,26 +1752,26 @@ msgstr ""
 "`%s' dokЭmanЩn ana noktasЩ (<%s>'in, <gconfschemafile> olmasЩ lazЩm ) "
 "yanlЩЧtЩr \n"
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "`%s' dokЭmanЩnЩn <gconfschemafile> ana noktasЩ yok \n"
 
-#: gconf/gconftool.c:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "IKAZ : <gconfschemafile> altЩndaki <%s> noktasЩ anlaЧЩladЩ\n"
 
-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Ayar bilgilerini eЧleЧtirirken hata oldu : %s"
 
-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "YЭklenecek Чekil dosyalarЩnЩ belirlemek zorundasЩm\n"
 
-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1477,16 +1780,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "KЩrma anahtarЩ %s'yi kaldЩramadЩm : %s\n"
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "KЩrЩlacak bazЩ anahtarlarЩ belirlemek zorundasЩn\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1495,11 +1798,11 @@ msgstr ""
 "UygulamanЩ bazЩ hatalЩ deПerleri oturtarak kЩrmaya uПraЧЩyorum : \n"
 "  %s\n"
 
-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "KЩrЩlacak bazЩ dizinleri belirlemek zorundasЩn\n"
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1515,7 +1818,25 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf ikazЩ : `%s''deki eЧleri sЩralarken hata oldu : %s"
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "%s beklerken, %s aldЩm, %s anahtarЩ iГin"
+
+#~ msgid "Received signal %d, ignoring"
+#~ msgstr "%d sinyalini aldЩm, bunu atlatЩyorum"
+
+#~ msgid "Attempt to unregister invalid context ID"
+#~ msgstr "GeГersiz ortam ID'sini ayЩrtmaya uПraЧtЩm"
+
+#~ msgid "Bad context ID %lu, request ignored"
+#~ msgstr "HatalЩ ortam ID'si %lu, istek gЖzardЩ edilecek"
+
+#~ msgid "Already-unregistered context ID %lu, request ignored"
+#~ msgstr "Ortam ID'si %lu zaten ayrЩlmЩЧ, istek gЖzardЩ edilecek"
+
+#~ msgid "Attempt to use invalid context ID %lu"
+#~ msgstr "GeГeresiz ortam ID'si %lu kullanЩlmaya uПraЧЩldЩ"
+
+#~ msgid "Attempt to use already-unregistered context ID %lu"
+#~ msgstr "гoktan ayrЩlmЩЧ ortam ID'si %lu kullanЩlmaya uПraЧЩlЩyor"
diff --git a/po/uk.po b/po/uk.po
index c6be8a12..b8dc0a87 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2000-08-19 16:51-0400\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 1999-12-29 12:36+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,136 +13,136 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: backends/xml-backend.c:247
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Вивантаження серверного модуля XML."
 
-#: backends/xml-backend.c:300
+#: backends/xml-backend.c:286
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Не вдалося в╕днайти кореневий каталог XML за адресою \"%s\""
 
-#: backends/xml-backend.c:315 backends/xml-dir.c:1047
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Неможливо створити каталог \"%s\": %s"
 
-#: backends/xml-backend.c:400
+#: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 "Неможливо зчитати з чи записати в кореневий катало XML за адресою \"%s\""
 
-#: backends/xml-backend.c:410
+#: backends/xml-backend.c:396
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/xml-backend.c:694
+#: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr "╤н╕ц╕ал╕зац╕я серверного модуля XML"
 
-#: backends/xml-backend.c:759
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr ""
 
-#: backends/xml-cache.c:134
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:243
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
 
-#: backends/xml-cache.c:268
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
 "%u seconds"
 msgstr ""
 
-#: backends/xml-dir.c:178
+#: backends/xml-dir.c:164
 #, fuzzy, c-format
 msgid "Could not stat `%s': %s"
 msgstr "Неможливо створити каталог \"%s\": %s"
 
-#: backends/xml-dir.c:188
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr ""
 
-#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, fuzzy, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Не вдалося в╕дкрити \"%s\": %s\n"
 
-#: backends/xml-dir.c:355
+#: backends/xml-dir.c:341
 #, fuzzy, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Не вдалося закрити файл \"%s\": %s"
 
-#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, fuzzy, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Не вдалося в╕дкрити \"%s\": %s\n"
 
-#: backends/xml-dir.c:387
+#: backends/xml-dir.c:373
 #, fuzzy, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Не вдалося отримати значення для \"%s\": %s\n"
 
-#: backends/xml-dir.c:399
+#: backends/xml-dir.c:385
 #, fuzzy, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Не вдалося закрити файл \"%s\": %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:802
+#: backends/xml-dir.c:788
 #, fuzzy, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Не вдалося в╕дкрити \"%s\": %s\n"
 
-#: backends/xml-dir.c:946
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:968
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:975
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1063
+#: backends/xml-dir.c:1049
 #, fuzzy, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Не вдалося закрити файл \"%s\": %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2455
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Не вдалося закрити файл \"%s\": %s"
 
 #. There was an error
-#: backends/xml-entry.c:162
+#: backends/xml-entry.c:148
 #, fuzzy, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Омилка отримання схеми для \"%s\": %s"
 
-#: backends/xml-entry.c:213 gconf/gconf-internals.c:2159
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:340
+#: backends/xml-entry.c:326
 #, fuzzy, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Омилка отримання схеми для \"%s\": %s"
@@ -150,569 +150,829 @@ msgstr "Омилка отримання схеми для \"%s\": %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:386
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 
-#: backends/xml-entry.c:713
+#: backends/xml-entry.c:699
 msgid "found <local_schema> with no locale setting"
 msgstr ""
 
-#: backends/xml-entry.c:735
+#: backends/xml-entry.c:721
 #, fuzzy, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Помилка отримання типового значення \"%s\": %s"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:958
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: backends/xml-entry.c:973
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1021 backends/xml-entry.c:1097
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1055
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1078
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1086
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1138
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1147 backends/xml-entry.c:1170
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1160
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1179
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1215
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
 #. -- end debug only
-#: gconf/gconf-backend.c:180
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "Нема╓ файлу \"%s\"\n"
 
-#: gconf/gconf-backend.c:208
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "Погана адреса - \"%s\""
 
-#: gconf/gconf-backend.c:233
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr "GConf не може працювати без п╕дтримки динам╕чних модул╕в (gmodule)"
 
-#: gconf/gconf-backend.c:243
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr "Помилка в╕дкриття модуля \"%s\": %s\n"
 
-#: gconf/gconf-backend.c:275
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr "Не вдалося знайти серверний модуль для \"%s\""
 
-#: gconf/gconf-backend.c:312
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr "Не вдалося в╕дключити сервер"
 
-#: gconf/gconf-error.c:39
+#: gconf/gconf-database.c:193
+msgid "Received invalid value in set request"
+msgstr "Отримано нев╕рне значення у запит╕"
+
+#: gconf/gconf-database.c:201
+#, c-format
+msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
+msgstr ""
+
+#: gconf/gconf-database.c:416
+msgid "Received request to drop all cached data"
+msgstr ""
+
+#: gconf/gconf-database.c:430
+msgid "Received request to sync synchronously"
+msgstr ""
+
+#: gconf/gconf-database.c:495
+msgid "Fatal error: failed to get object reference for ConfigDatabase"
+msgstr ""
+
+#: gconf/gconf-database.c:617
+#, c-format
+msgid "Failed to sync one or more sources: %s"
+msgstr ""
+
+#. 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:699
+#, c-format
+msgid ""
+"Failed to log addition of listener (%s); will not be able to restore this "
+"listener on gconfd restart, resulting in unreliable notification of "
+"configuration changes."
+msgstr ""
+
+#: gconf/gconf-database.c:724
+#, c-format
+msgid "Listener ID %lu doesn't exist"
+msgstr ""
+
+#: gconf/gconf-database.c:733
+#, 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:838 gconf/gconf-sources.c:1189
+#, c-format
+msgid "Error getting value for `%s': %s"
+msgstr "Помилка отримання значення \"%s\": %s"
+
+#: gconf/gconf-database.c:875
+#, c-format
+msgid "Error setting value for `%s': %s"
+msgstr "Помилка встановлення значення для \"%s\": %s"
+
+#: gconf/gconf-database.c:910
+#, c-format
+msgid "Error unsetting `%s': %s"
+msgstr "Помилка зняття значення \"%s\": %s"
+
+#: gconf/gconf-database.c:931
+#, c-format
+msgid "Error getting default value for `%s': %s"
+msgstr "Помилка отримання типового значення \"%s\": %s"
+
+#: gconf/gconf-database.c:969
+#, c-format
+msgid "Error checking existence of `%s': %s"
+msgstr "Помилка перев╕мрки наявност╕ \"%s\": %s"
+
+#: gconf/gconf-database.c:993
+#, c-format
+msgid "Error removing dir `%s': %s"
+msgstr "Помилка видалення каталогу \"%s\": %s"
+
+#: gconf/gconf-database.c:1019
+#, c-format
+msgid "Failed to get all entries in `%s': %s"
+msgstr "Невдалось отримати вс╕ елементи в \"%s\": %s"
+
+#: gconf/gconf-database.c:1045
+#, c-format
+msgid "Error listing dirs in `%s': %s"
+msgstr "Помилка отримання списку каталогу в \"%s\": %s"
+
+#: gconf/gconf-database.c:1066
+#, c-format
+msgid "Error setting schema for `%s': %s"
+msgstr "Омилка отримання схеми для \"%s\": %s"
+
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr ""
 
-#: gconf/gconf-error.c:40
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr ""
 
-#: gconf/gconf-error.c:41
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr ""
 
-#: gconf/gconf-error.c:42
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr ""
 
-#: gconf/gconf-error.c:43
+#: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
 msgstr ""
 
-#: gconf/gconf-error.c:44
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr ""
 
-#: gconf/gconf-error.c:45
+#: gconf/gconf-error.c:31
 #, fuzzy
 msgid "Parse error"
 msgstr "помилка анал╕зу OAF: %s"
 
-#: gconf/gconf-error.c:46
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr ""
 
-#: gconf/gconf-error.c:47
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr ""
 
-#: gconf/gconf-error.c:48
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr ""
 
-#: gconf/gconf-error.c:49
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr ""
 
-#: gconf/gconf-error.c:50
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr ""
 
-#: gconf/gconf-error.c:51
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr ""
 
-#: gconf/gconf-error.c:52
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr ""
 
-#: gconf/gconf-error.c:53
+#: gconf/gconf-error.c:39
 #, fuzzy
 msgid "Failed to get a lock"
 msgstr "Не вдалося отримати значення для \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:100
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Не вдалося закрити файл \"%s\": %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Помилка видалення каталогу \"%s\": %s"
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Нема╓ \"/\" в ключ╕ \"%s\""
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Не вдалося ╕нтерпретувати CORBA-значення елементу списку"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Некоректний тип елементу списку в %s"
 
-#: gconf/gconf-internals.c:279
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "В╕д gconfd отримано список з поганим типом списку"
 
-#: gconf/gconf-internals.c:798
+#: gconf/gconf-internals.c:445
+msgid "Failed to convert object to IOR"
+msgstr ""
+
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Не вдалося в╕дкрити файл шляху \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:853
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Додавання джерела \"%s\"\n"
 
-#: gconf/gconf-internals.c:865
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Помилка зчитування з файлу \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:1307
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Оч╕кувався список, отримано %s"
 
-#: gconf/gconf-internals.c:1317
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Очикувався список %s, отримано список %s"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Оч╕кувалася пара, отримано %s"
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Оч╕кувалась пара (%s,%s), отримано пару з нев╕рними одним або обома "
 "значеннями"
 
-#: gconf/gconf-internals.c:1486
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Оч╕кувалась пара типу (%s,%s) отримано типу (%s,%s)"
 
-#: gconf/gconf-internals.c:1602
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Рядок в лапках не почина╓ться з лапки"
 
-#: gconf/gconf-internals.c:1664
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Рядок в лапках не к╕нча╓ться лапкою"
 
-#: gconf/gconf-internals.c:2144 gconf/gconf.c:2643
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Помилка CORBA: %s"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "спроба видалити невказаний в списку каталог об'╓кт╕в OAF"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "спроба додати вже вказаний в списку каталог OAF"
 
-#: gconf/gconf-internals.c:2176
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "помилка анал╕зу OAF: %s"
 
-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Нев╕дома помилка OAF"
 
-#: gconf/gconf-internals.c:2264
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Нев╕рний файл ior в \"%s\""
 
-#: gconf/gconf-internals.c:2295
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd заблокував \"%s\" в╕д деяких ╕нших процес╕в"
 
-#: gconf/gconf-internals.c:2306
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "╤нша програма заблокувала \"%s\""
 
-#: gconf/gconf-internals.c:2326
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2358
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "Демон конф╕гурац╕╖ GConf (gconfd) заблокував \"%s\""
 
-#: gconf/gconf-internals.c:2372
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "не вдалося створити каталог \"%s\": %s"
 
-#: gconf/gconf-internals.c:2407
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Неможливо створити блокування \"%s\": %s"
 
-#: gconf/gconf-internals.c:2443
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Неможливо записати у файл \"%s\": %s"
 
-#: gconf/gconf-internals.c:2486
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2513
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
 
-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Не вдалося зв╕льнити заблокований каталог \"%s\": %s"
 
-#: gconf/gconf-sources.c:334
+#: gconf/gconf-sources.c:318
 #, fuzzy, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Не вдалося закрити файл \"%s\": %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1079
+#: gconf/gconf-sources.c:1063
 #, fuzzy, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Помилка отримання списку каталог╕в: %s\n"
 
-#: gconf/gconf-sources.c:1144
+#: gconf/gconf-sources.c:1128
 #, fuzzy, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Помилка встановлення значення: %s"
 
-#: gconf/gconf-sources.c:1168
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 
-#: gconf/gconf-sources.c:1205 gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr "Помилка отримання значення \"%s\": %s"
-
-#: gconf/gconf-value.c:96
+#: gconf/gconf-value.c:82
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: gconf/gconf-value.c:106
+#: gconf/gconf-value.c:92
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: gconf/gconf-value.c:127
+#: gconf/gconf-value.c:113
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: gconf/gconf-value.c:160
+#: gconf/gconf-value.c:146
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: gconf/gconf-value.c:228
+#: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr ""
 
-#: gconf/gconf-value.c:241
+#: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr ""
 
-#: gconf/gconf-value.c:292
+#: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 
-#: gconf/gconf-value.c:323 gconf/gconf-value.c:476
+#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr ""
 
-#: gconf/gconf-value.c:362
+#: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr ""
 
-#: gconf/gconf-value.c:375
+#: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr ""
 
-#: gconf/gconf-value.c:405 gconf/gconf-value.c:491
+#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr ""
 
-#: gconf/gconf-value.c:445
+#: gconf/gconf-value.c:431
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
 
-#: gconf/gconf.c:69
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:271
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Сервер не зм╕г розп╕знати адресу \"%s\""
 
-#: gconf/gconf.c:408
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1466
+#: gconf/gconf.c:1597
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1482
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
 "Please file an OAF bug report."
 msgstr ""
 
-#: gconf/gconf.c:1677
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати GConf: %s, вих╕д\n"
 
-#: gconf/gconf.c:1714
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Мусить починатися з \"/\""
 
-#: gconf/gconf.c:1736
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Не може бути два \"/\" в рядку"
 
-#: gconf/gconf.c:1738
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Не може бути крапки п╕сля \"/\""
 
-#: gconf/gconf.c:1759
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "\"%c\" - нев╕рний символ в назв╕ ключ╕в/каталог╕в"
 
-#: gconf/gconf.c:1773
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Ключ/каталог не може зак╕нчуватись слешем (/)"
 
-#: gconf/gconf.c:2115
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Невдалося в╕дключити сервер конф╕гурац╕╖: %s"
 
-#: gconf/gconf.c:2176
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Оч╕кувалось число з плаваючою точкою, отримано %s"
 
-#: gconf/gconf.c:2211
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Оч╕кувалось ц╕ле, отримано %s"
 
-#: gconf/gconf.c:2246
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Оч╕кувався рядок, отримано %s"
 
-#: gconf/gconf.c:2283
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Оч╕кувалось лог╕чне, отримано %s"
 
-#: gconf/gconf.c:2316
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Оч╕кувалась схема, отримано %s"
 
-#: gconf/gconfd.c:511
-msgid "Received invalid value in set request"
-msgstr "Отримано нев╕рне значення у запит╕"
-
-#: gconf/gconfd.c:519
-#, c-format
-msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
-msgstr ""
-
-#: gconf/gconfd.c:789
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Отримано запит на завершення роботи"
 
-#: gconf/gconfd.c:802
-msgid "Received request to drop all cached data"
-msgstr ""
-
-#: gconf/gconfd.c:822
-msgid "Received request to sync synchronously"
-msgstr ""
-
-#: gconf/gconfd.c:861
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:879
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:888
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:901
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:913
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -720,178 +980,221 @@ msgstr ""
 "Адресу конфигурац╕╖ не було усп╕шно розп╕знано, неможливо завантажити чи "
 "зберегти конф╕гурац╕йн╕ дан╕"
 
-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:287
+#, fuzzy
 msgid ""
-"No writeable config sources successfully resolved, may not be able to save "
+"No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
+"Адресу конфигурац╕╖ не було усп╕шно розп╕знано, неможливо завантажити чи "
+"зберегти конф╕гурац╕йн╕ дан╕"
 
-#: gconf/gconfd.c:955 gconf/gconfd.c:967
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
 msgid "Received signal %d, shutting down."
 msgstr "Отримано сигнал %d, завершення роботи."
 
-#: gconf/gconfd.c:972
-#, c-format
-msgid "Received signal %d, ignoring"
-msgstr "Отримано сиграл %d, про╕гноровано"
+#: gconf/gconfd.c:329
+#, fuzzy, 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:1013
-#, c-format
-msgid "starting, pid %u user `%s'"
+#: gconf/gconfd.c:376
+#, fuzzy, c-format
+msgid "starting (version %s), pid %u user '%s'"
 msgstr "запуск, процес %u користувач `%s'"
 
-#: gconf/gconfd.c:1036
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:1056
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:1075
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:1079
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "╤нший gconf вже заре╓стровано в OAF; вих╕д\n"
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Завершення"
 
-#: gconf/gconfd.c:1194
+#: gconf/gconfd.c:818
 #, c-format
-msgid "Failed to sync one or more sources: %s"
-msgstr ""
+msgid "Returning exception: %s"
+msgstr "Повертання виключення: %s"
 
-#: gconf/gconfd.c:1561
+#: gconf/gconfd.c:885
 #, c-format
-msgid "Error setting value for `%s': %s"
-msgstr "Помилка встановлення значення для \"%s\": %s"
+msgid ""
+"Failed to open gconfd logfile; won't be able to restore listeners after "
+"gconfd shutdown (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:1593
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Error unsetting `%s': %s"
-msgstr "Помилка зняття значення \"%s\": %s"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:1614
-#, c-format
-msgid "Error getting default value for `%s': %s"
-msgstr "Помилка отримання типового значення \"%s\": %s"
+#: gconf/gconfd.c:966
+#, fuzzy, c-format
+msgid "Could not open saved state file '%s' for writing: %s"
+msgstr "Не вдалося в╕дкрити файл шляху \"%s\": %s\n"
 
-#: gconf/gconfd.c:1652
-#, c-format
-msgid "Error checking existence of `%s': %s"
-msgstr "Помилка перев╕мрки наявност╕ \"%s\": %s"
+#: gconf/gconfd.c:980
+#, fuzzy, c-format
+msgid "Could not write saved state file '%s' fd: %d: %s"
+msgstr "Неможливо записати у файл \"%s\": %s"
 
-#: gconf/gconfd.c:1676
-#, c-format
-msgid "Error removing dir `%s': %s"
-msgstr "Помилка видалення каталогу \"%s\": %s"
+#: gconf/gconfd.c:989
+#, fuzzy, c-format
+msgid "Failed to close new saved state file '%s': %s"
+msgstr "Не вдалося закрити файл \"%s\": %s"
 
-#: gconf/gconfd.c:1701
-#, c-format
-msgid "Failed to get all entries in `%s': %s"
-msgstr "Невдалось отримати вс╕ елементи в \"%s\": %s"
+#: gconf/gconfd.c:1003
+#, fuzzy, c-format
+msgid "Could not move aside old saved state file '%s': %s"
+msgstr "Не вдалося в╕дкрити файл шляху \"%s\": %s\n"
 
-#: gconf/gconfd.c:1725
+#: gconf/gconfd.c:1013
+#, fuzzy, c-format
+msgid "Failed to move new save state file into place: %s"
+msgstr "Не вдалося закрити файл \"%s\": %s"
+
+#: gconf/gconfd.c:1022
 #, c-format
-msgid "Error listing dirs in `%s': %s"
-msgstr "Помилка отримання списку каталогу в \"%s\": %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr ""
 
-#: gconf/gconfd.c:1745
+#: gconf/gconfd.c:1110
 #, c-format
-msgid "Error setting schema for `%s': %s"
-msgstr "Омилка отримання схеми для \"%s\": %s"
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr ""
 
-#: gconf/gconfd.c:1913
-msgid "Attempt to unregister invalid context ID"
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
 msgstr ""
 
-#: gconf/gconfd.c:1920
+#: gconf/gconfd.c:1140
 #, c-format
-msgid "Bad context ID %lu, request ignored"
+msgid "Failed to unquote config source address from saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1928
+#: gconf/gconfd.c:1160
 #, c-format
-msgid "Already-unregistered context ID %lu, request ignored"
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr ""
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Не вдалося закрити файл \"%s\": %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
 msgstr ""
 
-#: gconf/gconfd.c:1953
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Attempt to use invalid context ID %lu"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1963
+#: gconf/gconfd.c:1377
+#, fuzzy, c-format
+msgid "Unable to open saved state file '%s': %s"
+msgstr "Не вдалося закрити файл \"%s\": %s"
+
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Attempt to use already-unregistered context ID %lu"
+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:2123
+#: gconf/gconfd.c:1481
 #, c-format
-msgid "Returning exception: %s"
-msgstr "Повертання виключення: %s"
+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/gconftool.c:76
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Параметри дов╕дки"
 
-#: gconf/gconftool.c:85
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:94
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Надрукувати значення ключа у стандартний вив╕д."
 
-#: gconf/gconftool.c:103
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
 msgstr ""
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "Зняти значення ключ╕в в командному рядку"
 
-#: gconf/gconftool.c:122
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Наздукувати ус╕ пари ключ╕/значення в каталоз╕."
 
-#: gconf/gconftool.c:131
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Надрукувати ус╕ п╕дкаталоги в каталоз╕."
 
-#: gconf/gconftool.c:140
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "Надрукувати вс╕ п╕дкаталоги та рядки каталогу рекурсивно."
 
-#: gconf/gconftool.c:149
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Повернути 0, якщо каталог ╕сну╓ -- 2, якщо н╕."
 
-#: gconf/gconftool.c:158
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Вимкнути gconfd. НЕ ВИКОРИСТОВУЙТЕ ЦЕЙ ПАРАМЕТР БЕЗ ВАГОМО╥ ПРИЧИНИ."
 
-#: gconf/gconftool.c:167
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Повернути 0, якщо gconfd викону╓ться -- 2, якщо н╕"
 
-#: gconf/gconftool.c:176
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -899,101 +1202,101 @@ msgstr ""
 "Запустити конф╕гурац╕йний сервер (gconfd). (Звичайно запуска╓ться "
 "автоматично, коли потр╕бно.)"
 
-#: gconf/gconftool.c:185
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:172
 #, fuzzy
 msgid "int|bool|float|string|list|pair"
 msgstr "ц╕ле|лог╕чне|плав|рядок"
 
-#: gconf/gconftool.c:194
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:195 gconf/gconftool.c:204 gconf/gconftool.c:213
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "ц╕ле|лог╕чне|плав|рядок"
 
-#: gconf/gconftool.c:203
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:212
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:221
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:222 gconf/gconftool.c:231
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "ОПИС"
 
-#: gconf/gconftool.c:230
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:239
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "Вказати власника схеми"
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "ВЛАСНИК"
 
-#: gconf/gconftool.c:248
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr ""
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "НАЗВАФАЙЛУ"
 
-#: gconf/gconftool.c:257
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "ДЖЕРЕЛО"
 
-#: gconf/gconftool.c:266
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:275
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
 "config source or set to the empty string to use the default."
 msgstr ""
 
-#: gconf/gconftool.c:284
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:293
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:340
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1002,23 +1305,23 @@ msgstr ""
 "Помилка в параметр╕ %s: %s.\n"
 "Виконайте \"%s --help\" щоб побачити повний список наявних параметр╕в.\n"
 
-#: gconf/gconftool.c:352
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:359
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:367
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "Не можна використати --all-pairs з --get чи --set\n"
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Не можна використати --all-dirs з --get чи --set\n"
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1026,7 +1329,7 @@ msgstr ""
 "--recursive-list не можне бути використано з --get, --set, --unset, "
 "--all-pairs, or --all-dirs\n"
 
-#: gconf/gconftool.c:395
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1034,56 +1337,56 @@ msgstr ""
 "--set_schema не можне бути використано з --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
 
-#: gconf/gconftool.c:401
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Тип значення ма╓ зм╕ст лише при встановленн╕ значення\n"
 
-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "Потр╕бно вказувати тип у встановленн╕ значення\n"
 
-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:471
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:477
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати GConf: %s\n"
 
-#: gconf/gconftool.c:502
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Необх╕дно встановити зм╕ну середовища GCONF_CONFIG_SOURCE\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:517
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1091,286 +1394,286 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:539
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:699
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Помилка вимкнення: %s\n"
 
-#: gconf/gconftool.c:744
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:778
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "Невдалося отримати список пар в \"%s\": %s"
 
-#: gconf/gconftool.c:796
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(не встановлено значення)"
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Невдалося розгалудити сервер конф╕гурац╕╖ (gconfd): %s\n"
 
-#: gconf/gconftool.c:863
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "Потр╕бно вказати ключ або ключ╕ для отримання\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Тип: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:886
 #, fuzzy, c-format
 msgid "List Type: %s\n"
 msgstr "Тип: %s\n"
 
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:887
 #, fuzzy, c-format
 msgid "Car Type: %s\n"
 msgstr "Тип: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:888
 #, fuzzy, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Тип: %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Власник: %s\n"
 
-#: gconf/gconftool.c:901 gconf/gconftool.c:902 gconf/gconftool.c:903
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Зняти значення"
 
-#: gconf/gconftool.c:902
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Короткий опис: %s\n"
 
-#: gconf/gconftool.c:903
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Довгий опис: %s\n"
 
-#: gconf/gconftool.c:912
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Не встановлено значення для \"%s\"\n"
 
-#: gconf/gconftool.c:916
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Не вдалося отримати значення для \"%s\": %s\n"
 
-#: gconf/gconftool.c:959 gconf/gconftool.c:971
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Незрозум╕лий тип \"%s\"\n"
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:1003
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Неми╓ значення для встановлення його ключу: \"%s\"\n"
 
-#: gconf/gconftool.c:1031
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1041
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1055
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1070
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Помилка: %s\n"
 
-#: gconf/gconftool.c:1083 gconf/gconftool.c:1216
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Помилка встановлення значення: %s"
 
-#: gconf/gconftool.c:1101 gconf/gconftool.c:1230
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Помилка синхрон╕зац╕╖: %s"
 
-#: gconf/gconftool.c:1119
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1201
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1245
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1259
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Потр╕бно вказати один або б╕льше ключ╕в для зняття значення.\n"
 
-#: gconf/gconftool.c:1270
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Помилка зняття значення \"%s\": %s\n"
 
-#: gconf/gconftool.c:1293
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Помилка отримання списку каталог╕в: %s\n"
 
-#: gconf/gconftool.c:1369
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "УВАГА: нев╕рний чи в╕дсутн╕й тип для схеми (%s)\n"
 
-#: gconf/gconftool.c:1378
+#: gconf/gconftool.c:1366
 #, fuzzy, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "УВАГА: нев╕рний чи в╕дсутн╕й тип для схеми (%s)\n"
 
-#: gconf/gconftool.c:1389 gconf/gconftool.c:1419 gconf/gconftool.c:1448
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1407
+#: gconf/gconftool.c:1395
 #, fuzzy, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "УВАГА: нев╕рний чи в╕дсутн╕й тип для схеми (%s)\n"
 
-#: gconf/gconftool.c:1432
+#: gconf/gconftool.c:1420
 #, fuzzy
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "УВАГА: не вказано ключ для схеми\n"
 
-#: gconf/gconftool.c:1461
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "УВАГА: внутр╕шня помилка gconftool, нев╕домий GConfValueType\n"
 
-#: gconf/gconftool.c:1509 gconf/gconftool.c:1530 gconf/gconftool.c:1551
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "УВАГА: не вдалося проанал╕зувати назву типу \"%s\"\n"
 
-#: gconf/gconftool.c:1526
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1595
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "УВАГА: порожн╕й вузол <applyto>"
 
-#: gconf/gconftool.c:1598 gconf/gconftool.c:1861
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "УВАГА: вузол <%s> незрозум╕лий п╕сля <schema>\n"
 
-#: gconf/gconftool.c:1608
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "УВАГА: не вказано ключ для схеми\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1647
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1728
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "УВАГА: Нев╕рний вузол <%s> у вузл╕ <locale>\n"
 
-#: gconf/gconftool.c:1757
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1765
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1795
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Долучено схему \"%s\" до ключа \"%s\"\n"
 
-#: gconf/gconftool.c:1874
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "УВАГА: вузол <%s> перед <schemalist> - незрозум╕лий\n"
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Не вдалося в╕дкрити \"%s\": %s\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Документ \"%s\" порожн╕й?\n"
 
-#: gconf/gconftool.c:1944
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1379,26 +1682,26 @@ msgstr ""
 "Документ \"%s\" ма╓ нев╕рний тип кор╕нного вузла (<%s>, ма╓ бути "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1957
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Документ \"%s\" нема╓ вузла верхнього р╕вня <gconfschemafile>\n"
 
-#: gconf/gconftool.c:1971
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "УВАГА: вузол <%s> перед <gconfschemafile> - незрозум╕лий\n"
 
-#: gconf/gconftool.c:1982 gconf/gconftool.c:2014
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Помилка синхрон╕зац╕╖ даних конф╕гурац╕╖: %s"
 
-#: gconf/gconftool.c:1998
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Потр╕бно вказати дек╕лька файл╕в схеми для ╕нсталяц╕╖\n"
 
-#: gconf/gconftool.c:2035
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1407,16 +1710,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2055
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "Потр╕бно вказати деяк╕ ключ╕ для переривання\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1425,11 +1728,11 @@ msgstr ""
 "Спроба перервати вашу програму встановленням поганих значень для ключа:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2205
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "Необх╕дно вказати деяк╕ каталоги для для переривання\n"
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1445,7 +1748,10 @@ msgstr ""
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Невдалося отримати список пар в \"%s\": %s"
 
-#: wrappers/gtk/gconf-client.c:990
+#: wrappers/gtk/gconf-client.c:985
 #, fuzzy, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Очикувався список %s, отримано список %s"
+
+#~ msgid "Received signal %d, ignoring"
+#~ msgstr "Отримано сиграл %d, про╕гноровано"
diff --git a/tests/testdirlist.c b/tests/testdirlist.c
index c9ab3a89..fbb9dcef 100644
--- a/tests/testdirlist.c
+++ b/tests/testdirlist.c
@@ -104,7 +104,7 @@ check_dir_listing(GConfEngine* conf)
   iter2 = entries;
   while (iter2 != NULL)
     {
-      if (strcmp(iter2->data, "testing") == 0)
+      if (strcmp(iter2->data, "/testing") == 0)
         got_it = TRUE;
       
       iter2 = g_slist_next(iter2);
@@ -124,7 +124,7 @@ check_dir_listing(GConfEngine* conf)
   iter2 = entries;
   while (iter2 != NULL)
     {
-      if (strcmp(iter2->data, "foo") == 0)
+      if (strcmp(iter2->data, "/testing/foo") == 0)
         got_it = TRUE;
       
       iter2 = g_slist_next(iter2);
@@ -147,9 +147,12 @@ check_dir_listing(GConfEngine* conf)
       iter = keys_in_foo;
       while (*iter)
         {
-          if (strcmp(iter2->data, *iter) == 0)
+          gchar *full = gconf_concat_key_and_dir ("/testing/foo", *iter);
+          if (strcmp(iter2->data, full) == 0)
             found[i] = TRUE;
-              
+
+          g_free (full);
+          
           ++i;
           ++iter;
         }