Release 0.6GCONF_0_6

18 files changed, 4188 insertions, 1371 deletions

diff --git a/configure.in b/configure.in
index e0e25368..c6792714 100644
--- a/configure.in
+++ b/configure.in
@@ -16,13 +16,13 @@ AC_ARG_PROGRAM
 AM_PROG_LIBTOOL
 
 dnl used to rename everything and support simultaneous installs.
-dnl not incremented for bugfix releases.
-MAJOR_VERSION=0.6
+dnl not incremented for bugfix or unstable releases.
+MAJOR_VERSION=1
 AC_SUBST(MAJOR_VERSION)
 
 dnl libtool versioning for guile wrapper
 
-SCMGCONF_CURRENT=1
+SCMGCONF_CURRENT=0
 SCMGCONF_REVISION=0
 SCMGCONF_AGE=0
 
@@ -32,7 +32,7 @@ AC_SUBST(SCMGCONF_AGE)
 
 dnl libtool versioning for GConfClient wrapper
 
-GCONFGTK_CURRENT=2
+GCONFGTK_CURRENT=0
 GCONFGTK_REVISION=0
 GCONFGTK_AGE=0
 
@@ -43,7 +43,7 @@ AC_SUBST(GCONFGTK_AGE)
 dnl libtool versioning for libgconf
 
 dnl increment if the interface has additions, changes, removals.
-GCONF_CURRENT=9
+GCONF_CURRENT=0
 
 dnl increment any time the source changes; set to 
 dnl  0 if you increment CURRENT
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 702fe17a..95e6c47f 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -5,9 +5,9 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
 
 EFENCE=
 
-lib_LTLIBRARIES = libgconf-0.6.la
+lib_LTLIBRARIES = libgconf-1.la
 
-bin_PROGRAMS = gconfd-0.6 gconftool-0.6
+bin_PROGRAMS = gconfd-1 gconftool-1
 
 CORBA_SOURCES = GConf-common.c GConf-skels.c GConf-stubs.c GConf.h
 
@@ -26,26 +26,26 @@ gconfinclude_HEADERS =     \
 
 ## This is broken I know, I'm going to break the server/client up and have a library later
 
-gconfd_0_6_SOURCES = \
+gconfd_1_SOURCES = \
 	gconf-sources.h		\
 	gconfd.c
 
-gconfd_0_6_LDADD = $(EFENCE) $(OAF_LIBS) $(GLIB_LIBS) libgconf-$(MAJOR_VERSION).la
+gconfd_1_LDADD = $(EFENCE) $(OAF_LIBS) $(GLIB_LIBS) libgconf-$(MAJOR_VERSION).la
 
 # gconf_testclient_SOURCES = \
 # 	testclient.c
 
 # gconf_testclient_LDADD = $(GLIB_LIBS) $(ORBIT_LIBS) libgconf-client.la
 
-gconftool_0_6_SOURCES = \
+gconftool_1_SOURCES = \
 	gconftool.c
 
-gconftool_0_6_LDADD = $(EFENCE) $(OAF_LIBS) $(GLIB_LIBS) $(ORBIT_LIBS) $(POPT_LIBS) $(XML_LIBS) libgconf-$(MAJOR_VERSION).la
+gconftool_1_LDADD = $(EFENCE) $(OAF_LIBS) $(GLIB_LIBS) $(ORBIT_LIBS) $(POPT_LIBS) $(XML_LIBS) libgconf-$(MAJOR_VERSION).la
 
 $(CORBA_SOURCES): $(srcdir)/GConf.idl
 	orbit-idl $(srcdir)/GConf.idl
 
-libgconf_0_6_la_SOURCES = \
+libgconf_1_la_SOURCES = \
 	gconf-internals.c	\
 	gconf-internals.h	\
 	gconf-backend.c		\
@@ -60,9 +60,9 @@ libgconf_0_6_la_SOURCES = \
 	gconf.c			\
 	$(CORBA_SOURCES)
 
-libgconf_0_6_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE)
+libgconf_1_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE)
 
-libgconf_0_6_la_LIBADD =  $(OAF_LIBS) $(GLIB_LIBS)
+libgconf_1_la_LIBADD =  $(OAF_LIBS) $(GLIB_LIBS)
 
 EXTRA_DIST=GConf.idl gconfd.oafinfo.in default.path.in
 
diff --git a/po/ca.po b/po/ca.po
index 242c372c..65853e05 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-04-20 00:37+0200\n"
+"POT-Creation-Date: 2000-07-27 13:55-0400\n"
 "PO-Revision-Date: 2000-04-14 11:35+01:00\n"
 "Last-Translator: Softcatala <linux@softcatala.org>\n"
 "Language-Team: \n"
@@ -22,7 +22,7 @@ msgstr "Descarregant el component de fons del XML"
 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-backend.c:315 backends/xml-dir.c:1047
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "No s'ha pogut crear el directori `%s': %s"
@@ -49,6 +49,193 @@ msgstr "Inicialitzant el component de fons del XML"
 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
+msgid "Unsynced directory deletions when shutting down XML backend"
+msgstr ""
+
+#: backends/xml-cache.c:243
+#, 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
+#, c-format
+msgid ""
+"%u items remain in the cache after cleaning already-synced items older than "
+"%u seconds"
+msgstr ""
+
+#: backends/xml-dir.c:178
+#, fuzzy, c-format
+msgid "Could not stat `%s': %s"
+msgstr "No s'ha pogut crear el directori `%s': %s"
+
+#: backends/xml-dir.c:188
+#, c-format
+msgid "XML filename `%s' is a directory"
+msgstr ""
+
+#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#, fuzzy, c-format
+msgid "Failed to delete `%s': %s"
+msgstr "Impossible d'obrir `%s': %s\n"
+
+#: backends/xml-dir.c:355
+#, 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
+#, fuzzy, c-format
+msgid "Failed to rename `%s' to `%s': %s"
+msgstr "Impossible d'obrir `%s': %s\n"
+
+#: backends/xml-dir.c:387
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Failed to stat `%s': %s"
+msgstr "Impossible d'obrir `%s': %s\n"
+
+#: backends/xml-dir.c:946
+#, c-format
+msgid "Duplicate entry `%s' in `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:968
+#, c-format
+msgid "Entry with no name in XML file `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:975
+#, c-format
+msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:1063
+#, 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:2416
+#, 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
+#, c-format
+msgid "Ignoring XML node with name `%s': %s"
+msgstr ""
+
+#: backends/xml-entry.c:213 gconf/gconf-internals.c:2120
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: backends/xml-entry.c:340
+#, fuzzy, c-format
+msgid "Ignoring schema name `%s', invalid: %s"
+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
+#, c-format
+msgid "Ignoring XML node `%s', except for possible schema name: %s"
+msgstr ""
+
+#: backends/xml-entry.c:688
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:710
+#, 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:892
+#, c-format
+msgid "No \"type\" attribute for <%s> node"
+msgstr ""
+
+#: backends/xml-entry.c:906
+#, 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:921
+msgid "No \"value\" attribute for node"
+msgstr ""
+
+#: backends/xml-entry.c:969 backends/xml-entry.c:1045
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML list node"
+msgstr ""
+
+#: backends/xml-entry.c:1003
+msgid "Invalid type (list, pair, or unknown) in a list node"
+msgstr ""
+
+#: backends/xml-entry.c:1026
+#, c-format
+msgid "Bad XML node: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1034
+#, c-format
+msgid "List contains a badly-typed node (%s, should be %s)"
+msgstr ""
+
+#: backends/xml-entry.c:1086
+#, c-format
+msgid "Ignoring bad car from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1095 backends/xml-entry.c:1118
+msgid "parsing XML file: lists and pairs may not be placed inside a pair"
+msgstr ""
+
+#: backends/xml-entry.c:1108
+#, c-format
+msgid "Ignoring bad cdr from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1127
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1145
+msgid "Didn't find car and cdr for XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1151
+msgid "Missing cdr from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1158
+msgid "Missing car from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1163
+msgid "Missing both car and cdr values from pair in XML file"
+msgstr ""
+
 #. -- end debug only
 #: gconf/gconf-backend.c:180
 #, c-format
@@ -78,6 +265,69 @@ msgstr "No s'ha pogut ubicar el mòdul del component de fons per `%s'"
 msgid "Failed to shut down backend"
 msgstr "Impossible de tancar el component de fons"
 
+#: gconf/gconf-error.c:39
+msgid "Success"
+msgstr ""
+
+#: gconf/gconf-error.c:40
+msgid "Failed"
+msgstr ""
+
+#: gconf/gconf-error.c:41
+msgid "Configuration server couldn't be contacted"
+msgstr ""
+
+#: gconf/gconf-error.c:42
+msgid "Permission denied"
+msgstr ""
+
+#: gconf/gconf-error.c:43
+#, 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
+msgid "Bad key or directory name"
+msgstr ""
+
+#: gconf/gconf-error.c:45
+#, fuzzy
+msgid "Parse error"
+msgstr "Error de parse de OAF: %s"
+
+#: gconf/gconf-error.c:46
+msgid "Corrupt data in configuration source database"
+msgstr ""
+
+#: gconf/gconf-error.c:47
+msgid "Type mismatch"
+msgstr ""
+
+#: gconf/gconf-error.c:48
+msgid "Key operation on directory"
+msgstr ""
+
+#: gconf/gconf-error.c:49
+msgid "Directory operation on key"
+msgstr ""
+
+#: gconf/gconf-error.c:50
+msgid "Can't overwrite existing read-only value"
+msgstr ""
+
+#: gconf/gconf-error.c:51
+msgid "Object Activation Framework error"
+msgstr ""
+
+#: gconf/gconf-error.c:52
+msgid "Operation not allowed without configuration server"
+msgstr ""
+
+#: gconf/gconf-error.c:53
+#, fuzzy
+msgid "Failed to get a lock"
+msgstr "Impossible de prendre valor per `%s': %s\n"
+
 #: gconf/gconf-internals.c:100
 #, c-format
 msgid "No '/' in key `%s'"
@@ -111,89 +361,84 @@ msgstr "Afegint origen `%s'\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "Error de lectura en el fitxer `%s': %s\n"
 
-#: gconf/gconf-internals.c:1284
+#: gconf/gconf-internals.c:1282
 #, c-format
 msgid "Expected list, got %s"
 msgstr "S'esperava llista, s'ha obtingut %s"
 
-#: gconf/gconf-internals.c:1294
+#: gconf/gconf-internals.c:1292
 #, 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:1433
+#: gconf/gconf-internals.c:1431
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "S'esperava parella, s'ha obtingut %s"
 
-#: gconf/gconf-internals.c:1447
+#: gconf/gconf-internals.c:1445
 #, 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:1463
+#: gconf/gconf-internals.c:1461
 #, 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:1579
+#: gconf/gconf-internals.c:1577
 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:1641
+#: gconf/gconf-internals.c:1639
 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:2107 gconf/gconf.c:2615
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Error CORBA: %s"
 
-#: gconf/gconf-internals.c:2122
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: gconf/gconf-internals.c:2127
+#: gconf/gconf-internals.c:2125
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "intenta d'eliminar directori d'objectes OAF no llistats"
 
-#: gconf/gconf-internals.c:2132
+#: gconf/gconf-internals.c:2130
 msgid "attempt to add already-listed OAF directory"
 msgstr "intenta d'afegir directoris OAF ja llistats"
 
-#: gconf/gconf-internals.c:2139
+#: gconf/gconf-internals.c:2137
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Error de parse de OAF: %s"
 
-#: gconf/gconf-internals.c:2144
+#: gconf/gconf-internals.c:2142
 msgid "Unknown OAF error"
 msgstr "Error desconegut de OAF"
 
-#: gconf/gconf-internals.c:2227
+#: gconf/gconf-internals.c:2225
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "No existeix fitxer ior a `%s'"
 
-#: gconf/gconf-internals.c:2258
+#: gconf/gconf-internals.c:2256
 #, 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:2269
+#: gconf/gconf-internals.c:2267
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Un altre programa ha blocat `%s'"
 
-#: gconf/gconf-internals.c:2289
+#: gconf/gconf-internals.c:2287
 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:2297
+#: gconf/gconf-internals.c:2295
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -202,50 +447,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:2309
+#: gconf/gconf-internals.c:2307
 #, 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:2321
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "La configuració daemon de GConf (gconfd) ha blocat `%s'"
 
-#: gconf/gconf-internals.c:2335
+#: gconf/gconf-internals.c:2333
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "no s'ha pogut crear el directori `%s': %s"
 
-#: gconf/gconf-internals.c:2370
+#: gconf/gconf-internals.c:2368
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "No s'ha pogut crear el bloqueig `%s': %s"
 
-#: gconf/gconf-internals.c:2406
+#: gconf/gconf-internals.c:2404
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "No s'ha pogut escriure al fitxer `%s': %s"
 
-#: gconf/gconf-internals.c:2418
-#, c-format
-msgid "Failed to close file `%s': %s"
-msgstr "Impossible de tancar el fitxer `%s': %s"
-
-#: gconf/gconf-internals.c:2449
+#: gconf/gconf-internals.c:2447
 #, 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:2466
+#: gconf/gconf-internals.c:2464
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Bloqueig de fitxer `%s' corrupte, eliminant igualment"
 
-#: gconf/gconf-internals.c:2476
+#: gconf/gconf-internals.c:2474
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -254,31 +494,92 @@ 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:2493
+#: gconf/gconf-internals.c:2491
 #, 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
+#, fuzzy, c-format
+msgid "Failed to load source `%s': %s"
+msgstr "Impossible de tancar el fitxer `%s': %s"
+
+#: gconf/gconf-sources.c:506
+#, c-format
+msgid "Schema `%s' specified for `%s' stores a non-schema value"
+msgstr ""
+
+#: gconf/gconf-sources.c:555
+msgid "The '/' name can only be a directory, not a key"
+msgstr ""
+
+#: gconf/gconf-sources.c:584
+#, 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
+#, fuzzy, c-format
+msgid "Error finding metainfo: %s"
+msgstr "Error en llistar directoris: %s\n"
+
+#: gconf/gconf-sources.c:1144
+#, fuzzy, c-format
+msgid "Error getting metainfo: %s"
+msgstr "Error en establir valor: %s"
+
+#: gconf/gconf-sources.c:1168
+#, 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
+#, c-format
+msgid "Didn't understand `%s' (expected integer)"
+msgstr ""
+
+#: gconf/gconf-value.c:106
+#, c-format
+msgid "Integer `%s' is too large or small"
+msgstr ""
+
+#: gconf/gconf-value.c:127
+#, c-format
+msgid "Didn't understand `%s' (expected real number)"
+msgstr ""
+
+#: gconf/gconf-value.c:160
+#, c-format
+msgid "Didn't understand `%s' (expected true or false)"
+msgstr ""
+
 #: gconf/gconf.c:69
 #, c-format
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:261
+#: gconf/gconf.c:271
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "El servidor no ha pogut resoldre l'adreça `%s'"
 
-#: gconf/gconf.c:391
+#: gconf/gconf.c:408
 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:1449
+#: gconf/gconf.c:1466
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Fallada del servidor fent pings, error de CORBA: %s"
 
-#: gconf/gconf.c:1465
+#: gconf/gconf.c:1482
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -288,57 +589,57 @@ 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:1660
+#: gconf/gconf.c:1677
 msgid "Failed to init GConf, exiting\n"
 msgstr "Impossible d'inicialitzar GConf, abandonant\n"
 
-#: gconf/gconf.c:1697
+#: gconf/gconf.c:1714
 msgid "Must begin with a slash (/)"
 msgstr "Ha de començar amb una barra (/)"
 
-#: gconf/gconf.c:1719
+#: gconf/gconf.c:1736
 msgid "Can't have two slashes (/) in a row"
 msgstr "No es poden tenir dues barres (/) en una línia"
 
-#: gconf/gconf.c:1721
+#: gconf/gconf.c:1738
 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:1742
+#: gconf/gconf.c:1759
 #, 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:1756
+#: gconf/gconf.c:1773
 msgid "Key/directory may not end with a slash (/)"
 msgstr "La clau/directori pot no acabar amb una barra (/)"
 
-#: gconf/gconf.c:2087
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fallada tancant la configuració del servidor: %s"
 
-#: gconf/gconf.c:2148
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr "S'esperava coma flotant, s'ha obtingut %s"
 
-#: gconf/gconf.c:2183
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr "S'esperava un enter, s'ha obtingut %s"
 
-#: gconf/gconf.c:2218
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr "S'esperava una cadena, s'ha obtingut %s"
 
-#: gconf/gconf.c:2255
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "S'esperava un boleà, s'ha obtingut %s"
 
-#: gconf/gconf.c:2288
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "S'esperava un esquema, s'ha obtingut %s"
@@ -465,11 +766,6 @@ msgstr "Sortint"
 msgid "Failed to sync one or more sources: %s"
 msgstr "Impossible de sincronitzar una o més fonts: %s"
 
-#: gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr "Error en obtenir valor per `%s': %s"
-
 #: gconf/gconfd.c:1561
 #, c-format
 msgid "Error setting value for `%s': %s"
@@ -510,31 +806,31 @@ msgstr "Error en llistar directoris en `%s': %s"
 msgid "Error setting schema for `%s': %s"
 msgstr "Error en definir esquema per `%s': %s"
 
-#: gconf/gconfd.c:1911
+#: 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:1918
+#: gconf/gconfd.c:1920
 #, c-format
 msgid "Bad context ID %lu, request ignored"
 msgstr "Context erroni de ID %lu, requeriment ignorat"
 
-#: gconf/gconfd.c:1926
+#: gconf/gconfd.c:1928
 #, c-format
 msgid "Already-unregistered context ID %lu, request ignored"
 msgstr "Ja s'havia desregistrat el context ID %lu, requeriment ignorat"
 
-#: gconf/gconfd.c:1951
+#: gconf/gconfd.c:1953
 #, c-format
 msgid "Attempt to use invalid context ID %lu"
 msgstr "Intent d'usar un context no vàlid de ID %lu"
 
-#: gconf/gconfd.c:1961
+#: gconf/gconfd.c:1963
 #, c-format
 msgid "Attempt to use already-unregistered context ID %lu"
 msgstr "Intent d'usar un context ja desregistrat de ID %lu"
 
-#: gconf/gconfd.c:2121
+#: gconf/gconfd.c:2123
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Retornant excepció: %s"
@@ -1078,3 +1374,13 @@ msgstr ""
 "Intentant pausar la vostra aplicació especificant valors dolents en clausde "
 "directori:\n"
 "  %s\n"
+
+#: wrappers/gtk/gconf-client.c:812
+#, fuzzy, c-format
+msgid "GConf warning: failure listing pairs in `%s': %s"
+msgstr "Fallada en llistar parelles en `%s': %s"
+
+#: wrappers/gtk/gconf-client.c:990
+#, fuzzy, c-format
+msgid "Expected `%s' got `%s' for key %s"
+msgstr "S'esperava llista de %s, s'ha obtingut llista de %s"
diff --git a/po/cs.po b/po/cs.po
index 95c2679d..29d2ec64 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-04-12 19:12+0200\n"
+"POT-Creation-Date: 2000-07-27 13:55-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"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:315
+#: backends/xml-backend.c:315 backends/xml-dir.c:1047
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nelze vytvoøit adresáø `%s': %s"
@@ -46,6 +46,191 @@ msgstr ""
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Nelze otevøít adresáø `%s': %s"
 
+#: backends/xml-cache.c:134
+msgid "Unsynced directory deletions when shutting down XML backend"
+msgstr ""
+
+#: backends/xml-cache.c:243
+#, 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
+#, c-format
+msgid ""
+"%u items remain in the cache after cleaning already-synced items older than "
+"%u seconds"
+msgstr ""
+
+#: backends/xml-dir.c:178
+#, c-format
+msgid "Could not stat `%s': %s"
+msgstr "`stat' selhal na `%s': %s"
+
+#: backends/xml-dir.c:188
+#, 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
+#, c-format
+msgid "Failed to delete `%s': %s"
+msgstr "Nelze vymazat `%s': %s"
+
+#: backends/xml-dir.c:355
+#, 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
+#, c-format
+msgid "Failed to rename `%s' to `%s': %s"
+msgstr "Nelze pøejmenovat `%s' na `%s': %s"
+
+#: backends/xml-dir.c:387
+#, fuzzy, c-format
+msgid "Failed to restore `%s' from `%s': %s"
+msgstr "Nelze pøejmenovat `%s' na `%s': %s"
+
+#: backends/xml-dir.c:399
+#, 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
+#, c-format
+msgid "Failed to stat `%s': %s"
+msgstr "`stat' selhal na `%s': %s"
+
+#: backends/xml-dir.c:946
+#, 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
+#, 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
+#, c-format
+msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:1063
+#, 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:2416
+#, 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
+#, c-format
+msgid "Ignoring XML node with name `%s': %s"
+msgstr ""
+
+#: backends/xml-entry.c:213 gconf/gconf-internals.c:2120
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: backends/xml-entry.c:340
+#, c-format
+msgid "Ignoring schema name `%s', invalid: %s"
+msgstr ""
+
+#. FIXME for nodes with no value stored, but containing a schema name,
+#. * we improperly log an error here
+#.
+#: backends/xml-entry.c:386
+#, c-format
+msgid "Ignoring XML node `%s', except for possible schema name: %s"
+msgstr ""
+
+#: backends/xml-entry.c:688
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:710
+#, c-format
+msgid "Failed reading default value for schema: %s"
+msgstr ""
+
+#: backends/xml-entry.c:892
+#, c-format
+msgid "No \"type\" attribute for <%s> node"
+msgstr ""
+
+#: backends/xml-entry.c:906
+#, c-format
+msgid "A node has unknown \"type\" attribute `%s', ignoring"
+msgstr ""
+
+#: backends/xml-entry.c:921
+msgid "No \"value\" attribute for node"
+msgstr ""
+
+#: backends/xml-entry.c:969 backends/xml-entry.c:1045
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML list node"
+msgstr ""
+
+#: backends/xml-entry.c:1003
+msgid "Invalid type (list, pair, or unknown) in a list node"
+msgstr ""
+
+#: backends/xml-entry.c:1026
+#, c-format
+msgid "Bad XML node: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1034
+#, c-format
+msgid "List contains a badly-typed node (%s, should be %s)"
+msgstr ""
+
+#: backends/xml-entry.c:1086
+#, c-format
+msgid "Ignoring bad car from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1095 backends/xml-entry.c:1118
+msgid "parsing XML file: lists and pairs may not be placed inside a pair"
+msgstr ""
+
+#: backends/xml-entry.c:1108
+#, c-format
+msgid "Ignoring bad cdr from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1127
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1145
+msgid "Didn't find car and cdr for XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1151
+msgid "Missing cdr from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1158
+msgid "Missing car from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1163
+msgid "Missing both car and cdr values from pair in XML file"
+msgstr ""
+
 #. -- end debug only
 #: gconf/gconf-backend.c:180
 #, c-format
@@ -75,6 +260,67 @@ msgstr ""
 msgid "Failed to shut down backend"
 msgstr ""
 
+#: gconf/gconf-error.c:39
+msgid "Success"
+msgstr ""
+
+#: gconf/gconf-error.c:40
+msgid "Failed"
+msgstr ""
+
+#: gconf/gconf-error.c:41
+msgid "Configuration server couldn't be contacted"
+msgstr ""
+
+#: gconf/gconf-error.c:42
+msgid "Permission denied"
+msgstr ""
+
+#: gconf/gconf-error.c:43
+msgid "Couldn't resolve address for configuration source"
+msgstr ""
+
+#: gconf/gconf-error.c:44
+msgid "Bad key or directory name"
+msgstr ""
+
+#: gconf/gconf-error.c:45
+msgid "Parse error"
+msgstr ""
+
+#: gconf/gconf-error.c:46
+msgid "Corrupt data in configuration source database"
+msgstr ""
+
+#: gconf/gconf-error.c:47
+msgid "Type mismatch"
+msgstr ""
+
+#: gconf/gconf-error.c:48
+msgid "Key operation on directory"
+msgstr ""
+
+#: gconf/gconf-error.c:49
+msgid "Directory operation on key"
+msgstr ""
+
+#: gconf/gconf-error.c:50
+msgid "Can't overwrite existing read-only value"
+msgstr ""
+
+#: gconf/gconf-error.c:51
+msgid "Object Activation Framework error"
+msgstr ""
+
+#: gconf/gconf-error.c:52
+msgid "Operation not allowed without configuration server"
+msgstr ""
+
+#: gconf/gconf-error.c:53
+#, fuzzy
+msgid "Failed to get a lock"
+msgstr "Nelze vymazat `%s': %s"
+
 #: gconf/gconf-internals.c:100
 #, c-format
 msgid "No '/' in key `%s'"
@@ -108,221 +354,272 @@ msgstr "Zdroj `%s' pøidán\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "Chyba v ètení souboru `%s': %s\n"
 
-#: gconf/gconf-internals.c:1284
+#: gconf/gconf-internals.c:1282
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1294
+#: gconf/gconf-internals.c:1292
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1433
+#: gconf/gconf-internals.c:1431
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1447
+#: gconf/gconf-internals.c:1445
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1463
+#: gconf/gconf-internals.c:1461
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1579
+#: gconf/gconf-internals.c:1577
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1641
+#: gconf/gconf-internals.c:1639
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2107 gconf/gconf.c:2615
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA chyba: %s"
 
-#: gconf/gconf-internals.c:2122
-#, c-format
-msgid "%s"
-msgstr ""
-
-#: gconf/gconf-internals.c:2127
+#: gconf/gconf-internals.c:2125
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2132
+#: gconf/gconf-internals.c:2130
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2139
+#: gconf/gconf-internals.c:2137
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2144
+#: gconf/gconf-internals.c:2142
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2227
+#: gconf/gconf-internals.c:2225
 #, c-format
 msgid "No ior file in `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2258
+#: gconf/gconf-internals.c:2256
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2269
+#: gconf/gconf-internals.c:2267
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2289
+#: gconf/gconf-internals.c:2287
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2297
+#: gconf/gconf-internals.c:2295
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2309
+#: gconf/gconf-internals.c:2307
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2335
+#: gconf/gconf-internals.c:2333
 #, fuzzy, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "Nelze vytvoøit adresáø `%s': %s"
 
-#: gconf/gconf-internals.c:2370
+#: gconf/gconf-internals.c:2368
 #, fuzzy, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Nelze vytvoøit soubor `%s': %s"
 
-#: gconf/gconf-internals.c:2406
+#: gconf/gconf-internals.c:2404
 #, fuzzy, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Nelze psát do souboru `%s': %s"
 
-#: gconf/gconf-internals.c:2418
-#, c-format
-msgid "Failed to close file `%s': %s"
-msgstr "Nelze zavøít soubor `%s': %s"
-
-#: gconf/gconf-internals.c:2449
+#: gconf/gconf-internals.c:2447
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2466
+#: gconf/gconf-internals.c:2464
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2476
+#: gconf/gconf-internals.c:2474
 #, 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:2493
+#: gconf/gconf-internals.c:2491
 #, fuzzy, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Nelze otevøít adresáø `%s': %s"
 
+#: gconf/gconf-sources.c:334
+#, fuzzy, c-format
+msgid "Failed to load source `%s': %s"
+msgstr "Nelze zavøít soubor `%s': %s"
+
+#: gconf/gconf-sources.c:506
+#, c-format
+msgid "Schema `%s' specified for `%s' stores a non-schema value"
+msgstr ""
+
+#: gconf/gconf-sources.c:555
+msgid "The '/' name can only be a directory, not a key"
+msgstr ""
+
+#: gconf/gconf-sources.c:584
+#, 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
+#, c-format
+msgid "Error finding metainfo: %s"
+msgstr ""
+
+#: gconf/gconf-sources.c:1144
+#, c-format
+msgid "Error getting metainfo: %s"
+msgstr ""
+
+#: gconf/gconf-sources.c:1168
+#, 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
+#, c-format
+msgid "Didn't understand `%s' (expected integer)"
+msgstr ""
+
+#: gconf/gconf-value.c:106
+#, c-format
+msgid "Integer `%s' is too large or small"
+msgstr ""
+
+#: gconf/gconf-value.c:127
+#, c-format
+msgid "Didn't understand `%s' (expected real number)"
+msgstr ""
+
+#: gconf/gconf-value.c:160
+#, c-format
+msgid "Didn't understand `%s' (expected true or false)"
+msgstr ""
+
 #: gconf/gconf.c:69
 #, c-format
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:261
+#: gconf/gconf.c:271
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:391
+#: gconf/gconf.c:408
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1449
+#: gconf/gconf.c:1466
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1465
+#: gconf/gconf.c:1482
 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:1660
+#: gconf/gconf.c:1677
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:1697
+#: gconf/gconf.c:1714
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1719
+#: gconf/gconf.c:1736
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:1721
+#: gconf/gconf.c:1738
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1742
+#: gconf/gconf.c:1759
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:1756
+#: gconf/gconf.c:1773
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2087
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2148
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2183
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2218
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2255
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2288
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
@@ -434,11 +731,6 @@ msgstr "Normální konec"
 msgid "Failed to sync one or more sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr ""
-
 #: gconf/gconfd.c:1561
 #, c-format
 msgid "Error setting value for `%s': %s"
@@ -479,31 +771,31 @@ msgstr ""
 msgid "Error setting schema for `%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1911
+#: gconf/gconfd.c:1913
 msgid "Attempt to unregister invalid context ID"
 msgstr ""
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1920
 #, c-format
 msgid "Bad context ID %lu, request ignored"
 msgstr ""
 
-#: gconf/gconfd.c:1926
+#: gconf/gconfd.c:1928
 #, c-format
 msgid "Already-unregistered context ID %lu, request ignored"
 msgstr ""
 
-#: gconf/gconfd.c:1951
+#: gconf/gconfd.c:1953
 #, c-format
 msgid "Attempt to use invalid context ID %lu"
 msgstr ""
 
-#: gconf/gconfd.c:1961
+#: gconf/gconfd.c:1963
 #, c-format
 msgid "Attempt to use already-unregistered context ID %lu"
 msgstr ""
 
-#: gconf/gconfd.c:2121
+#: gconf/gconfd.c:2123
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
@@ -715,7 +1007,7 @@ 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:488
+#: gconf/gconftool.c:487
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -723,273 +1015,273 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:510
+#: gconf/gconftool.c:509
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:670
+#: gconf/gconftool.c:669
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:715
+#: gconf/gconftool.c:714
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:749
+#: gconf/gconftool.c:748
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr ""
 
-#: gconf/gconftool.c:767
+#: gconf/gconftool.c:766
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:820
+#: gconf/gconftool.c:819
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:834
+#: gconf/gconftool.c:833
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:865
+#: gconf/gconftool.c:864
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:866
+#: gconf/gconftool.c:865
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Vlastník: %s\n"
 
-#: gconf/gconftool.c:866 gconf/gconftool.c:867 gconf/gconftool.c:868
+#: gconf/gconftool.c:865 gconf/gconftool.c:866 gconf/gconftool.c:867
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:867
+#: gconf/gconftool.c:866
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:868
+#: gconf/gconftool.c:867
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:877
+#: gconf/gconftool.c:876
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:881
+#: gconf/gconftool.c:880
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:899
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:917
+#: gconf/gconftool.c:916
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:940 gconf/gconftool.c:1052 gconf/gconftool.c:1056
+#: gconf/gconftool.c:939 gconf/gconftool.c:1051 gconf/gconftool.c:1055
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:951
+#: gconf/gconftool.c:950
 #, c-format
 msgid "Error: %s\n"
 msgstr "Chyba: %s\n"
 
-#: gconf/gconftool.c:964 gconf/gconftool.c:1070
+#: gconf/gconftool.c:963 gconf/gconftool.c:1069
 #, c-format
 msgid "Error setting value: %s"
 msgstr ""
 
-#: gconf/gconftool.c:982 gconf/gconftool.c:1084
+#: gconf/gconftool.c:981 gconf/gconftool.c:1083
 #, c-format
 msgid "Error syncing: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:999
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1099
+#: gconf/gconftool.c:1098
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1113
+#: gconf/gconftool.c:1112
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1124
+#: gconf/gconftool.c:1123
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1146
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1220
+#: gconf/gconftool.c:1219
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1227
+#: gconf/gconftool.c:1226
 msgid ""
 "WARNING: For now gconftool only knows how to install default values for "
 "simple types (int, string, bool, float)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1243
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1256
+#: gconf/gconftool.c:1255
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1304
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1326
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1330 gconf/gconftool.c:1575
+#: gconf/gconftool.c:1329 gconf/gconftool.c:1574
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1340
+#: gconf/gconftool.c:1339
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1372
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1379
+#: gconf/gconftool.c:1378
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1451
+#: gconf/gconftool.c:1450
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1480
+#: gconf/gconftool.c:1479
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1488
+#: gconf/gconftool.c:1487
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1510
+#: gconf/gconftool.c:1509
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1518
+#: gconf/gconftool.c:1517
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1588
+#: gconf/gconftool.c:1587
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1617
+#: gconf/gconftool.c:1616
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1639
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Nelze otevøít `%s': %s\n"
 
-#: gconf/gconftool.c:1646
+#: gconf/gconftool.c:1645
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument `%s' je prázdný?\n"
 
-#: gconf/gconftool.c:1658
+#: gconf/gconftool.c:1657
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1671
+#: gconf/gconftool.c:1670
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1685
+#: gconf/gconftool.c:1684
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1696 gconf/gconftool.c:1728
+#: gconf/gconftool.c:1695 gconf/gconftool.c:1727
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1712
+#: gconf/gconftool.c:1711
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1748
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1769
+#: gconf/gconftool.c:1768
 #, fuzzy, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Nelze vytvoøit soubor `%s': %s"
 
-#: gconf/gconftool.c:1895
+#: gconf/gconftool.c:1894
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:1901
+#: gconf/gconftool.c:1900
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1919
+#: gconf/gconftool.c:1918
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:1938
+#: gconf/gconftool.c:1937
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -997,6 +1289,16 @@ msgid ""
 "  %s\n"
 msgstr ""
 
+#: wrappers/gtk/gconf-client.c:812
+#, c-format
+msgid "GConf warning: failure listing pairs in `%s': %s"
+msgstr ""
+
+#: wrappers/gtk/gconf-client.c:990
+#, c-format
+msgid "Expected `%s' got `%s' for key %s"
+msgstr ""
+
 #~ msgid "Key"
 #~ msgstr "Klíè"
 
@@ -1005,27 +1307,3 @@ msgstr ""
 
 #~ msgid "Configuration Editor"
 #~ msgstr "Editor konfigurace"
-
-#~ msgid "Could not stat `%s': %s"
-#~ msgstr "`stat' selhal na `%s': %s"
-
-#~ msgid "XML filename `%s' is a directory"
-#~ msgstr "XML soubor `%s' je adresáø"
-
-#~ msgid "Failed to delete `%s': %s"
-#~ msgstr "Nelze vymazat `%s': %s"
-
-#~ msgid "Failed to rename `%s' to `%s': %s"
-#~ msgstr "Nelze pøejmenovat `%s' na `%s': %s"
-
-#~ msgid "Failed to delete old file `%s': %s"
-#~ msgstr "Nelze smazat starý soubor `%s': %s"
-
-#~ msgid "Failed to stat `%s': %s"
-#~ msgstr "`stat' selhal na `%s': %s"
-
-#~ msgid "Duplicate entry `%s' in `%s', deleting"
-#~ msgstr "Zdvojená polo¾ka `%s' v `%s', vymazávám"
-
-#~ msgid "Entry with no name in XML file `%s', deleting"
-#~ msgstr "Polo¾ka beze jména v XML souboru `%s', vymazávám"
diff --git a/po/da.po b/po/da.po
index f4282612..9614ec45 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf\n"
-"POT-Creation-Date: 2000-07-10 23:01+0200\n"
+"POT-Creation-Date: 2000-07-27 13:55-0400\n"
 "PO-Revision-Date: 2000-07-11 11:35+01:00\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -66,8 +66,8 @@ msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
 "%u seconds"
 msgstr ""
-"%u punkter er i bufferen efter fjerning af allerede-synkroniserede "
-"punkter ældre end %u sekunder"
+"%u punkter er i bufferen efter fjerning af allerede-synkroniserede punkter "
+"ældre end %u sekunder"
 
 #: backends/xml-dir.c:178
 #, c-format
@@ -130,101 +130,109 @@ msgstr "Topniveau-node i XML-fil `%s' er ikke et <punkt>, ignorerer"
 msgid "Failed to create file `%s': %s"
 msgstr "Kunne ikke oprette filen `%s': %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2418
+#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2416
 #, 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:381
-#, c-format
-msgid "Ignoring XML node `%s': %s"
+#: backends/xml-entry.c:162
+#, fuzzy, c-format
+msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorerer XML node `%s': %s"
 
-#: backends/xml-entry.c:211 gconf/gconf-internals.c:2122
+#: backends/xml-entry.c:213 gconf/gconf-internals.c:2120
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:338
+#: backends/xml-entry.c:340
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "ignorerer skemanavn `%s', ugyldig: %s"
 
-#: backends/xml-entry.c:683
+#. FIXME for nodes with no value stored, but containing a schema name,
+#. * we improperly log an error here
+#.
+#: backends/xml-entry.c:386
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s', except for possible schema name: %s"
+msgstr "Ignorerer XML node `%s': %s"
+
+#: backends/xml-entry.c:688
 msgid "found <local_schema> with no locale setting"
 msgstr "fandt <local_schema> uden lokaleindstilling"
 
-#: backends/xml-entry.c:705
+#: backends/xml-entry.c:710
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Kunne ikke læse standardværdi for skema: %s"
 
-#: backends/xml-entry.c:888
+#: backends/xml-entry.c:892
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Ingen \"type\" attribut for <%s> node"
 
-#: backends/xml-entry.c:902
+#: backends/xml-entry.c:906
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "En node har ukendt \"type\" attribut `%s', ignorerer"
 
-#: backends/xml-entry.c:917
+#: backends/xml-entry.c:921
 msgid "No \"value\" attribute for node"
 msgstr "Ingen \"værdi\" attribut for node"
 
-#: backends/xml-entry.c:965 backends/xml-entry.c:1041
+#: backends/xml-entry.c:969 backends/xml-entry.c:1045
 #, 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:999
+#: backends/xml-entry.c:1003
 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:1022
+#: backends/xml-entry.c:1026
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Ugyldig XML-node: %s"
 
-#: backends/xml-entry.c:1030
+#: backends/xml-entry.c:1034
 #, 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:1082
+#: backends/xml-entry.c:1086
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorerer ugyldig car fra XML-par: %s"
 
-#: backends/xml-entry.c:1091 backends/xml-entry.c:1114
+#: backends/xml-entry.c:1095 backends/xml-entry.c:1118
 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:1104
+#: backends/xml-entry.c:1108
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorerer ugyldig cdr fra XML-par: %s"
 
-#: backends/xml-entry.c:1123
+#: backends/xml-entry.c:1127
 #, 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:1141
+#: backends/xml-entry.c:1145
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Fandt ikke car og cdr for XML-parnode"
 
-#: backends/xml-entry.c:1147
+#: backends/xml-entry.c:1151
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Manglende cdr fra værdipar i XML-fil"
 
-#: backends/xml-entry.c:1154
+#: backends/xml-entry.c:1158
 msgid "Missing car from pair of values in XML file"
 msgstr "Manglende car fra værdipar i XML-fil"
 
-#: backends/xml-entry.c:1159
+#: backends/xml-entry.c:1163
 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"
 
@@ -350,81 +358,81 @@ msgstr "Tilføjer kilde '%s'\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "Læsefejl på fil '%s': %s\n"
 
-#: gconf/gconf-internals.c:1284
+#: gconf/gconf-internals.c:1282
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Forventede liste, fik %s"
 
-#: gconf/gconf-internals.c:1294
+#: gconf/gconf-internals.c:1292
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Forventede liste af %s, fik liste af %s"
 
-#: gconf/gconf-internals.c:1433
+#: gconf/gconf-internals.c:1431
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Forventede par, fik %s"
 
-#: gconf/gconf-internals.c:1447
+#: gconf/gconf-internals.c:1445
 #, 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:1463
+#: gconf/gconf-internals.c:1461
 #, 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:1579
+#: gconf/gconf-internals.c:1577
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Tekst i anførselstegn begynder ikke med anførselstegn"
 
-#: gconf/gconf-internals.c:1641
+#: gconf/gconf-internals.c:1639
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Tekst i anførselstegn ender ikke på anførselstegn"
 
-#: gconf/gconf-internals.c:2107 gconf/gconf.c:2630
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-fejl: %s"
 
-#: gconf/gconf-internals.c:2127
+#: gconf/gconf-internals.c:2125
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "forsøg på at fjerne ikke-listet OAF-objektmappe"
 
-#: gconf/gconf-internals.c:2132
+#: gconf/gconf-internals.c:2130
 msgid "attempt to add already-listed OAF directory"
 msgstr "forsøg på at tilføje allerede-listet OAF-mappe"
 
-#: gconf/gconf-internals.c:2139
+#: gconf/gconf-internals.c:2137
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF-fortolkningsfejl: %s"
 
-#: gconf/gconf-internals.c:2144
+#: gconf/gconf-internals.c:2142
 msgid "Unknown OAF error"
 msgstr "Ukendt OAF-fejl"
 
-#: gconf/gconf-internals.c:2227
+#: gconf/gconf-internals.c:2225
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Ingen ior-fil i '%s'"
 
-#: gconf/gconf-internals.c:2258
+#: gconf/gconf-internals.c:2256
 #, 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:2269
+#: gconf/gconf-internals.c:2267
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Et andet program har lås '%s'"
 
-#: gconf/gconf-internals.c:2289
+#: gconf/gconf-internals.c:2287
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "kunne ikke kontakte ORB for at pinge eksisterende gconfd"
 
-#: gconf/gconf-internals.c:2297
+#: gconf/gconf-internals.c:2295
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -433,42 +441,42 @@ msgstr ""
 "Fjerner udgået lås `%s' fordi IOR ikke kunne konverteres til "
 "objektreference, IOR `%s'"
 
-#: gconf/gconf-internals.c:2309
+#: gconf/gconf-internals.c:2307
 #, 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:2321
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf-konfigurationsdæmon (gconfd) har lås '%s'"
 
-#: gconf/gconf-internals.c:2335
+#: gconf/gconf-internals.c:2333
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "kunne ikke oprette kataloget '%s': %s"
 
-#: gconf/gconf-internals.c:2370
+#: gconf/gconf-internals.c:2368
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Kan ikke oprette lås '%s': %s"
 
-#: gconf/gconf-internals.c:2406
+#: gconf/gconf-internals.c:2404
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kan ikke skrive til filen '%s': %s"
 
-#: gconf/gconf-internals.c:2449
+#: gconf/gconf-internals.c:2447
 #, 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:2466
+#: gconf/gconf-internals.c:2464
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Ødelagt låsefil '%s', fjerner alligevel"
 
-#: gconf/gconf-internals.c:2476
+#: gconf/gconf-internals.c:2474
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -477,7 +485,7 @@ 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:2493
+#: gconf/gconf-internals.c:2491
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Kunne ikke frigive låsekatalog '%s': %s"
@@ -487,17 +495,16 @@ msgstr "Kunne ikke frigive låsekatalog '%s': %s"
 msgid "Failed to load source `%s': %s"
 msgstr "Kunne ikke indlæse kilden `%s': %s"
 
-#: gconf/gconf-sources.c:502
+#: gconf/gconf-sources.c:506
 #, 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"
+msgstr "Skema `%s' specificeret for `%s' lagrer en værdi som ikke er for skema"
 
-#: gconf/gconf-sources.c:551
+#: gconf/gconf-sources.c:555
 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:580
+#: gconf/gconf-sources.c:584
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -506,22 +513,22 @@ msgstr ""
 "Værdi for `%s' sat i en skrivebeskyttet kilde i begyndelsen af din "
 "konfigurationssti."
 
-#: gconf/gconf-sources.c:1067
+#: gconf/gconf-sources.c:1079
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Fejl ved finding af metainfo: %s"
 
-#: gconf/gconf-sources.c:1132
+#: gconf/gconf-sources.c:1144
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Fejl under hentning af metainfo: %s"
 
-#: gconf/gconf-sources.c:1156
+#: gconf/gconf-sources.c:1168
 #, 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-sources.c:1193 gconf/gconfd.c:1523
+#: gconf/gconf-sources.c:1205 gconf/gconfd.c:1523
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fejl ved forespørgsel på værdi af '%s': %s"
@@ -551,21 +558,21 @@ msgstr "Forstod ikke `%s' (forventede sand eller falsk)"
 msgid "`%s': %s"
 msgstr "'%s': %s"
 
-#: gconf/gconf.c:269
+#: gconf/gconf.c:271
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Server kunne ikke åbne adressen '%s'"
 
-#: gconf/gconf.c:406
+#: gconf/gconf.c:408
 msgid "Can't add notifications to a local configuration source"
 msgstr "Kan ikke tilføje notifikationer til en lokal konfigurationskilde"
 
-#: gconf/gconf.c:1464
+#: gconf/gconf.c:1466
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Pingning af tjeneren fejlede, CORBA-fejl: %s"
 
-#: gconf/gconf.c:1480
+#: gconf/gconf.c:1482
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -575,57 +582,57 @@ msgstr ""
 "fra oaf_activate_from_id() og satte ikke en undtagelse som forklarede "
 "problemet. Venligst udfyld en fejlrapport for OAF."
 
-#: gconf/gconf.c:1675
+#: gconf/gconf.c:1677
 msgid "Failed to init GConf, exiting\n"
 msgstr "Kunne ikke starte GConf, afslutter\n"
 
-#: gconf/gconf.c:1712
+#: gconf/gconf.c:1714
 msgid "Must begin with a slash (/)"
 msgstr "Skal begynde med en skråstreg (/)"
 
-#: gconf/gconf.c:1734
+#: gconf/gconf.c:1736
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan ikke have to skråstreger (/) efter hinanden"
 
-#: gconf/gconf.c:1736
+#: gconf/gconf.c:1738
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan ikke have et punktum (.) lige efter en skråstreg (/)"
 
-#: gconf/gconf.c:1757
+#: gconf/gconf.c:1759
 #, 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:1771
+#: gconf/gconf.c:1773
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Nøgle/katalog skal ikke ende med en skråstreg (/)"
 
-#: gconf/gconf.c:2102
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fejl ved nedlukning af konfigtjener: %s"
 
-#: gconf/gconf.c:2163
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Forventede flydendetal, fik %s"
 
-#: gconf/gconf.c:2198
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Forventede heltal, fik %s"
 
-#: gconf/gconf.c:2233
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Forventede streng, fik %s"
 
-#: gconf/gconf.c:2270
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Forventede boolsk, fik %s"
 
-#: gconf/gconf.c:2303
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Forventede skema, fik %s"
@@ -791,31 +798,31 @@ msgstr "Fejl under listning af kataloger i `%s': %s"
 msgid "Error setting schema for `%s': %s"
 msgstr "Fejl under opsætning af skema for `%s': %s"
 
-#: gconf/gconfd.c:1911
+#: gconf/gconfd.c:1913
 msgid "Attempt to unregister invalid context ID"
 msgstr "Forsøg på at afregistrere ugyldig kontekst ID"
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1920
 #, c-format
 msgid "Bad context ID %lu, request ignored"
 msgstr "Ugyldig kontekst-ID %lu, forespørgsel ignoreret"
 
-#: gconf/gconfd.c:1926
+#: gconf/gconfd.c:1928
 #, c-format
 msgid "Already-unregistered context ID %lu, request ignored"
 msgstr "Allerede afregistreret kontekst-ID %lu, forespørgsel ignoreret"
 
-#: gconf/gconfd.c:1951
+#: gconf/gconfd.c:1953
 #, c-format
 msgid "Attempt to use invalid context ID %lu"
 msgstr "Forsøg på at bruge ugyldig kontekst-ID %lu"
 
-#: gconf/gconfd.c:1961
+#: gconf/gconfd.c:1963
 #, c-format
 msgid "Attempt to use already-unregistered context ID %lu"
 msgstr "Forsøg på at bruge allerede afregistreret kontekst-ID %lu"
 
-#: gconf/gconfd.c:2121
+#: gconf/gconfd.c:2123
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Returnerede undtagelse: %s"
@@ -1359,12 +1366,12 @@ msgstr ""
 "nøgler i katalog:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:699
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 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:877
+#: wrappers/gtk/gconf-client.c:990
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Forventede %s, fik %s for nøgle %s"
diff --git a/po/de.po b/po/de.po
index 8723e5ae..a4006da6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gConf 0.5\n"
-"POT-Creation-Date: 2000-07-26 13:54+0200\n"
+"POT-Creation-Date: 2000-07-27 13:55-0400\n"
 "PO-Revision-Date: 2000-03-30 16:29+02:00\n"
 "Last-Translator: Matthias Warkus <mawa@iname.com>\n"
 "Language-Team: German <de@li.org>\n"
@@ -397,7 +397,7 @@ msgstr "Zeichenkette in Anführungszeichen beginnt nicht mit Anführungszeichen"
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Zeichenkette in Anführungszeichen endet nicht mit Anführungszeichen"
 
-#: gconf/gconf-internals.c:2105 gconf/gconf.c:2632
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-Fehler: %s"
@@ -620,32 +620,32 @@ msgstr "`%c' ist ein unerlaubtes Zeichen in Schlüssel-/Verzeichnisnamen"
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Schlüssel/Verzeichnis darf nicht mit einem Schrägstrich (/) enden"
 
-#: gconf/gconf.c:2104
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fehler beim Herunterfahren des Konfigurationsservers: %s"
 
-#: gconf/gconf.c:2165
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Habe float erwartet, erhielt %s"
 
-#: gconf/gconf.c:2200
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Habe int erwartet, erhielt %s"
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Habe Zeichenkette erwartet, erhielt %s"
 
-#: gconf/gconf.c:2272
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Habe bool erwartet, erhielt %s"
 
-#: gconf/gconf.c:2305
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Habe Schema erwartet, erhielt %s"
diff --git a/po/el.po b/po/el.po
index e7070d26..468b0aca 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-03-09 14:58-0500\n"
+"POT-Creation-Date: 2000-07-27 13:55-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"
@@ -25,7 +25,7 @@ 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-backend.c:315 backends/xml-dir.c:1047
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Äçìéïõñãßá êáôáëüãïõ áäýíáôç `%s': %s"
@@ -56,6 +56,208 @@ msgstr "Áñ÷éêïðïéåßôáé ç ìïíÜäá õðïóôÞñéîçò XML"
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Áäýíáôç ç ðáñÜäïóç êëåéäþìáôïò óôïí êáôÜëïãï XML `%s': %s"
 
+#: backends/xml-cache.c:134
+msgid "Unsynced directory deletions when shutting down XML backend"
+msgstr ""
+
+#: backends/xml-cache.c:243
+#, 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
+#, c-format
+msgid ""
+"%u items remain in the cache after cleaning already-synced items older than "
+"%u seconds"
+msgstr ""
+
+# backends/xml-backend.c:315

+#: backends/xml-dir.c:178
+#, fuzzy, c-format
+msgid "Could not stat `%s': %s"
+msgstr "Äçìéïõñãßá êáôáëüãïõ áäýíáôç `%s': %s"
+
+#: backends/xml-dir.c:188
+#, c-format
+msgid "XML filename `%s' is a directory"
+msgstr ""
+
+# gconf/gconftool.c:1639

+#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#, fuzzy, c-format
+msgid "Failed to delete `%s': %s"
+msgstr "Áðïôõ÷ßá áíïßãìáôïò `%s': %s\n"
+
+# gconf/gconf-internals.c:2416

+#: backends/xml-dir.c:355
+#, 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
+#, fuzzy, c-format
+msgid "Failed to rename `%s' to `%s': %s"
+msgstr "Áðïôõ÷ßá áíïßãìáôïò `%s': %s\n"
+
+# gconf/gconftool.c:881

+#: backends/xml-dir.c:387
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Failed to stat `%s': %s"
+msgstr "Áðïôõ÷ßá áíïßãìáôïò `%s': %s\n"
+
+#: backends/xml-dir.c:946
+#, c-format
+msgid "Duplicate entry `%s' in `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:968
+#, c-format
+msgid "Entry with no name in XML file `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:975
+#, 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
+#, 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:2416
+#, c-format
+msgid "Failed to close file `%s': %s"
+msgstr "Áäýíáôï ôï êëåßóéìï ôïõ áñ÷åßïõ `%s': %s"
+
+#. There was an error
+#: backends/xml-entry.c:162
+#, c-format
+msgid "Ignoring XML node with name `%s': %s"
+msgstr ""
+
+# gconf/gconf-internals.c:2120

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

+#: backends/xml-entry.c:340
+#, fuzzy, c-format
+msgid "Ignoring schema name `%s', invalid: %s"
+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
+#, c-format
+msgid "Ignoring XML node `%s', except for possible schema name: %s"
+msgstr ""
+
+#: backends/xml-entry.c:688
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+# gconf/gconftool.c:1243

+#: backends/xml-entry.c:710
+#, fuzzy, c-format
+msgid "Failed reading default value for schema: %s"
+msgstr ""
+"ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áðïôõ÷ßá óôçí ãñáììáôéêÞ áíÜëõóç ôçò ôéìÞò `%s' ãéá ôï ó÷Þìá "
+"(%s)\n"
+
+#: backends/xml-entry.c:892
+#, c-format
+msgid "No \"type\" attribute for <%s> node"
+msgstr ""
+
+# gconf/gconftool.c:1373

+#: backends/xml-entry.c:906
+#, fuzzy, c-format
+msgid "A node has unknown \"type\" attribute `%s', ignoring"
+msgstr ""
+"ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Ï êüìâïò <locale> äåí Ý÷åé ôçí éäéüôçôá `name=\"locale\", "
+"áãíïåßôáé\n"
+
+#: backends/xml-entry.c:921
+msgid "No \"value\" attribute for node"
+msgstr ""
+
+#: backends/xml-entry.c:969 backends/xml-entry.c:1045
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML list node"
+msgstr ""
+
+#: backends/xml-entry.c:1003
+msgid "Invalid type (list, pair, or unknown) in a list node"
+msgstr ""
+
+#: backends/xml-entry.c:1026
+#, c-format
+msgid "Bad XML node: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1034
+#, c-format
+msgid "List contains a badly-typed node (%s, should be %s)"
+msgstr ""
+
+#: backends/xml-entry.c:1086
+#, c-format
+msgid "Ignoring bad car from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1095 backends/xml-entry.c:1118
+msgid "parsing XML file: lists and pairs may not be placed inside a pair"
+msgstr ""
+
+#: backends/xml-entry.c:1108
+#, c-format
+msgid "Ignoring bad cdr from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1127
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1145
+msgid "Didn't find car and cdr for XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1151
+msgid "Missing cdr from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1158
+msgid "Missing car from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1163
+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
@@ -92,6 +294,72 @@ msgstr "Áäýíáôïò ï åíôïðéóìüò ìïíÜäáò õðïóôÞñéîçò ãéá `%s'"
 msgid "Failed to shut down backend"
 msgstr "Áäõíáìßá êëåéóßìáôïò ôçò õðïóôÞñéîçò (backend)"
 
+#: gconf/gconf-error.c:39
+msgid "Success"
+msgstr ""
+
+#: gconf/gconf-error.c:40
+msgid "Failed"
+msgstr ""
+
+#: gconf/gconf-error.c:41
+msgid "Configuration server couldn't be contacted"
+msgstr ""
+
+#: gconf/gconf-error.c:42
+msgid "Permission denied"
+msgstr ""
+
+# gconf/gconftool.c:510

+#: gconf/gconf-error.c:43
+#, fuzzy
+msgid "Couldn't resolve address for configuration source"
+msgstr "Áðïôõ÷ßá ðñüóâáóçò óôçí(éò) ðçãÞ(Ýò) äéáìüñöùóçò: %s\n"
+
+#: gconf/gconf-error.c:44
+msgid "Bad key or directory name"
+msgstr ""
+
+# gconf/gconf-internals.c:2137

+#: gconf/gconf-error.c:45
+#, fuzzy
+msgid "Parse error"
+msgstr "ÓöÜëìá ãñáììáôéêÞò áíÜëõóçò OAF: %s"
+
+#: gconf/gconf-error.c:46
+msgid "Corrupt data in configuration source database"
+msgstr ""
+
+#: gconf/gconf-error.c:47
+msgid "Type mismatch"
+msgstr ""
+
+#: gconf/gconf-error.c:48
+msgid "Key operation on directory"
+msgstr ""
+
+#: gconf/gconf-error.c:49
+msgid "Directory operation on key"
+msgstr ""
+
+#: gconf/gconf-error.c:50
+msgid "Can't overwrite existing read-only value"
+msgstr ""
+
+#: gconf/gconf-error.c:51
+msgid "Object Activation Framework error"
+msgstr ""
+
+#: gconf/gconf-error.c:52
+msgid "Operation not allowed without configuration server"
+msgstr ""
+
+# gconf/gconftool.c:881

+#: gconf/gconf-error.c:53
+#, fuzzy
+msgid "Failed to get a lock"
+msgstr "Áðïôõ÷ßá ëÞøçò ôéìÞò ãéá `%s': %s\n"
+
 # gconf/gconf-internals.c:100

 #: gconf/gconf-internals.c:100
 #, c-format
@@ -133,25 +401,25 @@ msgid "Read error on file `%s': %s\n"
 msgstr "ÓöÜëìá áíÜãíùóçò óôï áñ÷åßï `%s': %s\n"
 
 # gconf/gconf-internals.c:1282

-#: gconf/gconf-internals.c:1284
+#: gconf/gconf-internals.c:1282
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Áíáìåíüôáí ëßóôá, ëÞöèçêå %s"
 
 # gconf/gconf-internals.c:1292

-#: gconf/gconf-internals.c:1294
+#: gconf/gconf-internals.c:1292
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Áíáìåíüôáí ëßóôá áðü %s, ëÞöèçêå ëßóôá áðü %s"
 
 # gconf/gconf-internals.c:1431

-#: gconf/gconf-internals.c:1433
+#: gconf/gconf-internals.c:1431
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Áíáìåíüôáí æåýãïò, ëÞöèçêå %s"
 
 # gconf/gconf-internals.c:1445

-#: gconf/gconf-internals.c:1447
+#: gconf/gconf-internals.c:1445
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
@@ -159,79 +427,73 @@ msgstr ""
 "ôéìÝò"
 
 # gconf/gconf-internals.c:1461

-#: gconf/gconf-internals.c:1463
+#: gconf/gconf-internals.c:1461
 #, 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:1579
+#: gconf/gconf-internals.c:1577
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Ôï ðáñáôéèÝìåíï áëöáñéèìçôéêü äåí áñ÷ßæåé ìå åéóáãùãéêü óçìåßï"
 
 # gconf/gconf-internals.c:1639

-#: gconf/gconf-internals.c:1641
+#: gconf/gconf-internals.c:1639
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Ôï ðáñáôéèÝìåíï áëöáñéèìçôéêü äåí ôåëåéþíåé ìå åéóáãùãéêü óçìåßï"
 
 # gconf/gconf-internals.c:2105 gconf/gconf.c:2607

-#: gconf/gconf-internals.c:2107 gconf/gconf.c:2615
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr "ÓöÜëìá CORBA: %s"
 
-# gconf/gconf-internals.c:2120

-#: gconf/gconf-internals.c:2122
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 # gconf/gconf-internals.c:2125

-#: gconf/gconf-internals.c:2127
+#: gconf/gconf-internals.c:2125
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "ðñïóðÜèåéá áöáßñåóçò ìç êáôá÷ùñçìÝíïõ êáôáëüãïõ áíôéêåéìÝíùí OAF"
 
 # gconf/gconf-internals.c:2130

-#: gconf/gconf-internals.c:2132
+#: gconf/gconf-internals.c:2130
 msgid "attempt to add already-listed OAF directory"
 msgstr "ðñïóðÜèåéá ðñüóèåóçò Þäç êáôá÷ùñçìÝíïõ êáôáëüãïõ OAF"
 
 # gconf/gconf-internals.c:2137

-#: gconf/gconf-internals.c:2139
+#: gconf/gconf-internals.c:2137
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "ÓöÜëìá ãñáììáôéêÞò áíÜëõóçò OAF: %s"
 
 # gconf/gconf-internals.c:2142

-#: gconf/gconf-internals.c:2144
+#: gconf/gconf-internals.c:2142
 msgid "Unknown OAF error"
 msgstr "¶ãíùóôï óöÜëìá OAF"
 
 # gconf/gconf-internals.c:2225

-#: gconf/gconf-internals.c:2227
+#: gconf/gconf-internals.c:2225
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Äåí õðÜñ÷åé áñ÷åßï ior óôï `%s'"
 
 # gconf/gconf-internals.c:2256

-#: gconf/gconf-internals.c:2258
+#: gconf/gconf-internals.c:2256
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "ôï gconfd ðáßñíåé ôï êëåßäùìá `%s' áðü êÜðïéá Üëëç äéåñãáóßá"
 
 # gconf/gconf-internals.c:2267

-#: gconf/gconf-internals.c:2269
+#: gconf/gconf-internals.c:2267
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "ÊÜðïéï Üëëï ðñüãñáììá Ý÷åé ôï êëåßäùìá `%s'"
 
 # gconf/gconf-internals.c:2287

-#: gconf/gconf-internals.c:2289
+#: gconf/gconf-internals.c:2287
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "áäýíáôç ç åðáöÞ ìå ôï ORB ãéá áíß÷íåõóç õðÜñ÷ïíôïò gconfd"
 
 # gconf/gconf-internals.c:2295

-#: gconf/gconf-internals.c:2297
+#: gconf/gconf-internals.c:2295
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -241,44 +503,38 @@ msgstr ""
 "áíáöïñÜ áíôéêåéìÝíïõ, IOR `%s'"
 
 # gconf/gconf-internals.c:2307

-#: gconf/gconf-internals.c:2309
+#: gconf/gconf-internals.c:2307
 #, 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:2321
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "Ï äáßìïíáò äéáìüñöùóçò GConf (gconfd) Ý÷åé ôï êëåßäùìá `%s'"
 
 # gconf/gconf-internals.c:2333

-#: gconf/gconf-internals.c:2335
+#: gconf/gconf-internals.c:2333
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "áäýíáôç ç äçìéïõñãßá êáôáëüãïõ `%s': %s"
 
 # gconf/gconf-internals.c:2368

-#: gconf/gconf-internals.c:2370
+#: gconf/gconf-internals.c:2368
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Áäýíáôç ç äçìéïõñãßá êëåéäþìáôïò `%s': %s"
 
 # gconf/gconf-internals.c:2404

-#: gconf/gconf-internals.c:2406
+#: gconf/gconf-internals.c:2404
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Áäýíáôç ç åããñáöÞ óôï áñ÷åßï `%s': %s"
 
-# gconf/gconf-internals.c:2416

-#: gconf/gconf-internals.c:2418
-#, c-format
-msgid "Failed to close file `%s': %s"
-msgstr "Áäýíáôï ôï êëåßóéìï ôïõ áñ÷åßïõ `%s': %s"
-
 # gconf/gconf-internals.c:2447

-#: gconf/gconf-internals.c:2449
+#: gconf/gconf-internals.c:2447
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
@@ -286,13 +542,13 @@ msgstr ""
 "äéêü ìáò: %s"
 
 # gconf/gconf-internals.c:2464

-#: gconf/gconf-internals.c:2466
+#: gconf/gconf-internals.c:2464
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "ÖèáñìÝíï áñ÷åßï êëåéäþìáôïò `%s', áöáéñåßôáé ïýôùò Þ Üëëùò"
 
 # gconf/gconf-internals.c:2474

-#: gconf/gconf-internals.c:2476
+#: gconf/gconf-internals.c:2474
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -302,11 +558,76 @@ msgstr ""
 "%u· õðïèÝôïõìå üôé êÜðïéïò ðÞñå ôï êëåßäùìá ìáò"
 
 # gconf/gconf-internals.c:2491

-#: gconf/gconf-internals.c:2493
+#: gconf/gconf-internals.c:2491
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Áäýíáôç ç áðïäÝóìåõóç êëåéäþìáôïò êáôáëüãïõ `%s': %s"
 
+# gconf/gconf-internals.c:2416

+#: gconf/gconf-sources.c:334
+#, fuzzy, c-format
+msgid "Failed to load source `%s': %s"
+msgstr "Áäýíáôï ôï êëåßóéìï ôïõ áñ÷åßïõ `%s': %s"
+
+#: gconf/gconf-sources.c:506
+#, c-format
+msgid "Schema `%s' specified for `%s' stores a non-schema value"
+msgstr ""
+
+#: gconf/gconf-sources.c:555
+msgid "The '/' name can only be a directory, not a key"
+msgstr ""
+
+#: gconf/gconf-sources.c:584
+#, c-format
+msgid ""
+"Value for `%s' set in a read-only source at the front of your configuration "
+"path."
+msgstr ""
+
+# gconf/gconftool.c:1181

+#: gconf/gconf-sources.c:1079
+#, fuzzy, c-format
+msgid "Error finding metainfo: %s"
+msgstr "ÓöÜëìá óôçí áðáñßèìçóç êáôáëüãùí: %s\n"
+
+# gconf/gconftool.c:964 gconf/gconftool.c:1070

+#: gconf/gconf-sources.c:1144
+#, fuzzy, c-format
+msgid "Error getting metainfo: %s"
+msgstr "ÓöÜëìá êáôÜ ôçí áíÜèåóç ôéìÞò: %s"
+
+#: gconf/gconf-sources.c:1168
+#, 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
+#, c-format
+msgid "Didn't understand `%s' (expected integer)"
+msgstr ""
+
+#: gconf/gconf-value.c:106
+#, c-format
+msgid "Integer `%s' is too large or small"
+msgstr ""
+
+#: gconf/gconf-value.c:127
+#, c-format
+msgid "Didn't understand `%s' (expected real number)"
+msgstr ""
+
+#: gconf/gconf-value.c:160
+#, c-format
+msgid "Didn't understand `%s' (expected true or false)"
+msgstr ""
+
 # gconf/gconf.c:69

 #: gconf/gconf.c:69
 #, c-format
@@ -314,24 +635,24 @@ msgid "`%s': %s"
 msgstr "`%s': %s"
 
 # gconf/gconf.c:261

-#: gconf/gconf.c:261
+#: gconf/gconf.c:271
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Ï åîõðçñÝôçò äåí ìðüñåóå íá áíáëýóåé ôç äéåýèõíóç `%s'"
 
 # gconf/gconf.c:391

-#: gconf/gconf.c:391
+#: gconf/gconf.c:408
 msgid "Can't add notifications to a local configuration source"
 msgstr "Áäýíáôç ç ðñüóèåóç åéäïðïéÞóåùí óå Ýíá ôïðéêü ðçãáßï äéáìüñöùóçò"
 
 # gconf/gconf.c:1449

-#: gconf/gconf.c:1449
+#: gconf/gconf.c:1466
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Áäýíáôç ç áíß÷íåõóç ôïõ åîõðçñÝôç, óöÜëìá CORBA: %s"
 
 # gconf/gconf.c:1463

-#: gconf/gconf.c:1465
+#: gconf/gconf.c:1482
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -342,69 +663,69 @@ msgstr ""
 "ðñüâëçìá. Ðáñáêáëþ óôåßëôå ìéá áíáöïñÜ óöÜëìáôïò OAF"
 
 # gconf-editor/gconf-editor.c:69 gconf/gconftool.c:447

-#: gconf/gconf.c:1660
+#: gconf/gconf.c:1677
 #, fuzzy
 msgid "Failed to init GConf, exiting\n"
 msgstr "Áðïôõ÷ßá áñ÷éêïðïßçóçò GConf: %s\n"
 
 # gconf/gconf.c:1689

-#: gconf/gconf.c:1697
+#: gconf/gconf.c:1714
 msgid "Must begin with a slash (/)"
 msgstr "ÐñÝðåé íá áñ÷ßæåé ìå ìéá êÜèåôï (/)"
 
 # gconf/gconf.c:1711

-#: gconf/gconf.c:1719
+#: gconf/gconf.c:1736
 msgid "Can't have two slashes (/) in a row"
 msgstr "Äå ãßíåôáé íá õðÜñ÷ïõí äýï êÜèåôïé (/) óôç óåéñÜ"
 
 # gconf/gconf.c:1713

-#: gconf/gconf.c:1721
+#: gconf/gconf.c:1738
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Äå ãßíåôáé íá õðÜñ÷åé ìéá ôåëåßá (.) áìÝóùò ìåôÜ áðü ìßá êÜèåôï (/)"
 
 # gconf/gconf.c:1734

-#: gconf/gconf.c:1742
+#: gconf/gconf.c:1759
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' äåí åßíáé Ýãêõñïò ÷áñáêôÞñáò óå ïíüìáôá êëåéäéþí/êáôáëüãùí"
 
 # gconf/gconf.c:1748

-#: gconf/gconf.c:1756
+#: gconf/gconf.c:1773
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Ôï êëåéäß/êáôÜëïãïò äåí ìðïñåß íá ôåëåéþíåé ìå êÜèåôï (/)"
 
 # gconf/gconf.c:2079

-#: gconf/gconf.c:2087
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Áäýíáôï ôï êëåßóéìï ôïõ åîõðçñÝôç äéáìüñöùóçò: %s"
 
 # gconf/gconf.c:2140

-#: gconf/gconf.c:2148
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Áíáìåíüôáí áñéèìüò êéíçôÞò õðïäéáóôïëÞò, ëÞöèçêå %s"
 
 # gconf/gconf.c:2175

-#: gconf/gconf.c:2183
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Áíáìåíüôáí áêÝñáéïò, ëÞöèçêå %s"
 
 # gconf/gconf.c:2210

-#: gconf/gconf.c:2218
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Áíáìåíüôáí áëöáñéèìçôéêü, ëÞöèçêå %s"
 
 # gconf/gconf.c:2247

-#: gconf/gconf.c:2255
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Áíáìåíüôáí äõáäéêÞ ôéìÞ, ëÞöèçêå %s"
 
 # gconf/gconf.c:2280

-#: gconf/gconf.c:2288
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Áíáìåíüôáí ó÷Þìá, ëÞöèçêå %s"
@@ -552,12 +873,6 @@ msgstr "Êëåßóéìï"
 msgid "Failed to sync one or more sources: %s"
 msgstr "Áðïôõ÷ßá óõã÷ñïíéóìïý ìßáò Þ ðåñéóóïôÝñùí ðçãþí: %s"
 
-# gconf/gconfd.c:1523

-#: gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr "ÓöÜëìá êáôÜ ôç ëÞøç ôéìÞò ãéá `%s': %s"
-
 # gconf/gconfd.c:1561

 #: gconf/gconfd.c:1561
 #, c-format
@@ -607,36 +922,36 @@ msgid "Error setting schema for `%s': %s"
 msgstr "ÓöÜëìá áíÜèåóçò ó÷Þìáôïò ãéá `%s': %s"
 
 # gconf/gconfd.c:1911

-#: gconf/gconfd.c:1911
+#: gconf/gconfd.c:1913
 msgid "Attempt to unregister invalid context ID"
 msgstr "ÐñïóðÜèåéá äéáãñáöÞò Üêõñïõ context ID"
 
 # gconf/gconfd.c:1918

-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1920
 #, c-format
 msgid "Bad context ID %lu, request ignored"
 msgstr "ËÜèïò context ID %lu, áßôçóç áãíïåßôáé"
 
 # gconf/gconfd.c:1926

-#: gconf/gconfd.c:1926
+#: gconf/gconfd.c:1928
 #, c-format
 msgid "Already-unregistered context ID %lu, request ignored"
 msgstr "Context ID %lu Þäç áðïêáôá÷ùñçìÝíï, áßôçóç áãíïåßôáé"
 
 # gconf/gconfd.c:1951

-#: gconf/gconfd.c:1951
+#: gconf/gconfd.c:1953
 #, c-format
 msgid "Attempt to use invalid context ID %lu"
 msgstr "ÐñïóðÜèåéá ÷ñÞóçò Üêõñïõ context ID %lu"
 
 # gconf/gconfd.c:1961

-#: gconf/gconfd.c:1961
+#: gconf/gconfd.c:1963
 #, c-format
 msgid "Attempt to use already-unregistered context ID %lu"
 msgstr "ÐñïóðÜèåéá ÷ñÞóçò Þäç áðïêáôá÷ùñçìÝíïõ context ID %lu"
 
 # gconf/gconfd.c:2115

-#: gconf/gconfd.c:2121
+#: gconf/gconfd.c:2123
 #, c-format
 msgid "Returning exception: %s"
 msgstr "ÅðéóôñÝöåôáé åîáßñåóç: %s"
@@ -909,7 +1224,7 @@ msgstr ""
 "÷ñçóéìïðïéåßôå ôçí --direct\n"
 
 # gconf-editor/gconf-editor.c:69 gconf/gconftool.c:447

-#: gconf-editor/gconf-editor.c:69 gconf/gconftool.c:447
+#: gconf/gconftool.c:447
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Áðïôõ÷ßá áñ÷éêïðïßçóçò GConf: %s\n"
@@ -923,7 +1238,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:488
+#: gconf/gconftool.c:487
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -937,166 +1252,166 @@ msgstr ""
 "(áí êáé èåùñçôéêÜ èá Ýðñåðå íá äïõëÝøåé áí åêôåëïýíôáé åöáñìïãÝò).\n"
 
 # gconf/gconftool.c:510

-#: gconf/gconftool.c:510
+#: gconf/gconftool.c:509
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Áðïôõ÷ßá ðñüóâáóçò óôçí(éò) ðçãÞ(Ýò) äéáìüñöùóçò: %s\n"
 
 # gconf/gconftool.c:670

-#: gconf/gconftool.c:670
+#: gconf/gconftool.c:669
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "ÓöÜëìá êëåéóßìáôïò: %s\n"
 
 # gconf/gconftool.c:715

-#: gconf/gconftool.c:715
+#: gconf/gconftool.c:714
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "ÐñÝðåé íá êáèïñéóôåß Ýíáò Þ ðåñéóóüôåñïé êáôÜëïãïé ãéá áíáäñïìéêÞ "
 "áðáñßèìçóç.\n"
 
 # gconf/gconftool.c:749

-#: gconf/gconftool.c:749
+#: gconf/gconftool.c:748
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "Áðïôõ÷ßá áðáñßèìçóçò æåõãþí óôï `%s': %s"
 
 # gconf/gconftool.c:767

-#: gconf/gconftool.c:767
+#: gconf/gconftool.c:766
 msgid "(no value set)"
 msgstr "(äåí Ý÷åé ôåèåß ôéìÞ)"
 
 # gconf/gconftool.c:820

-#: gconf/gconftool.c:820
+#: gconf/gconftool.c:819
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Áðïôõ÷ßá ðïëëáðëáóéáóìïý åîõðçñÝôç äéáìüñöùóçò: %s\n"
 
 # gconf/gconftool.c:834

-#: gconf/gconftool.c:834
+#: gconf/gconftool.c:833
 msgid "Must specify a key or keys to get\n"
 msgstr "ÐñÝðåé íá êáèïñéóôåß Ýíá êëåéäß Þ êëåéäéÜ ãéá ëÞøç\n"
 
 # gconf/gconftool.c:865

-#: gconf/gconftool.c:865
+#: gconf/gconftool.c:864
 #, c-format
 msgid "Type: %s\n"
 msgstr "Ôýðïò: %s\n"
 
 # gconf/gconftool.c:866

-#: gconf/gconftool.c:866
+#: gconf/gconftool.c:865
 #, c-format
 msgid "Owner: %s\n"
 msgstr "ÉäéïêôÞôçò: %s\n"
 
 # gconf/gconftool.c:866 gconf/gconftool.c:867 gconf/gconftool.c:868

-#: gconf/gconftool.c:866 gconf/gconftool.c:867 gconf/gconftool.c:868
+#: gconf/gconftool.c:865 gconf/gconftool.c:866 gconf/gconftool.c:867
 msgid "Unset"
 msgstr "Áöáßñåóç"
 
 # gconf/gconftool.c:867

-#: gconf/gconftool.c:867
+#: gconf/gconftool.c:866
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Óýíôïìç ÐåñéãñáöÞ: %s\n"
 
 # gconf/gconftool.c:868

-#: gconf/gconftool.c:868
+#: gconf/gconftool.c:867
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "ÌáêñÜ ÐåñéãñáöÞ: %s\n"
 
 # gconf/gconftool.c:877

-#: gconf/gconftool.c:877
+#: gconf/gconftool.c:876
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Äåí Ý÷åé ôåèåß ôéìÞ ãéá `%s'\n"
 
 # gconf/gconftool.c:881

-#: gconf/gconftool.c:881
+#: gconf/gconftool.c:880
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Áðïôõ÷ßá ëÞøçò ôéìÞò ãéá `%s': %s\n"
 
 # gconf/gconftool.c:900

-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:899
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "ÐñÝðåé íá êáèïñéóôïýí åíáëëáóóüìåíá êëåéäéÜ/ôéìÝò ùò ïñßóìáôá\n"
 
 # gconf/gconftool.c:917

-#: gconf/gconftool.c:917
+#: gconf/gconftool.c:916
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Äåí Ý÷åé ôåèåß ôéìÞ ãéá ôï êëåéäß: `%s'\n"
 
 # gconf/gconftool.c:940 gconf/gconftool.c:1052 gconf/gconftool.c:1056

-#: gconf/gconftool.c:940 gconf/gconftool.c:1052 gconf/gconftool.c:1056
+#: gconf/gconftool.c:939 gconf/gconftool.c:1051 gconf/gconftool.c:1055
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Äåí åßíáé êáôáíïçôüò ï ôýðïò `%s'\n"
 
 # gconf/gconftool.c:951

-#: gconf/gconftool.c:951
+#: gconf/gconftool.c:950
 #, c-format
 msgid "Error: %s\n"
 msgstr "ÓöÜëìá: %s\n"
 
 # gconf/gconftool.c:964 gconf/gconftool.c:1070

-#: gconf/gconftool.c:964 gconf/gconftool.c:1070
+#: gconf/gconftool.c:963 gconf/gconftool.c:1069
 #, c-format
 msgid "Error setting value: %s"
 msgstr "ÓöÜëìá êáôÜ ôçí áíÜèåóç ôéìÞò: %s"
 
 # gconf/gconftool.c:982 gconf/gconftool.c:1084

-#: gconf/gconftool.c:982 gconf/gconftool.c:1084
+#: gconf/gconftool.c:981 gconf/gconftool.c:1083
 #, c-format
 msgid "Error syncing: %s"
 msgstr "ÓöÜëìá óôï óõã÷ñïíéóìü: %s"
 
 # gconf/gconftool.c:1000

-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:999
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "ÐñÝðåé íá êáèïñéóôåß êëåéäß (üíïìá ó÷Þìáôïò) ùò ìïíáäéêü üñéóìá\n"
 
 # gconf/gconftool.c:1099

-#: gconf/gconftool.c:1099
+#: gconf/gconftool.c:1098
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "ÐñÝðåé íá êáèïñéóôïýí Ýíáò Þ ðåñéóóüôåñïé êáôÜëïãïé áðü üðïõ íá ëçöèïýí ôá "
 "æåýãç êëåéäéþí/ôéìþí.\n"
 
 # gconf/gconftool.c:1113

-#: gconf/gconftool.c:1113
+#: gconf/gconftool.c:1112
 msgid "Must specify one or more keys to unset.\n"
 msgstr "ÐñÝðåé íá êáèïñéóôïýí Ýíá Þ ðåñéóóüôåñá êëåéäéÜ ðñïò áöáßñåóç.\n"
 
 # gconf/gconftool.c:1124

-#: gconf/gconftool.c:1124
+#: gconf/gconftool.c:1123
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "ÓöÜëìá óôçí áöáßñåóç `%s': %s\n"
 
 # gconf/gconftool.c:1147

-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1146
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "ÐñÝðåé íá êáèïñéóôïýí Ýíáò Þ ðåñéóóüôåñïé êáôÜëïãïé áðü üðïõ íá ëçöèïýí ïé "
 "õðïêáôÜëïãïé.\n"
 
 # gconf/gconftool.c:1181

-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "ÓöÜëìá óôçí áðáñßèìçóç êáôáëüãùí: %s\n"
 
 # gconf/gconftool.c:1220

-#: gconf/gconftool.c:1220
+#: gconf/gconftool.c:1219
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ¶êõñïò Þ áðþí ôýðïò ãéá ôï ó÷Þìá (%s)\n"
 
 # gconf/gconftool.c:1227

-#: gconf/gconftool.c:1227
+#: gconf/gconftool.c:1226
 msgid ""
 "WARNING: For now gconftool only knows how to install default values for "
 "simple types (int, string, bool, float)\n"
@@ -1106,7 +1421,7 @@ msgstr ""
 "êéíçôÞò õðïäéáóôïëÞò)\n"
 
 # gconf/gconftool.c:1243

-#: gconf/gconftool.c:1243
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
@@ -1114,24 +1429,24 @@ msgstr ""
 "(%s)\n"
 
 # gconf/gconftool.c:1256

-#: gconf/gconftool.c:1256
+#: gconf/gconftool.c:1255
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Åóùôåñéêü óöÜëìá ôïõ gconftool, Üãíùóôï GConfValueType\n"
 
 # gconf/gconftool.c:1304

-#: gconf/gconftool.c:1304
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áðïôõ÷ßá ãñáììáôéêÞò áíÜëõóçò ïíüìáôïò ôýðïõ `%s'\n"
 
 # gconf/gconftool.c:1327

-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1326
 msgid "WARNING: empty <applyto> node"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: êåíüò êüìâïò <applyto>"
 
 # gconf/gconftool.c:1330 gconf/gconftool.c:1575

-#: gconf/gconftool.c:1330 gconf/gconftool.c:1575
+#: gconf/gconftool.c:1329 gconf/gconftool.c:1574
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
@@ -1139,19 +1454,19 @@ msgstr ""
 "<schema>\n"
 
 # gconf/gconftool.c:1340

-#: gconf/gconftool.c:1340
+#: gconf/gconftool.c:1339
 msgid "WARNING: no key specified for schema\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äåí Ý÷åé êáèïñéóôåß êëåéäß ãéá ôï ó÷Þìá\n"
 
 # gconf/gconftool.c:1373

-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1372
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Ï êüìâïò <locale> äåí Ý÷åé ôçí éäéüôçôá `name=\"locale\", "
 "áãíïåßôáé\n"
 
 # gconf/gconftool.c:1379

-#: gconf/gconftool.c:1379
+#: gconf/gconftool.c:1378
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1160,13 +1475,13 @@ msgstr ""
 "áãíïïýíôáé üëïé ìåôÜ ôïí ðñþôï\n"
 
 # gconf/gconftool.c:1451

-#: gconf/gconftool.c:1451
+#: gconf/gconftool.c:1450
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ¶êõñïò êüìâïò <%s> óå Ýíá êüìâï <locale>\n"
 
 # gconf/gconftool.c:1480

-#: gconf/gconftool.c:1480
+#: gconf/gconftool.c:1479
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
@@ -1174,32 +1489,32 @@ msgstr ""
 "%s\n"
 
 # gconf/gconftool.c:1488

-#: gconf/gconftool.c:1488
+#: gconf/gconftool.c:1487
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "ÅãêáôåóôçìÝíï ó÷Þìá `%s' ãéá ôçí ôïðéêÞ ñýèìéóç `%s'\n"
 
 # gconf/gconftool.c:1510

-#: gconf/gconftool.c:1510
+#: gconf/gconftool.c:1509
 #, 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:1518
+#: gconf/gconftool.c:1517
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Ó÷Þìá `%s' åðéóõíÜöôçêå óôï êëåéäß `%s'\n"
 
 # gconf/gconftool.c:1588

-#: gconf/gconftool.c:1588
+#: gconf/gconftool.c:1587
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 "ÐñÝðåé íá õðÜñ÷åé ôïõëÜ÷éóôïí ìßá êáôá÷þñçóç <locale> óå Ýíá <schema>\n"
 
 # gconf/gconftool.c:1617

-#: gconf/gconftool.c:1617
+#: gconf/gconftool.c:1616
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
@@ -1207,19 +1522,19 @@ msgstr ""
 "<schemalist>\n"
 
 # gconf/gconftool.c:1639

-#: gconf/gconftool.c:1639
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Áðïôõ÷ßá áíïßãìáôïò `%s': %s\n"
 
 # gconf/gconftool.c:1646

-#: gconf/gconftool.c:1646
+#: gconf/gconftool.c:1645
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Ôï Ýããñáöï `%s' åßíáé êåíü;\n"
 
 # gconf/gconftool.c:1658

-#: gconf/gconftool.c:1658
+#: gconf/gconftool.c:1657
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1229,13 +1544,13 @@ msgstr ""
 "åßíáé <gconfschemafile>)\n"
 
 # gconf/gconftool.c:1671

-#: gconf/gconftool.c:1671
+#: gconf/gconftool.c:1670
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Ôï Ýããñáöï `%s' äåí Ý÷åé êüìâï <gconfschemafile> êïñõöáßïõ åðéðÝäïõ\n"
 
 # gconf/gconftool.c:1685

-#: gconf/gconftool.c:1685
+#: gconf/gconftool.c:1684
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
@@ -1243,18 +1558,18 @@ msgstr ""
 "<gconfschemafile>\n"
 
 # gconf/gconftool.c:1696 gconf/gconftool.c:1728

-#: gconf/gconftool.c:1696 gconf/gconftool.c:1728
+#: gconf/gconftool.c:1695 gconf/gconftool.c:1727
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "ÓöÜëìá óôï óõã÷ñïíéóìü äåäïìÝíùí äéáìüñöùóçò: %s"
 
 # gconf/gconftool.c:1712

-#: gconf/gconftool.c:1712
+#: gconf/gconftool.c:1711
 msgid "Must specify some schema files to install\n"
 msgstr "ÐñÝðåé íá êáèïñéóôïýí ìåñéêÜ áñ÷åßá ó÷Þìáôïò ðñïò åãêáôÜóôáóç\n"
 
 # gconf/gconftool.c:1749

-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1748
 #, c-format
 msgid ""
 "\n"
@@ -1264,18 +1579,18 @@ msgstr ""
 "%s\n"
 
 # gconf/gconftool.c:1769

-#: gconf/gconftool.c:1769
+#: gconf/gconftool.c:1768
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Áðïôõ÷ßá óôçí áöáßñåóç êëåéäéïý óðáóßìáôïò %s: %s\n"
 
 # gconf/gconftool.c:1895

-#: gconf/gconftool.c:1895
+#: gconf/gconftool.c:1894
 msgid "Must specify some keys to break\n"
 msgstr "ÐñÝðåé íá êáèïñéóôïýí ìåñéêÜ êëåéäéÜ ãéá óðÜóéìï\n"
 
 # gconf/gconftool.c:1901

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

-#: gconf/gconftool.c:1919
+#: gconf/gconftool.c:1918
 msgid "Must specify some directories to break\n"
 msgstr "ÐñÝðåé íá êáèïñéóôïýí ìåñéêïß êáôÜëïãïé ðñïò óðÜóéìï\n"
 
 # gconf/gconftool.c:1938

-#: gconf/gconftool.c:1938
+#: gconf/gconftool.c:1937
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1302,32 +1617,38 @@ msgstr ""
 "ôï êëåéäß óôïí êáôÜëïãï:\n"
 "  %s\n"
 
+# gconf/gconftool.c:749

+#: wrappers/gtk/gconf-client.c:812
+#, fuzzy, c-format
+msgid "GConf warning: failure listing pairs in `%s': %s"
+msgstr "Áðïôõ÷ßá áðáñßèìçóçò æåõãþí óôï `%s': %s"
+
+# gconf/gconf-internals.c:1292

+#: wrappers/gtk/gconf-client.c:990
+#, fuzzy, c-format
+msgid "Expected `%s' got `%s' for key %s"
+msgstr "Áíáìåíüôáí ëßóôá áðü %s, ëÞöèçêå ëßóôá áðü %s"
+
 # gconf-editor/app.c:53

-#: gconf-editor/app.c:53
-msgid "Key"
-msgstr "Êëåéäß"
+#~ msgid "Key"
+#~ msgstr "Êëåéäß"
 
 # gconf-editor/app.c:54

-#: gconf-editor/app.c:54
-msgid "Value"
-msgstr "ÔéìÞ"
+#~ msgid "Value"
+#~ msgstr "ÔéìÞ"
 
 # gconf-editor/app.c:57

-#: gconf-editor/app.c:57
-msgid "Configuration Editor"
-msgstr "ÓõíôÜêôçò Äéáìüñöùóçò"
+#~ msgid "Configuration Editor"
+#~ msgstr "ÓõíôÜêôçò Äéáìüñöùóçò"
 
 # gconf-editor/app.c:117

-#: gconf-editor/app.c:117
-msgid "Could not parse geometry string"
-msgstr "Áðïôõ÷ßá ãñáììáôéêÞò áíÜëõóçò áëöáñéèìçôéêïý ãåùìåôñßáò"
+#~ msgid "Could not parse geometry string"
+#~ msgstr "Áðïôõ÷ßá ãñáììáôéêÞò áíÜëõóçò áëöáñéèìçôéêïý ãåùìåôñßáò"
 
 # gconf-editor/gconf-editor.c:41

-#: gconf-editor/gconf-editor.c:41
-msgid "Specify the geometry of the main window"
-msgstr "Êáèïñßóôå ôç ãåùìåôñßá ôïõ êýñéïõ ðáñáèýñïõ"
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "Êáèïñßóôå ôç ãåùìåôñßá ôïõ êýñéïõ ðáñáèýñïõ"
 
 # gconf-editor/gconf-editor.c:42

-#: gconf-editor/gconf-editor.c:42
-msgid "GEOMETRY"
-msgstr "ÃÅÙÌÅÔÑÉÁ"
+#~ msgid "GEOMETRY"
+#~ msgstr "ÃÅÙÌÅÔÑÉÁ"
diff --git a/po/fi.po b/po/fi.po
index c5fa1332..3be14e38 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-04-04 20:41+0300\n"
+"POT-Creation-Date: 2000-07-27 13:55-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"
@@ -34,7 +34,7 @@ msgstr "Poistetaan XML-moduuli muistista"
 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-backend.c:315 backends/xml-dir.c:1047
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Hakemistoa '%s' ei voitu luoda: %s"
@@ -60,6 +60,193 @@ msgstr "Käynnistetään XML-moduuli"
 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
+msgid "Unsynced directory deletions when shutting down XML backend"
+msgstr ""
+
+#: backends/xml-cache.c:243
+#, 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
+#, c-format
+msgid ""
+"%u items remain in the cache after cleaning already-synced items older than "
+"%u seconds"
+msgstr ""
+
+#: backends/xml-dir.c:178
+#, fuzzy, c-format
+msgid "Could not stat `%s': %s"
+msgstr "Hakemistoa '%s' ei voitu luoda: %s"
+
+#: backends/xml-dir.c:188
+#, c-format
+msgid "XML filename `%s' is a directory"
+msgstr ""
+
+#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#, fuzzy, c-format
+msgid "Failed to delete `%s': %s"
+msgstr "'%s':n avaaminen epäonnistui: %s\n"
+
+#: backends/xml-dir.c:355
+#, 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
+#, fuzzy, c-format
+msgid "Failed to rename `%s' to `%s': %s"
+msgstr "'%s':n avaaminen epäonnistui: %s\n"
+
+#: backends/xml-dir.c:387
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Failed to stat `%s': %s"
+msgstr "'%s':n avaaminen epäonnistui: %s\n"
+
+#: backends/xml-dir.c:946
+#, c-format
+msgid "Duplicate entry `%s' in `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:968
+#, c-format
+msgid "Entry with no name in XML file `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:975
+#, c-format
+msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:1063
+#, 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:2416
+#, 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
+#, c-format
+msgid "Ignoring XML node with name `%s': %s"
+msgstr ""
+
+#: backends/xml-entry.c:213 gconf/gconf-internals.c:2120
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: backends/xml-entry.c:340
+#, fuzzy, c-format
+msgid "Ignoring schema name `%s', invalid: %s"
+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
+#, c-format
+msgid "Ignoring XML node `%s', except for possible schema name: %s"
+msgstr ""
+
+#: backends/xml-entry.c:688
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:710
+#, 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:892
+#, c-format
+msgid "No \"type\" attribute for <%s> node"
+msgstr ""
+
+#: backends/xml-entry.c:906
+#, 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:921
+msgid "No \"value\" attribute for node"
+msgstr ""
+
+#: backends/xml-entry.c:969 backends/xml-entry.c:1045
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML list node"
+msgstr ""
+
+#: backends/xml-entry.c:1003
+msgid "Invalid type (list, pair, or unknown) in a list node"
+msgstr ""
+
+#: backends/xml-entry.c:1026
+#, c-format
+msgid "Bad XML node: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1034
+#, c-format
+msgid "List contains a badly-typed node (%s, should be %s)"
+msgstr ""
+
+#: backends/xml-entry.c:1086
+#, c-format
+msgid "Ignoring bad car from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1095 backends/xml-entry.c:1118
+msgid "parsing XML file: lists and pairs may not be placed inside a pair"
+msgstr ""
+
+#: backends/xml-entry.c:1108
+#, c-format
+msgid "Ignoring bad cdr from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1127
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1145
+msgid "Didn't find car and cdr for XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1151
+msgid "Missing cdr from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1158
+msgid "Missing car from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1163
+msgid "Missing both car and cdr values from pair in XML file"
+msgstr ""
+
 #. -- end debug only
 #: gconf/gconf-backend.c:180
 #, c-format
@@ -89,6 +276,69 @@ msgstr "Moduulia '%s' ei löytynyt"
 msgid "Failed to shut down backend"
 msgstr "Moduulia ei onnistuttu sulkemaan"
 
+#: gconf/gconf-error.c:39
+msgid "Success"
+msgstr ""
+
+#: gconf/gconf-error.c:40
+msgid "Failed"
+msgstr ""
+
+#: gconf/gconf-error.c:41
+msgid "Configuration server couldn't be contacted"
+msgstr ""
+
+#: gconf/gconf-error.c:42
+msgid "Permission denied"
+msgstr ""
+
+#: gconf/gconf-error.c:43
+#, 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
+msgid "Bad key or directory name"
+msgstr ""
+
+#: gconf/gconf-error.c:45
+#, fuzzy
+msgid "Parse error"
+msgstr "OAF-jäsennysvirhe: %s"
+
+#: gconf/gconf-error.c:46
+msgid "Corrupt data in configuration source database"
+msgstr ""
+
+#: gconf/gconf-error.c:47
+msgid "Type mismatch"
+msgstr ""
+
+#: gconf/gconf-error.c:48
+msgid "Key operation on directory"
+msgstr ""
+
+#: gconf/gconf-error.c:49
+msgid "Directory operation on key"
+msgstr ""
+
+#: gconf/gconf-error.c:50
+msgid "Can't overwrite existing read-only value"
+msgstr ""
+
+#: gconf/gconf-error.c:51
+msgid "Object Activation Framework error"
+msgstr ""
+
+#: gconf/gconf-error.c:52
+msgid "Operation not allowed without configuration server"
+msgstr ""
+
+#: gconf/gconf-error.c:53
+#, fuzzy
+msgid "Failed to get a lock"
+msgstr "'%s':n arvon hakeminen epäonnistui: %s\n"
+
 #: gconf/gconf-internals.c:100
 #, c-format
 msgid "No '/' in key `%s'"
@@ -122,89 +372,84 @@ msgstr "Lisätään lähde '%s'\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "Virhe luettaessa tiedostoa '%s': %s\n"
 
-#: gconf/gconf-internals.c:1284
+#: gconf/gconf-internals.c:1282
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Odotettiin luetteloa, saatiin %s"
 
-#: gconf/gconf-internals.c:1294
+#: gconf/gconf-internals.c:1292
 #, 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:1433
+#: gconf/gconf-internals.c:1431
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Odotettiin paria, saatiin %s"
 
-#: gconf/gconf-internals.c:1447
+#: gconf/gconf-internals.c:1445
 #, 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:1463
+#: gconf/gconf-internals.c:1461
 #, 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:1579
+#: gconf/gconf-internals.c:1577
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Lainattu merkkijono ei ala lainausmerkillä"
 
-#: gconf/gconf-internals.c:1641
+#: gconf/gconf-internals.c:1639
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Lainattu merkkijono ei lopu lainausmerkkiin"
 
-#: gconf/gconf-internals.c:2107 gconf/gconf.c:2615
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-virhe: %s"
 
-#: gconf/gconf-internals.c:2122
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: gconf/gconf-internals.c:2127
+#: gconf/gconf-internals.c:2125
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "yritettiin poistaa luetteloimaton OAF-olio hakemistosta"
 
-#: gconf/gconf-internals.c:2132
+#: gconf/gconf-internals.c:2130
 msgid "attempt to add already-listed OAF directory"
 msgstr "yritettiin lisätä jo luetteloitu OAF hakemisto"
 
-#: gconf/gconf-internals.c:2139
+#: gconf/gconf-internals.c:2137
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF-jäsennysvirhe: %s"
 
-#: gconf/gconf-internals.c:2144
+#: gconf/gconf-internals.c:2142
 msgid "Unknown OAF error"
 msgstr "Tuntematon OAF-virhe"
 
-#: gconf/gconf-internals.c:2227
+#: gconf/gconf-internals.c:2225
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Ei IOR-tiedostoa hakemistossa '%s'"
 
-#: gconf/gconf-internals.c:2258
+#: gconf/gconf-internals.c:2256
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd vei lukituksen '%s' toiselta prosessilta"
 
-#: gconf/gconf-internals.c:2269
+#: gconf/gconf-internals.c:2267
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Toinen ohjelma on jo lukinnut '%s':n"
 
-#: gconf/gconf-internals.c:2289
+#: gconf/gconf-internals.c:2287
 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:2297
+#: gconf/gconf-internals.c:2295
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -213,48 +458,43 @@ msgstr ""
 "Poistetaan tyhjä lukitus '%s', koska IOR:ia ei voitu muuntaa "
 "olioviittaukseksi. IOR '%s'"
 
-#: gconf/gconf-internals.c:2309
+#: gconf/gconf-internals.c:2307
 #, 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:2321
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf asetusdemoni (gconfd) omistaa lukituksen '%s'"
 
-#: gconf/gconf-internals.c:2335
+#: gconf/gconf-internals.c:2333
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "hakemistoa '%s' ei voitu luoda: %s"
 
-#: gconf/gconf-internals.c:2370
+#: gconf/gconf-internals.c:2368
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Lukitusta '%s' ei voitu luoda: %s"
 
-#: gconf/gconf-internals.c:2406
+#: gconf/gconf-internals.c:2404
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Tiedostoon '%s' ei voi kirjoittaa: %s"
 
-#: gconf/gconf-internals.c:2418
-#, c-format
-msgid "Failed to close file `%s': %s"
-msgstr "Tiedoston '%s' sulkeminen epäonnistui: %s"
-
-#: gconf/gconf-internals.c:2449
+#: gconf/gconf-internals.c:2447
 #, 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:2466
+#: gconf/gconf-internals.c:2464
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Virheellinen lukitustiedosto '%s': poistetaan"
 
-#: gconf/gconf-internals.c:2476
+#: gconf/gconf-internals.c:2474
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -263,31 +503,92 @@ msgstr ""
 "Lukitustiedostoa '%s' ei luotu. (luojan pid %u, oma pid %u; oletetaan jonkin "
 "vieneen lukituksen)"
 
-#: gconf/gconf-internals.c:2493
+#: gconf/gconf-internals.c:2491
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Lukitushakemistoa '%s' ei voitu vapauttaa: %s"
 
+#: gconf/gconf-sources.c:334
+#, fuzzy, c-format
+msgid "Failed to load source `%s': %s"
+msgstr "Tiedoston '%s' sulkeminen epäonnistui: %s"
+
+#: gconf/gconf-sources.c:506
+#, c-format
+msgid "Schema `%s' specified for `%s' stores a non-schema value"
+msgstr ""
+
+#: gconf/gconf-sources.c:555
+msgid "The '/' name can only be a directory, not a key"
+msgstr ""
+
+#: gconf/gconf-sources.c:584
+#, 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
+#, fuzzy, c-format
+msgid "Error finding metainfo: %s"
+msgstr "Virhe luetteloitaessa hakemistoja: %s\n"
+
+#: gconf/gconf-sources.c:1144
+#, fuzzy, c-format
+msgid "Error getting metainfo: %s"
+msgstr "Virhe asetettaesa arvoa: %s"
+
+#: gconf/gconf-sources.c:1168
+#, 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
+#, c-format
+msgid "Didn't understand `%s' (expected integer)"
+msgstr ""
+
+#: gconf/gconf-value.c:106
+#, c-format
+msgid "Integer `%s' is too large or small"
+msgstr ""
+
+#: gconf/gconf-value.c:127
+#, c-format
+msgid "Didn't understand `%s' (expected real number)"
+msgstr ""
+
+#: gconf/gconf-value.c:160
+#, c-format
+msgid "Didn't understand `%s' (expected true or false)"
+msgstr ""
+
 #: gconf/gconf.c:69
 #, c-format
 msgid "`%s': %s"
 msgstr "'%s': %s"
 
-#: gconf/gconf.c:261
+#: gconf/gconf.c:271
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Palvelin ei voinut selvittää osoitetta '%s'"
 
-#: gconf/gconf.c:391
+#: gconf/gconf.c:408
 msgid "Can't add notifications to a local configuration source"
 msgstr "Ei voitu lisätä huomautuksia paikalliseen asetuslähteeseen"
 
-#: gconf/gconf.c:1449
+#: gconf/gconf.c:1466
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Palvelimen ping epäonnistui, CORBA-virhe: %s"
 
-#: gconf/gconf.c:1465
+#: gconf/gconf.c:1482
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -297,57 +598,57 @@ msgstr ""
 "oaf_activate_from_id() ja ei asettanut virhekeskeytystä. Olkaa hyvä, ja "
 "tehkää OAF:ista virheilmoitus."
 
-#: gconf/gconf.c:1660
+#: gconf/gconf.c:1677
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConfia ei voitu käynnistää, lopetetaan\n"
 
-#: gconf/gconf.c:1697
+#: gconf/gconf.c:1714
 msgid "Must begin with a slash (/)"
 msgstr "Täytyy alkaa kauttaviivalla (/)"
 
-#: gconf/gconf.c:1719
+#: gconf/gconf.c:1736
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kahta kauttaviivaa (/) ei voi olla peräkkäin"
 
-#: gconf/gconf.c:1721
+#: gconf/gconf.c:1738
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Pistettä (.) ei voi olla heti kauttaviivan (/) jälkeen"
 
-#: gconf/gconf.c:1742
+#: gconf/gconf.c:1759
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' on virheellinen merkki avaimien ja hakemistojen nimissä"
 
-#: gconf/gconf.c:1756
+#: gconf/gconf.c:1773
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Avaimen tai hakemiston nimi ei voi päättyä kauttaviivaan (/)"
 
-#: gconf/gconf.c:2087
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Asetuspalvelinta ei voitu sulkea: %s"
 
-#: gconf/gconf.c:2148
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Odotettiin liukulukua, saatiin %s"
 
-#: gconf/gconf.c:2183
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Odotettiin kokonaislukua, mutta saatiin %s"
 
-#: gconf/gconf.c:2218
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Odotettiin merkkijonoa, mutta saatiin %s"
 
-#: gconf/gconf.c:2255
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Odotettiin totuusarvoa, mutta saatiin %s"
 
-#: gconf/gconf.c:2288
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Odotettiin schemaa, mutta saatiin %s"
@@ -469,11 +770,6 @@ msgstr "Poistutaan"
 msgid "Failed to sync one or more sources: %s"
 msgstr "Yhtä tai useampaa lähdettä ei voitu synkronoida: %s"
 
-#: gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr "Virhe haettaessa '%s':n arvoa: %s"
-
 #: gconf/gconfd.c:1561
 #, c-format
 msgid "Error setting value for `%s': %s"
@@ -514,31 +810,31 @@ msgstr "Virhe luetteloidessa hakemistoja '%s':ssä: %s"
 msgid "Error setting schema for `%s': %s"
 msgstr "Virhe asetettaessa schemaa '%s':lle: %s"
 
-#: gconf/gconfd.c:1911
+#: gconf/gconfd.c:1913
 msgid "Attempt to unregister invalid context ID"
 msgstr "Yritys poistaa virheellisen context ID:n rekisteröintiä"
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1920
 #, c-format
 msgid "Bad context ID %lu, request ignored"
 msgstr "Virheellinen context ID %lu, pyyntö ohitettiin"
 
-#: gconf/gconfd.c:1926
+#: gconf/gconfd.c:1928
 #, c-format
 msgid "Already-unregistered context ID %lu, request ignored"
 msgstr "Jo rekisteristä poistettu context ID %lu, pyyntö ohitettiin"
 
-#: gconf/gconfd.c:1951
+#: gconf/gconfd.c:1953
 #, c-format
 msgid "Attempt to use invalid context ID %lu"
 msgstr "Yritys käyttää virheellistä context ID:tä %lu"
 
-#: gconf/gconfd.c:1961
+#: gconf/gconfd.c:1963
 #, c-format
 msgid "Attempt to use already-unregistered context ID %lu"
 msgstr "Yritys käyttää jo rekisteristä poistettua context ID:tä %lu"
 
-#: gconf/gconfd.c:2121
+#: gconf/gconfd.c:2123
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Palautetaan poikkeus: %s"
@@ -760,7 +1056,9 @@ msgstr "--break-directory asetusta voi käyttää vain yksinään.\n"
 #: gconf/gconftool.c:441
 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"
+msgstr ""
+"--direct asetusta käytettäessä täytyy määritellä asetuslähde asetuksella "
+"--config-source\n"
 
 #: gconf/gconftool.c:447
 #, c-format
@@ -774,7 +1072,7 @@ 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:488
+#: gconf/gconftool.c:487
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -786,135 +1084,135 @@ msgstr ""
 "muita sovelluksia ei ole käynnissä. (vaikka sen pitäisi toimia teoriassa\n"
 "ohjelmien käynnissä ollessakin)\n"
 
-#: gconf/gconftool.c:510
+#: gconf/gconftool.c:509
 #, 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:670
+#: gconf/gconftool.c:669
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Sulkemisvirhe: %s\n"
 
-#: gconf/gconftool.c:715
+#: gconf/gconftool.c:714
 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:749
+#: gconf/gconftool.c:748
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "Virhe luetteloitaessa pareja '%s':ssa: %s"
 
-#: gconf/gconftool.c:767
+#: gconf/gconftool.c:766
 msgid "(no value set)"
 msgstr "(ei arvoa)"
 
-#: gconf/gconftool.c:820
+#: gconf/gconftool.c:819
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Asetuspalvelimen (gconfd) käynnistys epäonnistui: %s\n"
 
-#: gconf/gconftool.c:834
+#: gconf/gconftool.c:833
 msgid "Must specify a key or keys to get\n"
 msgstr "Täytyy määritellä haettavat avaimet\n"
 
-#: gconf/gconftool.c:865
+#: gconf/gconftool.c:864
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tyyppi: %s\n"
 
-#: gconf/gconftool.c:866
+#: gconf/gconftool.c:865
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Omistaja: %s\n"
 
-#: gconf/gconftool.c:866 gconf/gconftool.c:867 gconf/gconftool.c:868
+#: gconf/gconftool.c:865 gconf/gconftool.c:866 gconf/gconftool.c:867
 msgid "Unset"
 msgstr "Poista"
 
-#: gconf/gconftool.c:867
+#: gconf/gconftool.c:866
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Lyhyt seloste: %s\n"
 
-#: gconf/gconftool.c:868
+#: gconf/gconftool.c:867
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Pitkä seloste: %s\n"
 
-#: gconf/gconftool.c:877
+#: gconf/gconftool.c:876
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Ei arvoa '%s':lle\n"
 
-#: gconf/gconftool.c:881
+#: gconf/gconftool.c:880
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "'%s':n arvon hakeminen epäonnistui: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:899
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Täytyy määritellä avain+arvo -pari parametreina\n"
 
-#: gconf/gconftool.c:917
+#: gconf/gconftool.c:916
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Avaimella '%s' ei arvoa\n"
 
-#: gconf/gconftool.c:940 gconf/gconftool.c:1052 gconf/gconftool.c:1056
+#: gconf/gconftool.c:939 gconf/gconftool.c:1051 gconf/gconftool.c:1055
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Tyyppi '%s' ei ole tuettu\n"
 
-#: gconf/gconftool.c:951
+#: gconf/gconftool.c:950
 #, c-format
 msgid "Error: %s\n"
 msgstr "Virhe: %s\n"
 
-#: gconf/gconftool.c:964 gconf/gconftool.c:1070
+#: gconf/gconftool.c:963 gconf/gconftool.c:1069
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Virhe asetettaesa arvoa: %s"
 
-#: gconf/gconftool.c:982 gconf/gconftool.c:1084
+#: gconf/gconftool.c:981 gconf/gconftool.c:1083
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Virhe synkronoitaessa: %s"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:999
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Arvo (scheman nimi) täytyy olla ainoana parametrina\n"
 
-#: gconf/gconftool.c:1099
+#: gconf/gconftool.c:1098
 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:1113
+#: gconf/gconftool.c:1112
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Täytyy määritellä poistettavat avaimet.\n"
 
-#: gconf/gconftool.c:1124
+#: gconf/gconftool.c:1123
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Virhe poistettaessa '%s':aa: %s\n"
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1146
 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:1181
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Virhe luetteloitaessa hakemistoja: %s\n"
 
-#: gconf/gconftool.c:1220
+#: gconf/gconftool.c:1219
 #, 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:1227
+#: gconf/gconftool.c:1226
 msgid ""
 "WARNING: For now gconftool only knows how to install default values for "
 "simple types (int, string, bool, float)\n"
@@ -922,90 +1220,92 @@ msgstr ""
 "VAROITUS: Tällä hetkellä gconftool voi asentaa oletusarvot vain "
 "yksinkertaisille tyypeille (int, string, bool, float)\n"
 
-#: gconf/gconftool.c:1243
+#: gconf/gconftool.c:1242
 #, 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:1256
+#: gconf/gconftool.c:1255
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "VAROITUS: gconftool:in sisäinen virhe: tuntematon GConfValueType\n"
 
-#: gconf/gconftool.c:1304
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "VAROITUS: tyypin '%s' nimen jäsennys epäonnistui\n"
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1326
 msgid "WARNING: empty <applyto> node"
 msgstr "VAROITUS: tyhjä <applyto> osio"
 
-#: gconf/gconftool.c:1330 gconf/gconftool.c:1575
+#: gconf/gconftool.c:1329 gconf/gconftool.c:1574
 #, 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:1340
+#: gconf/gconftool.c:1339
 msgid "WARNING: no key specified for schema\n"
 msgstr "VAROITUS: schemalle ei ole määritelty avainta\n"
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1372
 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:1379
+#: gconf/gconftool.c:1378
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
-msgstr "VAROITUS: useita <locale> osioita localelle '%s': ohitetaan kaikki paitsi ensimmäinen\n"
+msgstr ""
+"VAROITUS: useita <locale> osioita localelle '%s': ohitetaan kaikki paitsi "
+"ensimmäinen\n"
 
-#: gconf/gconftool.c:1451
+#: gconf/gconftool.c:1450
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "VAROITUS: virheellinen osio <%s> osiossa <locale>\n"
 
-#: gconf/gconftool.c:1480
+#: gconf/gconftool.c:1479
 #, 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:1488
+#: gconf/gconftool.c:1487
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Asennettiin schema '%s' localelle '%s'\n"
 
-#: gconf/gconftool.c:1510
+#: gconf/gconftool.c:1509
 #, 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:1518
+#: gconf/gconftool.c:1517
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Kytkettiin schema '%s' avaimeen '%s'\n"
 
-#: gconf/gconftool.c:1588
+#: gconf/gconftool.c:1587
 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:1617
+#: gconf/gconftool.c:1616
 #, 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:1639
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "'%s':n avaaminen epäonnistui: %s\n"
 
-#: gconf/gconftool.c:1646
+#: gconf/gconftool.c:1645
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Asiakirja '%s' on tyhjä?\n"
 
-#: gconf/gconftool.c:1658
+#: gconf/gconftool.c:1657
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1014,27 +1314,27 @@ msgstr ""
 "Asiakirjalla '%s' on vääräntyyppinen juuriosio (<%s>, pitäisi olla "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1671
+#: gconf/gconftool.c:1670
 #, 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:1685
+#: gconf/gconftool.c:1684
 #, 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:1696 gconf/gconftool.c:1728
+#: gconf/gconftool.c:1695 gconf/gconftool.c:1727
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Virhe synkronoitaessa asetustietoja: %s"
 
-#: gconf/gconftool.c:1712
+#: gconf/gconftool.c:1711
 msgid "Must specify some schema files to install\n"
 msgstr "Täytyy määritellä asennettavat schema-tiedostot\n"
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1748
 #, c-format
 msgid ""
 "\n"
@@ -1043,16 +1343,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:1769
+#: gconf/gconftool.c:1768
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Rikkomisavainta %s ei voitu poistaa: %s\n"
 
-#: gconf/gconftool.c:1895
+#: gconf/gconftool.c:1894
 msgid "Must specify some keys to break\n"
 msgstr "Täytyy määritellä rikottavat avaimet\n"
 
-#: gconf/gconftool.c:1901
+#: gconf/gconftool.c:1900
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1061,11 +1361,11 @@ msgstr ""
 "Yritetään rikkoa sovellus asettamalla virheellisiä arvoja avaimelle:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:1919
+#: gconf/gconftool.c:1918
 msgid "Must specify some directories to break\n"
 msgstr "Täytyy määritellä rikottavat hakemistot\n"
 
-#: gconf/gconftool.c:1938
+#: gconf/gconftool.c:1937
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1075,3 +1375,13 @@ msgstr ""
 "Yritetään rikkoa sovellus asettamalla virheellisiä arvoja avaimille "
 "hakemistossa:\n"
 "  %s\n"
+
+#: wrappers/gtk/gconf-client.c:812
+#, fuzzy, c-format
+msgid "GConf warning: failure listing pairs in `%s': %s"
+msgstr "Virhe luetteloitaessa pareja '%s':ssa: %s"
+
+#: wrappers/gtk/gconf-client.c:990
+#, fuzzy, c-format
+msgid "Expected `%s' got `%s' for key %s"
+msgstr "Odotettiin %s:n listaa, mutta saatiin %s:n lista"
diff --git a/po/fr.po b/po/fr.po
index cdea0bff..68de9bb5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf VERSION\n"
-"POT-Creation-Date: 2000-04-12 19:12+0200\n"
+"POT-Creation-Date: 2000-07-27 13:55-0400\n"
 "PO-Revision-Date: 2000-02-15 17:50+0100\n"
 "Last-Translator: Vincent Renardias <vincent@ldsol.com>\n"
 "Language-Team: French\n"
@@ -22,7 +22,7 @@ msgstr "Déchargement du module XML."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:315
+#: backends/xml-backend.c:315 backends/xml-dir.c:1047
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr ""
@@ -46,6 +46,191 @@ msgstr ""
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr ""
 
+#: backends/xml-cache.c:134
+msgid "Unsynced directory deletions when shutting down XML backend"
+msgstr ""
+
+#: backends/xml-cache.c:243
+#, 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
+#, c-format
+msgid ""
+"%u items remain in the cache after cleaning already-synced items older than "
+"%u seconds"
+msgstr ""
+
+#: backends/xml-dir.c:178
+#, c-format
+msgid "Could not stat `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:188
+#, c-format
+msgid "XML filename `%s' is a directory"
+msgstr ""
+
+#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#, c-format
+msgid "Failed to delete `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:355
+#, c-format
+msgid "Failed to write file `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#, c-format
+msgid "Failed to rename `%s' to `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:387
+#, c-format
+msgid "Failed to restore `%s' from `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:399
+#, c-format
+msgid "Failed to delete old file `%s': %s"
+msgstr ""
+
+#. These are all fatal errors
+#: backends/xml-dir.c:802
+#, c-format
+msgid "Failed to stat `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:946
+#, c-format
+msgid "Duplicate entry `%s' in `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:968
+#, c-format
+msgid "Entry with no name in XML file `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:975
+#, c-format
+msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:1063
+#, c-format
+msgid "Failed to create file `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2416
+#, c-format
+msgid "Failed to close file `%s': %s"
+msgstr ""
+
+#. There was an error
+#: backends/xml-entry.c:162
+#, c-format
+msgid "Ignoring XML node with name `%s': %s"
+msgstr ""
+
+#: backends/xml-entry.c:213 gconf/gconf-internals.c:2120
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: backends/xml-entry.c:340
+#, c-format
+msgid "Ignoring schema name `%s', invalid: %s"
+msgstr ""
+
+#. FIXME for nodes with no value stored, but containing a schema name,
+#. * we improperly log an error here
+#.
+#: backends/xml-entry.c:386
+#, c-format
+msgid "Ignoring XML node `%s', except for possible schema name: %s"
+msgstr ""
+
+#: backends/xml-entry.c:688
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:710
+#, c-format
+msgid "Failed reading default value for schema: %s"
+msgstr ""
+
+#: backends/xml-entry.c:892
+#, c-format
+msgid "No \"type\" attribute for <%s> node"
+msgstr ""
+
+#: backends/xml-entry.c:906
+#, c-format
+msgid "A node has unknown \"type\" attribute `%s', ignoring"
+msgstr ""
+
+#: backends/xml-entry.c:921
+msgid "No \"value\" attribute for node"
+msgstr ""
+
+#: backends/xml-entry.c:969 backends/xml-entry.c:1045
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML list node"
+msgstr ""
+
+#: backends/xml-entry.c:1003
+msgid "Invalid type (list, pair, or unknown) in a list node"
+msgstr ""
+
+#: backends/xml-entry.c:1026
+#, c-format
+msgid "Bad XML node: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1034
+#, c-format
+msgid "List contains a badly-typed node (%s, should be %s)"
+msgstr ""
+
+#: backends/xml-entry.c:1086
+#, c-format
+msgid "Ignoring bad car from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1095 backends/xml-entry.c:1118
+msgid "parsing XML file: lists and pairs may not be placed inside a pair"
+msgstr ""
+
+#: backends/xml-entry.c:1108
+#, c-format
+msgid "Ignoring bad cdr from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1127
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1145
+msgid "Didn't find car and cdr for XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1151
+msgid "Missing cdr from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1158
+msgid "Missing car from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1163
+msgid "Missing both car and cdr values from pair in XML file"
+msgstr ""
+
 #. -- end debug only
 #: gconf/gconf-backend.c:180
 #, c-format
@@ -75,6 +260,66 @@ msgstr ""
 msgid "Failed to shut down backend"
 msgstr ""
 
+#: gconf/gconf-error.c:39
+msgid "Success"
+msgstr ""
+
+#: gconf/gconf-error.c:40
+msgid "Failed"
+msgstr ""
+
+#: gconf/gconf-error.c:41
+msgid "Configuration server couldn't be contacted"
+msgstr ""
+
+#: gconf/gconf-error.c:42
+msgid "Permission denied"
+msgstr ""
+
+#: gconf/gconf-error.c:43
+msgid "Couldn't resolve address for configuration source"
+msgstr ""
+
+#: gconf/gconf-error.c:44
+msgid "Bad key or directory name"
+msgstr ""
+
+#: gconf/gconf-error.c:45
+msgid "Parse error"
+msgstr ""
+
+#: gconf/gconf-error.c:46
+msgid "Corrupt data in configuration source database"
+msgstr ""
+
+#: gconf/gconf-error.c:47
+msgid "Type mismatch"
+msgstr ""
+
+#: gconf/gconf-error.c:48
+msgid "Key operation on directory"
+msgstr ""
+
+#: gconf/gconf-error.c:49
+msgid "Directory operation on key"
+msgstr ""
+
+#: gconf/gconf-error.c:50
+msgid "Can't overwrite existing read-only value"
+msgstr ""
+
+#: gconf/gconf-error.c:51
+msgid "Object Activation Framework error"
+msgstr ""
+
+#: gconf/gconf-error.c:52
+msgid "Operation not allowed without configuration server"
+msgstr ""
+
+#: gconf/gconf-error.c:53
+msgid "Failed to get a lock"
+msgstr ""
+
 #: gconf/gconf-internals.c:100
 #, c-format
 msgid "No '/' in key `%s'"
@@ -108,221 +353,272 @@ msgstr "Ajout de la source `%s'\n"
 msgid "Read error on file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:1284
+#: gconf/gconf-internals.c:1282
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1294
+#: gconf/gconf-internals.c:1292
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1433
+#: gconf/gconf-internals.c:1431
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1447
+#: gconf/gconf-internals.c:1445
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1463
+#: gconf/gconf-internals.c:1461
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1579
+#: gconf/gconf-internals.c:1577
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1641
+#: gconf/gconf-internals.c:1639
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2107 gconf/gconf.c:2615
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2122
-#, c-format
-msgid "%s"
-msgstr ""
-
-#: gconf/gconf-internals.c:2127
+#: gconf/gconf-internals.c:2125
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2132
+#: gconf/gconf-internals.c:2130
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2139
+#: gconf/gconf-internals.c:2137
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2144
+#: gconf/gconf-internals.c:2142
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2227
+#: gconf/gconf-internals.c:2225
 #, c-format
 msgid "No ior file in `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2258
+#: gconf/gconf-internals.c:2256
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2269
+#: gconf/gconf-internals.c:2267
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2289
+#: gconf/gconf-internals.c:2287
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2297
+#: gconf/gconf-internals.c:2295
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2309
+#: gconf/gconf-internals.c:2307
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2335
+#: gconf/gconf-internals.c:2333
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2370
+#: gconf/gconf-internals.c:2368
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2406
+#: gconf/gconf-internals.c:2404
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2418
-#, c-format
-msgid "Failed to close file `%s': %s"
-msgstr ""
-
-#: gconf/gconf-internals.c:2449
+#: gconf/gconf-internals.c:2447
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2466
+#: gconf/gconf-internals.c:2464
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2476
+#: gconf/gconf-internals.c:2474
 #, 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:2493
+#: gconf/gconf-internals.c:2491
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr ""
 
+#: gconf/gconf-sources.c:334
+#, c-format
+msgid "Failed to load source `%s': %s"
+msgstr ""
+
+#: gconf/gconf-sources.c:506
+#, c-format
+msgid "Schema `%s' specified for `%s' stores a non-schema value"
+msgstr ""
+
+#: gconf/gconf-sources.c:555
+msgid "The '/' name can only be a directory, not a key"
+msgstr ""
+
+#: gconf/gconf-sources.c:584
+#, 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
+#, c-format
+msgid "Error finding metainfo: %s"
+msgstr ""
+
+#: gconf/gconf-sources.c:1144
+#, c-format
+msgid "Error getting metainfo: %s"
+msgstr ""
+
+#: gconf/gconf-sources.c:1168
+#, 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
+#, c-format
+msgid "Didn't understand `%s' (expected integer)"
+msgstr ""
+
+#: gconf/gconf-value.c:106
+#, c-format
+msgid "Integer `%s' is too large or small"
+msgstr ""
+
+#: gconf/gconf-value.c:127
+#, c-format
+msgid "Didn't understand `%s' (expected real number)"
+msgstr ""
+
+#: gconf/gconf-value.c:160
+#, c-format
+msgid "Didn't understand `%s' (expected true or false)"
+msgstr ""
+
 #: gconf/gconf.c:69
 #, c-format
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:261
+#: gconf/gconf.c:271
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:391
+#: gconf/gconf.c:408
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1449
+#: gconf/gconf.c:1466
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1465
+#: gconf/gconf.c:1482
 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:1660
+#: gconf/gconf.c:1677
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:1697
+#: gconf/gconf.c:1714
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1719
+#: gconf/gconf.c:1736
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:1721
+#: gconf/gconf.c:1738
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1742
+#: gconf/gconf.c:1759
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:1756
+#: gconf/gconf.c:1773
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2087
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2148
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2183
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2218
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2255
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2288
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
@@ -433,11 +729,6 @@ msgstr ""
 msgid "Failed to sync one or more sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr ""
-
 #: gconf/gconfd.c:1561
 #, c-format
 msgid "Error setting value for `%s': %s"
@@ -478,31 +769,31 @@ msgstr ""
 msgid "Error setting schema for `%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1911
+#: gconf/gconfd.c:1913
 msgid "Attempt to unregister invalid context ID"
 msgstr ""
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1920
 #, c-format
 msgid "Bad context ID %lu, request ignored"
 msgstr ""
 
-#: gconf/gconfd.c:1926
+#: gconf/gconfd.c:1928
 #, c-format
 msgid "Already-unregistered context ID %lu, request ignored"
 msgstr ""
 
-#: gconf/gconfd.c:1951
+#: gconf/gconfd.c:1953
 #, c-format
 msgid "Attempt to use invalid context ID %lu"
 msgstr ""
 
-#: gconf/gconfd.c:1961
+#: gconf/gconfd.c:1963
 #, c-format
 msgid "Attempt to use already-unregistered context ID %lu"
 msgstr ""
 
-#: gconf/gconfd.c:2121
+#: gconf/gconfd.c:2123
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
@@ -714,7 +1005,7 @@ 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:488
+#: gconf/gconftool.c:487
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -722,273 +1013,273 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:510
+#: gconf/gconftool.c:509
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:670
+#: gconf/gconftool.c:669
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:715
+#: gconf/gconftool.c:714
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:749
+#: gconf/gconftool.c:748
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr ""
 
-#: gconf/gconftool.c:767
+#: gconf/gconftool.c:766
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:820
+#: gconf/gconftool.c:819
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:834
+#: gconf/gconftool.c:833
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:865
+#: gconf/gconftool.c:864
 #, c-format
 msgid "Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:866
+#: gconf/gconftool.c:865
 #, c-format
 msgid "Owner: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:866 gconf/gconftool.c:867 gconf/gconftool.c:868
+#: gconf/gconftool.c:865 gconf/gconftool.c:866 gconf/gconftool.c:867
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:867
+#: gconf/gconftool.c:866
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:868
+#: gconf/gconftool.c:867
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:877
+#: gconf/gconftool.c:876
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:881
+#: gconf/gconftool.c:880
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:899
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:917
+#: gconf/gconftool.c:916
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:940 gconf/gconftool.c:1052 gconf/gconftool.c:1056
+#: gconf/gconftool.c:939 gconf/gconftool.c:1051 gconf/gconftool.c:1055
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:951
+#: gconf/gconftool.c:950
 #, c-format
 msgid "Error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:964 gconf/gconftool.c:1070
+#: gconf/gconftool.c:963 gconf/gconftool.c:1069
 #, c-format
 msgid "Error setting value: %s"
 msgstr ""
 
-#: gconf/gconftool.c:982 gconf/gconftool.c:1084
+#: gconf/gconftool.c:981 gconf/gconftool.c:1083
 #, c-format
 msgid "Error syncing: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:999
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1099
+#: gconf/gconftool.c:1098
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1113
+#: gconf/gconftool.c:1112
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1124
+#: gconf/gconftool.c:1123
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1146
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1220
+#: gconf/gconftool.c:1219
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1227
+#: gconf/gconftool.c:1226
 msgid ""
 "WARNING: For now gconftool only knows how to install default values for "
 "simple types (int, string, bool, float)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1243
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1256
+#: gconf/gconftool.c:1255
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1304
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1326
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1330 gconf/gconftool.c:1575
+#: gconf/gconftool.c:1329 gconf/gconftool.c:1574
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1340
+#: gconf/gconftool.c:1339
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1372
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1379
+#: gconf/gconftool.c:1378
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1451
+#: gconf/gconftool.c:1450
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1480
+#: gconf/gconftool.c:1479
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1488
+#: gconf/gconftool.c:1487
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1510
+#: gconf/gconftool.c:1509
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1518
+#: gconf/gconftool.c:1517
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1588
+#: gconf/gconftool.c:1587
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1617
+#: gconf/gconftool.c:1616
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1639
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1646
+#: gconf/gconftool.c:1645
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr ""
 
-#: gconf/gconftool.c:1658
+#: gconf/gconftool.c:1657
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1671
+#: gconf/gconftool.c:1670
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1685
+#: gconf/gconftool.c:1684
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1696 gconf/gconftool.c:1728
+#: gconf/gconftool.c:1695 gconf/gconftool.c:1727
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1712
+#: gconf/gconftool.c:1711
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1748
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1769
+#: gconf/gconftool.c:1768
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1895
+#: gconf/gconftool.c:1894
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:1901
+#: gconf/gconftool.c:1900
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1919
+#: gconf/gconftool.c:1918
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:1938
+#: gconf/gconftool.c:1937
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -996,6 +1287,16 @@ msgid ""
 "  %s\n"
 msgstr ""
 
+#: wrappers/gtk/gconf-client.c:812
+#, c-format
+msgid "GConf warning: failure listing pairs in `%s': %s"
+msgstr ""
+
+#: wrappers/gtk/gconf-client.c:990
+#, c-format
+msgid "Expected `%s' got `%s' for key %s"
+msgstr ""
+
 #~ msgid "Key"
 #~ msgstr "Clé"
 
diff --git a/po/ga.po b/po/ga.po
index 01ded5bf..181af25d 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-03-10 23:05+0000\n"
+"POT-Creation-Date: 2000-07-27 13:55-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"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:315
+#: backends/xml-backend.c:315 backends/xml-dir.c:1047
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr ""
@@ -46,6 +46,191 @@ msgstr ""
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr ""
 
+#: backends/xml-cache.c:134
+msgid "Unsynced directory deletions when shutting down XML backend"
+msgstr ""
+
+#: backends/xml-cache.c:243
+#, 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
+#, c-format
+msgid ""
+"%u items remain in the cache after cleaning already-synced items older than "
+"%u seconds"
+msgstr ""
+
+#: backends/xml-dir.c:178
+#, c-format
+msgid "Could not stat `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:188
+#, c-format
+msgid "XML filename `%s' is a directory"
+msgstr ""
+
+#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#, c-format
+msgid "Failed to delete `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:355
+#, c-format
+msgid "Failed to write file `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#, c-format
+msgid "Failed to rename `%s' to `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:387
+#, c-format
+msgid "Failed to restore `%s' from `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:399
+#, c-format
+msgid "Failed to delete old file `%s': %s"
+msgstr ""
+
+#. These are all fatal errors
+#: backends/xml-dir.c:802
+#, c-format
+msgid "Failed to stat `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:946
+#, c-format
+msgid "Duplicate entry `%s' in `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:968
+#, c-format
+msgid "Entry with no name in XML file `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:975
+#, c-format
+msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:1063
+#, c-format
+msgid "Failed to create file `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2416
+#, c-format
+msgid "Failed to close file `%s': %s"
+msgstr ""
+
+#. There was an error
+#: backends/xml-entry.c:162
+#, c-format
+msgid "Ignoring XML node with name `%s': %s"
+msgstr ""
+
+#: backends/xml-entry.c:213 gconf/gconf-internals.c:2120
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: backends/xml-entry.c:340
+#, c-format
+msgid "Ignoring schema name `%s', invalid: %s"
+msgstr ""
+
+#. FIXME for nodes with no value stored, but containing a schema name,
+#. * we improperly log an error here
+#.
+#: backends/xml-entry.c:386
+#, c-format
+msgid "Ignoring XML node `%s', except for possible schema name: %s"
+msgstr ""
+
+#: backends/xml-entry.c:688
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:710
+#, c-format
+msgid "Failed reading default value for schema: %s"
+msgstr ""
+
+#: backends/xml-entry.c:892
+#, c-format
+msgid "No \"type\" attribute for <%s> node"
+msgstr ""
+
+#: backends/xml-entry.c:906
+#, c-format
+msgid "A node has unknown \"type\" attribute `%s', ignoring"
+msgstr ""
+
+#: backends/xml-entry.c:921
+msgid "No \"value\" attribute for node"
+msgstr ""
+
+#: backends/xml-entry.c:969 backends/xml-entry.c:1045
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML list node"
+msgstr ""
+
+#: backends/xml-entry.c:1003
+msgid "Invalid type (list, pair, or unknown) in a list node"
+msgstr ""
+
+#: backends/xml-entry.c:1026
+#, c-format
+msgid "Bad XML node: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1034
+#, c-format
+msgid "List contains a badly-typed node (%s, should be %s)"
+msgstr ""
+
+#: backends/xml-entry.c:1086
+#, c-format
+msgid "Ignoring bad car from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1095 backends/xml-entry.c:1118
+msgid "parsing XML file: lists and pairs may not be placed inside a pair"
+msgstr ""
+
+#: backends/xml-entry.c:1108
+#, c-format
+msgid "Ignoring bad cdr from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1127
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1145
+msgid "Didn't find car and cdr for XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1151
+msgid "Missing cdr from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1158
+msgid "Missing car from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1163
+msgid "Missing both car and cdr values from pair in XML file"
+msgstr ""
+
 #. -- end debug only
 #: gconf/gconf-backend.c:180
 #, c-format
@@ -75,6 +260,66 @@ msgstr ""
 msgid "Failed to shut down backend"
 msgstr ""
 
+#: gconf/gconf-error.c:39
+msgid "Success"
+msgstr ""
+
+#: gconf/gconf-error.c:40
+msgid "Failed"
+msgstr ""
+
+#: gconf/gconf-error.c:41
+msgid "Configuration server couldn't be contacted"
+msgstr ""
+
+#: gconf/gconf-error.c:42
+msgid "Permission denied"
+msgstr ""
+
+#: gconf/gconf-error.c:43
+msgid "Couldn't resolve address for configuration source"
+msgstr ""
+
+#: gconf/gconf-error.c:44
+msgid "Bad key or directory name"
+msgstr ""
+
+#: gconf/gconf-error.c:45
+msgid "Parse error"
+msgstr ""
+
+#: gconf/gconf-error.c:46
+msgid "Corrupt data in configuration source database"
+msgstr ""
+
+#: gconf/gconf-error.c:47
+msgid "Type mismatch"
+msgstr ""
+
+#: gconf/gconf-error.c:48
+msgid "Key operation on directory"
+msgstr ""
+
+#: gconf/gconf-error.c:49
+msgid "Directory operation on key"
+msgstr ""
+
+#: gconf/gconf-error.c:50
+msgid "Can't overwrite existing read-only value"
+msgstr ""
+
+#: gconf/gconf-error.c:51
+msgid "Object Activation Framework error"
+msgstr ""
+
+#: gconf/gconf-error.c:52
+msgid "Operation not allowed without configuration server"
+msgstr ""
+
+#: gconf/gconf-error.c:53
+msgid "Failed to get a lock"
+msgstr ""
+
 #: gconf/gconf-internals.c:100
 #, c-format
 msgid "No '/' in key `%s'"
@@ -108,221 +353,272 @@ msgstr ""
 msgid "Read error on file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:1284
+#: gconf/gconf-internals.c:1282
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1294
+#: gconf/gconf-internals.c:1292
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1433
+#: gconf/gconf-internals.c:1431
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1447
+#: gconf/gconf-internals.c:1445
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1463
+#: gconf/gconf-internals.c:1461
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1579
+#: gconf/gconf-internals.c:1577
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1641
+#: gconf/gconf-internals.c:1639
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2107 gconf/gconf.c:2615
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2122
-#, c-format
-msgid "%s"
-msgstr ""
-
-#: gconf/gconf-internals.c:2127
+#: gconf/gconf-internals.c:2125
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2132
+#: gconf/gconf-internals.c:2130
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2139
+#: gconf/gconf-internals.c:2137
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2144
+#: gconf/gconf-internals.c:2142
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2227
+#: gconf/gconf-internals.c:2225
 #, c-format
 msgid "No ior file in `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2258
+#: gconf/gconf-internals.c:2256
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2269
+#: gconf/gconf-internals.c:2267
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2289
+#: gconf/gconf-internals.c:2287
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2297
+#: gconf/gconf-internals.c:2295
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2309
+#: gconf/gconf-internals.c:2307
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2335
+#: gconf/gconf-internals.c:2333
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2370
+#: gconf/gconf-internals.c:2368
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2406
+#: gconf/gconf-internals.c:2404
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2418
-#, c-format
-msgid "Failed to close file `%s': %s"
-msgstr ""
-
-#: gconf/gconf-internals.c:2449
+#: gconf/gconf-internals.c:2447
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2466
+#: gconf/gconf-internals.c:2464
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2476
+#: gconf/gconf-internals.c:2474
 #, 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:2493
+#: gconf/gconf-internals.c:2491
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr ""
 
+#: gconf/gconf-sources.c:334
+#, c-format
+msgid "Failed to load source `%s': %s"
+msgstr ""
+
+#: gconf/gconf-sources.c:506
+#, c-format
+msgid "Schema `%s' specified for `%s' stores a non-schema value"
+msgstr ""
+
+#: gconf/gconf-sources.c:555
+msgid "The '/' name can only be a directory, not a key"
+msgstr ""
+
+#: gconf/gconf-sources.c:584
+#, 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
+#, c-format
+msgid "Error finding metainfo: %s"
+msgstr ""
+
+#: gconf/gconf-sources.c:1144
+#, c-format
+msgid "Error getting metainfo: %s"
+msgstr ""
+
+#: gconf/gconf-sources.c:1168
+#, 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
+#, c-format
+msgid "Didn't understand `%s' (expected integer)"
+msgstr ""
+
+#: gconf/gconf-value.c:106
+#, c-format
+msgid "Integer `%s' is too large or small"
+msgstr ""
+
+#: gconf/gconf-value.c:127
+#, c-format
+msgid "Didn't understand `%s' (expected real number)"
+msgstr ""
+
+#: gconf/gconf-value.c:160
+#, c-format
+msgid "Didn't understand `%s' (expected true or false)"
+msgstr ""
+
 #: gconf/gconf.c:69
 #, c-format
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:261
+#: gconf/gconf.c:271
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:391
+#: gconf/gconf.c:408
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1449
+#: gconf/gconf.c:1466
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1465
+#: gconf/gconf.c:1482
 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:1660
+#: gconf/gconf.c:1677
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:1697
+#: gconf/gconf.c:1714
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1719
+#: gconf/gconf.c:1736
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:1721
+#: gconf/gconf.c:1738
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1742
+#: gconf/gconf.c:1759
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:1756
+#: gconf/gconf.c:1773
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2087
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2148
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2183
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2218
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2255
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2288
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
@@ -433,11 +729,6 @@ msgstr ""
 msgid "Failed to sync one or more sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr ""
-
 #: gconf/gconfd.c:1561
 #, c-format
 msgid "Error setting value for `%s': %s"
@@ -478,31 +769,31 @@ msgstr ""
 msgid "Error setting schema for `%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1911
+#: gconf/gconfd.c:1913
 msgid "Attempt to unregister invalid context ID"
 msgstr ""
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1920
 #, c-format
 msgid "Bad context ID %lu, request ignored"
 msgstr ""
 
-#: gconf/gconfd.c:1926
+#: gconf/gconfd.c:1928
 #, c-format
 msgid "Already-unregistered context ID %lu, request ignored"
 msgstr ""
 
-#: gconf/gconfd.c:1951
+#: gconf/gconfd.c:1953
 #, c-format
 msgid "Attempt to use invalid context ID %lu"
 msgstr ""
 
-#: gconf/gconfd.c:1961
+#: gconf/gconfd.c:1963
 #, c-format
 msgid "Attempt to use already-unregistered context ID %lu"
 msgstr ""
 
-#: gconf/gconfd.c:2121
+#: gconf/gconfd.c:2123
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
@@ -714,7 +1005,7 @@ 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:488
+#: gconf/gconftool.c:487
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -722,246 +1013,246 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:510
+#: gconf/gconftool.c:509
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:670
+#: gconf/gconftool.c:669
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:715
+#: gconf/gconftool.c:714
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:749
+#: gconf/gconftool.c:748
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr ""
 
-#: gconf/gconftool.c:767
+#: gconf/gconftool.c:766
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:820
+#: gconf/gconftool.c:819
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:834
+#: gconf/gconftool.c:833
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:865
+#: gconf/gconftool.c:864
 #, c-format
 msgid "Type: %s\n"
 msgstr "Saghas: %s\n"
 
-#: gconf/gconftool.c:866
+#: gconf/gconftool.c:865
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Úinéar: %s\n"
 
-#: gconf/gconftool.c:866 gconf/gconftool.c:867 gconf/gconftool.c:868
+#: gconf/gconftool.c:865 gconf/gconftool.c:866 gconf/gconftool.c:867
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:867
+#: gconf/gconftool.c:866
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:868
+#: gconf/gconftool.c:867
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:877
+#: gconf/gconftool.c:876
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:881
+#: gconf/gconftool.c:880
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:899
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:917
+#: gconf/gconftool.c:916
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:940 gconf/gconftool.c:1052 gconf/gconftool.c:1056
+#: gconf/gconftool.c:939 gconf/gconftool.c:1051 gconf/gconftool.c:1055
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:951
+#: gconf/gconftool.c:950
 #, c-format
 msgid "Error: %s\n"
 msgstr "Earráid: %s\n"
 
-#: gconf/gconftool.c:964 gconf/gconftool.c:1070
+#: gconf/gconftool.c:963 gconf/gconftool.c:1069
 #, c-format
 msgid "Error setting value: %s"
 msgstr ""
 
-#: gconf/gconftool.c:982 gconf/gconftool.c:1084
+#: gconf/gconftool.c:981 gconf/gconftool.c:1083
 #, c-format
 msgid "Error syncing: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:999
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1099
+#: gconf/gconftool.c:1098
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1113
+#: gconf/gconftool.c:1112
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1124
+#: gconf/gconftool.c:1123
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1146
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1220
+#: gconf/gconftool.c:1219
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1227
+#: gconf/gconftool.c:1226
 msgid ""
 "WARNING: For now gconftool only knows how to install default values for "
 "simple types (int, string, bool, float)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1243
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1256
+#: gconf/gconftool.c:1255
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1304
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1326
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1330 gconf/gconftool.c:1575
+#: gconf/gconftool.c:1329 gconf/gconftool.c:1574
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1340
+#: gconf/gconftool.c:1339
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1372
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1379
+#: gconf/gconftool.c:1378
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1451
+#: gconf/gconftool.c:1450
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1480
+#: gconf/gconftool.c:1479
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1488
+#: gconf/gconftool.c:1487
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1510
+#: gconf/gconftool.c:1509
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1518
+#: gconf/gconftool.c:1517
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1588
+#: gconf/gconftool.c:1587
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1617
+#: gconf/gconftool.c:1616
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1639
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1646
+#: gconf/gconftool.c:1645
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Is Capéis '`%s' folamh?\n"
 
-#: gconf/gconftool.c:1658
+#: gconf/gconftool.c:1657
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1671
+#: gconf/gconftool.c:1670
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1685
+#: gconf/gconftool.c:1684
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1696 gconf/gconftool.c:1728
+#: gconf/gconftool.c:1695 gconf/gconftool.c:1727
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1712
+#: gconf/gconftool.c:1711
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1748
 #, c-format
 msgid ""
 "\n"
@@ -970,30 +1261,40 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:1769
+#: gconf/gconftool.c:1768
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1895
+#: gconf/gconftool.c:1894
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:1901
+#: gconf/gconftool.c:1900
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1919
+#: gconf/gconftool.c:1918
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:1938
+#: gconf/gconftool.c:1937
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
 "directory:\n"
 "  %s\n"
 msgstr ""
+
+#: wrappers/gtk/gconf-client.c:812
+#, c-format
+msgid "GConf warning: failure listing pairs in `%s': %s"
+msgstr ""
+
+#: wrappers/gtk/gconf-client.c:990
+#, c-format
+msgid "Expected `%s' got `%s' for key %s"
+msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 1451faee..c5c40d1d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 0.5\n"
-"POT-Creation-Date: 2000-03-09 14:58-0500\n"
+"POT-Creation-Date: 2000-07-27 13:55-0400\n"
 "PO-Revision-Date: 2000-07-24 17:25+09:00\n"
 "Last-Translator: Takeshi Aihana <aihana@muc.biglobe.ne.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -22,7 +22,7 @@ msgstr "XML ¥Ð¥Ã¥¯¥¨¥ó¥É¥â¥¸¥å¡¼¥ë¤ò²òÊüÃæ¤Ç¤¹¡£"
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "¥¢¥É¥ì¥¹ '%s' Ãæ¤Î XML ¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: backends/xml-backend.c:315
+#: backends/xml-backend.c:315 backends/xml-dir.c:1047
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê '%s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
@@ -30,7 +30,8 @@ msgstr "¥Ç¥£¥ì¥¯¥È¥ê '%s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 #: backends/xml-backend.c:400
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
-msgstr "¥¢¥É¥ì¥¹ '%s' Ãæ¤Î XML ¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤ÎÆɤ߼è¤ê/½ñ¤­¹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó¡£"
+msgstr ""
+"¥¢¥É¥ì¥¹ '%s' Ãæ¤Î XML ¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤ÎÆɤ߼è¤ê/½ñ¤­¹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó¡£"
 
 #: backends/xml-backend.c:410
 #, c-format
@@ -46,6 +47,193 @@ msgstr "XML ¥Ð¥Ã¥¯¥¨¥ó¥É¥â¥¸¥å¡¼¥ë¤Î½é´ü²½Ãæ¤Ç¤¹¡£"
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "XML ¾å¤Î¥Ç¥£¥ì¥¯¥È¥ê '%s' ¤Î¥í¥Ã¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
+#: backends/xml-cache.c:134
+msgid "Unsynced directory deletions when shutting down XML backend"
+msgstr ""
+
+#: backends/xml-cache.c:243
+#, 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
+#, c-format
+msgid ""
+"%u items remain in the cache after cleaning already-synced items older than "
+"%u seconds"
+msgstr ""
+
+#: backends/xml-dir.c:178
+#, fuzzy, c-format
+msgid "Could not stat `%s': %s"
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê '%s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
+
+#: backends/xml-dir.c:188
+#, c-format
+msgid "XML filename `%s' is a directory"
+msgstr ""
+
+#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#, fuzzy, c-format
+msgid "Failed to delete `%s': %s"
+msgstr "'%s'¤¬³«¤±¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
+
+#: backends/xml-dir.c:355
+#, fuzzy, c-format
+msgid "Failed to write file `%s': %s"
+msgstr "¥Õ¥¡¥¤¥ë '%s' ¤òÊĤ¸¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
+
+#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#, fuzzy, c-format
+msgid "Failed to rename `%s' to `%s': %s"
+msgstr "'%s'¤¬³«¤±¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
+
+#: backends/xml-dir.c:387
+#, fuzzy, c-format
+msgid "Failed to restore `%s' from `%s': %s"
+msgstr "'%s' ¤ÎÃͤμèÆÀ¤Ë¼ºÇÔ: %s\n"
+
+#: backends/xml-dir.c:399
+#, fuzzy, c-format
+msgid "Failed to delete old file `%s': %s"
+msgstr "¥Õ¥¡¥¤¥ë '%s' ¤òÊĤ¸¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
+
+#. These are all fatal errors
+#: backends/xml-dir.c:802
+#, fuzzy, c-format
+msgid "Failed to stat `%s': %s"
+msgstr "'%s'¤¬³«¤±¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
+
+#: backends/xml-dir.c:946
+#, c-format
+msgid "Duplicate entry `%s' in `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:968
+#, c-format
+msgid "Entry with no name in XML file `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:975
+#, c-format
+msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:1063
+#, fuzzy, c-format
+msgid "Failed to create file `%s': %s"
+msgstr "¥Õ¥¡¥¤¥ë '%s' ¤òÊĤ¸¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
+
+#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2416
+#, c-format
+msgid "Failed to close file `%s': %s"
+msgstr "¥Õ¥¡¥¤¥ë '%s' ¤òÊĤ¸¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
+
+#. There was an error
+#: backends/xml-entry.c:162
+#, c-format
+msgid "Ignoring XML node with name `%s': %s"
+msgstr ""
+
+#: backends/xml-entry.c:213 gconf/gconf-internals.c:2120
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: backends/xml-entry.c:340
+#, fuzzy, c-format
+msgid "Ignoring schema name `%s', invalid: %s"
+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
+#, c-format
+msgid "Ignoring XML node `%s', except for possible schema name: %s"
+msgstr ""
+
+#: backends/xml-entry.c:688
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:710
+#, fuzzy, c-format
+msgid "Failed reading default value for schema: %s"
+msgstr "·Ù¹ð: ¥Ç¥Õ¥©¥ë¥ÈÃÍ '%s' ¤Î²òÀϤ˼ºÇÔ: (¥¹¥­¡¼¥à¤Ï %s)\n"
+
+#: backends/xml-entry.c:892
+#, c-format
+msgid "No \"type\" attribute for <%s> node"
+msgstr ""
+
+#: backends/xml-entry.c:906
+#, fuzzy, c-format
+msgid "A node has unknown \"type\" attribute `%s', ignoring"
+msgstr ""
+"·Ù¹ð: <locale> ¥Î¡¼¥É¤Ë¤Ï °À­ 'name = "
+"\"¥í¥±¡¼¥ë̾\"¤¬¤¢¤ê¤Þ¤»¤ó¡£Ìµ»ë¤·¤Þ¤¹¡£\n"
+
+#: backends/xml-entry.c:921
+msgid "No \"value\" attribute for node"
+msgstr ""
+
+#: backends/xml-entry.c:969 backends/xml-entry.c:1045
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML list node"
+msgstr ""
+
+#: backends/xml-entry.c:1003
+msgid "Invalid type (list, pair, or unknown) in a list node"
+msgstr ""
+
+#: backends/xml-entry.c:1026
+#, c-format
+msgid "Bad XML node: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1034
+#, c-format
+msgid "List contains a badly-typed node (%s, should be %s)"
+msgstr ""
+
+#: backends/xml-entry.c:1086
+#, c-format
+msgid "Ignoring bad car from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1095 backends/xml-entry.c:1118
+msgid "parsing XML file: lists and pairs may not be placed inside a pair"
+msgstr ""
+
+#: backends/xml-entry.c:1108
+#, c-format
+msgid "Ignoring bad cdr from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1127
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1145
+msgid "Didn't find car and cdr for XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1151
+msgid "Missing cdr from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1158
+msgid "Missing car from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1163
+msgid "Missing both car and cdr values from pair in XML file"
+msgstr ""
+
 #. -- end debug only
 #: gconf/gconf-backend.c:180
 #, c-format
@@ -75,6 +263,69 @@ msgstr "'%s' ÍѤΥХ寥¨¥ó¥É¥â¥¸¥å¡¼¥ë¤¬ÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£"
 msgid "Failed to shut down backend"
 msgstr "¥Ð¥Ã¥¯¥¨¥ó¥É¥â¥¸¥å¡¼¥ë¤Î¥·¥ã¥Ã¥È¥À¥¦¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 
+#: gconf/gconf-error.c:39
+msgid "Success"
+msgstr ""
+
+#: gconf/gconf-error.c:40
+msgid "Failed"
+msgstr ""
+
+#: gconf/gconf-error.c:41
+msgid "Configuration server couldn't be contacted"
+msgstr ""
+
+#: gconf/gconf-error.c:42
+msgid "Permission denied"
+msgstr ""
+
+#: gconf/gconf-error.c:43
+#, fuzzy
+msgid "Couldn't resolve address for configuration source"
+msgstr "ÀßÄê¥Õ¥¡¥¤¥ë¤Î¥¢¥¯¥»¥¹¤Ë¼ºÇÔ: %s\n"
+
+#: gconf/gconf-error.c:44
+msgid "Bad key or directory name"
+msgstr ""
+
+#: gconf/gconf-error.c:45
+#, fuzzy
+msgid "Parse error"
+msgstr "OAF ²òÀÏ¥¨¥é¡¼: %s"
+
+#: gconf/gconf-error.c:46
+msgid "Corrupt data in configuration source database"
+msgstr ""
+
+#: gconf/gconf-error.c:47
+msgid "Type mismatch"
+msgstr ""
+
+#: gconf/gconf-error.c:48
+msgid "Key operation on directory"
+msgstr ""
+
+#: gconf/gconf-error.c:49
+msgid "Directory operation on key"
+msgstr ""
+
+#: gconf/gconf-error.c:50
+msgid "Can't overwrite existing read-only value"
+msgstr ""
+
+#: gconf/gconf-error.c:51
+msgid "Object Activation Framework error"
+msgstr ""
+
+#: gconf/gconf-error.c:52
+msgid "Operation not allowed without configuration server"
+msgstr ""
+
+#: gconf/gconf-error.c:53
+#, fuzzy
+msgid "Failed to get a lock"
+msgstr "'%s' ¤ÎÃͤμèÆÀ¤Ë¼ºÇÔ: %s\n"
+
 #: gconf/gconf-internals.c:100
 #, c-format
 msgid "No '/' in key `%s'"
@@ -108,221 +359,287 @@ msgstr "¥½¡¼¥¹ '%s' ¤òÄɲ䷤Ƥ¤¤Þ¤¹¡£\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "¥Õ¥¡¥¤¥ë '%s' ¾å¤Ë¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹: %s\n"
 
-#: gconf/gconf-internals.c:1284
+#: gconf/gconf-internals.c:1282
 #, c-format
 msgid "Expected list, got %s"
 msgstr "¥ê¥¹¥È¤ò´üÂÔ¤µ¤ì¤¿¤¬¡¢ÆÀ¤é¤ì¤¿¤Î¤Ï %s ¤Ç¤¹¡£"
 
-#: gconf/gconf-internals.c:1294
+#: gconf/gconf-internals.c:1292
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "%s ¤Î¥ê¥¹¥È¤ò´üÂÔ¤µ¤ì¤¿¤¬¡¢ÆÀ¤é¤ì¤¿¤Î¤Ï %s ¤Î¥ê¥¹¥È¤Ç¤¹¡£"
 
-#: gconf/gconf-internals.c:1433
+#: gconf/gconf-internals.c:1431
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "ÂФò´üÂÔ¤µ¤ì¤¿¤¬¡¢ÆÀ¤é¤ì¤¿¤Î¤Ï %s ¤Ç¤¹¡£"
 
-#: gconf/gconf-internals.c:1447
+#: gconf/gconf-internals.c:1445
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
-msgstr "(%s ¤È %s)¤Î¥Ú¥¢¤ò´üÂÔ¤µ¤ì¤¿¤¬¡¢ÆÀ¤é¤ì¤¿¤Î¤Ï£±¤Ä¤Ê¤¤¤·Î¾Êý¤ÎÃͤ¬Ìµ¤¤¥Ú¥¢¤Ç¤¹¡£"
+msgstr ""
+"(%s ¤È "
+"%s)¤Î¥Ú¥¢¤ò´üÂÔ¤µ¤ì¤¿¤¬¡¢ÆÀ¤é¤ì¤¿¤Î¤Ï£±¤Ä¤Ê¤¤¤·Î¾Êý¤ÎÃͤ¬Ìµ¤¤¥Ú¥¢¤Ç¤¹¡£"
 
-#: gconf/gconf-internals.c:1463
+#: gconf/gconf-internals.c:1461
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
-msgstr "(%s ¤È %s)¤Î¥¿¥¤¥×¤Î¥Ú¥¢¤ò´üÂÔ¤µ¤ì¤¿¤¬¡¢ÆÀ¤é¤ì¤¿¤Î¤Ï(%s ¤È %s)¤Î¥¿¥¤¥×¤Ç¤¹¡£"
+msgstr ""
+"(%s ¤È %s)¤Î¥¿¥¤¥×¤Î¥Ú¥¢¤ò´üÂÔ¤µ¤ì¤¿¤¬¡¢ÆÀ¤é¤ì¤¿¤Î¤Ï(%s ¤È %s)¤Î¥¿¥¤¥×¤Ç¤¹¡£"
 
-#: gconf/gconf-internals.c:1579
+#: gconf/gconf-internals.c:1577
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "°úÍѤµ¤ì¤¿Ê¸»úÎó¤Ï¥¯¥©¡¼¥Æ¡¼¥·¥ç¥óµ­¹æ(')¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: gconf/gconf-internals.c:1641
+#: gconf/gconf-internals.c:1639
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "°úÍѤµ¤ì¤¿Ê¸»úÎó¤Ï¥¯¥©¡¼¥Æ¡¼¥·¥ç¥óµ­¹æ(')¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: gconf/gconf-internals.c:2107 gconf/gconf.c:2615
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA ¥¨¥é¡¼: %s"
 
-#: gconf/gconf-internals.c:2122
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: gconf/gconf-internals.c:2127
+#: gconf/gconf-internals.c:2125
 msgid "attempt to remove not-listed OAF object directory"
-msgstr "¥ê¥¹¥È²½¤µ¤ì¤Æ¤¤¤Ê¤¤ OAF ¥ª¥Ö¥¸¥§¥¯¥È¥Ç¥£¥ì¥¯¥È¥ê¤òºï½ü¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹¡£"
+msgstr ""
+"¥ê¥¹¥È²½¤µ¤ì¤Æ¤¤¤Ê¤¤ OAF ¥ª¥Ö¥¸¥§¥¯¥È¥Ç¥£¥ì¥¯¥È¥ê¤òºï½ü¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: gconf/gconf-internals.c:2132
+#: gconf/gconf-internals.c:2130
 msgid "attempt to add already-listed OAF directory"
 msgstr "´û¤Ë¥ê¥¹¥È²½¤µ¤ì¤¿ OAF ¥Ç¥£¥ì¥¯¥È¥ê¤òÄɲ䷤褦¤È¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: gconf/gconf-internals.c:2139
+#: gconf/gconf-internals.c:2137
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF ²òÀÏ¥¨¥é¡¼: %s"
 
-#: gconf/gconf-internals.c:2144
+#: gconf/gconf-internals.c:2142
 msgid "Unknown OAF error"
 msgstr "ÉÔÌÀ¤Ê OAF ¥¨¥é¡¼"
 
-#: gconf/gconf-internals.c:2227
+#: gconf/gconf-internals.c:2225
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "'%s' ¤ÎÃæ¤Ë¤Ï ior ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: gconf/gconf-internals.c:2258
+#: gconf/gconf-internals.c:2256
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd ¤Ï¾¤Î¥×¥í¥»¥¹¤«¤é ¥í¥Ã¥¯ '%s' ¤ò¼èÆÀÃæ¤Ç¤¹¡£"
 
-#: gconf/gconf-internals.c:2269
+#: gconf/gconf-internals.c:2267
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "¤½¤Î¾¤Î¥×¥í¥°¥é¥à¤Ï¥í¥Ã¥¯ '%s' ¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
-#: gconf/gconf-internals.c:2289
+#: gconf/gconf-internals.c:2287
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "¸ºß¤·¤Æ¤¤¤ë gconfd ¤Ë¥Ô¥ó¥°¤¹¤ë¤¿¤á¤Î ORB ¤ËÀܳ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: gconf/gconf-internals.c:2297
+#: gconf/gconf-internals.c:2295
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
-msgstr "¸Å¤¤¥í¥Ã¥¯ '%s' ¤òºï½ü¤·¤Þ¤·¤¿¡£(IOR ¤¬¥ª¥Ö¥¸¥§¥¯¥È¥ê¥Õ¥¡¥ì¥ó¥¹¡¢IOR '%s' ¤ËÊÑ´¹¤Ç¤­¤Ê¤«¤Ã¤¿¤¿¤á)"
+msgstr ""
+"¸Å¤¤¥í¥Ã¥¯ '%s' ¤òºï½ü¤·¤Þ¤·¤¿¡£(IOR ¤¬¥ª¥Ö¥¸¥§¥¯¥È¥ê¥Õ¥¡¥ì¥ó¥¹¡¢IOR '%s' "
+"¤ËÊÑ´¹¤Ç¤­¤Ê¤«¤Ã¤¿¤¿¤á)"
 
-#: gconf/gconf-internals.c:2309
+#: gconf/gconf-internals.c:2307
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
-msgstr "¸Å¤¤¥í¥Ã¥¯ '%s' ¤òºï½ü¤·¤Þ¤·¤¿¡£(Ping¥µ¡¼¥Ð¡¼¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤¿¤¿¤á: %s)"
+msgstr ""
+"¸Å¤¤¥í¥Ã¥¯ '%s' ¤òºï½ü¤·¤Þ¤·¤¿¡£(Ping¥µ¡¼¥Ð¡¼¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤¿¤¿¤á: %s)"
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf ÀßÄê¥Ç¡¼¥â¥ó(gconfd)¤¬¥í¥Ã¥¯ '%s' ¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
-#: gconf/gconf-internals.c:2335
+#: gconf/gconf-internals.c:2333
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê '%s' ¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: gconf/gconf-internals.c:2370
+#: gconf/gconf-internals.c:2368
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "¥í¥Ã¥¯ '%s' ¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: gconf/gconf-internals.c:2406
+#: gconf/gconf-internals.c:2404
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "¥Õ¥¡¥¤¥ë '%s' ¤¬½ñ¤­¹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: gconf/gconf-internals.c:2418
-#, c-format
-msgid "Failed to close file `%s': %s"
-msgstr "¥Õ¥¡¥¤¥ë '%s' ¤òÊĤ¸¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
-
-#: gconf/gconf-internals.c:2449
+#: gconf/gconf-internals.c:2447
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
-msgstr "¥í¥Ã¥¯¥Õ¥¡¥¤¥ë '%s' ¤¬³«¤±¤Þ¤»¤ó¤Ç¤·¤¿¡£¤½¤Î¥í¥Ã¥¯¤Ï GConf ¤Îʪ¤Ç¤Ï̵¤¤¤Ç¤¹: %s"
+msgstr ""
+"¥í¥Ã¥¯¥Õ¥¡¥¤¥ë '%s' ¤¬³«¤±¤Þ¤»¤ó¤Ç¤·¤¿¡£¤½¤Î¥í¥Ã¥¯¤Ï GConf ¤Îʪ¤Ç¤Ï̵¤¤¤Ç¤¹: "
+"%s"
 
-#: gconf/gconf-internals.c:2466
+#: gconf/gconf-internals.c:2464
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "ÉÔÀµ¤Ê¥í¥Ã¥¯¥Õ¥¡¥¤¥ë '%s'¤Ç¤¹¡£ºï½ü¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: gconf/gconf-internals.c:2476
+#: gconf/gconf-internals.c:2474
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
-msgstr "¥í¥Ã¥¯¥Õ¥¡¥¤¥ë '%s' ¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£ (ºîÀ®¸µPID: %u GConf PID: %u  狼¤¬²æ¡¹¤Î¥í¥Ã¥¯¤ò²ò½ü¤·¤¿¤È²¾Äꤷ¤¿¾ì¹ç)"
+msgstr ""
+"¥í¥Ã¥¯¥Õ¥¡¥¤¥ë '%s' ¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£ (ºîÀ®¸µPID: %u GConf PID: %u  "
+"狼¤¬²æ¡¹¤Î¥í¥Ã¥¯¤ò²ò½ü¤·¤¿¤È²¾Äꤷ¤¿¾ì¹ç)"
 
-#: gconf/gconf-internals.c:2493
+#: gconf/gconf-internals.c:2491
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "¥í¥Ã¥¯¥Ç¥£¥ì¥¯¥È¥ê '%s' ¤Î²òÊü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
+#: gconf/gconf-sources.c:334
+#, fuzzy, c-format
+msgid "Failed to load source `%s': %s"
+msgstr "¥Õ¥¡¥¤¥ë '%s' ¤òÊĤ¸¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
+
+#: gconf/gconf-sources.c:506
+#, c-format
+msgid "Schema `%s' specified for `%s' stores a non-schema value"
+msgstr ""
+
+#: gconf/gconf-sources.c:555
+msgid "The '/' name can only be a directory, not a key"
+msgstr ""
+
+#: gconf/gconf-sources.c:584
+#, 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
+#, fuzzy, c-format
+msgid "Error finding metainfo: %s"
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È²½Ãæ¤Ë¥¨¥é¡¼: %s\n"
+
+#: gconf/gconf-sources.c:1144
+#, fuzzy, c-format
+msgid "Error getting metainfo: %s"
+msgstr "ÃͤÎÀßÄꥨ¥é¡¼: %s"
+
+#: gconf/gconf-sources.c:1168
+#, 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
+#, c-format
+msgid "Didn't understand `%s' (expected integer)"
+msgstr ""
+
+#: gconf/gconf-value.c:106
+#, c-format
+msgid "Integer `%s' is too large or small"
+msgstr ""
+
+#: gconf/gconf-value.c:127
+#, c-format
+msgid "Didn't understand `%s' (expected real number)"
+msgstr ""
+
+#: gconf/gconf-value.c:160
+#, c-format
+msgid "Didn't understand `%s' (expected true or false)"
+msgstr ""
+
 #: gconf/gconf.c:69
 #, c-format
 msgid "`%s': %s"
 msgstr "'%s' : %s"
 
-#: gconf/gconf.c:261
+#: gconf/gconf.c:271
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "¥µ¡¼¥Ð¡¼¤¬¥¢¥É¥ì¥¹ '%s' ¤Î²ò·è¤ò¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: gconf/gconf.c:391
+#: gconf/gconf.c:408
 msgid "Can't add notifications to a local configuration source"
 msgstr "¥í¡¼¥«¥ëÀßÄê¤ËÄÌÃΤòÄɲäǤ­¤Þ¤»¤ó¡£"
 
-#: gconf/gconf.c:1449
+#: gconf/gconf.c:1466
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "¥µ¡¼¥Ð¡¼¤ÎPing¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£CORBA¥¨¥é¡¼: %s"
 
-#: gconf/gconf.c:1465
+#: gconf/gconf.c:1482
 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 "ÀßÄꥵ¡¼¥Ð¡¼¤ÎÀܳ¥¨¥é¡¼: OAF ¤Ï oaf_activate_id()¤«¤é nil ¤òÊÖ¤·¤Æ¤­¤Þ¤·¤¿¡£¤Þ¤¿ ¤½¤ÎÌäÂê¤òÀâÌÀ¤¹¤ëÎã³°¤ò¥»¥Ã¥È¤·¤Þ¤»¤ó¤Ç¤·¤¿¡£¤³¤Î¥Õ¥¡¥¤¥ë¤ò OAF ¥Ð¥°¥ì¥Ý¡¼¥È¤ËÁ÷ÉÕ¤·¤Æ²¼¤µ¤¤¡£"
+msgstr ""
+"ÀßÄꥵ¡¼¥Ð¡¼¤ÎÀܳ¥¨¥é¡¼: OAF ¤Ï oaf_activate_id()¤«¤é nil "
+"¤òÊÖ¤·¤Æ¤­¤Þ¤·¤¿¡£¤Þ¤¿ "
+"¤½¤ÎÌäÂê¤òÀâÌÀ¤¹¤ëÎã³°¤ò¥»¥Ã¥È¤·¤Þ¤»¤ó¤Ç¤·¤¿¡£¤³¤Î¥Õ¥¡¥¤¥ë¤ò OAF "
+"¥Ð¥°¥ì¥Ý¡¼¥È¤ËÁ÷ÉÕ¤·¤Æ²¼¤µ¤¤¡£"
 
-#: gconf/gconf.c:1660
+#: gconf/gconf.c:1677
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConf ¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£½ªÎ»¤·¤Þ¤¹¡£\n"
 
-#: gconf/gconf.c:1697
+#: gconf/gconf.c:1714
 msgid "Must begin with a slash (/)"
 msgstr "¥¹¥é¥Ã¥·¥å '/' ¤Ç»Ï¤á¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
 
-#: gconf/gconf.c:1719
+#: gconf/gconf.c:1736
 msgid "Can't have two slashes (/) in a row"
 msgstr "¹ÔÃæ¤Ë£²¤Ä¤Î¥¹¥é¥Ã¥·¥å '/' ¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: gconf/gconf.c:1721
+#: gconf/gconf.c:1738
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "¥¹¥é¥Ã¥·¥å '/' ¤Î±¦Â¦¤Ë¥Ô¥ê¥ª¥É '.' ¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: gconf/gconf.c:1742
+#: gconf/gconf.c:1759
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' ¤Ï ¥­¡¼/¥Ç¥£¥ì¥¯¥È¥ê̾¤ÎÃæ¤Ç¤ÏÉÔÀµ¤Êʸ»ú¤Ç¤¹¡£"
 
-#: gconf/gconf.c:1756
+#: gconf/gconf.c:1773
 msgid "Key/directory may not end with a slash (/)"
 msgstr "¥­¡¼/¥Ç¥£¥ì¥¯¥È¥ê¤Ï¥¹¥é¥Ã¥·¥å '/' ¤Ç½ªÎ»¤·¤Æ¤¤¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£"
 
-#: gconf/gconf.c:2087
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "ÀßÄꥵ¡¼¥Ð¡¼¤Î¥·¥ã¥Ã¥È¥À¥¦¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
-#: gconf/gconf.c:2148
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr "'float'·¿¤ò´üÂÔ¤µ¤ì¤¿¤¬¡¢ÆÀ¤é¤ì¤¿¤Î¤Ï %s ¤Ç¤¹¡£"
 
-#: gconf/gconf.c:2183
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr "'int'·¿¤ò´üÂÔ¤µ¤ì¤¿¤¬¡¢ÆÀ¤é¤ì¤¿¤Î¤Ï %s ¤Ç¤¹¡£"
 
-#: gconf/gconf.c:2218
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr "'string'·¿¤ò´üÂÔ¤µ¤ì¤¿¤¬¡¢ÆÀ¤é¤ì¤¿¤Î¤Ï %s ¤Ç¤¹¡£"
 
-#: gconf/gconf.c:2255
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "'bool'·¿¤ò´üÂÔ¤µ¤ì¤¿¤¬¡¢ÆÀ¤é¤ì¤¿¤Î¤Ï %s ¤Ç¤¹¡£"
 
-#: gconf/gconf.c:2288
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "'schema'·¿¤ò´üÂÔ¤µ¤ì¤¿¤¬¡¢ÆÀ¤é¤ì¤¿¤Î¤Ï %s ¤Ç¤¹¡£"
@@ -334,7 +651,8 @@ 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 Ãͤò²ò¼á¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
+msgstr ""
+"¥­¡¼ '%s' ÍѤËÀßÄꤵ¤ì¤¿Í×µá¤Ç¼õ¤±¼è¤Ã¤¿ CORBA Ãͤò²ò¼á¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
 #: gconf/gconfd.c:789
 msgid "Shutdown request received"
@@ -352,13 +670,17 @@ msgstr "Ʊ´ü¤¹¤ëÍ×µá¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿¡£"
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
-msgstr "¥Ç¥Ð¥Ã¥°¾ðÊóÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿ gconfd; ¥½¡¼¥¹¥Ç¥£¥ì¥¯¥È¥ê¤«¤é gconf.path ¤òÆɤ߹þ¤â¤¦¤È¤·¤Æ¤¤¤Þ¤¹¡£"
+msgstr ""
+"¥Ç¥Ð¥Ã¥°¾ðÊóÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿ gconfd; ¥½¡¼¥¹¥Ç¥£¥ì¥¯¥È¥ê¤«¤é gconf.path "
+"¤òÆɤ߹þ¤â¤¦¤È¤·¤Æ¤¤¤Þ¤¹¡£"
 
 #: gconf/gconfd.c:879
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
-msgstr "ÀßÄê¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£¥Ç¥Õ¥©¥ë¥ÈÀßÄê¥Õ¥¡¥¤¥ë '%s' ¤ò»È¤ª¤¦¤È¤·¤Æ¤¤¤Þ¤¹¡£"
+msgstr ""
+"ÀßÄê¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£¥Ç¥Õ¥©¥ë¥ÈÀßÄê¥Õ¥¡¥¤¥ë '%s' "
+"¤ò»È¤ª¤¦¤È¤·¤Æ¤¤¤Þ¤¹¡£"
 
 #: gconf/gconfd.c:888
 msgid ""
@@ -375,13 +697,17 @@ msgstr "´ö¤Ä¤«¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ÎÆɤ߼è¤ê¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
-msgstr "ÀßÄê¥Õ¥¡¥¤¥ë¤Ï¥¢¥É¥ì¥¹¤ò»Ý¤¯²ò·è¤·¤Æ¤¤¤Þ¤»¤ó¡£¥Ç¡¼¥¿¤ÎÆɤ߹þ¤ß¤Þ¤¿¤ÏÊݸ¤¬¤Ç¤­¤Þ¤»¤ó¡£"
+msgstr ""
+"ÀßÄê¥Õ¥¡¥¤¥ë¤Ï¥¢¥É¥ì¥¹¤ò»Ý¤¯²ò·è¤·¤Æ¤¤¤Þ¤»¤ó¡£¥Ç¡¼¥¿¤ÎÆɤ߹þ¤ß¤Þ¤¿¤ÏÊݸ¤¬¤Ç¤"
+"­¤Þ¤»¤ó¡£"
 
 #: gconf/gconfd.c:930
 msgid ""
 "No writeable config sources successfully resolved, may not be able to save "
 "some configuration changes"
-msgstr "»Ý¤¯²ò·è¤µ¤ì¤¿½ñ¤­¹þ¤ß²Äǽ¤ÊÀßÄê¥Õ¥¡¥¤¥ë¤Ï´ö¤Ä¤«¤ÎÀßÄê¤òÊݸ¤Ç¤­¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£"
+msgstr ""
+"»Ý¤¯²ò·è¤µ¤ì¤¿½ñ¤­¹þ¤ß²Äǽ¤ÊÀßÄê¥Õ¥¡¥¤¥ë¤Ï´ö¤Ä¤«¤ÎÀßÄê¤òÊݸ¤Ç¤­¤ë¤«¤â¤·¤ì¤Þ¤"
+"»¤ó¡£"
 
 #: gconf/gconfd.c:955 gconf/gconfd.c:967
 #, c-format
@@ -404,7 +730,9 @@ msgstr "PID: %u ¥æ¡¼¥¶¡¼ '%s' ¤Çµ¯Æ°Ãæ¤Ç¤¹¡£"
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
-msgstr "¥ª¥Ö¥¸¥§¥¯¥È³èÀ­²½¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: OAF ¥á¥ó¥Æ¥Ê¡¼¤Ë¥Ð¥°Êó¹ð¤ò¤·¤Æ¤¯¤À¤µ¤¤¡£"
+msgstr ""
+"¥ª¥Ö¥¸¥§¥¯¥È³èÀ­²½¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: OAF "
+"¥á¥ó¥Æ¥Ê¡¼¤Ë¥Ð¥°Êó¹ð¤ò¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #: gconf/gconfd.c:1056
 msgid "Failed to get object reference for ConfigServer"
@@ -414,7 +742,9 @@ msgstr "ÀßÄꥵ¡¼¥Ð¡¼ÍѤΥª¥Ö¥¸¥§¥¯¥È¥ê¥Õ¥¡¥ì¥ó¥¹¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
-msgstr "OAF ¤Ï GConf ¤Î IID ¤Ë¤Ä¤¤¤Æ¤ÏÃΤé¤Ê¤¤¤Ç¤¹¡£; ¥¤¥ó¥¹¥È¡¼¥ë¤¬¼ºÇÔ¤·¤¿¤³¤È¤ò¼¨¤·¤Þ¤¹¡£; ÅÐÏ¿¤Ç¤­¤Þ¤»¤ó¡£; ½ªÎ»¤·¤Þ¤¹¡£\n"
+msgstr ""
+"OAF ¤Ï GConf ¤Î IID ¤Ë¤Ä¤¤¤Æ¤ÏÃΤé¤Ê¤¤¤Ç¤¹¡£; "
+"¥¤¥ó¥¹¥È¡¼¥ë¤¬¼ºÇÔ¤·¤¿¤³¤È¤ò¼¨¤·¤Þ¤¹¡£; ÅÐÏ¿¤Ç¤­¤Þ¤»¤ó¡£; ½ªÎ»¤·¤Þ¤¹¡£\n"
 
 #: gconf/gconfd.c:1079
 msgid "Another gconfd already registered with OAF; exiting\n"
@@ -433,11 +763,6 @@ msgstr "½ªÎ»¤·¤Þ¤¹¡£"
 msgid "Failed to sync one or more sources: %s"
 msgstr "£±¤Ä°Ê¾å¤Î¥½¡¼¥¹¤ÎƱ´ü¤Ç¥¨¥é¡¼: %s"
 
-#: gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr "'%s' ¤ÎÃͤμèÆÀ¤Ç¥¨¥é¡¼: %s"
-
 #: gconf/gconfd.c:1561
 #, c-format
 msgid "Error setting value for `%s': %s"
@@ -478,31 +803,31 @@ msgstr "'%s' ¤ÎÃæ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È²½¤Ç¥¨¥é¡¼: %s"
 msgid "Error setting schema for `%s': %s"
 msgstr "'%s'ÍѤΥ¹¥­¡¼¥àÀßÄê¤Ç¥¨¥é¡¼: %s"
 
-#: gconf/gconfd.c:1911
+#: gconf/gconfd.c:1913
 msgid "Attempt to unregister invalid context ID"
 msgstr "ÉÔÀµ¤Ê¥³¥ó¥Æ¥­¥¹¥ÈID¤ò̤ÅÐÏ¿¤Ë¤·¤Þ¤¹"
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1920
 #, c-format
 msgid "Bad context ID %lu, request ignored"
 msgstr "¤ª¤«¤·¤Ê¥³¥ó¥Æ¥­¥¹¥ÈID %lu ¤Ç¤¹¡£Í×µá¤ò̵»ë¤·¤Þ¤¹¡£"
 
-#: gconf/gconfd.c:1926
+#: gconf/gconfd.c:1928
 #, c-format
 msgid "Already-unregistered context ID %lu, request ignored"
 msgstr "´û¤Ë̤ÅÐÏ¿¤Î¥³¥ó¥Æ¥­¥¹¥ÈID %lu ¤Ç¤¹¡£Í×µá¤ò̵»ë¤·¤Þ¤¹¡£"
 
-#: gconf/gconfd.c:1951
+#: gconf/gconfd.c:1953
 #, c-format
 msgid "Attempt to use invalid context ID %lu"
 msgstr "ÉÔÀµ¤Ê¥³¥ó¥Æ¥­¥¹¥ÈID %lu ¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£"
 
-#: gconf/gconfd.c:1961
+#: gconf/gconfd.c:1963
 #, c-format
 msgid "Attempt to use already-unregistered context ID %lu"
 msgstr "´û¤Ë̤ÅÐÏ¿¤Î¥³¥ó¥Æ¥­¥¹¥ÈID %lu ¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£"
 
-#: gconf/gconfd.c:2121
+#: gconf/gconfd.c:2123
 #, c-format
 msgid "Returning exception: %s"
 msgstr "ÊÖ¤µ¤ì¤¿Îã³°: %s"
@@ -523,7 +848,9 @@ msgstr "ɸ½à½ÐÎϤ˥­¡¼¤ÎÃͤòɽ¼¨¤·¤Þ¤¹¡£"
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
-msgstr "\"--short-desc, --long-desc, --owner, --type\" ¤ò»È¤Ã¤Æ¥¹¥­¡¼¥à¤ò¥»¥Ã¥È¤·¤ÆƱ´ü¤·¤Þ¤¹¡£"
+msgstr ""
+"\"--short-desc, --long-desc, --owner, --type\" "
+"¤ò»È¤Ã¤Æ¥¹¥­¡¼¥à¤ò¥»¥Ã¥È¤·¤ÆƱ´ü¤·¤Þ¤¹¡£"
 
 #: gconf/gconftool.c:110
 msgid "Unset the keys on the command line"
@@ -547,7 +874,8 @@ msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤¿¤é0¤òÊÖ¤·¡¢Â¸ºß¤·¤Ê¤±¤ì¤Ð2¤òÊÖ¤·¤Þ¤¹¡£"
 
 #: gconf/gconftool.c:155
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
-msgstr "gconfd ¤ò¥·¥ã¥Ã¥È¥À¥¦¥ó¤·¤Þ¤¹¡£Íýͳ̵¤·¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Ê¤¤¤³¤È!!"
+msgstr ""
+"gconfd ¤ò¥·¥ã¥Ã¥È¥À¥¦¥ó¤·¤Þ¤¹¡£Íýͳ̵¤·¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Ê¤¤¤³¤È!!"
 
 #: gconf/gconftool.c:164
 msgid "Return 0 if gconfd is running, 2 if not."
@@ -557,13 +885,16 @@ msgstr "¤â¤· gconfd ¤¬µ¯Æ°Ãæ¤Ê¤é¤Ð0¤òÊÖ¤·¡¢¤½¤¦¤Ç¤Ê¤±¤ì¤Ð2¤òÊÖ¤·¤Þ¤¹¡£"
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
-msgstr "gcnofd ÀßÄꥵ¡¼¥Ð¡¼¤òΩ¤Á¾å¤²¤Þ¤¹¡£(ÉáÄ̤ÏɬÍפ˱þ¤¸¤Æ¼«Æ°Åª¤Ëµ¯Æ°¤·¤Þ¤¹)"
+msgstr ""
+"gcnofd ÀßÄꥵ¡¼¥Ð¡¼¤òΩ¤Á¾å¤²¤Þ¤¹¡£(ÉáÄ̤ÏɬÍפ˱þ¤¸¤Æ¼«Æ°Åª¤Ëµ¯Æ°¤·¤Þ¤¹)"
 
 #: gconf/gconftool.c:182
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
-msgstr "¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤ëÃͤη¿¤Þ¤¿¤Ï¥¹¥­¡¼¥à¤ÎÃͤη¿¤ò»ØÄꤷ¤Æ²¼¤µ¤¤¡£½ÅÊ£¤·¤Ê¤±¤ì¤Ð¾Êά·Á¤âOK¤Ç¤¹¡£"
+msgstr ""
+"¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤ëÃͤη¿¤Þ¤¿¤Ï¥¹¥­¡¼¥à¤ÎÃͤη¿¤ò»ØÄꤷ¤Æ²¼¤µ¤¤¡£½ÅÊ£¤·¤Ê¤±¤ì¤Ð¾"
+"Êά·Á¤âOK¤Ç¤¹¡£"
 
 #: gconf/gconftool.c:183
 msgid "int|bool|float|string"
@@ -609,26 +940,36 @@ msgstr "¥½¡¼¥¹"
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
-msgstr "ľÀÜ¡¢¥Ð¥¤¥Ñ¥¹¤·¤Æ¤¤¤ë¥µ¡¼¥Ð¡¼¤ÎÀßÄê¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¥¢¥¯¥»¥¹¤·¤Æ²¼¤µ¤¤¡£gconfd ¤¬µ¯Æ°¤·¤Æ¤¤¤Ê¤¤¤³¤È¤¬¾ò·ï¤Ç¤¹¡£"
+msgstr ""
+"ľÀÜ¡¢¥Ð¥¤¥Ñ¥¹¤·¤Æ¤¤¤ë¥µ¡¼¥Ð¡¼¤ÎÀßÄê¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¥¢¥¯¥»¥¹¤·¤Æ²¼¤µ¤¤¡£gconfd "
+"¤¬µ¯Æ°¤·¤Æ¤¤¤Ê¤¤¤³¤È¤¬¾ò·ï¤Ç¤¹¡£"
 
 #: gconf/gconftool.c:245
 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_CONFIG_SOURCE ¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤Ê¤¤ÀßÄ꥽¡¼¥¹¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤«¡¢¤â¤·¤¯¤Ï¥Ç¥Õ¥©¥ë¥È¤È¤·¤Æ¶õ¤Îʸ»úÎó¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
+msgstr ""
+"¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¥¹¥­¡¼¥à¥Õ¥¡¥¤¥ë¤òÀµ¤·¤¯¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ²¼¤µ¤"
+"¤¡£´Ä¶­ÊÑ¿ô GCONF_CONFIG_SOURCE "
+"¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤Ê¤¤ÀßÄ꥽¡¼¥¹¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤«¡¢¤â¤·¤¯¤Ï¥Ç¥Õ¥©¥ë¥È¤È¤·¤Æ¶õ¤ÎÊ"
+"¸»úÎó¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
 
 #: gconf/gconftool.c:254
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
-msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Ç¥­¡¼¤Î°Û¤Ê¤ë·¿¤ÎÃͤΤޤȤޤê¤òÀßÄê/̤ÀßÄꤹ¤ë»ö¤Ë¤è¤ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥Æ¥¹¥È¤Ç¤­¤Þ¤¹¡£"
+msgstr ""
+"¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Ç¥­¡¼¤Î°Û¤Ê¤ë·¿¤ÎÃͤΤޤȤޤê¤òÀßÄê/̤ÀßÄꤹ¤ë»ö¤Ë¤è¤ê¥¢¥×¥ê"
+"¥±¡¼¥·¥ç¥ó¤ò¥Æ¥¹¥È¤Ç¤­¤Þ¤¹¡£"
 
 #: gconf/gconftool.c:263
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
-msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Ç¥Ç¥£¥ì¥¯¥È¥êÆâÉô¤Î¥­¡¼¤Î¤Þ¤È¤Þ¤ê¤òÀßÄê/̤ÀßÄê¤Ë¤¹¤ë»ö¤Ë¤è¤ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥Æ¥¹¥È¤Ç¤­¤Þ¤¹¡£"
+msgstr ""
+"¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Ç¥Ç¥£¥ì¥¯¥È¥êÆâÉô¤Î¥­¡¼¤Î¤Þ¤È¤Þ¤ê¤òÀßÄê/̤ÀßÄê¤Ë¤¹¤ë»ö¤Ë¤è¤ê"
+"¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥Æ¥¹¥È¤Ç¤­¤Þ¤¹¡£"
 
 #: gconf/gconftool.c:310
 #, c-format
@@ -637,7 +978,8 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "¥ª¥×¥·¥ç¥ó %s ¤Ç¥¨¥é¡¼: %s\n"
-"'%s --help' ¤ò¼Â¹Ô¤·¤Æ¡¢Í­¸ú¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¥ê¥¹¥È¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£\n"
+"'%s --help' "
+"¤ò¼Â¹Ô¤·¤Æ¡¢Í­¸ú¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¡¦¥ª¥×¥·¥ç¥ó¥ê¥¹¥È¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£\n"
 
 #: gconf/gconftool.c:322
 msgid "Can't get and set/unset simultaneously\n"
@@ -659,13 +1001,17 @@ msgstr "--get ¤Þ¤¿¤Ï --set ¤È°ì½ï¤Ë --all-dirs ¤Ï»È¤¨¤Þ¤»¤ó¡£\n"
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
-msgstr "--recursive-list ¤Ï --get, --set, --unset, --all-pairs, --all-dirs ¤È°ì½ï¤Ë»È¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
+msgstr ""
+"--recursive-list ¤Ï --get, --set, --unset, --all-pairs, --all-dirs "
+"¤È°ì½ï¤Ë»È¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
 #: gconf/gconftool.c:365
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
-msgstr "--set_schema ¤Ï --get, --set, --unset, --all-pairs, --all-dirs ¤È°ì½ï¤Ë»È¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
+msgstr ""
+"--set_schema ¤Ï --get, --set, --unset, --all-pairs, --all-dirs "
+"¤È°ì½ï¤Ë»È¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
 #: gconf/gconftool.c:371
 msgid "Value type is only relevant when setting a value\n"
@@ -702,9 +1048,11 @@ msgstr "--break-directroy ¤Ï¤½¤ì¼«¿È¤Ç»È¤ï¤ì¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 #: gconf/gconftool.c:441
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
-msgstr "--direct ¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï --config-source ÉÕ¤­¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
+msgstr ""
+"--direct ¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï --config-source "
+"ÉÕ¤­¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: gconf-editor/gconf-editor.c:69 gconf/gconftool.c:447
+#: gconf/gconftool.c:447
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf ¤Î½é´ü²½¤Ë¼ºÇÔ: %s\n"
@@ -716,315 +1064,336 @@ 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:488
+#: gconf/gconftool.c:487
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
 "applications are running\n"
 "(though things theoretically work if apps are running).\n"
 msgstr ""
-"¿·¤·¤¤¥¹¥­¡¼¥à¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤ëºÇÃæ¤Ë gconfd ¤ò¼Â¹Ô¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£\n"
-"²¿¤â¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬µ¯Æ°Ãæ¤Ç¤Ê¤¤¾õÂ֤ǡ¢'gconftool --shutdown' ¤Ç gconfd ¥Ç¡¼¥â¥ó¤ò\n"
+"¿·¤·¤¤¥¹¥­¡¼¥à¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤ëºÇÃæ¤Ë gconfd "
+"¤ò¼Â¹Ô¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£\n"
+"²¿¤â¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬µ¯Æ°Ãæ¤Ç¤Ê¤¤¾õÂ֤ǡ¢'gconftool --shutdown' ¤Ç gconfd "
+"¥Ç¡¼¥â¥ó¤ò\n"
 "¥·¥ã¥Ã¥È¥À¥¦¥ó¤·¤Æ¤¯¤À¤µ¤¤¡£(Î㤨¥¢¥×¥ê¤¬ÍýÏÀŪ¤ËÆ°¤¤¤Æ¤¤¤¿¤È¤·¤Æ¤â)\n"
 
-#: gconf/gconftool.c:510
+#: gconf/gconftool.c:509
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "ÀßÄê¥Õ¥¡¥¤¥ë¤Î¥¢¥¯¥»¥¹¤Ë¼ºÇÔ: %s\n"
 
-#: gconf/gconftool.c:670
+#: gconf/gconftool.c:669
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "¥·¥ã¥Ã¥È¥À¥¦¥ó¥¨¥é¡¼: %s\n"
 
-#: gconf/gconftool.c:715
+#: gconf/gconftool.c:714
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "ºÆµ¢¥ê¥¹¥È¤Ë£±¤Ä°Ê¾å¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: gconf/gconftool.c:749
+#: gconf/gconftool.c:748
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "'%s' ¤Î¥Ú¥¢¤ò¥ê¥¹¥È²½Ãæ¤Ë¥¨¥é¡¼: %s"
 
-#: gconf/gconftool.c:767
+#: gconf/gconftool.c:766
 msgid "(no value set)"
 msgstr "(²¿¤â¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó)"
 
-#: gconf/gconftool.c:820
+#: gconf/gconftool.c:819
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "ÀßÄꥵ¡¼¥Ð¡¼(gconfd)¤Îµ¯Æ°¤Ë¼ºÇÔ: %s\n"
 
-#: gconf/gconftool.c:834
+#: gconf/gconftool.c:833
 msgid "Must specify a key or keys to get\n"
 msgstr "£±¤Ä¤Î¥­¡¼¤Þ¤¿¤Ï¼èÆÀ¤¹¤ë¤¿¤á¤Î¥­¡¼¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: gconf/gconftool.c:865
+#: gconf/gconftool.c:864
 #, c-format
 msgid "Type: %s\n"
 msgstr "·¿: %s\n"
 
-#: gconf/gconftool.c:866
+#: gconf/gconftool.c:865
 #, c-format
 msgid "Owner: %s\n"
 msgstr "¥ª¡¼¥Ê¡¼: %s\n"
 
-#: gconf/gconftool.c:866 gconf/gconftool.c:867 gconf/gconftool.c:868
+#: gconf/gconftool.c:865 gconf/gconftool.c:866 gconf/gconftool.c:867
 msgid "Unset"
 msgstr "̤ÀßÄê"
 
-#: gconf/gconftool.c:867
+#: gconf/gconftool.c:866
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "¥·¥ç¡¼¥È¥Ç¥£¥¹¥¯: %s\n"
 
-#: gconf/gconftool.c:868
+#: gconf/gconftool.c:867
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "¥í¥ó¥°¥Ç¥£¥¹¥¯: %s\n"
 
-#: gconf/gconftool.c:877
+#: gconf/gconftool.c:876
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "'%s' ¤Ë²¿¤âÃͤ¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: gconf/gconftool.c:881
+#: gconf/gconftool.c:880
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "'%s' ¤ÎÃͤμèÆÀ¤Ë¼ºÇÔ: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:899
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "°ú¿ô¤Ç¥­¡¼/Ãͤθò´¹¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: gconf/gconftool.c:917
+#: gconf/gconftool.c:916
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "¥­¡¼¤Ë²¿¤âÃͤ¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: '%s'\n"
 
-#: gconf/gconftool.c:940 gconf/gconftool.c:1052 gconf/gconftool.c:1056
+#: gconf/gconftool.c:939 gconf/gconftool.c:1051 gconf/gconftool.c:1055
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "'%s' ¤Î·¿¤¬ÉÔÌÀ¤Ç¤¹¡£\n"
 
-#: gconf/gconftool.c:951
+#: gconf/gconftool.c:950
 #, c-format
 msgid "Error: %s\n"
 msgstr "¥¨¥é¡¼: %s\n"
 
-#: gconf/gconftool.c:964 gconf/gconftool.c:1070
+#: gconf/gconftool.c:963 gconf/gconftool.c:1069
 #, c-format
 msgid "Error setting value: %s"
 msgstr "ÃͤÎÀßÄꥨ¥é¡¼: %s"
 
-#: gconf/gconftool.c:982 gconf/gconftool.c:1084
+#: gconf/gconftool.c:981 gconf/gconftool.c:1083
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Ʊ´üÃæ¤Ë¥¨¥é¡¼: %s"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:999
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "°ú¿ô¤Ç¤Î¤ß¥­¡¼(¥¹¥­¡¼¥à̾)¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: gconf/gconftool.c:1099
+#: gconf/gconftool.c:1098
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
-msgstr "¥­¡¼/ÃͤΥڥ¢¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Ë¤Ï£±°Ê¾å¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î»ØÄ꤬ɬÍפǤ¹¡£\n"
+msgstr ""
+"¥­¡¼/ÃͤΥڥ¢¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Ë¤Ï£±°Ê¾å¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î»ØÄ꤬ɬÍפǤ¹¡£\n"
 
-#: gconf/gconftool.c:1113
+#: gconf/gconftool.c:1112
 msgid "Must specify one or more keys to unset.\n"
 msgstr "̵¸ú¤Ë¤¹¤ë¤¿¤á¤Ë£±¸Ä°Ê¾å¤Î¥­¡¼¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: gconf/gconftool.c:1124
+#: gconf/gconftool.c:1123
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "'%s' ̤ÀßÄêÃæ¤Ë¥¨¥é¡¼: %s\n"
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1146
 msgid "Must specify one or more dirs to get subdirs from.\n"
-msgstr "¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Ë£±¤Ä°Ê¾å¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î»ØÄ꤬ɬÍפǤ¹¡£\n"
+msgstr ""
+"¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Ë£±¤Ä°Ê¾å¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î»ØÄ꤬ɬÍפǤ¹¡£\n"
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È²½Ãæ¤Ë¥¨¥é¡¼: %s\n"
 
-#: gconf/gconftool.c:1220
+#: gconf/gconftool.c:1219
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "·Ù¹ð: ÉÔÀµ¤â¤·¤¯¤Ï·¿¤Î̵¤¤¥¹¥­¡¼¥à(%s)¤Ç¤¹¡£\n"
 
-#: gconf/gconftool.c:1227
+#: gconf/gconftool.c:1226
 msgid ""
 "WARNING: For now gconftool only knows how to install default values for "
 "simple types (int, string, bool, float)\n"
-msgstr "·Ù¹ð: ¿·¤·¤¤ gconftool ¤Ç´ðËÜ·¿(int, string, bool, float)¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤΥ¤¥ó¥¹¥È¡¼¥ë¤¬¤Ç¤­¤Þ¤¹¡£\n"
+msgstr ""
+"·Ù¹ð: ¿·¤·¤¤ gconftool ¤Ç´ðËÜ·¿(int, string, bool, "
+"float)¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤΥ¤¥ó¥¹¥È¡¼¥ë¤¬¤Ç¤­¤Þ¤¹¡£\n"
 
-#: gconf/gconftool.c:1243
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "·Ù¹ð: ¥Ç¥Õ¥©¥ë¥ÈÃÍ '%s' ¤Î²òÀϤ˼ºÇÔ: (¥¹¥­¡¼¥à¤Ï %s)\n"
 
-#: gconf/gconftool.c:1256
+#: gconf/gconftool.c:1255
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "·Ù¹ð: gconftool ¤ÎÆâÉô¥¨¥é¡¼¤Ç¤¹¡£ÉÔÌÀ¤Ê GConfValueType ¤Ç¤¹¡£\n"
 
-#: gconf/gconftool.c:1304
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "·Ù¹ð: ·¿Ì¾ '%s' ¤Î²òÀϤ˼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1326
 msgid "WARNING: empty <applyto> node"
 msgstr "·Ù¹ð: ¶õ¤Î¥Î¡¼¥É"
 
-#: gconf/gconftool.c:1330 gconf/gconftool.c:1575
+#: gconf/gconftool.c:1329 gconf/gconftool.c:1574
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "·Ù¹ð: ¥Î¡¼¥É <%s> ¤Ï¥¹¥­¡¼¥à¤Ç¤Ï²òÆɤǤ­¤Þ¤»¤ó¡£\n"
 
-#: gconf/gconftool.c:1340
+#: gconf/gconftool.c:1339
 msgid "WARNING: no key specified for schema\n"
 msgstr "·Ù¹ð: ¥¹¥­¡¼¥à¤Ë»ØÄꤵ¤ì¤¿¥­¡¼¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1372
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
-msgstr "·Ù¹ð: <locale> ¥Î¡¼¥É¤Ë¤Ï °À­ 'name = \"¥í¥±¡¼¥ë̾\"¤¬¤¢¤ê¤Þ¤»¤ó¡£Ìµ»ë¤·¤Þ¤¹¡£\n"
+msgstr ""
+"·Ù¹ð: <locale> ¥Î¡¼¥É¤Ë¤Ï °À­ 'name = "
+"\"¥í¥±¡¼¥ë̾\"¤¬¤¢¤ê¤Þ¤»¤ó¡£Ìµ»ë¤·¤Þ¤¹¡£\n"
 
-#: gconf/gconftool.c:1379
+#: gconf/gconftool.c:1378
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
-msgstr "·Ù¹ð: ¥í¡¼¥±¥ë '%s' ÍѤο½Å <locale> ¥Î¡¼¥É¤Ç¤¹¡£Á´¤Æ¤ÎºÇ½é¤ò̵»ë¤·¤Þ¤¹¡£\n"
+msgstr ""
+"·Ù¹ð: ¥í¡¼¥±¥ë '%s' ÍѤο½Å <locale> ¥Î¡¼¥É¤Ç¤¹¡£Á´¤Æ¤ÎºÇ½é¤ò̵»ë¤·¤Þ¤¹¡£\n"
 
-#: gconf/gconftool.c:1451
+#: gconf/gconftool.c:1450
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "·Ù¹ð: <locale>¥Î¡¼¥ÉÃæ¤ËÉÔÀµ¤Ê¥Î¡¼¥É <%s> ¤¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: gconf/gconftool.c:1480
+#: gconf/gconftool.c:1479
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "·Ù¹ð: ¥¹¥­¡¼¥à '%s' ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë¼ºÇÔ(¥í¥±¡¼¥ë¤Ï '%s'): %s\n"
 
-#: gconf/gconftool.c:1488
+#: gconf/gconftool.c:1487
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "¥¹¥­¡¼¥à '%s' ¤Î¥¤¥ó¥¹¥È¡¼¥ë (¥í¡¼¥±¥ë '%s'ÍÑ)\n"
 
-#: gconf/gconftool.c:1510
+#: gconf/gconftool.c:1509
 #, 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:1517
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "¥¹¥­¡¼¥à '%s' ¤ÎÏ¢·ë (¥­¡¼¤Ï '%s')\n"
 
-#: gconf/gconftool.c:1588
+#: gconf/gconftool.c:1587
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "£±¤Ä¤Î <schema> ¤ËÉÕ¤­£±¤Ä¤Î <locale> ¥¨¥ó¥È¥ê¤¬É¬ÍפǤ¹¡£\n"
 
-#: gconf/gconftool.c:1617
+#: gconf/gconftool.c:1616
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "·Ù¹ð: ¥Î¡¼¥É <%s> ¤Ï <schemalist> ¤Ç¤Ï²òÀϤǤ­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: gconf/gconftool.c:1639
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "'%s'¤¬³«¤±¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
 
-#: gconf/gconftool.c:1646
+#: gconf/gconftool.c:1645
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "¥É¥­¥å¥á¥ó¥È '%s' ¤Ï¶õ¤Ç¤¹¤«?\n"
 
-#: gconf/gconftool.c:1658
+#: gconf/gconftool.c:1657
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
-msgstr "¥É¥­¥å¥á¥ó¥È '%s' ¤Î¥ë¡¼¥È¥Î¡¼¥É¤Î·¿¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹¡£( <%s>¤Ï<gconfschemafile>)\n"
+msgstr ""
+"¥É¥­¥å¥á¥ó¥È '%s' ¤Î¥ë¡¼¥È¥Î¡¼¥É¤Î·¿¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹¡£( "
+"<%s>¤Ï<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1671
+#: gconf/gconftool.c:1670
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
-msgstr "¥É¥­¥å¥á¥ó¥È '%s' ¤Ë¤Ï¥È¥Ã¥×¥ì¥Ù¥ë <gconfshemafile> ¥Î¡¼¥É¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
+msgstr ""
+"¥É¥­¥å¥á¥ó¥È '%s' ¤Ë¤Ï¥È¥Ã¥×¥ì¥Ù¥ë <gconfshemafile> ¥Î¡¼¥É¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: gconf/gconftool.c:1685
+#: gconf/gconftool.c:1684
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "·Ù¹ð: <gconfshemafile> ²¼¤Î¥Î¡¼¥É <%s> ¤Ï²òÀϤǤ­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 
-#: gconf/gconftool.c:1696 gconf/gconftool.c:1728
+#: gconf/gconftool.c:1695 gconf/gconftool.c:1727
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "ÀßÄê¥Ç¡¼¥¿¤ÎƱ´ü¤Ç¥¨¥é¡¼: %s"
 
-#: gconf/gconftool.c:1712
+#: gconf/gconftool.c:1711
 msgid "Must specify some schema files to install\n"
-msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Ë´ö¤Ä¤«¤Î¥¹¥­¡¼¥à¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
+msgstr ""
+"¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Ë´ö¤Ä¤«¤Î¥¹¥­¡¼¥à¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1748
 #, c-format
 msgid ""
 "\n"
 "%s\n"
-msgstr "\n%s\n"
+msgstr ""
+"\n"
+"%s\n"
 
-#: gconf/gconftool.c:1769
+#: gconf/gconftool.c:1768
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "ÉÔ´°Á´¤Ê¥­¡¼ '%s' ¤Î̵¸ú²½¤Ë¼ºÇÔ: %s\n"
 
-#: gconf/gconftool.c:1895
+#: gconf/gconftool.c:1894
 msgid "Must specify some keys to break\n"
 msgstr "½ªÎ»¤¹¤ë¤¿¤á¤Ë¤Ï´ö¤Ä¤«¤Î¥­¡¼¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: gconf/gconftool.c:1901
+#: gconf/gconftool.c:1900
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
-"¥­¡¼¤Ë¤ª¤«¤·¤ÊÃͤòÀßÄꤹ¤ë»ö¤Ë¤è¤Ã¤Æ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò½ªÎ»¤µ¤»¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹:\n"
+"¥­¡¼¤Ë¤ª¤«¤·¤ÊÃͤòÀßÄꤹ¤ë»ö¤Ë¤è¤Ã¤Æ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò½ªÎ»¤µ¤»¤è¤¦¤È¤·¤Æ¤¤¤Þ¤"
+"¹:\n"
 " %s\n"
 
-#: gconf/gconftool.c:1919
+#: gconf/gconftool.c:1918
 msgid "Must specify some directories to break\n"
 msgstr "½ªÎ»¤¹¤ë¤¿¤á¤Ë¤Ï´ö¤Ä¤«¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n"
 
-#: gconf/gconftool.c:1938
+#: gconf/gconftool.c:1937
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
 "directory:\n"
 "  %s\n"
 msgstr ""
-"¥Ç¥£¥ì¥¯¥È¥ê¤Î¥­¡¼¤Ë¤ª¤«¤·¤ÊÃͤòÀßÄꤹ¤ë»ö¤Ë¤è¤Ã¤Æ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò½ªÎ»¤µ¤»¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹:\n"
+"¥Ç¥£¥ì¥¯¥È¥ê¤Î¥­¡¼¤Ë¤ª¤«¤·¤ÊÃͤòÀßÄꤹ¤ë»ö¤Ë¤è¤Ã¤Æ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò½ªÎ»¤µ¤»¤"
+"褦¤È¤·¤Æ¤¤¤Þ¤¹:\n"
 " %s\n"
 
-#: gconf-editor/app.c:53
-msgid "Key"
-msgstr "¥­¡¼"
+#: wrappers/gtk/gconf-client.c:812
+#, fuzzy, c-format
+msgid "GConf warning: failure listing pairs in `%s': %s"
+msgstr "'%s' ¤Î¥Ú¥¢¤ò¥ê¥¹¥È²½Ãæ¤Ë¥¨¥é¡¼: %s"
+
+#: wrappers/gtk/gconf-client.c:990
+#, fuzzy, c-format
+msgid "Expected `%s' got `%s' for key %s"
+msgstr "%s ¤Î¥ê¥¹¥È¤ò´üÂÔ¤µ¤ì¤¿¤¬¡¢ÆÀ¤é¤ì¤¿¤Î¤Ï %s ¤Î¥ê¥¹¥È¤Ç¤¹¡£"
+
+#~ msgid "Key"
+#~ msgstr "¥­¡¼"
 
-#: gconf-editor/app.c:54
-msgid "Value"
-msgstr "ÃÍ"
+#~ msgid "Value"
+#~ msgstr "ÃÍ"
 
-#: gconf-editor/app.c:57
-msgid "Configuration Editor"
-msgstr "ÀßÄꥨ¥Ç¥£¥¿"
+#~ msgid "Configuration Editor"
+#~ msgstr "ÀßÄꥨ¥Ç¥£¥¿"
 
-#: gconf-editor/app.c:117
-msgid "Could not parse geometry string"
-msgstr "¥¸¥ª¥á¥È¥ê(°ÌÃÖ¾ðÊó)¤Îʸ»úÎ󤬲òÀϤǤ­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
+#~ msgid "Could not parse geometry string"
+#~ msgstr "¥¸¥ª¥á¥È¥ê(°ÌÃÖ¾ðÊó)¤Îʸ»úÎ󤬲òÀϤǤ­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: gconf-editor/gconf-editor.c:41
-msgid "Specify the geometry of the main window"
-msgstr "¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤Î¥¸¥ª¥á¥È¥ê(°ÌÃÖ¾ðÊó)¤Î»ØÄꤷ¤Æ²¼¤µ¤¤¡£"
+#~ msgid "Specify the geometry of the main window"
+#~ msgstr "¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤Î¥¸¥ª¥á¥È¥ê(°ÌÃÖ¾ðÊó)¤Î»ØÄꤷ¤Æ²¼¤µ¤¤¡£"
 
-#: gconf-editor/gconf-editor.c:42
-msgid "GEOMETRY"
-msgstr "¥¸¥ª¥á¥È¥ê"
+#~ msgid "GEOMETRY"
+#~ msgstr "¥¸¥ª¥á¥È¥ê"
diff --git a/po/no.po b/po/no.po
index def479a6..b17fd0c5 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-07-21 00:26+0200\n"
+"POT-Creation-Date: 2000-07-27 13:55-0400\n"
 "PO-Revision-Date: 2000-07-21 00:26+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -391,7 +391,7 @@ msgstr "Streng i sitattegn begynner ikke med et sitattegn"
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Streng i anførselstegn slutter ikke med et sitattegn"
 
-#: gconf/gconf-internals.c:2105 gconf/gconf.c:2632
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA feil: %s"
@@ -608,32 +608,32 @@ msgstr "`%c' er et ugyldig tegn i nøkkel/katalog navn"
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Nøkkel/katalog kan ikke slutte med en skråstrek (/)"
 
-#: gconf/gconf.c:2104
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Feil under nedstenging av konfigurasjonstjeneren: %s"
 
-#: gconf/gconf.c:2165
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Forventet flyttall, mottok %s"
 
-#: gconf/gconf.c:2200
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Forventet heltall, mottok %s"
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Forventet streng, mottok %s"
 
-#: gconf/gconf.c:2272
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Forventet boolsk verdi, mottok %s"
 
-#: gconf/gconf.c:2305
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Forventet schema, mottok %s"
@@ -1365,12 +1365,12 @@ msgstr ""
 "katalogen:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:708
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 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:886
+#: wrappers/gtk/gconf-client.c:990
 #, 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 6a0dbe68..6f033147 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 0.5\n"
-"POT-Creation-Date: 2000-07-12 12:40-0300\n"
+"POT-Creation-Date: 2000-07-27 13:55-0400\n"
 "PO-Revision-Date: 2000-07-09 11:46-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"
@@ -132,103 +132,111 @@ msgstr ""
 msgid "Failed to create file `%s': %s"
 msgstr "Falha ao criar arquivo `%s': %s"
 
-#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2418
+#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2416
 #, 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:381
-#, c-format
-msgid "Ignoring XML node `%s': %s"
+#: backends/xml-entry.c:162
+#, fuzzy, c-format
+msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorando nó XML `%s': %s"
 
-#: backends/xml-entry.c:211 gconf/gconf-internals.c:2122
+#: backends/xml-entry.c:213 gconf/gconf-internals.c:2120
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:338
+#: backends/xml-entry.c:340
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignorando nome de schema `%s', inválido: %s"
 
-#: backends/xml-entry.c:683
+#. FIXME for nodes with no value stored, but containing a schema name,
+#. * we improperly log an error here
+#.
+#: backends/xml-entry.c:386
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s', except for possible schema name: %s"
+msgstr "Ignorando nó XML `%s': %s"
+
+#: backends/xml-entry.c:688
 msgid "found <local_schema> with no locale setting"
 msgstr "encontrado <local_schema> sem configuração de locale"
 
-#: backends/xml-entry.c:705
+#: backends/xml-entry.c:710
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Falha ao ler valor padrão para schema: %s"
 
-#: backends/xml-entry.c:888
+#: backends/xml-entry.c:892
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Sem atributo \"type\" para nó <%s>"
 
-#: backends/xml-entry.c:902
+#: backends/xml-entry.c:906
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Um nó tem atributo \"type\" desconhecido `%s', ignorando"
 
-#: backends/xml-entry.c:917
+#: backends/xml-entry.c:921
 msgid "No \"value\" attribute for node"
 msgstr "Sem atributo \"value\" para nó"
 
-#: backends/xml-entry.c:965 backends/xml-entry.c:1041
+#: backends/xml-entry.c:969 backends/xml-entry.c:1045
 #, 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:999
+#: backends/xml-entry.c:1003
 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:1022
+#: backends/xml-entry.c:1026
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Nó XML defeituoso: %s"
 
-#: backends/xml-entry.c:1030
+#: backends/xml-entry.c:1034
 #, 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:1082
+#: backends/xml-entry.c:1086
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorando car defeituoso do par XML: %s"
 
-#: backends/xml-entry.c:1091 backends/xml-entry.c:1114
+#: backends/xml-entry.c:1095 backends/xml-entry.c:1118
 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:1104
+#: backends/xml-entry.c:1108
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorando cdr defeituoso do par XML: %s"
 
-#: backends/xml-entry.c:1123
+#: backends/xml-entry.c:1127
 #, 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:1141
+#: backends/xml-entry.c:1145
 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:1147
+#: backends/xml-entry.c:1151
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Faltando cdr do par de valores em arquivo XML"
 
-#: backends/xml-entry.c:1154
+#: backends/xml-entry.c:1158
 msgid "Missing car from pair of values in XML file"
 msgstr "Faltando car do par de valores em arquivo XML"
 
-#: backends/xml-entry.c:1159
+#: backends/xml-entry.c:1163
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Faltando car e cdr do par de valores em arquivo XML"
 
@@ -354,83 +362,83 @@ msgstr "Incluindo fonte `%s'\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "Erro de leitura no arquivo `%s': %s\n"
 
-#: gconf/gconf-internals.c:1284
+#: gconf/gconf-internals.c:1282
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Lista esperada, recebi %s"
 
-#: gconf/gconf-internals.c:1294
+#: gconf/gconf-internals.c:1292
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Lista de %s esperada, recebi lista de %s"
 
-#: gconf/gconf-internals.c:1433
+#: gconf/gconf-internals.c:1431
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Par esperado, recebi %s"
 
-#: gconf/gconf-internals.c:1447
+#: gconf/gconf-internals.c:1445
 #, 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:1463
+#: gconf/gconf-internals.c:1461
 #, 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:1579
+#: gconf/gconf-internals.c:1577
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Cadeia entre aspas não começa com aspas"
 
-#: gconf/gconf-internals.c:1641
+#: gconf/gconf-internals.c:1639
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Cadeia entre aspas não termina com aspas"
 
-#: gconf/gconf-internals.c:2107 gconf/gconf.c:2632
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Erro CORBA: %s"
 
-#: gconf/gconf-internals.c:2127
+#: gconf/gconf-internals.c:2125
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "tentativa de remover lista de objetos OAF não listada"
 
-#: gconf/gconf-internals.c:2132
+#: gconf/gconf-internals.c:2130
 msgid "attempt to add already-listed OAF directory"
 msgstr "tentativa de incluir lista OAF já listada"
 
-#: gconf/gconf-internals.c:2139
+#: gconf/gconf-internals.c:2137
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Erro de análise OAF: %s"
 
-#: gconf/gconf-internals.c:2144
+#: gconf/gconf-internals.c:2142
 msgid "Unknown OAF error"
 msgstr "Erro OAF desconhecido"
 
-#: gconf/gconf-internals.c:2227
+#: gconf/gconf-internals.c:2225
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Arquivo ior não encontrado em `%s'"
 
-#: gconf/gconf-internals.c:2258
+#: gconf/gconf-internals.c:2256
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd tomando bloqueio `%s' de algum outro processo"
 
-#: gconf/gconf-internals.c:2269
+#: gconf/gconf-internals.c:2267
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Outro programa tem bloqueio `%s'"
 
-#: gconf/gconf-internals.c:2289
+#: gconf/gconf-internals.c:2287
 #, fuzzy
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "não foi possível contactar ORB para ??? gconfd existente"
 
-#: gconf/gconf-internals.c:2297
+#: gconf/gconf-internals.c:2295
 #, fuzzy, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -439,42 +447,42 @@ msgstr ""
 "Removendo bloqueio ??? `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 
-#: gconf/gconf-internals.c:2309
+#: gconf/gconf-internals.c:2307
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "Daemon de configuração GConf (gconfd) possui bloqueio `%s'"
 
-#: gconf/gconf-internals.c:2335
+#: gconf/gconf-internals.c:2333
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "não foi possível criar diretório `%s': %s"
 
-#: gconf/gconf-internals.c:2370
+#: gconf/gconf-internals.c:2368
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Não é possível criar bloqueio `%s': %s"
 
-#: gconf/gconf-internals.c:2406
+#: gconf/gconf-internals.c:2404
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Não é possível escrever no arquivo `%s': %s"
 
-#: gconf/gconf-internals.c:2449
+#: gconf/gconf-internals.c:2447
 #, 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:2466
+#: gconf/gconf-internals.c:2464
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Arquivo de bloqueio `%s' corrompido, removendo mesmo assim"
 
-#: gconf/gconf-internals.c:2476
+#: gconf/gconf-internals.c:2474
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -483,7 +491,7 @@ 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:2493
+#: gconf/gconf-internals.c:2491
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Falha ao liberar diretório de bloqueios `%s': %s"
@@ -493,16 +501,16 @@ msgstr "Falha ao liberar diretório de bloqueios `%s': %s"
 msgid "Failed to load source `%s': %s"
 msgstr "Falha ao carregar fonte `%s': %s"
 
-#: gconf/gconf-sources.c:502
+#: gconf/gconf-sources.c:506
 #, 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:551
+#: gconf/gconf-sources.c:555
 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:580
+#: gconf/gconf-sources.c:584
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -511,23 +519,23 @@ msgstr ""
 "Valor para `%s' atribuído em fonte somente leitura no início do seu caminho "
 "de configuração."
 
-#: gconf/gconf-sources.c:1067
+#: gconf/gconf-sources.c:1079
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Erro ao localizar metainfo: %s"
 
-#: gconf/gconf-sources.c:1132
+#: gconf/gconf-sources.c:1144
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Erro ao obter metainfo: %s"
 
-#: gconf/gconf-sources.c:1156
+#: gconf/gconf-sources.c:1168
 #, 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:1193 gconf/gconfd.c:1523
+#: 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"
@@ -607,32 +615,32 @@ msgstr "`%c' é um caracter inválido em nomes de chave/diretório"
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Chave/diretório não pode terminar com uma barra (/)"
 
-#: gconf/gconf.c:2104
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Falha ao desligar servidor de configuração: %s"
 
-#: gconf/gconf.c:2165
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Flutuante esperado, recebi %s"
 
-#: gconf/gconf.c:2200
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Inteiro esperado, recebi %s"
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr "String esperado, recebi %s"
 
-#: gconf/gconf.c:2272
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Booleano esperado, recebi %s"
 
-#: gconf/gconf.c:2305
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Schema esperado, recebi %s"
@@ -800,31 +808,31 @@ msgstr "Erro ao listar diretórios em `%s': %s"
 msgid "Error setting schema for `%s': %s"
 msgstr "Erro ao atribuir schema para `%s': %s"
 
-#: gconf/gconfd.c:1911
+#: gconf/gconfd.c:1913
 msgid "Attempt to unregister invalid context ID"
 msgstr "Tentativa de desregistrar uma ID de contexto inválida"
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1920
 #, c-format
 msgid "Bad context ID %lu, request ignored"
 msgstr "ID de contexto inválida %lu, requisição ignorada"
 
-#: gconf/gconfd.c:1926
+#: gconf/gconfd.c:1928
 #, c-format
 msgid "Already-unregistered context ID %lu, request ignored"
 msgstr "ID de contexto %lu já desregistrada, requisição ignorada"
 
-#: gconf/gconfd.c:1951
+#: gconf/gconfd.c:1953
 #, c-format
 msgid "Attempt to use invalid context ID %lu"
 msgstr "Tentativa de usar uma ID de contexto inválida %lu"
 
-#: gconf/gconfd.c:1961
+#: gconf/gconfd.c:1963
 #, c-format
 msgid "Attempt to use already-unregistered context ID %lu"
 msgstr "Tentativa de usar uma ID de contexto já desregistrada %lu"
 
-#: gconf/gconfd.c:2121
+#: gconf/gconfd.c:2123
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Levantando exceção: %s"
@@ -1359,12 +1367,12 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:708
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 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:886
+#: wrappers/gtk/gconf-client.c:990
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Esperado `%s' recebi `%s' para chave %s"
diff --git a/po/ru.po b/po/ru.po
index aef8e000..d61fbf61 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf\n"
-"POT-Creation-Date: 2000-07-20 15:08+0000\n"
+"POT-Creation-Date: 2000-07-27 13:55-0400\n"
 "PO-Revision-Date: 2000-07-20 15:32+00:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -389,7 +389,7 @@ msgstr "óÔÒÏËÁ × ËÁ×ÙÞËÁÈ ÎÅ ÎÁÞÉÎÁÅÔÓÑ Ó ËÁ×ÙÞËÉ"
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "óÔÒÏËÁ × ËÁ×ÙÞËÁÈ ÎÅ ÚÁËÁÎÞÉ×ÁÅÔÓÑ ËÁ×ÙÞËÏÊ"
 
-#: gconf/gconf-internals.c:2105 gconf/gconf.c:2632
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr "ïÛÉÂËÁ CORBA: %s"
@@ -596,32 +596,32 @@ msgstr "'%c' ÎÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ÎÁÚ×ÁÎÉÉ ËÌÀÞÁ/ËÁÔÁÌÏÇÁ"
 msgid "Key/directory may not end with a slash (/)"
 msgstr "ëÌÀÞ/ËÁÔÁÌÏÇ ÎÅ ÍÏÖÅÔ ÚÁËÁÎÞÉ×ÁÔØÓÑ ÎÁ '/'"
 
-#: gconf/gconf.c:2104
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "óÂÏÊ ×ÙËÌÀÞÅÎÉÑ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÇÏ ÓÅÒ×ÅÒÁ: %s"
 
-#: gconf/gconf.c:2165
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr "ïÖÉÄÁÌÏÓØ Ó ÐÌÁ×.ÔÏÞËÏÊ, ÐÏÌÕÞÅÎÏ %s"
 
-#: gconf/gconf.c:2200
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr "ïÖÉÄÁÌÏÓØ ÃÅÌÏÅ, ÐÏÌÕÞÅÎÏ %s"
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr "ïÖÉÄÁÌÁÓØ ÓÔÒÏËÁ, ÐÏÌÕÞÅÎÏ %s"
 
-#: gconf/gconf.c:2272
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "ïÖÉÄÁÌÏÓØ ÂÕÌÅ×Ï, ÐÏÌÕÞÅÎÏ %s"
 
-#: gconf/gconf.c:2305
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "ïÖÉÄÁÌÏÓØ schema, ÐÏÌÕÞÅÎÏ %s"
@@ -1011,7 +1011,9 @@ msgstr "ÐÁÒÁÍÅÔÒ --break-directory ÄÏÌÖÅÎ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÓÁÍ.\n"
 #: gconf/gconftool.c:441
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
-msgstr "÷Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÉÓÔÏÞÎÉË ËÏÎÆÉÇÕÒÁÃÉÉ Ó ÐÏÍÏÝØÀ ÐÁÒÁÍÅÔÒÁ --config-source, ÅÓÌÉ ÉÓÐÏÌØÚÕÅÔÅ ÐÁÒÁÍÅÔÒ --direct\n"
+msgstr ""
+"÷Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ ÉÓÔÏÞÎÉË ËÏÎÆÉÇÕÒÁÃÉÉ Ó ÐÏÍÏÝØÀ ÐÁÒÁÍÅÔÒÁ --config-source, "
+"ÅÓÌÉ ÉÓÐÏÌØÚÕÅÔÅ ÐÁÒÁÍÅÔÒ --direct\n"
 
 #: gconf/gconftool.c:447
 #, c-format
@@ -1147,7 +1149,9 @@ msgstr ""
 
 #: gconf/gconftool.c:1146
 msgid "Must specify one or more dirs to get subdirs from.\n"
-msgstr "ôÒÅÂÕÅÔÓÑ ÕËÁÚÁÔØ ÏÄÉÎ ÉÌÉ ÂÏÌÅÅ ËÁÔÁÌÏÇÏ× ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÉÚ ÎÉÈ ÐÏÄËÁÔÁÌÏÇÏ×.\n"
+msgstr ""
+"ôÒÅÂÕÅÔÓÑ ÕËÁÚÁÔØ ÏÄÉÎ ÉÌÉ ÂÏÌÅÅ ËÁÔÁÌÏÇÏ× ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÉÚ ÎÉÈ "
+"ÐÏÄËÁÔÁÌÏÇÏ×.\n"
 
 #: gconf/gconftool.c:1180
 #, c-format
@@ -1316,12 +1320,12 @@ msgstr ""
 "ËÁÔÁÌÏÇÅ:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:708
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:886
+#: wrappers/gtk/gconf-client.c:990
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "ïÖÉÄÁÌÏÓØ \"%s\" ÐÏÌÕÞÅÎÏ \"%s\" ÄÌÑ ËÌÀÞÁ %s"
diff --git a/po/sv.po b/po/sv.po
index f1c01e62..dd5897e7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf VERSION\n"
-"POT-Creation-Date: 2000-04-12 19:12+0200\n"
+"POT-Creation-Date: 2000-07-27 13:55-0400\n"
 "PO-Revision-Date: 2000-01-04 15:34+01:00\n"
 "Last-Translator: andreas.hyden <andreas.hyden@telia.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -22,7 +22,7 @@ msgstr "Kopplar bort XML backendmodulen"
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Kunde inte hitta XML-rotkatalogen i adressen \"%s\""
 
-#: backends/xml-backend.c:315
+#: backends/xml-backend.c:315 backends/xml-dir.c:1047
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kunde inte skapa katalogen \"%s\": %s"
@@ -46,6 +46,192 @@ msgstr "Initialiserar XML-backendmodulen"
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Kunde inte ge upp lås på XML-katalogen \"%s\": %s"
 
+#: backends/xml-cache.c:134
+msgid "Unsynced directory deletions when shutting down XML backend"
+msgstr ""
+
+#: backends/xml-cache.c:243
+#, 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
+#, c-format
+msgid ""
+"%u items remain in the cache after cleaning already-synced items older than "
+"%u seconds"
+msgstr ""
+
+#: backends/xml-dir.c:178
+#, fuzzy, c-format
+msgid "Could not stat `%s': %s"
+msgstr "Kunde inte skapa katalogen \"%s\": %s"
+
+#: backends/xml-dir.c:188
+#, c-format
+msgid "XML filename `%s' is a directory"
+msgstr ""
+
+#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#, fuzzy, c-format
+msgid "Failed to delete `%s': %s"
+msgstr "Misslyckades med att öppna \"%s\": %s\n"
+
+#: backends/xml-dir.c:355
+#, fuzzy, c-format
+msgid "Failed to write file `%s': %s"
+msgstr "Misslyckades att stänga filen \"%s\": %s"
+
+#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#, fuzzy, c-format
+msgid "Failed to rename `%s' to `%s': %s"
+msgstr "Misslyckades med att öppna \"%s\": %s\n"
+
+#: backends/xml-dir.c:387
+#, fuzzy, c-format
+msgid "Failed to restore `%s' from `%s': %s"
+msgstr "Misslyckades att få värdet för \"%s\": %s\n"
+
+#: backends/xml-dir.c:399
+#, fuzzy, c-format
+msgid "Failed to delete old file `%s': %s"
+msgstr "Misslyckades att stänga filen \"%s\": %s"
+
+#. These are all fatal errors
+#: backends/xml-dir.c:802
+#, fuzzy, c-format
+msgid "Failed to stat `%s': %s"
+msgstr "Misslyckades med att öppna \"%s\": %s\n"
+
+#: backends/xml-dir.c:946
+#, c-format
+msgid "Duplicate entry `%s' in `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:968
+#, c-format
+msgid "Entry with no name in XML file `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:975
+#, c-format
+msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:1063
+#, fuzzy, c-format
+msgid "Failed to create file `%s': %s"
+msgstr "Misslyckades att stänga filen \"%s\": %s"
+
+#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2416
+#, c-format
+msgid "Failed to close file `%s': %s"
+msgstr "Misslyckades att stänga filen \"%s\": %s"
+
+#. There was an error
+#: backends/xml-entry.c:162
+#, c-format
+msgid "Ignoring XML node with name `%s': %s"
+msgstr ""
+
+#: backends/xml-entry.c:213 gconf/gconf-internals.c:2120
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: backends/xml-entry.c:340
+#, fuzzy, c-format
+msgid "Ignoring schema name `%s', invalid: %s"
+msgstr "Fel vid sättning av schema för \"%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
+#, c-format
+msgid "Ignoring XML node `%s', except for possible schema name: %s"
+msgstr ""
+
+#: backends/xml-entry.c:688
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:710
+#, fuzzy, c-format
+msgid "Failed reading default value for schema: %s"
+msgstr "VARNING: Misslyckades att tolka standardväde \"%s\" för schema (%s)\n"
+
+#: backends/xml-entry.c:892
+#, c-format
+msgid "No \"type\" attribute for <%s> node"
+msgstr ""
+
+#: backends/xml-entry.c:906
+#, fuzzy, c-format
+msgid "A node has unknown \"type\" attribute `%s', ignoring"
+msgstr ""
+"VARNING: <locale> noden har inget `name=\"locale\"' attribut, ignorerar\n"
+
+#: backends/xml-entry.c:921
+msgid "No \"value\" attribute for node"
+msgstr ""
+
+#: backends/xml-entry.c:969 backends/xml-entry.c:1045
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML list node"
+msgstr ""
+
+#: backends/xml-entry.c:1003
+msgid "Invalid type (list, pair, or unknown) in a list node"
+msgstr ""
+
+#: backends/xml-entry.c:1026
+#, c-format
+msgid "Bad XML node: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1034
+#, c-format
+msgid "List contains a badly-typed node (%s, should be %s)"
+msgstr ""
+
+#: backends/xml-entry.c:1086
+#, c-format
+msgid "Ignoring bad car from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1095 backends/xml-entry.c:1118
+msgid "parsing XML file: lists and pairs may not be placed inside a pair"
+msgstr ""
+
+#: backends/xml-entry.c:1108
+#, c-format
+msgid "Ignoring bad cdr from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1127
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1145
+msgid "Didn't find car and cdr for XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1151
+msgid "Missing cdr from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1158
+msgid "Missing car from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1163
+msgid "Missing both car and cdr values from pair in XML file"
+msgstr ""
+
 #. -- end debug only
 #: gconf/gconf-backend.c:180
 #, c-format
@@ -75,6 +261,69 @@ msgstr "Kunde inte lokalisera backendmodul för \"%s\""
 msgid "Failed to shut down backend"
 msgstr "Fel vid avstängning av backend"
 
+#: gconf/gconf-error.c:39
+msgid "Success"
+msgstr ""
+
+#: gconf/gconf-error.c:40
+msgid "Failed"
+msgstr ""
+
+#: gconf/gconf-error.c:41
+msgid "Configuration server couldn't be contacted"
+msgstr ""
+
+#: gconf/gconf-error.c:42
+msgid "Permission denied"
+msgstr ""
+
+#: gconf/gconf-error.c:43
+#, fuzzy
+msgid "Couldn't resolve address for configuration source"
+msgstr "Misslyckades att få tillgång till konfigurationskällorna: %s\n"
+
+#: gconf/gconf-error.c:44
+msgid "Bad key or directory name"
+msgstr ""
+
+#: gconf/gconf-error.c:45
+#, fuzzy
+msgid "Parse error"
+msgstr "OAF tolkningsfel: %s"
+
+#: gconf/gconf-error.c:46
+msgid "Corrupt data in configuration source database"
+msgstr ""
+
+#: gconf/gconf-error.c:47
+msgid "Type mismatch"
+msgstr ""
+
+#: gconf/gconf-error.c:48
+msgid "Key operation on directory"
+msgstr ""
+
+#: gconf/gconf-error.c:49
+msgid "Directory operation on key"
+msgstr ""
+
+#: gconf/gconf-error.c:50
+msgid "Can't overwrite existing read-only value"
+msgstr ""
+
+#: gconf/gconf-error.c:51
+msgid "Object Activation Framework error"
+msgstr ""
+
+#: gconf/gconf-error.c:52
+msgid "Operation not allowed without configuration server"
+msgstr ""
+
+#: gconf/gconf-error.c:53
+#, fuzzy
+msgid "Failed to get a lock"
+msgstr "Misslyckades att få värdet för \"%s\": %s\n"
+
 #: gconf/gconf-internals.c:100
 #, c-format
 msgid "No '/' in key `%s'"
@@ -108,87 +357,82 @@ msgstr "Lägger till källan \"%s\"\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "Fel vid läsning av fil \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:1284
+#: gconf/gconf-internals.c:1282
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Förväntade lista, fick %s"
 
-#: gconf/gconf-internals.c:1294
+#: gconf/gconf-internals.c:1292
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Förväntade lista med %s, fick lista med %s"
 
-#: gconf/gconf-internals.c:1433
+#: gconf/gconf-internals.c:1431
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Förväntade par, fick %s"
 
-#: gconf/gconf-internals.c:1447
+#: gconf/gconf-internals.c:1445
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Förväntade ett par (%s,%s), fick ett par med en eller båda värdena saknade"
 
-#: gconf/gconf-internals.c:1463
+#: gconf/gconf-internals.c:1461
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Förväntade par av typen (%s,%s), men fick typen (%s,%s)"
 
-#: gconf/gconf-internals.c:1579
+#: gconf/gconf-internals.c:1577
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Strängar inom citattecken börjar inte med ett citationstecken"
 
-#: gconf/gconf-internals.c:1641
+#: gconf/gconf-internals.c:1639
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Strängar inom citattecken slutar inte med ett citationstecken"
 
-#: gconf/gconf-internals.c:2107 gconf/gconf.c:2615
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-fel: %s"
 
-#: gconf/gconf-internals.c:2122
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: gconf/gconf-internals.c:2127
+#: gconf/gconf-internals.c:2125
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "försöker att ta bort icke-listad OAF objektkatalog"
 
-#: gconf/gconf-internals.c:2132
+#: gconf/gconf-internals.c:2130
 msgid "attempt to add already-listed OAF directory"
 msgstr "försöker att lägga till redan-listad OAF katalog"
 
-#: gconf/gconf-internals.c:2139
+#: gconf/gconf-internals.c:2137
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF tolkningsfel: %s"
 
-#: gconf/gconf-internals.c:2144
+#: gconf/gconf-internals.c:2142
 msgid "Unknown OAF error"
 msgstr "Okänt OAF-fel"
 
-#: gconf/gconf-internals.c:2227
+#: gconf/gconf-internals.c:2225
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Ingen ior-fil i\"%s\""
 
-#: gconf/gconf-internals.c:2258
+#: gconf/gconf-internals.c:2256
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd tar låset \"%s\" från en annan process"
 
-#: gconf/gconf-internals.c:2269
+#: gconf/gconf-internals.c:2267
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Ett annat program har låset \"%s\""
 
-#: gconf/gconf-internals.c:2289
+#: gconf/gconf-internals.c:2287
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "kunde inte kontakta ORB för att pinga existerande gconfd"
 
-#: gconf/gconf-internals.c:2297
+#: gconf/gconf-internals.c:2295
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -197,47 +441,42 @@ msgstr ""
 "Tar bort gammalt lås \"%s\" på grund av att IOR inte kunde konverteras till "
 "objekt-referencen, IOR \"%s\""
 
-#: gconf/gconf-internals.c:2309
+#: gconf/gconf-internals.c:2307
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr "Tar bort gammalt lås \"%s\" på grund av fel vid pingande av server: %s"
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf konfigurationsdemon (gconfd) har låset \"%s\""
 
-#: gconf/gconf-internals.c:2335
+#: gconf/gconf-internals.c:2333
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "kunde inte skapa katalog \"%s\": %s"
 
-#: gconf/gconf-internals.c:2370
+#: gconf/gconf-internals.c:2368
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "kunde inte skapa låset \"%s\": %s"
 
-#: gconf/gconf-internals.c:2406
+#: gconf/gconf-internals.c:2404
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kan inte skriva till filen \"%s\": %s"
 
-#: gconf/gconf-internals.c:2418
-#, c-format
-msgid "Failed to close file `%s': %s"
-msgstr "Misslyckades att stänga filen \"%s\": %s"
-
-#: gconf/gconf-internals.c:2449
+#: gconf/gconf-internals.c:2447
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "Kan inte öppna låsfil \"%s\"; antar att den inte är vår: %s"
 
-#: gconf/gconf-internals.c:2466
+#: gconf/gconf-internals.c:2464
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Korrupt låsfil \"%s\", tar bort den ändå"
 
-#: gconf/gconf-internals.c:2476
+#: gconf/gconf-internals.c:2474
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -246,31 +485,92 @@ msgstr ""
 "Skapade inte låsfilen \"%s\" (skapare pid %u, vårt pid %u; antar att någon "
 "tog vårt lås"
 
-#: gconf/gconf-internals.c:2493
+#: gconf/gconf-internals.c:2491
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Misslyckades att släppa låset på katalogen \"%s\": %s"
 
+#: gconf/gconf-sources.c:334
+#, fuzzy, c-format
+msgid "Failed to load source `%s': %s"
+msgstr "Misslyckades att stänga filen \"%s\": %s"
+
+#: gconf/gconf-sources.c:506
+#, c-format
+msgid "Schema `%s' specified for `%s' stores a non-schema value"
+msgstr ""
+
+#: gconf/gconf-sources.c:555
+msgid "The '/' name can only be a directory, not a key"
+msgstr ""
+
+#: gconf/gconf-sources.c:584
+#, 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
+#, fuzzy, c-format
+msgid "Error finding metainfo: %s"
+msgstr "Fel vid listning av kataloger: %s\n"
+
+#: gconf/gconf-sources.c:1144
+#, fuzzy, c-format
+msgid "Error getting metainfo: %s"
+msgstr "Fel vid sättning av värde: %s"
+
+#: gconf/gconf-sources.c:1168
+#, 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 "Fel vid mottagning av värde för \"%s\": %s"
+
+#: gconf/gconf-value.c:96
+#, c-format
+msgid "Didn't understand `%s' (expected integer)"
+msgstr ""
+
+#: gconf/gconf-value.c:106
+#, c-format
+msgid "Integer `%s' is too large or small"
+msgstr ""
+
+#: gconf/gconf-value.c:127
+#, c-format
+msgid "Didn't understand `%s' (expected real number)"
+msgstr ""
+
+#: gconf/gconf-value.c:160
+#, c-format
+msgid "Didn't understand `%s' (expected true or false)"
+msgstr ""
+
 #: gconf/gconf.c:69
 #, c-format
 msgid "`%s': %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:261
+#: gconf/gconf.c:271
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Servern kunde inte lösa adressen \"%s\""
 
-#: gconf/gconf.c:391
+#: gconf/gconf.c:408
 msgid "Can't add notifications to a local configuration source"
 msgstr "Kan inte lägga till notifikationer till lokal konfigurationskälla"
 
-#: gconf/gconf.c:1449
+#: gconf/gconf.c:1466
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Pingning av server misslyckades, CORBA-fel: %s"
 
-#: gconf/gconf.c:1465
+#: gconf/gconf.c:1482
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -280,57 +580,57 @@ msgstr ""
 "oaf_activate_from_id() och satte inte ett undantag som förklarade problemet. "
 "Var vänlig skicka en OAF buggrapport."
 
-#: gconf/gconf.c:1660
+#: gconf/gconf.c:1677
 msgid "Failed to init GConf, exiting\n"
 msgstr "Misslyckades med att initiera GConf, avslutar\n"
 
-#: gconf/gconf.c:1697
+#: gconf/gconf.c:1714
 msgid "Must begin with a slash (/)"
 msgstr "Måste börja med ett snedstreck (/)"
 
-#: gconf/gconf.c:1719
+#: gconf/gconf.c:1736
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan inte ha två snedstreck (/) i rad"
 
-#: gconf/gconf.c:1721
+#: gconf/gconf.c:1738
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan inte ha en punkt (.) precis efter ett snedstreck (/)"
 
-#: gconf/gconf.c:1742
+#: gconf/gconf.c:1759
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "\"%c\" är ett ogiligt tecken i nyckel/katalognamnen"
 
-#: gconf/gconf.c:1756
+#: gconf/gconf.c:1773
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Nyckel/katalog kan inte avslutas med ett snedstreck (/)"
 
-#: gconf/gconf.c:2087
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Misslyckades att stänga ner konfigurationsservern: %s"
 
-#: gconf/gconf.c:2148
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Förväntade float, fick %s"
 
-#: gconf/gconf.c:2183
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Förväntade int, fick %s"
 
-#: gconf/gconf.c:2218
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Förväntade string, fick %s"
 
-#: gconf/gconf.c:2255
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Förväntade bool, fick %s"
 
-#: gconf/gconf.c:2288
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Förväntade schema, fick %s"
@@ -457,11 +757,6 @@ msgstr "Avlsutar"
 msgid "Failed to sync one or more sources: %s"
 msgstr "Misslyckades att synkronisera med en eller flera källor: %s"
 
-#: gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr "Fel vid mottagning av värde för \"%s\": %s"
-
 #: gconf/gconfd.c:1561
 #, c-format
 msgid "Error setting value for `%s': %s"
@@ -502,31 +797,31 @@ msgstr "Fel vid listning av kataloger i \"%s\": %s"
 msgid "Error setting schema for `%s': %s"
 msgstr "Fel vid sättning av schema för \"%s\": %s"
 
-#: gconf/gconfd.c:1911
+#: gconf/gconfd.c:1913
 msgid "Attempt to unregister invalid context ID"
 msgstr "Försöker att avregistrera ogiltigt kontext ID"
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1920
 #, c-format
 msgid "Bad context ID %lu, request ignored"
 msgstr "Ogiltigt kontext ID %lu, begäran ignorerad"
 
-#: gconf/gconfd.c:1926
+#: gconf/gconfd.c:1928
 #, c-format
 msgid "Already-unregistered context ID %lu, request ignored"
 msgstr "Redan-avregistrerad kontext ID %lu, begäran ignorerad"
 
-#: gconf/gconfd.c:1951
+#: gconf/gconfd.c:1953
 #, c-format
 msgid "Attempt to use invalid context ID %lu"
 msgstr "Försöker att använda ogiltigt kontext ID %lu"
 
-#: gconf/gconfd.c:1961
+#: gconf/gconfd.c:1963
 #, c-format
 msgid "Attempt to use already-unregistered context ID %lu"
 msgstr "Försöker att använda redan-avregistrerad kontext ID %lu"
 
-#: gconf/gconfd.c:2121
+#: gconf/gconfd.c:2123
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Retunerar undantag: %s"
@@ -767,7 +1062,7 @@ msgstr "Måste sätta miljövariabeln 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:488
+#: gconf/gconftool.c:487
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -779,133 +1074,133 @@ msgstr ""
 "inga applikationer körs\n"
 "(fast teoretiskt fungerar saker om applikationerna körs).\n"
 
-#: gconf/gconftool.c:510
+#: gconf/gconftool.c:509
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Misslyckades att få tillgång till konfigurationskällorna: %s\n"
 
-#: gconf/gconftool.c:670
+#: gconf/gconftool.c:669
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Avstängningsfel: %s\n"
 
-#: gconf/gconftool.c:715
+#: gconf/gconftool.c:714
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Måste ange en eller flera kataloger att rekursivt lista.\n"
 
-#: gconf/gconftool.c:749
+#: gconf/gconftool.c:748
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "Misslyckades att lista par i \"%s\": %s"
 
-#: gconf/gconftool.c:767
+#: gconf/gconftool.c:766
 msgid "(no value set)"
 msgstr "(inget värde satt)"
 
-#: gconf/gconftool.c:820
+#: gconf/gconftool.c:819
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Misslyckades att \"spawna\" konfigurationsservern (gconfd): %s\n"
 
-#: gconf/gconftool.c:834
+#: gconf/gconftool.c:833
 msgid "Must specify a key or keys to get\n"
 msgstr "Måste ange en nyckel eller flera att få\n"
 
-#: gconf/gconftool.c:865
+#: gconf/gconftool.c:864
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:866
+#: gconf/gconftool.c:865
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Ägare: %s\n"
 
-#: gconf/gconftool.c:866 gconf/gconftool.c:867 gconf/gconftool.c:868
+#: gconf/gconftool.c:865 gconf/gconftool.c:866 gconf/gconftool.c:867
 msgid "Unset"
 msgstr "Nollställ"
 
-#: gconf/gconftool.c:867
+#: gconf/gconftool.c:866
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kort beskrivning: %s\n"
 
-#: gconf/gconftool.c:868
+#: gconf/gconftool.c:867
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Lång beskrivning: %s\n"
 
-#: gconf/gconftool.c:877
+#: gconf/gconftool.c:876
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Inget värde satt för \"%s\"\n"
 
-#: gconf/gconftool.c:881
+#: gconf/gconftool.c:880
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Misslyckades att få värdet för \"%s\": %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:899
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Du måste ange alternativa nycklar/värden som argument\n"
 
-#: gconf/gconftool.c:917
+#: gconf/gconftool.c:916
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Inget värde satt för nyckel: \"%s\"\n"
 
-#: gconf/gconftool.c:940 gconf/gconftool.c:1052 gconf/gconftool.c:1056
+#: gconf/gconftool.c:939 gconf/gconftool.c:1051 gconf/gconftool.c:1055
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Förstår inte typen \"%s\"\n"
 
-#: gconf/gconftool.c:951
+#: gconf/gconftool.c:950
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fel: %s\n"
 
-#: gconf/gconftool.c:964 gconf/gconftool.c:1070
+#: gconf/gconftool.c:963 gconf/gconftool.c:1069
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Fel vid sättning av värde: %s"
 
-#: gconf/gconftool.c:982 gconf/gconftool.c:1084
+#: gconf/gconftool.c:981 gconf/gconftool.c:1083
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Fel vid synkronisering av: %s"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:999
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Måste specifiera nyckel (schema namn) som det enda argumentet\n"
 
-#: gconf/gconftool.c:1099
+#: gconf/gconftool.c:1098
 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:1113
+#: gconf/gconftool.c:1112
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Måste specifiera en eller flera nycklar att nollställa.\n"
 
-#: gconf/gconftool.c:1124
+#: gconf/gconftool.c:1123
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Fel vid nollställning av \"%s\": %s\n"
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1146
 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:1181
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Fel vid listning av kataloger: %s\n"
 
-#: gconf/gconftool.c:1220
+#: gconf/gconftool.c:1219
 #, 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:1227
+#: gconf/gconftool.c:1226
 msgid ""
 "WARNING: For now gconftool only knows how to install default values for "
 "simple types (int, string, bool, float)\n"
@@ -913,39 +1208,39 @@ msgstr ""
 "VARNING: Just nu vet bara gconftool hur man installerar standard värden för "
 "enkla typer (int, string, bool, float)\n"
 
-#: gconf/gconftool.c:1243
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "VARNING: Misslyckades att tolka standardväde \"%s\" för schema (%s)\n"
 
-#: gconf/gconftool.c:1256
+#: gconf/gconftool.c:1255
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "VARNING: internt fel i gconftool, okänd GConfValueType\n"
 
-#: gconf/gconftool.c:1304
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "VARNING: misslyckades att tolka typnamnet \"%s\"\n"
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1326
 msgid "WARNING: empty <applyto> node"
 msgstr "VARNING: tom <applyto> nod"
 
-#: gconf/gconftool.c:1330 gconf/gconftool.c:1575
+#: gconf/gconftool.c:1329 gconf/gconftool.c:1574
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "VARNING: noden <%s> nedan kan inte förstås <schema>\n"
 
-#: gconf/gconftool.c:1340
+#: gconf/gconftool.c:1339
 msgid "WARNING: no key specified for schema\n"
 msgstr "VARNING: ingen nyckel specifierad för schema\n"
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1372
 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:1379
+#: gconf/gconftool.c:1378
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -953,52 +1248,52 @@ msgstr ""
 "VARNING: multipla <locale> noder för platsen \"%s\", ignorerar allt "
 "föregående först\n"
 
-#: gconf/gconftool.c:1451
+#: gconf/gconftool.c:1450
 #, 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:1480
+#: gconf/gconftool.c:1479
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "VARNING: misslyckades att installera schemat \"%s\" plats \"%s\": %s\n"
 
-#: gconf/gconftool.c:1488
+#: gconf/gconftool.c:1487
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Installerade schemat \"%s\" för platsen \"%s\"\n"
 
-#: gconf/gconftool.c:1510
+#: gconf/gconftool.c:1509
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 "VARNING: misslyckades att associera schemat `%s' med nyckeln `%s': %s\n"
 
-#: gconf/gconftool.c:1518
+#: gconf/gconftool.c:1517
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Kopplade ihop schemat \"%s\" med nyckeln \"%s\"\n"
 
-#: gconf/gconftool.c:1588
+#: gconf/gconftool.c:1587
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Du måste ha minst en <locale> post i en <schema>\n"
 
-#: gconf/gconftool.c:1617
+#: gconf/gconftool.c:1616
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "VARNING: nod <%s> nedan kan inte förstås <schemalist>\n"
 
-#: gconf/gconftool.c:1639
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Misslyckades med att öppna \"%s\": %s\n"
 
-#: gconf/gconftool.c:1646
+#: gconf/gconftool.c:1645
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument \"%s\" tomt?\n"
 
-#: gconf/gconftool.c:1658
+#: gconf/gconftool.c:1657
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1007,26 +1302,26 @@ msgstr ""
 "Dokumentet \"%s\" har fel typ av rotnod (<%s>, borde vara "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1671
+#: gconf/gconftool.c:1670
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokumentet \"%s\" har ingen toppnivå <gconfschemafil> nod\n"
 
-#: gconf/gconftool.c:1685
+#: gconf/gconftool.c:1684
 #, 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:1696 gconf/gconftool.c:1728
+#: gconf/gconftool.c:1695 gconf/gconftool.c:1727
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Fel vid synkronisering av konfigurationsdata: %s"
 
-#: gconf/gconftool.c:1712
+#: gconf/gconftool.c:1711
 msgid "Must specify some schema files to install\n"
 msgstr "Måste ange någon schemafil att installera\n"
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1748
 #, c-format
 msgid ""
 "\n"
@@ -1035,16 +1330,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:1769
+#: gconf/gconftool.c:1768
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Misslyckades att nollställa knäcknyckeln %s: %s\n"
 
-#: gconf/gconftool.c:1895
+#: gconf/gconftool.c:1894
 msgid "Must specify some keys to break\n"
 msgstr "Måste ange några nycklar att knäcka\n"
 
-#: gconf/gconftool.c:1901
+#: gconf/gconftool.c:1900
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1054,11 +1349,11 @@ msgstr ""
 "nyckeln:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:1919
+#: gconf/gconftool.c:1918
 msgid "Must specify some directories to break\n"
 msgstr "Måste ange några kataloger att knäcka\n"
 
-#: gconf/gconftool.c:1938
+#: gconf/gconftool.c:1937
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1069,6 +1364,16 @@ msgstr ""
 "nyckeln i katalogen:\n"
 "  %s\n"
 
+#: wrappers/gtk/gconf-client.c:812
+#, fuzzy, c-format
+msgid "GConf warning: failure listing pairs in `%s': %s"
+msgstr "Misslyckades att lista par i \"%s\": %s"
+
+#: wrappers/gtk/gconf-client.c:990
+#, fuzzy, c-format
+msgid "Expected `%s' got `%s' for key %s"
+msgstr "Förväntade lista med %s, fick lista med %s"
+
 #~ msgid "Key"
 #~ msgstr "Nyckel"
 
diff --git a/po/tr.po b/po/tr.po
index 49bb5ad3..c2481edf 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 0.6\n"
-"POT-Creation-Date: 2000-07-24 12:45+0200\n"
+"POT-Creation-Date: 2000-07-27 13:55-0400\n"
 "PO-Revision-Date: 2000-07-24 13:10+0200\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -48,7 +48,8 @@ msgstr "`%s' XML dizininde kilitleme yapamadým : %s"
 
 #: backends/xml-cache.c:134
 msgid "Unsynced directory deletions when shutting down XML backend"
-msgstr "XML modülünü kapatýrken eþitleþtirilmemiþ dizin silimleri geriye kalýyor"
+msgstr ""
+"XML modülünü kapatýrken eþitleþtirilmemiþ dizin silimleri geriye kalýyor"
 
 #: backends/xml-cache.c:243
 #, c-format
@@ -65,8 +66,8 @@ msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
 "%u seconds"
 msgstr ""
-"%u birim arabellekte geriye kaldý. %u saniyeden eski eþitleþtirilmiþ birimler"
-"silinmiþtir"
+"%u birim arabellekte geriye kaldý. %u saniyeden eski eþitleþtirilmiþ "
+"birimlersilinmiþtir"
 
 #: backends/xml-dir.c:178
 #, c-format
@@ -160,7 +161,8 @@ msgstr "`%s' XML birimini geçiyorum, imkani þekil ismi %s haricen"
 
 #: backends/xml-entry.c:688
 msgid "found <local_schema> with no locale setting"
-msgstr "<local_scheme> bir yerelleþme ayarlarýyla alakasý olmayan bir yerde buldum"
+msgstr ""
+"<local_scheme> bir yerelleþme ayarlarýyla alakasý olmayan bir yerde buldum"
 
 #: backends/xml-entry.c:710
 #, c-format
@@ -175,7 +177,8 @@ msgstr "<%s> birimi için \"type\" özelliði belirtilmemiþ"
 #: backends/xml-entry.c:906
 #, 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"
+msgstr ""
+"Bir birimin bilinmeyen bir \"type\" özelliði `%s''yi barýndýrýyor, geçiyorum"
 
 #: backends/xml-entry.c:921
 msgid "No \"value\" attribute for node"
@@ -391,7 +394,7 @@ msgstr "Sorgulama metni bir soru iþaretiyle baþlamýyor"
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Sorgulama metni bir soru iþaretiyle bitmiyor"
 
-#: gconf/gconf-internals.c:2105 gconf/gconf.c:2632
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA hatasý : %s"
@@ -510,8 +513,7 @@ msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
-"`%s' için sýrf-okunur kaynakta senin dizinlemenden önce bir deðer"
-"oturtulmuþ"
+"`%s' için sýrf-okunur kaynakta senin dizinlemenden önce bir deðeroturtulmuþ"
 
 #: gconf/gconf-sources.c:1079
 #, c-format
@@ -526,7 +528,9 @@ msgstr "Meta bilgileri alýrken hata oldu : %s"
 #: gconf/gconf-sources.c:1168
 #, 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"
+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
@@ -607,32 +611,32 @@ msgstr "`%c' anahtar/dizinler isimlerinde geçersiz bir harfdýr"
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Anahtar/Dizin bir taksimle( '/' ) bitemez"
 
-#: gconf/gconf.c:2104
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Ayarlama sunucusunu kapatamadým : %s"
 
-#: gconf/gconf.c:2165
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Kayan sayý beklerken, %s aldým"
 
-#: gconf/gconf.c:2200
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Tamsayý beklerken, %s aldým"
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Metin beklerken, %s aldým"
 
-#: gconf/gconf.c:2272
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Boolean beklerken, %s aldým"
 
-#: gconf/gconf.c:2305
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Þekil beklerken, %s aldým"
@@ -1366,12 +1370,12 @@ msgstr ""
 ":\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:708
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 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:886
+#: wrappers/gtk/gconf-client.c:990
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "%s beklerken, %s aldým, %s anahtarý için"
diff --git a/po/uk.po b/po/uk.po
index 86ac0790..81165a90 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2000-04-12 19:12+0200\n"
+"POT-Creation-Date: 2000-07-27 13:55-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"
@@ -22,7 +22,7 @@ msgstr "÷É×ÁÎÔÁÖÅÎÎÑ ÓÅÒ×ÅÒÎÏÇÏ ÍÏÄÕÌÑ XML."
 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
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ËÁÔÁÌÏÇ \"%s\": %s"
@@ -47,6 +47,191 @@ msgstr "¶Î¦Ã¦Á̦ÚÁÃ¦Ñ ÓÅÒ×ÅÒÎÏÇÏ ÍÏÄÕÌÑ XML"
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr ""
 
+#: backends/xml-cache.c:134
+msgid "Unsynced directory deletions when shutting down XML backend"
+msgstr ""
+
+#: backends/xml-cache.c:243
+#, 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
+#, c-format
+msgid ""
+"%u items remain in the cache after cleaning already-synced items older than "
+"%u seconds"
+msgstr ""
+
+#: backends/xml-dir.c:178
+#, fuzzy, c-format
+msgid "Could not stat `%s': %s"
+msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ËÁÔÁÌÏÇ \"%s\": %s"
+
+#: backends/xml-dir.c:188
+#, c-format
+msgid "XML filename `%s' is a directory"
+msgstr ""
+
+#: backends/xml-dir.c:307 backends/xml-dir.c:314
+#, fuzzy, c-format
+msgid "Failed to delete `%s': %s"
+msgstr "îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ \"%s\": %s\n"
+
+#: backends/xml-dir.c:355
+#, fuzzy, c-format
+msgid "Failed to write file `%s': %s"
+msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁËÒÉÔÉ ÆÁÊÌ \"%s\": %s"
+
+#: backends/xml-dir.c:371 backends/xml-dir.c:381
+#, fuzzy, c-format
+msgid "Failed to rename `%s' to `%s': %s"
+msgstr "îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ \"%s\": %s\n"
+
+#: backends/xml-dir.c:387
+#, fuzzy, c-format
+msgid "Failed to restore `%s' from `%s': %s"
+msgstr "îÅ ×ÄÁÌÏÓÑ ÏÔÒÉÍÁÔÉ ÚÎÁÞÅÎÎÑ ÄÌÑ \"%s\": %s\n"
+
+#: backends/xml-dir.c:399
+#, fuzzy, c-format
+msgid "Failed to delete old file `%s': %s"
+msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁËÒÉÔÉ ÆÁÊÌ \"%s\": %s"
+
+#. These are all fatal errors
+#: backends/xml-dir.c:802
+#, fuzzy, c-format
+msgid "Failed to stat `%s': %s"
+msgstr "îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ \"%s\": %s\n"
+
+#: backends/xml-dir.c:946
+#, c-format
+msgid "Duplicate entry `%s' in `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:968
+#, c-format
+msgid "Entry with no name in XML file `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:975
+#, c-format
+msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:1063
+#, fuzzy, c-format
+msgid "Failed to create file `%s': %s"
+msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁËÒÉÔÉ ÆÁÊÌ \"%s\": %s"
+
+#: backends/xml-dir.c:1071 gconf/gconf-internals.c:2416
+#, c-format
+msgid "Failed to close file `%s': %s"
+msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁËÒÉÔÉ ÆÁÊÌ \"%s\": %s"
+
+#. There was an error
+#: backends/xml-entry.c:162
+#, c-format
+msgid "Ignoring XML node with name `%s': %s"
+msgstr ""
+
+#: backends/xml-entry.c:213 gconf/gconf-internals.c:2120
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: backends/xml-entry.c:340
+#, fuzzy, c-format
+msgid "Ignoring schema name `%s', invalid: %s"
+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
+#, c-format
+msgid "Ignoring XML node `%s', except for possible schema name: %s"
+msgstr ""
+
+#: backends/xml-entry.c:688
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:710
+#, fuzzy, c-format
+msgid "Failed reading default value for schema: %s"
+msgstr "ðÏÍÉÌËÁ ÏÔÒÉÍÁÎÎÑ ÔÉÐÏ×ÏÇÏ ÚÎÁÞÅÎÎÑ \"%s\": %s"
+
+#: backends/xml-entry.c:892
+#, c-format
+msgid "No \"type\" attribute for <%s> node"
+msgstr ""
+
+#: backends/xml-entry.c:906
+#, c-format
+msgid "A node has unknown \"type\" attribute `%s', ignoring"
+msgstr ""
+
+#: backends/xml-entry.c:921
+msgid "No \"value\" attribute for node"
+msgstr ""
+
+#: backends/xml-entry.c:969 backends/xml-entry.c:1045
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML list node"
+msgstr ""
+
+#: backends/xml-entry.c:1003
+msgid "Invalid type (list, pair, or unknown) in a list node"
+msgstr ""
+
+#: backends/xml-entry.c:1026
+#, c-format
+msgid "Bad XML node: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1034
+#, c-format
+msgid "List contains a badly-typed node (%s, should be %s)"
+msgstr ""
+
+#: backends/xml-entry.c:1086
+#, c-format
+msgid "Ignoring bad car from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1095 backends/xml-entry.c:1118
+msgid "parsing XML file: lists and pairs may not be placed inside a pair"
+msgstr ""
+
+#: backends/xml-entry.c:1108
+#, c-format
+msgid "Ignoring bad cdr from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1127
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1145
+msgid "Didn't find car and cdr for XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1151
+msgid "Missing cdr from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1158
+msgid "Missing car from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1163
+msgid "Missing both car and cdr values from pair in XML file"
+msgstr ""
+
 #. -- end debug only
 #: gconf/gconf-backend.c:180
 #, c-format
@@ -76,6 +261,68 @@ msgstr "îÅ ×ÄÁÌÏÓÑ ÚÎÁÊÔÉ ÓÅÒ×ÅÒÎÉÊ ÍÏÄÕÌØ ÄÌÑ \"%s\""
 msgid "Failed to shut down backend"
 msgstr "îÅ ×ÄÁÌÏÓÑ ×¦ÄËÌÀÞÉÔÉ ÓÅÒ×ÅÒ"
 
+#: gconf/gconf-error.c:39
+msgid "Success"
+msgstr ""
+
+#: gconf/gconf-error.c:40
+msgid "Failed"
+msgstr ""
+
+#: gconf/gconf-error.c:41
+msgid "Configuration server couldn't be contacted"
+msgstr ""
+
+#: gconf/gconf-error.c:42
+msgid "Permission denied"
+msgstr ""
+
+#: gconf/gconf-error.c:43
+msgid "Couldn't resolve address for configuration source"
+msgstr ""
+
+#: gconf/gconf-error.c:44
+msgid "Bad key or directory name"
+msgstr ""
+
+#: gconf/gconf-error.c:45
+#, fuzzy
+msgid "Parse error"
+msgstr "ÐÏÍÉÌËÁ ÁÎÁ̦ÚÕ OAF: %s"
+
+#: gconf/gconf-error.c:46
+msgid "Corrupt data in configuration source database"
+msgstr ""
+
+#: gconf/gconf-error.c:47
+msgid "Type mismatch"
+msgstr ""
+
+#: gconf/gconf-error.c:48
+msgid "Key operation on directory"
+msgstr ""
+
+#: gconf/gconf-error.c:49
+msgid "Directory operation on key"
+msgstr ""
+
+#: gconf/gconf-error.c:50
+msgid "Can't overwrite existing read-only value"
+msgstr ""
+
+#: gconf/gconf-error.c:51
+msgid "Object Activation Framework error"
+msgstr ""
+
+#: gconf/gconf-error.c:52
+msgid "Operation not allowed without configuration server"
+msgstr ""
+
+#: gconf/gconf-error.c:53
+#, fuzzy
+msgid "Failed to get a lock"
+msgstr "îÅ ×ÄÁÌÏÓÑ ÏÔÒÉÍÁÔÉ ÚÎÁÞÅÎÎÑ ÄÌÑ \"%s\": %s\n"
+
 #: gconf/gconf-internals.c:100
 #, c-format
 msgid "No '/' in key `%s'"
@@ -109,223 +356,274 @@ msgstr "äÏÄÁ×ÁÎÎÑ ÄÖÅÒÅÌÁ \"%s\"\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "ðÏÍÉÌËÁ ÚÞÉÔÕ×ÁÎÎÑ Ú ÆÁÊÌÕ \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:1284
+#: gconf/gconf-internals.c:1282
 #, c-format
 msgid "Expected list, got %s"
 msgstr "ïÞ¦ËÕ×Á×ÓÑ ÓÐÉÓÏË, ÏÔÒÉÍÁÎÏ %s"
 
-#: gconf/gconf-internals.c:1294
+#: gconf/gconf-internals.c:1292
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "ïÞÉËÕ×Á×ÓÑ ÓÐÉÓÏË %s, ÏÔÒÉÍÁÎÏ ÓÐÉÓÏË %s"
 
-#: gconf/gconf-internals.c:1433
+#: gconf/gconf-internals.c:1431
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "ïÞ¦ËÕ×ÁÌÁÓÑ ÐÁÒÁ, ÏÔÒÉÍÁÎÏ %s"
 
-#: gconf/gconf-internals.c:1447
+#: gconf/gconf-internals.c:1445
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "ïÞ¦ËÕ×ÁÌÁÓØ ÐÁÒÁ (%s,%s), ÏÔÒÉÍÁÎÏ ÐÁÒÕ Ú ÎÅצÒÎÉÍÉ ÏÄÎÉÍ ÁÂÏ ÏÂÏÍÁ "
 "ÚÎÁÞÅÎÎÑÍÉ"
 
-#: gconf/gconf-internals.c:1463
+#: gconf/gconf-internals.c:1461
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "ïÞ¦ËÕ×ÁÌÁÓØ ÐÁÒÁ ÔÉÐÕ (%s,%s) ÏÔÒÉÍÁÎÏ ÔÉÐÕ (%s,%s)"
 
-#: gconf/gconf-internals.c:1579
+#: gconf/gconf-internals.c:1577
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "òÑÄÏË × ÌÁÐËÁÈ ÎÅ ÐÏÞÉÎÁ¤ÔØÓÑ Ú ÌÁÐËÉ"
 
-#: gconf/gconf-internals.c:1641
+#: gconf/gconf-internals.c:1639
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "òÑÄÏË × ÌÁÐËÁÈ ÎŠ˦ÎÞÁ¤ÔØÓÑ ÌÁÐËÏÀ"
 
-#: gconf/gconf-internals.c:2107 gconf/gconf.c:2615
+#: gconf/gconf-internals.c:2105 gconf/gconf.c:2643
 #, c-format
 msgid "CORBA error: %s"
 msgstr "ðÏÍÉÌËÁ CORBA: %s"
 
-#: gconf/gconf-internals.c:2122
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: gconf/gconf-internals.c:2127
+#: gconf/gconf-internals.c:2125
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "ÓÐÒÏÂÁ ×ÉÄÁÌÉÔÉ ÎÅ×ËÁÚÁÎÉÊ × ÓÐÉÓËÕ ËÁÔÁÌÏÇ ÏÂ'¤ËÔ¦× OAF"
 
-#: gconf/gconf-internals.c:2132
+#: gconf/gconf-internals.c:2130
 msgid "attempt to add already-listed OAF directory"
 msgstr "ÓÐÒÏÂÁ ÄÏÄÁÔÉ ×ÖÅ ×ËÁÚÁÎÉÊ × ÓÐÉÓËÕ ËÁÔÁÌÏÇ OAF"
 
-#: gconf/gconf-internals.c:2139
+#: gconf/gconf-internals.c:2137
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "ÐÏÍÉÌËÁ ÁÎÁ̦ÚÕ OAF: %s"
 
-#: gconf/gconf-internals.c:2144
+#: gconf/gconf-internals.c:2142
 msgid "Unknown OAF error"
 msgstr "îÅצÄÏÍÁ ÐÏÍÉÌËÁ OAF"
 
-#: gconf/gconf-internals.c:2227
+#: gconf/gconf-internals.c:2225
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "îÅצÒÎÉÊ ÆÁÊÌ ior × \"%s\""
 
-#: gconf/gconf-internals.c:2258
+#: gconf/gconf-internals.c:2256
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd ÚÁÂÌÏËÕ×Á× \"%s\" ×¦Ä ÄÅÑËÉÈ ¦ÎÛÉÈ ÐÒÏÃÅÓ¦×"
 
-#: gconf/gconf-internals.c:2269
+#: gconf/gconf-internals.c:2267
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "¶ÎÛÁ ÐÒÏÇÒÁÍÁ ÚÁÂÌÏËÕ×ÁÌÁ \"%s\""
 
-#: gconf/gconf-internals.c:2289
+#: gconf/gconf-internals.c:2287
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2297
+#: gconf/gconf-internals.c:2295
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2309
+#: gconf/gconf-internals.c:2307
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "äÅÍÏÎ ËÏÎƦÇÕÒÁæ§ GConf (gconfd) ÚÁÂÌÏËÕ×Á× \"%s\""
 
-#: gconf/gconf-internals.c:2335
+#: gconf/gconf-internals.c:2333
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "ÎÅ ×ÄÁÌÏÓÑ ÓÔ×ÏÒÉÔÉ ËÁÔÁÌÏÇ \"%s\": %s"
 
-#: gconf/gconf-internals.c:2370
+#: gconf/gconf-internals.c:2368
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÂÌÏËÕ×ÁÎÎÑ \"%s\": %s"
 
-#: gconf/gconf-internals.c:2406
+#: gconf/gconf-internals.c:2404
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ Õ ÆÁÊÌ \"%s\": %s"
 
-#: gconf/gconf-internals.c:2418
-#, c-format
-msgid "Failed to close file `%s': %s"
-msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁËÒÉÔÉ ÆÁÊÌ \"%s\": %s"
-
-#: gconf/gconf-internals.c:2449
+#: gconf/gconf-internals.c:2447
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2466
+#: gconf/gconf-internals.c:2464
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2476
+#: gconf/gconf-internals.c:2474
 #, 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:2493
+#: gconf/gconf-internals.c:2491
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "îÅ ×ÄÁÌÏÓÑ ÚצÌØÎÉÔÉ ÚÁÂÌÏËÏ×ÁÎÉÊ ËÁÔÁÌÏÇ \"%s\": %s"
 
+#: gconf/gconf-sources.c:334
+#, fuzzy, c-format
+msgid "Failed to load source `%s': %s"
+msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁËÒÉÔÉ ÆÁÊÌ \"%s\": %s"
+
+#: gconf/gconf-sources.c:506
+#, c-format
+msgid "Schema `%s' specified for `%s' stores a non-schema value"
+msgstr ""
+
+#: gconf/gconf-sources.c:555
+msgid "The '/' name can only be a directory, not a key"
+msgstr ""
+
+#: gconf/gconf-sources.c:584
+#, 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
+#, fuzzy, c-format
+msgid "Error finding metainfo: %s"
+msgstr "ðÏÍÉÌËÁ ÏÔÒÉÍÁÎÎÑ ÓÐÉÓËÕ ËÁÔÁÌÏǦ×: %s\n"
+
+#: gconf/gconf-sources.c:1144
+#, fuzzy, c-format
+msgid "Error getting metainfo: %s"
+msgstr "ðÏÍÉÌËÁ ×ÓÔÁÎÏ×ÌÅÎÎÑ ÚÎÁÞÅÎÎÑ: %s"
+
+#: gconf/gconf-sources.c:1168
+#, 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
+#, c-format
+msgid "Didn't understand `%s' (expected integer)"
+msgstr ""
+
+#: gconf/gconf-value.c:106
+#, c-format
+msgid "Integer `%s' is too large or small"
+msgstr ""
+
+#: gconf/gconf-value.c:127
+#, c-format
+msgid "Didn't understand `%s' (expected real number)"
+msgstr ""
+
+#: gconf/gconf-value.c:160
+#, c-format
+msgid "Didn't understand `%s' (expected true or false)"
+msgstr ""
+
 #: gconf/gconf.c:69
 #, c-format
 msgid "`%s': %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:261
+#: gconf/gconf.c:271
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "óÅÒ×ÅÒ ÎÅ ÚÍ¦Ç ÒÏÚЦÚÎÁÔÉ ÁÄÒÅÓÕ \"%s\""
 
-#: gconf/gconf.c:391
+#: gconf/gconf.c:408
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1449
+#: gconf/gconf.c:1466
 #, c-format
 msgid "Pinging the server failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1465
+#: gconf/gconf.c:1482
 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:1660
+#: gconf/gconf.c:1677
 msgid "Failed to init GConf, exiting\n"
 msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ GConf: %s, ×ÉȦÄ\n"
 
-#: gconf/gconf.c:1697
+#: gconf/gconf.c:1714
 msgid "Must begin with a slash (/)"
 msgstr "íÕÓÉÔØ ÐÏÞÉÎÁÔÉÓÑ Ú \"/\""
 
-#: gconf/gconf.c:1719
+#: gconf/gconf.c:1736
 msgid "Can't have two slashes (/) in a row"
 msgstr "îÅ ÍÏÖÅ ÂÕÔÉ Ä×Á \"/\" × ÒÑÄËÕ"
 
-#: gconf/gconf.c:1721
+#: gconf/gconf.c:1738
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "îÅ ÍÏÖÅ ÂÕÔÉ ËÒÁÐËÉ Ð¦ÓÌÑ \"/\""
 
-#: gconf/gconf.c:1742
+#: gconf/gconf.c:1759
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "\"%c\" - ÎÅצÒÎÉÊ ÓÉÍ×ÏÌ × ÎÁÚצ ËÌÀÞ¦×/ËÁÔÁÌÏǦ×"
 
-#: gconf/gconf.c:1756
+#: gconf/gconf.c:1773
 msgid "Key/directory may not end with a slash (/)"
 msgstr "ëÌÀÞ/ËÁÔÁÌÏÇ ÎÅ ÍÏÖÅ ÚÁ˦ÎÞÕ×ÁÔÉÓØ ÓÌÅÛÅÍ (/)"
 
-#: gconf/gconf.c:2087
+#: gconf/gconf.c:2115
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "îÅ×ÄÁÌÏÓÑ ×¦ÄËÌÀÞÉÔÉ ÓÅÒ×ÅÒ ËÏÎƦÇÕÒÁæ§: %s"
 
-#: gconf/gconf.c:2148
+#: gconf/gconf.c:2176
 #, c-format
 msgid "Expected float, got %s"
 msgstr "ïÞ¦ËÕ×ÁÌÏÓØ ÞÉÓÌÏ Ú ÐÌÁ×ÁÀÞÏÀ ÔÏÞËÏÀ, ÏÔÒÉÍÁÎÏ %s"
 
-#: gconf/gconf.c:2183
+#: gconf/gconf.c:2211
 #, c-format
 msgid "Expected int, got %s"
 msgstr "ïÞ¦ËÕ×ÁÌÏÓØ Ã¦ÌÅ, ÏÔÒÉÍÁÎÏ %s"
 
-#: gconf/gconf.c:2218
+#: gconf/gconf.c:2246
 #, c-format
 msgid "Expected string, got %s"
 msgstr "ïÞ¦ËÕ×Á×ÓÑ ÒÑÄÏË, ÏÔÒÉÍÁÎÏ %s"
 
-#: gconf/gconf.c:2255
+#: gconf/gconf.c:2283
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "ïÞ¦ËÕ×ÁÌÏÓØ ÌÏǦÞÎÅ, ÏÔÒÉÍÁÎÏ %s"
 
-#: gconf/gconf.c:2288
+#: gconf/gconf.c:2316
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "ïÞ¦ËÕ×ÁÌÁÓØ ÓÈÅÍÁ, ÏÔÒÉÍÁÎÏ %s"
@@ -438,11 +736,6 @@ msgstr "úÁ×ÅÒÛÅÎÎÑ"
 msgid "Failed to sync one or more sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1523
-#, c-format
-msgid "Error getting value for `%s': %s"
-msgstr "ðÏÍÉÌËÁ ÏÔÒÉÍÁÎÎÑ ÚÎÁÞÅÎÎÑ \"%s\": %s"
-
 #: gconf/gconfd.c:1561
 #, c-format
 msgid "Error setting value for `%s': %s"
@@ -483,31 +776,31 @@ msgstr "ðÏÍÉÌËÁ ÏÔÒÉÍÁÎÎÑ ÓÐÉÓËÕ ËÁÔÁÌÏÇÕ × \"%s\": %s"
 msgid "Error setting schema for `%s': %s"
 msgstr "ïÍÉÌËÁ ÏÔÒÉÍÁÎÎÑ ÓÈÅÍÉ ÄÌÑ \"%s\": %s"
 
-#: gconf/gconfd.c:1911
+#: gconf/gconfd.c:1913
 msgid "Attempt to unregister invalid context ID"
 msgstr ""
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1920
 #, c-format
 msgid "Bad context ID %lu, request ignored"
 msgstr ""
 
-#: gconf/gconfd.c:1926
+#: gconf/gconfd.c:1928
 #, c-format
 msgid "Already-unregistered context ID %lu, request ignored"
 msgstr ""
 
-#: gconf/gconfd.c:1951
+#: gconf/gconfd.c:1953
 #, c-format
 msgid "Attempt to use invalid context ID %lu"
 msgstr ""
 
-#: gconf/gconfd.c:1961
+#: gconf/gconfd.c:1963
 #, c-format
 msgid "Attempt to use already-unregistered context ID %lu"
 msgstr ""
 
-#: gconf/gconfd.c:2121
+#: gconf/gconfd.c:2123
 #, c-format
 msgid "Returning exception: %s"
 msgstr "ðÏ×ÅÒÔÁÎÎÑ ×ÉËÌÀÞÅÎÎÑ: %s"
@@ -727,7 +1020,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:488
+#: gconf/gconftool.c:487
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -735,220 +1028,220 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:510
+#: gconf/gconftool.c:509
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:670
+#: gconf/gconftool.c:669
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "ðÏÍÉÌËÁ ×ÉÍËÎÅÎÎÑ: %s\n"
 
-#: gconf/gconftool.c:715
+#: gconf/gconftool.c:714
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:749
+#: gconf/gconftool.c:748
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "îÅ×ÄÁÌÏÓÑ ÏÔÒÉÍÁÔÉ ÓÐÉÓÏË ÐÁÒ × \"%s\": %s"
 
-#: gconf/gconftool.c:767
+#: gconf/gconftool.c:766
 msgid "(no value set)"
 msgstr "(ÎÅ ×ÓÔÁÎÏ×ÌÅÎÏ ÚÎÁÞÅÎÎÑ)"
 
-#: gconf/gconftool.c:820
+#: gconf/gconftool.c:819
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "îÅ×ÄÁÌÏÓÑ ÒÏÚÇÁÌÕÄÉÔÉ ÓÅÒ×ÅÒ ËÏÎƦÇÕÒÁæ§ (gconfd): %s\n"
 
-#: gconf/gconftool.c:834
+#: gconf/gconftool.c:833
 msgid "Must specify a key or keys to get\n"
 msgstr "ðÏÔÒ¦ÂÎÏ ×ËÁÚÁÔÉ ËÌÀÞ ÁÂÏ ËÌÀÞ¦ ÄÌÑ ÏÔÒÉÍÁÎÎÑ\n"
 
-#: gconf/gconftool.c:865
+#: gconf/gconftool.c:864
 #, c-format
 msgid "Type: %s\n"
 msgstr "ôÉÐ: %s\n"
 
-#: gconf/gconftool.c:866
+#: gconf/gconftool.c:865
 #, c-format
 msgid "Owner: %s\n"
 msgstr "÷ÌÁÓÎÉË: %s\n"
 
-#: gconf/gconftool.c:866 gconf/gconftool.c:867 gconf/gconftool.c:868
+#: gconf/gconftool.c:865 gconf/gconftool.c:866 gconf/gconftool.c:867
 msgid "Unset"
 msgstr "úÎÑÔÉ ÚÎÁÞÅÎÎÑ"
 
-#: gconf/gconftool.c:867
+#: gconf/gconftool.c:866
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "ëÏÒÏÔËÉÊ ÏÐÉÓ: %s\n"
 
-#: gconf/gconftool.c:868
+#: gconf/gconftool.c:867
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "äÏ×ÇÉÊ ÏÐÉÓ: %s\n"
 
-#: gconf/gconftool.c:877
+#: gconf/gconftool.c:876
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "îÅ ×ÓÔÁÎÏ×ÌÅÎÏ ÚÎÁÞÅÎÎÑ ÄÌÑ \"%s\"\n"
 
-#: gconf/gconftool.c:881
+#: gconf/gconftool.c:880
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "îÅ ×ÄÁÌÏÓÑ ÏÔÒÉÍÁÔÉ ÚÎÁÞÅÎÎÑ ÄÌÑ \"%s\": %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:899
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:917
+#: gconf/gconftool.c:916
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "îÅÍɤ ÚÎÁÞÅÎÎÑ ÄÌÑ ×ÓÔÁÎÏ×ÌÅÎÎÑ ÊÏÇÏ ËÌÀÞÕ: \"%s\"\n"
 
-#: gconf/gconftool.c:940 gconf/gconftool.c:1052 gconf/gconftool.c:1056
+#: gconf/gconftool.c:939 gconf/gconftool.c:1051 gconf/gconftool.c:1055
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "îÅÚÒÏÚÕͦÌÉÊ ÔÉÐ \"%s\"\n"
 
-#: gconf/gconftool.c:951
+#: gconf/gconftool.c:950
 #, c-format
 msgid "Error: %s\n"
 msgstr "ðÏÍÉÌËÁ: %s\n"
 
-#: gconf/gconftool.c:964 gconf/gconftool.c:1070
+#: gconf/gconftool.c:963 gconf/gconftool.c:1069
 #, c-format
 msgid "Error setting value: %s"
 msgstr "ðÏÍÉÌËÁ ×ÓÔÁÎÏ×ÌÅÎÎÑ ÚÎÁÞÅÎÎÑ: %s"
 
-#: gconf/gconftool.c:982 gconf/gconftool.c:1084
+#: gconf/gconftool.c:981 gconf/gconftool.c:1083
 #, c-format
 msgid "Error syncing: %s"
 msgstr "ðÏÍÉÌËÁ ÓÉÎÈÒÏΦÚÁæ§: %s"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:999
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1099
+#: gconf/gconftool.c:1098
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1113
+#: gconf/gconftool.c:1112
 msgid "Must specify one or more keys to unset.\n"
 msgstr "ðÏÔÒ¦ÂÎÏ ×ËÁÚÁÔÉ ÏÄÉÎ ÁÂÏ Â¦ÌØÛÅ ËÌÀÞ¦× ÄÌÑ ÚÎÑÔÔÑ ÚÎÁÞÅÎÎÑ.\n"
 
-#: gconf/gconftool.c:1124
+#: gconf/gconftool.c:1123
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "ðÏÍÉÌËÁ ÚÎÑÔÔÑ ÚÎÁÞÅÎÎÑ \"%s\": %s\n"
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1146
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "ðÏÍÉÌËÁ ÏÔÒÉÍÁÎÎÑ ÓÐÉÓËÕ ËÁÔÁÌÏǦ×: %s\n"
 
-#: gconf/gconftool.c:1220
+#: gconf/gconftool.c:1219
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "õ÷áçá: ÎÅצÒÎÉÊ ÞÉ ×¦ÄÓÕÔÎ¦Ê ÔÉÐ ÄÌÑ ÓÈÅÍÉ (%s)\n"
 
-#: gconf/gconftool.c:1227
+#: gconf/gconftool.c:1226
 msgid ""
 "WARNING: For now gconftool only knows how to install default values for "
 "simple types (int, string, bool, float)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1243
+#: gconf/gconftool.c:1242
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1256
+#: gconf/gconftool.c:1255
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "õ÷áçá: ×ÎÕÔÒ¦ÛÎÑ ÐÏÍÉÌËÁ gconftool, ÎÅצÄÏÍÉÊ GConfValueType\n"
 
-#: gconf/gconftool.c:1304
+#: gconf/gconftool.c:1303
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "õ÷áçá: ÎÅ ×ÄÁÌÏÓÑ ÐÒÏÁÎÁ̦ÚÕ×ÁÔÉ ÎÁÚ×Õ ÔÉÐÕ \"%s\"\n"
 
-#: gconf/gconftool.c:1327
+#: gconf/gconftool.c:1326
 msgid "WARNING: empty <applyto> node"
 msgstr "õ÷áçá: ÐÏÒÏÖÎ¦Ê ×ÕÚÏÌ <applyto>"
 
-#: gconf/gconftool.c:1330 gconf/gconftool.c:1575
+#: gconf/gconftool.c:1329 gconf/gconftool.c:1574
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "õ÷áçá: ×ÕÚÏÌ <%s> ÎÅÚÒÏÚÕͦÌÉÊ Ð¦ÓÌÑ <schema>\n"
 
-#: gconf/gconftool.c:1340
+#: gconf/gconftool.c:1339
 msgid "WARNING: no key specified for schema\n"
 msgstr "õ÷áçá: ÎÅ ×ËÁÚÁÎÏ ËÌÀÞ ÄÌÑ ÓÈÅÍÉ\n"
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1372
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1379
+#: gconf/gconftool.c:1378
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1451
+#: gconf/gconftool.c:1450
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "õ÷áçá: îÅצÒÎÉÊ ×ÕÚÏÌ <%s> Õ ×ÕÚ̦ <locale>\n"
 
-#: gconf/gconftool.c:1480
+#: gconf/gconftool.c:1479
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1488
+#: gconf/gconftool.c:1487
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1510
+#: gconf/gconftool.c:1509
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1518
+#: gconf/gconftool.c:1517
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "äÏÌÕÞÅÎÏ ÓÈÅÍÕ \"%s\" ÄÏ ËÌÀÞÁ \"%s\"\n"
 
-#: gconf/gconftool.c:1588
+#: gconf/gconftool.c:1587
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1617
+#: gconf/gconftool.c:1616
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "õ÷áçá: ×ÕÚÏÌ <%s> ÐÅÒÅÄ <schemalist> - ÎÅÚÒÏÚÕͦÌÉÊ\n"
 
-#: gconf/gconftool.c:1639
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ \"%s\": %s\n"
 
-#: gconf/gconftool.c:1646
+#: gconf/gconftool.c:1645
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "äÏËÕÍÅÎÔ \"%s\" ÐÏÒÏÖΦÊ?\n"
 
-#: gconf/gconftool.c:1658
+#: gconf/gconftool.c:1657
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -957,26 +1250,26 @@ msgstr ""
 "äÏËÕÍÅÎÔ \"%s\" ÍÁ¤ ÎÅצÒÎÉÊ ÔÉÐ ËÏÒ¦ÎÎÏÇÏ ×ÕÚÌÁ (<%s>, ÍÁ¤ ÂÕÔÉ "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1671
+#: gconf/gconftool.c:1670
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "äÏËÕÍÅÎÔ \"%s\" ÎÅÍÁ¤ ×ÕÚÌÁ ×ÅÒÈÎØÏÇÏ Ò¦×ÎÑ <gconfschemafile>\n"
 
-#: gconf/gconftool.c:1685
+#: gconf/gconftool.c:1684
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "õ÷áçá: ×ÕÚÏÌ <%s> ÐÅÒÅÄ <gconfschemafile> - ÎÅÚÒÏÚÕͦÌÉÊ\n"
 
-#: gconf/gconftool.c:1696 gconf/gconftool.c:1728
+#: gconf/gconftool.c:1695 gconf/gconftool.c:1727
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "ðÏÍÉÌËÁ ÓÉÎÈÒÏΦÚÁæ§ ÄÁÎÉÈ ËÏÎƦÇÕÒÁæ§: %s"
 
-#: gconf/gconftool.c:1712
+#: gconf/gconftool.c:1711
 msgid "Must specify some schema files to install\n"
 msgstr "ðÏÔÒ¦ÂÎÏ ×ËÁÚÁÔÉ ÄÅ˦ÌØËÁ ÆÁÊÌ¦× ÓÈÅÍÉ ÄÌÑ ¦ÎÓÔÁÌÑæ§\n"
 
-#: gconf/gconftool.c:1749
+#: gconf/gconftool.c:1748
 #, c-format
 msgid ""
 "\n"
@@ -985,16 +1278,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:1769
+#: gconf/gconftool.c:1768
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1895
+#: gconf/gconftool.c:1894
 msgid "Must specify some keys to break\n"
 msgstr "ðÏÔÒ¦ÂÎÏ ×ËÁÚÁÔÉ ÄÅÑ˦ ËÌÀÞ¦ ÄÌÑ ÐÅÒÅÒÉ×ÁÎÎÑ\n"
 
-#: gconf/gconftool.c:1901
+#: gconf/gconftool.c:1900
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1003,11 +1296,11 @@ msgstr ""
 "óÐÒÏÂÁ ÐÅÒÅÒ×ÁÔÉ ×ÁÛÕ ÐÒÏÇÒÁÍÕ ×ÓÔÁÎÏ×ÌÅÎÎÑÍ ÐÏÇÁÎÉÈ ÚÎÁÞÅÎØ ÄÌÑ ËÌÀÞÁ:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:1919
+#: gconf/gconftool.c:1918
 msgid "Must specify some directories to break\n"
 msgstr "îÅÏÂȦÄÎÏ ×ËÁÚÁÔÉ ÄÅÑ˦ ËÁÔÁÌÏÇÉ ÄÌÑ ÄÌÑ ÐÅÒÅÒÉ×ÁÎÎÑ\n"
 
-#: gconf/gconftool.c:1938
+#: gconf/gconftool.c:1937
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1017,3 +1310,13 @@ msgstr ""
 "óÐÒÏÂÁ ÐÅÒÅÒ×ÁÔÉ ×ÁÛÕ ÐÒÏÇÒÁÍÕ ×ÓÔÁÎÏ×ÌÅÎÎÑÍ ÐÏÇÁÎÉÈ ÚÎÁÞÅÎØ ÄÌÑ ËÌÀÞ¦× Õ "
 "ËÁÔÁÌÏÚ¦:\n"
 "  %s\n"
+
+#: wrappers/gtk/gconf-client.c:812
+#, fuzzy, c-format
+msgid "GConf warning: failure listing pairs in `%s': %s"
+msgstr "îÅ×ÄÁÌÏÓÑ ÏÔÒÉÍÁÔÉ ÓÐÉÓÏË ÐÁÒ × \"%s\": %s"
+
+#: wrappers/gtk/gconf-client.c:990
+#, fuzzy, c-format
+msgid "Expected `%s' got `%s' for key %s"
+msgstr "ïÞÉËÕ×Á×ÓÑ ÓÐÉÓÏË %s, ÏÔÒÉÍÁÎÏ ÓÐÉÓÏË %s"
diff --git a/wrappers/gtk/Makefile.am b/wrappers/gtk/Makefile.am
index df122a00..16b3dffe 100644
--- a/wrappers/gtk/Makefile.am
+++ b/wrappers/gtk/Makefile.am
@@ -2,18 +2,18 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/gconf \
 	$(GLIB_CFLAGS) $(OAF_CFLAGS) $(GMODULE_CFLAGS) $(ORBIT_CFLAGS) $(GTK_CFLAGS) \
 	-DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_SYSCONFDIR=\""$(sysconfdir)/$(MAJOR_VERSION)"\" -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\"  -DGCONF_ENABLE_INTERNALS=1 -DG_LOG_DOMAIN=\"GConfClient\"
 
-lib_LTLIBRARIES = libgconf-gtk-0.6.la
+lib_LTLIBRARIES = libgconf-gtk-1.la
 
 gconfincludedir = $(includedir)/gconf/$(MAJOR_VERSION)/gconf
 gconfinclude_HEADERS =     \
 	gconf-client.h
 
-libgconf_gtk_0_6_la_SOURCES = \
+libgconf_gtk_1_la_SOURCES = \
 	gconf-client.c
 
-libgconf_gtk_0_6_la_LDFLAGS=-version-info $(GCONFGTK_CURRENT):$(GCONFGTK_REVISION):$(GCONFGTK_AGE)
+libgconf_gtk_1_la_LDFLAGS=-version-info $(GCONFGTK_CURRENT):$(GCONFGTK_REVISION):$(GCONFGTK_AGE)
 
-libgconf_gtk_0_6_la_LIBADD=$(OAF_LIBS) $(GTK_LIBS)
+libgconf_gtk_1_la_LIBADD=$(OAF_LIBS) $(GTK_LIBS)
 
 noinst_PROGRAMS= testgconfclient