version 1.1.1GCONF_1_1_1

2001-08-02  Havoc Pennington  <hp@pobox.com>

	* configure.in: version 1.1.1

	* autogen.sh: don't search for subdirs to autogen, that's just
	annoying if you have a make dist directory laying around

27 files changed, 11132 insertions, 8241 deletions

diff --git a/ChangeLog b/ChangeLog
index 2862683d..abeeb50a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-02  Havoc Pennington  <hp@pobox.com>
+
+	* configure.in: version 1.1.1
+
+	* autogen.sh: don't search for subdirs to autogen, that's just
+	annoying if you have a make dist directory laying around
+
 2001-08-01  Michael Meeks  <michael@ximian.com>
 
 	* port to bonobo-activation from oaf.
diff --git a/autogen.sh b/autogen.sh
index 4025ef08..670e67df 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -67,7 +67,7 @@ case $CC in
 *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
 
-for coin in `find . -name configure.in -print`
+for coin in ./configure.in
 do 
   dr=`dirname $coin`
   if test -f $dr/NO-AUTO-GEN; then
diff --git a/configure.in b/configure.in
index af046b10..037b7155 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_INIT(gconf/gconf.h)
 
 AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE(GConf, 1.1)
+AM_INIT_AUTOMAKE(GConf, 1.1.1)
 
 AM_MAINTAINER_MODE
 
diff --git a/po/ChangeLog b/po/ChangeLog
index ae14303e..c4ae41b5 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-02  Havoc Pennington  <hp@pobox.com>
+
+	* POTFILES.in: remove gconf-glib.c
+
 2001-07-17  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
 
 	* sk.po: Updated Slovak translation.
@@ -41,7 +45,7 @@
 	* hu.po,it.po: added Hungarian and Italian files from stable
 	  branch
 
-2001-03-10  H嶰tor Garc燰 翼varez  <hector@scouts-es.org>
+2001-03-10  Hictor Garcma Alvarez  <hector@scouts-es.org>
 
 	* es.po: Added Spanish Translation.
 
@@ -57,7 +61,7 @@
 
 	* fr.po: Updated French translation.
 
-2001-02-09  Martin Norb踄k  <d95mback@dtek.chalmers.se>
+2001-02-09  Martin Norbdck  <d95mback@dtek.chalmers.se>
 
 	* sv.po: Updated Swedish translation.
 
@@ -371,7 +375,7 @@
 
 	* de.po: Added.
 
-2000-03-14  Martin Norb$Bdc(Bk  <d95mback@dtek.chalmers.se>
+2000-03-14  Martin Norb$(Bdc(Bk  <d95mback@dtek.chalmers.se>
 
 	* sv.po: fixed one message
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a6c734b6..06a921b3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,7 +7,6 @@ backends/xml-entry.c
 gconf/gconf-backend.c
 gconf/gconf-database.c
 gconf/gconf-error.c
-gconf/gconf-glib.c
 gconf/gconf-internals.c
 gconf/gconf-sources.c
 gconf/gconf-value.c
diff --git a/po/az.po b/po/az.po
index 4dec83fb..f742990d 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.1\n"
-"POT-Creation-Date: 2001-03-15 11:54+0100\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2001-01-23 15:04+0200\n"
 "Last-Translator: Vasif Ismailoglu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkish\n"
@@ -13,34 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "BerkeleyDB (BDB) \"backend\" modulunu 癟覺xar覺ram ."
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "BerkeleyDB qayna��覺 k繹k \"%s\"da(d��) a癟覺ld覺"
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "BDB \"backend\" modulu ba��lad覺l覺r"
-
-#: backends/dir-utils.c:108
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "`%s' 羹nvanda %s ana qovlu��unu tapa bilm��dim ."
-
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "`%s' qovlu��unu yarada bilm��dim : %s"
-
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "`%s' 羹nvanda %s ana qovlu��unda oxuya bilm��dim v�� yaza bilm��dim ."
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "XML modulunu 癟覺xar覺ram ."
@@ -50,6 +22,11 @@ msgstr "XML modulunu 癟覺xar覺ram ."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "`%s' 羹nvanda XML ana qovlu��unu tapa bilm��dim ."
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "`%s' qovlu��unu yarada bilm��dim : %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -75,7 +52,7 @@ msgstr ""
 "XML modulunu qapad覺rk��n sinxronla��d覺r覺lmam覺�� qovluq silinm��l��ri "
 "geriy�� qal覺r"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -84,7 +61,7 @@ msgstr ""
 "XML modulunun axtar yadda��覺ndan `%s' qovlu��unu sil�� bilmir��m, 癟羹nk羹 "
 "bu qovluq disk�� m羹v��ff��qiyy��tl�� sinxronla��d覺r覺lmam覺��d覺r"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -103,79 +80,74 @@ msgstr "`%s''yi stat ed�� bilm��dim :%s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML fayl覺 `%s' bir qovluqdur"
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "`%s''yi sil�� bilm��dim : %s"
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "`%s' fayl覺n覺 yazark��n x��ta oldu : %s"
 
-#: backends/xml-dir.c:359
-#, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr "`%s''da(d��) mod qurula bilm��di: %s"
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "`%s''yi t��z��d��n `%s''ye adland覺ra bilm��dim : %s"
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "`%s''yi `%s''d��n qeyd ed�� bilm��dim : %s"
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Esi fayl `%s''yi silerken x��ta oldu : %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "`%s''yi a癟a bilm��dim : %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "C羹t `%s' 羹zvl��ri ( `%s''de ), ke癟ir��m"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "`%s' XML fayl覺nda ads覺z bir 羹zv var, ke癟ir��m"
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "`%s' XML fayl覺ndak覺 birinci 羹zv <entry> deyildir, ke癟ir��m"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "`%s' fayl覺n覺 yaradark��n x��ta oldu : %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2442
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "`%s' fayl覺n覺 qapad覺rk��n x��ta oldu : %s"
 
 #. There was an error
-#: backends/xml-entry.c:149
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "`%s' adl覺 XML 羹zv羹n羹 ke癟ir��m : %s"
 
-#: backends/xml-entry.c:200
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:327
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "`%s' ����kil ad覺n覺 ke癟ir��m, 癟羹nk羹 ke癟��rsizdir : %s"
@@ -183,89 +155,95 @@ msgstr "`%s' ����kil ad覺n覺 ke癟ir��m, 癟羹nk羹 ke癟��rsizdir : %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:373
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 "`%s' XML 羹zv羹n羹 ke癟ir��m, m羹mk羹n ����kil ad覺 %s xaric olmaq 羹z��r��"
 
-#: backends/xml-entry.c:724
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+"<local_scheme> bir yerl����m�� qur��ular覺 il�� ��laq��si olmayan bir yerd�� "
+"tapd覺m"
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "����kil 羹癟羹n ��sas qiym��t `%s''yi oxurk��n x��ta oldu"
 
-#: backends/xml-entry.c:938
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "<%s> 羹zv羹 羹癟羹n \"type\" x羹susiyy��ti bildirilm��mi��dir"
 
-#: backends/xml-entry.c:952
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 "Bir 羹zv羹n nam��'lum bir \"type\" x羹susiyy��ti `%s''yi daxil edir, "
 "ke癟ir��m"
 
-#: backends/xml-entry.c:967
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "��zv 羹癟羹n bir qiym��t yoxdur"
 
-#: backends/xml-entry.c:1015 backends/xml-entry.c:1091
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "XML siyah覺 羹zv羹nd��ki <%s> XML 羹zv羹n羹 ba��a d羹��m��dim"
 
-#: backends/xml-entry.c:1049
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 "Siyah覺 羹zv羹n羹n n繹v羹 ke癟��rsizdir ( siyah覺, yolda�� ya da nam��'lum "
 "ola bil��r )"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Pis ����kill��ndirilmi�� XML 羹zv羹 : %s"
 
-#: backends/xml-entry.c:1080
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 "Siyah覺 s��hv yaz覺lm覺�� bir 羹zv daxil edir ( %s, amma %s olmal覺d覺r)"
 
-#: backends/xml-entry.c:1132
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "XML yolda��覺 羹癟羹n pis ����kill��ndirilmi�� `car''覺 : %s"
 
-#: backends/xml-entry.c:1141 backends/xml-entry.c:1164
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "XML fayl覺n覺 oxuyuram : siyah覺 v�� yolda��lar birlikd�� bir yerd�� ola "
 "bilm��z"
 
-#: backends/xml-entry.c:1154
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "XML yolda��覺 羹癟羹n pis ����kill��ndirilmi�� `cdr''覺 : %s"
 
-#: backends/xml-entry.c:1173
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "XML yolda�� 羹zv羹nd��ki <%s> XML 羹zv羹n羹 ba��a d羹��m��dim"
 
-#: backends/xml-entry.c:1191
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "XML yolda�� 羹zv羹 羹癟羹n `car' v�� `cdr''l��ri tapa bilm��dim"
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "XML fayl覺ndak覺 qiym��t yolda��lar覺 羹癟羹n `cdr' ��ksikdir"
 
-#: backends/xml-entry.c:1204
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "XML fayl覺ndak覺 qiym��t yolda��lar覺 羹癟羹n `car' ��ksikdir"
 
-#: backends/xml-entry.c:1209
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 "XML fayl覺ndak覺 qiym��t yolda��lar覺 羹癟羹n `cdr' v�� `cdr' qiym��tl��ri "
@@ -300,31 +278,31 @@ msgstr "`%s' 羹癟羹n modul tapa bilm��dim"
 msgid "Failed to shut down backend"
 msgstr "Modulu Qapada bilm��dim"
 
-#: gconf/gconf-database.c:231
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Qiym��t oturtma ist��yind�� ke癟��rsiz qiym��t tap覺ld覺"
 
-#: gconf/gconf-database.c:239
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "`%s' a癟ar覺n覺n oturtma ist��yind��ki CORBA qiym��tin�� m��'na ver�� "
 "bilm��dim"
 
-#: gconf/gconf-database.c:517
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "B羹t羹n axtar yadda��a al覺nm覺�� m��'lumatlar覺 silme arzunu ald覺m"
 
-#: gconf/gconf-database.c:534
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Sinxronla��d覺rma arzunu ald覺m"
 
-#: gconf/gconf-database.c:601
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "A��覺r X��ta: Qura��d覺rma vericisi 羹癟羹n cism ba��覺n覺 ala bilm��dim"
 
-#: gconf/gconf-database.c:760
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr ""
@@ -334,7 +312,7 @@ msgstr ""
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -345,12 +323,12 @@ msgstr ""
 "b��rpa  edila bilm��yac��k. Qura��d覺rma d��yi��iklikl��ri da buna g繹r�� "
 "h��y��ta ke癟irila bilm��y��c��k."
 
-#: gconf/gconf-database.c:873
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Dinl��yici ID %lu yoxdur"
 
-#: gconf/gconf-database.c:882
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -359,47 +337,47 @@ msgstr ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 
-#: gconf/gconf-database.c:997 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "`%s' 羹癟羹n qiym��ti al覺rk��n x��ta oldu : %s"
 
-#: gconf/gconf-database.c:1044
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "`%s' 羹癟羹n qiym��ti oturdurk��n x��ta oldu : %s"
 
-#: gconf/gconf-database.c:1087
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "`%s''yi sil�� bilm��dim : %s"
 
-#: gconf/gconf-database.c:1111
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "`%s' 羹癟羹n ��sas qiym��ti al覺rk��n x��ta oldu : %s"
 
-#: gconf/gconf-database.c:1151
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "`%s' varl覺��覺n覺 yoxlark��n x��ta oldu : %s"
 
-#: gconf/gconf-database.c:1175
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "`%s' qovlu��u silin��rk��n x��ta oldu : %s"
 
-#: gconf/gconf-database.c:1202
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "`%s''nin b羹t羹n 羹zvl��rini ala bilm��dim : %s"
 
-#: gconf/gconf-database.c:1228
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "`%s''d��ki qovluqlar覺 s覺ralark��n x��ta oldu : %s"
 
-#: gconf/gconf-database.c:1249
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "`%s' 羹癟羹n ����kli oturdurk��n x��ta oldu : %s"
@@ -464,9 +442,224 @@ msgstr "Qura��d覺rma vericisiz bu ��m��liyyat m羹mk羹n deyildir"
 msgid "Failed to get a lock"
 msgstr "Q覺f覺l yarada bilm��dim"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "Qur��ular覺n覺z覺n qeyd edil�� bil��c��yi bir databeyz yoxdur"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+"%d s��tiri %d h��rfind�� x��ta oldu: %s\n"
+"(B��'zi m��tnl��r '%s' idi)\n"
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+"Nam��'lum '%s' giri��i ('&' &amo giri��i ila ba��lamal覺d覺r; &quot; &lt; "
+"&gt; &apos;)"
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+"Se癟ili m��tn h��rf referensinin ortas覺nda qurtard覺, '&#' dan h��man sonra"
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+"H��rf b��hsi r��g��m olmayan '%s' h��rfini daxil edir ('&#' unicode olmayan "
+"h��rfi g繹st��r��r��k  ba��lamal覺d覺r, '&#2342;'kimi)"
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+"M��tn h��rf b��hsinin ortas覺nda q覺rtard覺 ('&#' '&#2342;'kimi h��rf "
+"g繹st��ricisinin ba��覺nda olmal覺d覺r)"
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+"'%s'h��rf b��hsi darana bilm��di ('&#' '&#2343:' kimi h��rf g繹st��ricisinin "
+"ba��覺nda olmal覺d覺r)"
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+"%#lx H��rf kodu XML s��n��dl��rind�� yol veril��zdir ya da ke癟��siz Unicode "
+"h��rfidir"
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+"S��n��d '&' d��n h��m��n qonra qurtarm覺��d覺r, '&' h��rf g繹st��ricisini "
+"h��m��n ba��覺nda g��lm��lidir."
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+"'<' v�� ya '>' xarakterl��ri burada istifad�� edil�� bilm��z: sad��ca olaraq "
+"tagler ��traf覺nda ola bil��rl��r. Yoxsa bunlar &lt; v�� &gt; olaraq "
+"kodlancaqlard覺r."
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr "'%s' xarakteri simvolun ad覺n覺n ba��覺nda i��l��dilm��z"
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr "S��n��d simvol ad覺ndan h��m��n sonra qurtard覺"
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr "Simvol ad覺 '=' xaraketri il�� davam etdirilm��lidir"
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+"simvoldan sonrak覺 '=' xarakteri m羹tl��q '\"' xatakteri ila davam "
+"etdirilmalidir"
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+"Simvolun qiym��tini i癟ind�� '%c' tap覺ld覺; d��y��s��n sizin simvol "
+"qiym��tinizd��n  sonra '\"' xarakteri g��lmir."
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+"'\"' dan ��vv��l m��tn qurtard覺: '\"' simvol qiym��tinin ax覺r覺nda "
+"g繹r羹ld羹"
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+"M��tn element qapat覺lmadan ��vv��l sivvol qiym��tind��n h��m��n sonra "
+"qurtarar"
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr "Elementin ba��覺nda '<' yoxdur"
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr "S��n��d '<' xarakterind��n sonra qurtard覺"
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr "<? v�� ya <! 羹癟羹n ba��lay覺c覺 '<' tap覺lmad覺"
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr "'%s' xarakteri element ba��覺nda i��l��dilm��z"
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr "S��n��d element ad覺ndan ham��n sonra qurtard覺, '>' g繹r羹lm��di"
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr "Elementl��r '>' v�� ya '/>' il�� qurtarar, '%s' il�� deyil"
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+"Element '/' dan sonra qurtard覺, '>' g繹rilm��di; bo�� elementl��r '/>' il�� "
+"qurtarmal覺d覺rlar"
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr "Element ax覺r覺nda qapatma tag覺 tap覺lmad覺"
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr "Qapatma tag覺 '<' xarakterind��n sonra qurtar覺r"
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+"Qapatma tag覺 '</' v�� ya '/'  xarakterlari il�� ba��lamal覺d覺r, "
+"xarakterl��r yoxdur"
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr "Qapatma tag覺 '/' xarakterind��n h��m��n sonra qurtar覺r"
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+"S��n��d qapatma tag覺ndak覺 elemement ad覺ndan sonra qurtard覺, '>' "
+"g繹r羹lm��di"
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr "S��n��d qapatma tag覺 ad覺ndan sonra qurtard覺, '>' g繹r羹lm��di"
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr "'%s' Qapatma tag覺 '%s' a癟覺l覺�� tag覺na uy��un g��lmir"
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+"Se癟ili m��tnd�� %d bayt覺nda ke癟��rsiz UTF-8 xarakteri var. X��tal覺 "
+"xarakterd��n ��vv��lki bir qisim m��tn '%s' idi"
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr "Se癟ili m��tnd�� bo��luqlardan ba��qa bir ��ey yoxdur"
+
+#: gconf/gconf-glib.c:10666
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "`%s' fayl覺n覺 a癟ark��n x��ta oldu : %s"
+
+#: gconf/gconf-glib.c:10683
+#, c-format
+msgid "Error reading file '%s': %s"
+msgstr "`%s' dosyesi oxunark��n x��ta oldu : %s"
 
 #: gconf/gconf-internals.c:85
 #, c-format
@@ -491,103 +684,98 @@ msgstr ""
 msgid "Failed to convert object to IOR"
 msgstr "Cism IORa 癟evrila bilm��di"
 
-#: gconf/gconf-internals.c:809
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Yol fayl覺 `%s''yi a癟a bilm��dim : %s\n"
 
-#: gconf/gconf-internals.c:856
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "`%s' qayna��覺n覺 ��lav�� edir��m\n"
 
-#: gconf/gconf-internals.c:868
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "`%s' fayl覺nda oxuma x��tas覺 oldu: %s\n"
 
-#: gconf/gconf-internals.c:1292
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Siyah覺 g繹zl��y��rk��n, %s ald覺m"
 
-#: gconf/gconf-internals.c:1302
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "%s siyah覺s覺n覺 g繹zl��y��rk��n, %s siyah覺s覺n覺 ald覺m"
 
-#: gconf/gconf-internals.c:1441
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "C羹t羹n羹 g繹zl��y��rk��n, %s ald覺m"
 
-#: gconf/gconf-internals.c:1455
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "%s,%s c羹t羹n羹 g繹zl��y��rk��n , bir ya da iki qiym��ti olmayan bir ox��ar "
 "ald覺m"
 
-#: gconf/gconf-internals.c:1471
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "%s,%s c羹t羹n羹 g繹zl��y��rk��n , %s,%s c羹t羹n羹 ald覺m"
 
-#: gconf/gconf-internals.c:1587
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Al覺nt覺 m��tni bir sual isar��ti ba��lam覺yor"
 
-#: gconf/gconf-internals.c:1649
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Al覺nt覺 m��tni bir sual isar��ti il�� qurtarm覺r"
 
-#: gconf/gconf-internals.c:2129 gconf/gconf.c:2999
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA x��tas覺 : %s"
 
-#: gconf/gconf-internals.c:2145
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "OAF problem izahat覺 : '%s'"
-
-#: gconf/gconf-internals.c:2151
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "siyah覺lanmam覺�� OAF cism-qovlu��unu silm��y�� c��hd edilir"
 
-#: gconf/gconf-internals.c:2156
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "onsuz da siyah覺lanm覺�� OAF qovlu��u ��lav�� edilm��y�� c��hd edilir"
 
-#: gconf/gconf-internals.c:2163
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF darama x��tas覺 : %s"
 
-#: gconf/gconf-internals.c:2168
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Nam��'lum OAF x��tas覺"
 
-#: gconf/gconf-internals.c:2251
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "`%s' 羹癟羹n ior fayl覺 yoxdur"
 
-#: gconf/gconf-internals.c:2282
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "ba��qa bir ��m��liyyatdan gconfd vericisi '%s' q覺f覺llamas覺 ald覺"
 
-#: gconf/gconf-internals.c:2293
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "`%s' q覺f覺llamas覺 ba��qa bir proqrama aittir"
 
-#: gconf/gconf-internals.c:2313
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "varolan bir gconfd'yi yoxlamaq 羹癟羹n ORB'e ba��lana bilm��dim"
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -596,46 +784,46 @@ msgstr ""
 "S��rt q覺f覺l `%s''yi a癟覺ram , 癟羹nk羹 IOR bir cism ba��覺na "
 "d繹nd羹r羹l�� bilm��di ,IOR `%s'"
 
-#: gconf/gconf-internals.c:2333
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "M繹hkam q覺f覺l `%s''yi a癟覺ram , 癟羹nk羹 vericiy�� yeti��m�� probleml��ri "
 "var : %s"
 
-#: gconf/gconf-internals.c:2345
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf qura��d覺rma vericisi ( gconfd ) `%s' q覺f覺l覺na sahib oldu "
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "`%s' qovlu��unu yarada bilm��dim : %s"
 
-#: gconf/gconf-internals.c:2394
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "`%s' q覺f覺l覺n覺 yarada bilm��dim : %s"
 
-#: gconf/gconf-internals.c:2430
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "`%s' fayl覺na yaza bilm��dim : %s"
 
-#: gconf/gconf-internals.c:2473
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "`%s' q覺f覺l fayl覺n覺 a癟a bilm��dim ; bizim olmad覺��覺n覺 fikirl����ir��m "
 ": %s"
 
-#: gconf/gconf-internals.c:2490
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "X��tal覺 q覺f覺l fayl覺 `%s' ; onu silir��m"
 
-#: gconf/gconf-internals.c:2500
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -644,29 +832,29 @@ msgstr ""
 "`%s' q覺f覺l fayl覺n覺 yaratmad覺m ( \"yarad覺c覺\" pid %u , bizim pid %u ; "
 "fikirl����ir��m ki birisi bizim q覺f覺l覺 o��urlad覺 (��hs��n)"
 
-#: gconf/gconf-internals.c:2517
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "`%s' q覺f覺l qovlu��unu a癟a bilm��dim : %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "`%s' qayna��覺n覺 y羹kl��y�� bilm��dim : %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 "`%s' ����kli `%s' 羹癟羹n bir ����kil qiym��ti olmayan bir qiym��t daxil edir"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 "'/' adlar覺 sad��c�� bir qovluq ola bil��r, q��tiyyan'iyyen bir a癟ar ola "
 "bilm��z"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -675,22 +863,17 @@ msgstr ""
 "`%s' 羹癟羹n s覺rf-oxunan qaynaqda s��nin yolundan ��vv��l bir qiym��t "
 "oturdulub"
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "'%s' a癟ar覺nda qiym��t saxlana bilm��di"
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Meta m��'lumatlar覺 axtar覺l覺rk��n x��ta oldu : %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Meta m��'lumatlar覺 al覺rk��n x��ta oldu : %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -768,22 +951,21 @@ msgstr "`%s''yi ba��a d羹��m��dim (c羹td�� ��lav�� bir ')' vard覺r)"
 msgid "`%s': %s"
 msgstr "`%s' : %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "`%s' 羹nvan覺 h��ll edil�� bilm��di"
 
-#: gconf/gconf.c:571
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "Yerli qura��d覺rma qayna��覺na izahatlar ��lav�� ed�� bilm��dim"
 
-#: gconf/gconf.c:1778
+#: gconf/gconf.c:1597
 #, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
-msgstr ""
-"Al覺c覺n覺n verici siyah覺s覺na ��lav��si bacar覺lmad覺, CORBA x��tas覺 : %s "
+msgid "Pinging the server failed, CORBA error: %s"
+msgstr "Vericinin pingl��nm��si iflas etdi( CORBA x��tas覺 : %s )"
 
-#: gconf/gconf.c:1794
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -793,66 +975,66 @@ msgstr ""
 "oaf_activate_from_id()'d��n ald覺 v�� bu x��tay覺 izah ed��c��k bir "
 "n��tic��sini-data da yoxdur .L羹tf��n bir OAF x��ta raportu g繹nd��r ."
 
-#: gconf/gconf.c:2105
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConf'u ba��lada bilm��dim , qurtar覺ram\n"
 
-#: gconf/gconf.c:2142
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Bir b繹l羹 i��ar��ti il��( '/' ) ba��lamaq m��cburiyy��tind��dir"
 
-#: gconf/gconf.c:2164
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Bir s覺rada iki b繹l羹 i��ar��ti( '/' ) ola bilm��z"
 
-#: gconf/gconf.c:2166
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Bir b繹l羹 i��ar��ti( '/' )'d��n sonra bir d繹vr��( . ) ola bilm��z"
 
-#: gconf/gconf.c:2187
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' a癟ar/qovluqlar adlar覺nda ke癟��rsiz bir harfd覺r"
 
-#: gconf/gconf.c:2201
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "A癟ar/Qovluq bir b繹l羹 i��ar��ti il��( '/' ) qurtara bilm��z"
 
-#: gconf/gconf.c:2454
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Qura��d覺rma vericisini Qapada bilm��dim : %s"
 
-#: gconf/gconf.c:2515
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "��z��n say覺 (float) g繹zl��y��rk��n, %s ald覺m"
 
-#: gconf/gconf.c:2550
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Tamsay覺 (int) g繹zl��y��rk��n, %s ald覺m"
 
-#: gconf/gconf.c:2585
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "M��tn g繹zl��y��rk��n, %s ald覺m"
 
-#: gconf/gconf.c:2622
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Boolean g繹zl��y��rk��n, %s ald覺m"
 
-#: gconf/gconf.c:2655
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Sxem g繹zl��y��rk��n, %s ald覺m"
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Qapanma ist��yi al覺nd覺"
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -860,7 +1042,7 @@ msgstr ""
 "gconfd vericisi m��'lumatland覺rma il�� yoxlan覺b ; qaynaq qovlu��unda "
 "gconf.path'yu羹kl��m��y�� c��hd edir��m"
 
-#: gconf/gconfd.c:293
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -868,10 +1050,7 @@ msgstr ""
 "Qura��d覺rma fayllar覺 tap覺la bilm��di , ��sas qura��d覺rma qayna��覺 "
 "`%s''yi istifad�� edir��m"
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:301
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -879,12 +1058,12 @@ msgstr ""
 "Qaynaq qovlu��unda qura��d覺rma m��nb��l��ri yoxdur, qur��ular qeyd "
 "edilm��y��c��kdir ; d��yi��dir "
 
-#: gconf/gconfd.c:314
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "B��'zi qura��d覺rma qaynaqlar覺n覺 y羹kl��rk��n x��ta oldu : %s"
 
-#: gconf/gconfd.c:326
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -893,7 +1072,7 @@ msgstr ""
 "bilm��dim, qura��d覺rma m��'lumatlar覺n覺 y羹kl��ya bilm��r��m ya da qeyd "
 "eda bilm��r��m"
 
-#: gconf/gconfd.c:343
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -901,34 +1080,28 @@ msgstr ""
 "Yaz覺la bil��n bir qura��d覺rma qayna��覺 羹nvan覺n覺 h��ll ed�� bilm��dim, "
 "b��'zi qura��d覺rma d��yi��iklikl��rini b��lk�� qeyd ed�� bilm��dim"
 
-#: gconf/gconfd.c:369
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-"%d siqnal覺n覺 ald覺m, ay覺qlama m��'lumat覺n覺 t繹k羹r��m. L羹tf��n GConf "
-"baq覺n覺 raport edin."
-
-#: gconf/gconfd.c:385
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"%d siqnal覺n覺 ald覺m, t��miz s羹r��td�� qapana bilmir��m. L羹tf��n GConf "
-"x��tas覺n覺 raport edin."
+msgid "Received signal %d, shutting down."
+msgstr "%d siqnal覺n覺 ald覺m, qapan覺ram ."
 
-#: gconf/gconfd.c:402
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "%d siqnal覺n覺 ald覺m, t��miz s羹r��td�� qapan覺ram ."
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:498
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "ba��lay覺ram (burax覺l覺�� %s), pid %u istifad��癟i '%s'"
 
-#: gconf/gconfd.c:525
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr "FConf x��ta ay覺qlamas覺 qabilliy��ti il�� qurulub"
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -936,11 +1109,11 @@ msgstr ""
 "OAF'覺 ba��lada bilm��dim ; l羹tf��n OAF yaz覺癟覺lar覺na bir x��ta raportu "
 "癟atd覺r "
 
-#: gconf/gconfd.c:545
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Qura��d覺rma vericisi 羹癟羹n cism ba��覺n覺 ala bilm��dim"
 
-#: gconf/gconfd.c:565
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -948,29 +1121,25 @@ msgstr ""
 "OAF bizim IID'mizi tan覺m覺r ; bu x��tal覺 bir qurman覺n g繹st��ricisidir ; "
 "qeyd ola bilmiram ; qurtar覺ram \n"
 
-#: gconf/gconfd.c:569
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Ba��qa bir gconfd vericisi OAF'a onsuz da qeydlidir ; qurtar覺ram\n"
 
-#: gconf/gconfd.c:574
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr ""
 "gconfd vericisini OAF'a qeyd ed��rk��n nam��'lum x��ta oldu ; qurtar覺ram\n"
 
-#: gconf/gconfd.c:612
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "��覺x覺ram"
 
-#: gconf/gconfd.c:637
-msgid "GConf server is not in use, shutting down."
-msgstr "GConf vericisi istifad��d�� deyildir, qapan覺ram ."
-
-#: gconf/gconfd.c:996
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "X��ta t��pm��si: %s"
 
-#: gconf/gconfd.c:1096
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -979,39 +1148,39 @@ msgstr ""
 "Gconf qeyd fayl覺 a癟覺la bilm��di; fconf qurtard覺qdan sonra "
 "dinl��yicil��ri b��rpa  eda bilm��y��c��ks��n (%s)"
 
-#: gconf/gconfd.c:1131
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 "Gconf qeyd fayl覺 qapad覺la bilm��di; data d羹zg羹n qeyd edil�� bilm��z (%s)"
 
-#: gconf/gconfd.c:1200
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Qeyd edilmi�� hal fayl覺 `%s''yi a癟a bilm��dim : %s"
 
-#: gconf/gconfd.c:1214
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Qeyd edilmi�� hal fayl覺 `%s' ni yaza bilm��dim fd: %d: %s"
 
-#: gconf/gconfd.c:1223
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "T��z�� qeyd edilmi�� `%s' hal fayl覺n覺 qapada bilm��dim: %s"
 
-#: gconf/gconfd.c:1237
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "��vv��ld��n qeyd edilmi�� hal fayl覺 '%s' yi k繹癟羹r�� bilm��dim : %s"
 
-#: gconf/gconfd.c:1247
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "T��z�� qeyd edilmi��  hal fayl覺n覺 buraya k繹癟羹r�� bilm��dim: %s"
 
-#: gconf/gconfd.c:1256
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1019,7 +1188,49 @@ msgstr ""
 "'%s' a(��) k繹癟羹r羹lm羹�� ��sl qeyd edilmi�� hal fayl覺n覺 b��rpa eda "
 "bilm��dim: %s"
 
-#: gconf/gconfd.c:1731
+#: gconf/gconfd.c:1110
+#, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Qeyd edilmi�� hal fayl覺ndak覺 bu s��tri ba��a d羹��m��dim: '%s'"
+
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Qeyd edilmi�� hal fayl覺nda ba��lant覺 ad覺 IDsi darana bilm��di"
+
+#: gconf/gconfd.c:1140
+#, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr ""
+"Qeyd edilmi�� hal fayl覺ndan qura��d覺rma qaynaq 羹nvan覺 ayr覺la bilm��di: "
+"%s"
+
+#: gconf/gconfd.c:1160
+#, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "Qeyd edilmi�� hal dosyesind��n dinl��yici yeri ayr覺la bilm��di: %s"
+
+#: gconf/gconfd.c:1180
+#, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Qeyd edilmi�� hal dosyesind��n IOR ayr覺la bilm��di: %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+"Qeyd edilmi�� hal fayl覺nda eyni dinl��yici iki d��f�� ��lav�� edilmi��dir: "
+"ikincisini hesaba qatm覺ram"
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+"Qeyd edilmi�� hal fayl覺nda ��lav�� edilm��mi�� dinl��yicinin silindiyi "
+"bildirilir: silinm��yi hesaba qatm覺ram"
+
+#: gconf/gconfd.c:1346
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1027,17 +1238,12 @@ msgstr ""
 "'%s' 羹nvan覺ndak覺 dinl��yici b��rpa edil�� bilmir, database hall edil�� "
 "bilmir"
 
-#: gconf/gconfd.c:1777
-#, c-format
-msgid "Error reading saved state file: %s"
-msgstr "Qeyd edilmi�� v��ziyy��t fayl覺 oxunark��n x��ta oldu : %s"
-
-#: gconf/gconfd.c:1830
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Qeyd edilmi�� `%s' hal fayl覺 a癟覺la bilm��di:  %s"
 
-#: gconf/gconfd.c:1947
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to "
@@ -1047,7 +1253,7 @@ msgstr ""
 "癟覺xd覺��覺n覺z vaxt  bu qeydl��ri t��z��d��n ��lav�� ed�� bilm��y��c��yik "
 "(%s)"
 
-#: gconf/gconfd.c:1952
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously "
@@ -1057,47 +1263,20 @@ msgstr ""
 "癟覺xd覺��覺n覺z vaxt eyni dinl��yiciyi x��tal覺 olaraq t��z��d��n ��lav�� "
 "ed�� bil��r��m (%s)"
 
-#: gconf/gconfd.c:1975 gconf/gconfd.c:2140
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "IOR al覺c覺s覺 al覺nmas覺 bacar覺lmad覺: %s"
-
-#: gconf/gconfd.c:1990
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "Qeyd edilmi�� hal fayl覺 a癟覺la bilm��di:  %s"
-
-#: gconf/gconfd.c:2003
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr "Qeyd edilmi�� hal fayl覺na al覺c覺 qeyd edil�� bilm��di: %s"
-
-#: gconf/gconfd.c:2011
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr "Qeyd edilmi�� hal fayl覺na \"flush\" al覺c覺 qeyd edil�� bilm��di: %s"
-
-#: gconf/gconfd.c:2101
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr ""
-"Bir al覺c覺 繹z羹n羹 GConf vericisind��n 癟覺xard覺b v�� ona g繹r�� d�� "
-"��lav�� edilm��yib."
-
-#: gconf/gconftool.c:63
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "K繹m��k se癟��n��kl��ri"
 
-#: gconf/gconftool.c:72
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 "Bir a癟ara bir qiym��t ver v�� sinxronla��d覺r . --type'la istifad�� edilir ."
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Standart n��tic��y�� bir a癟ar覺n覺n qiym��tini ver."
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -1105,41 +1284,41 @@ msgstr ""
 "Bir ����kli oturt v�� sinxronla��d覺r . --short-desc, --long-desc, --owner "
 "v�� --type'la birlikd�� istifad�� edilir ."
 
-#: gconf/gconftool.c:100
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "��mr s��tirind��ki a癟arlar覺 sil"
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Bir qovluqdak覺 a癟ar/qiym��t yolda��lar覺n覺 g繹st��r ."
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Bir qovluqdak覺 altqovluqlar覺 g繹st��r ."
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Bir qovlu��un b羹t羹n alt qovluqlar覺n覺 v�� 羹zvl��rini d��rinliyi il�� "
 "g繹st��r ."
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Qovluq varsa 0'覺 n��tic��sini ver, yoxsa 2'yi n��tic��sini ver ."
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 "gconfd'yi qapat . BU SE����N��Y襤 YAX��I BIR S��B��B襤N OLMADAN 襤ST襤FAD�� "
 "ETM��."
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr ""
 "gconfd vericisi i��l��yirs�� 0'覺 n��tic��sini ver, yoxsa 2'yi n��tic��sini "
 "ver ."
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1147,7 +1326,7 @@ msgstr ""
 "Qura��d覺rma vericisini ( gconfd ) ba��latd覺m. ( Bu onsuz da laz覺ml覺 "
 "oldu��u vaxt edilir . )"
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1156,11 +1335,11 @@ msgstr ""
 "qiym��tin n繹v羹n羹 ba��a sal . H��m��n ba��a d羹��羹l��c��k q覺saltmalar "
 "q��bul edilir ."
 
-#: gconf/gconftool.c:173
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1169,11 +1348,11 @@ msgstr ""
 "anlatd覺��覺 qiym��tin n繹v羹n羹 ba��a sal. H��m��n ba��a d羹��羹l��c��k "
 "q覺saltmalar q��bul edilir."
 
-#: gconf/gconftool.c:182 gconf/gconftool.c:191 gconf/gconftool.c:200
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "int | bool | float | string"
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1182,7 +1361,7 @@ msgstr ""
 "qiym��tin n繹v羹n羹 ba��a sal. H��m��n ba��a d羹��羹l��c��k q覺saltmalar "
 "q��bul edilir."
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1191,47 +1370,47 @@ msgstr ""
 "qiym��tin n繹v羹n羹 ba��a sal. H��m��n ba��a d羹��羹l��c��k q覺saltmalar "
 "q��bul edilir."
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "��ekilld�� yax��覺 g繹r羹n��c��k n繹vd�� , q覺sa v�� yar覺m-s��tir "
 "uzunlu��unda bir izah覺 bildir ."
 
-#: gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "襤ZAH"
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "����kil�� ��lav�� edl��c��k n繹vd�� bir izah ver ."
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "����klin yiy��sini bildir"
 
-#: gconf/gconftool.c:227
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "Y襤Y��"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "Y羹kl��n��c��k bir ����kil fayl覺n覺 bildir"
 
-#: gconf/gconftool.c:236
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "FAYLADI"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "��sas qur��ulu qovluq xaricind�� istifad�� edil��c��k bir qura��d覺rma "
 "qayna��覺n覺 bildir"
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "QAYNAQ"
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1239,7 +1418,7 @@ msgstr ""
 "Qura��d覺rma bildi taban覺na direkt olaraq yeti�� v�� vericiyi ke癟 . "
 "gconfd'nin f��al olmamal覺d覺r."
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1250,7 +1429,7 @@ msgstr ""
 "yer�� g繹st��rm��yi laz覺md覺r v�� ya ��sas yeri istifad�� etm��k "
 "ist��yirs��ns�� bo�� olmal覺d覺r ."
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1258,7 +1437,7 @@ msgstr ""
 "Bir proqrama c��fa s覺na��覺n覺 ��lav�� et ( bu ��mrd�� tap覺lan m羹xt��lif "
 "n繹vl羹 m羹xt��lif qiym��tl��rin oturdulub silinm��si il�� olur) ."
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1266,7 +1445,7 @@ msgstr ""
 "Bir proqrama c��fa s覺na��覺n覺 ��lav�� et ( bu ��mrd�� tap覺lan qovluqlar "
 "i癟ind��ki m羹xt��lif a癟arlar覺n oturdulub silinm��si il�� olur) ."
 
-#: gconf/gconftool.c:327
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1275,24 +1454,24 @@ msgstr ""
 "`%s' se癟��n��yind�� x��ta var : %s .\n"
 "L羹tf��n `%s --help' il�� m羹mk羹n olan se癟��n��kl��ri g繹r羹n.\n"
 
-#: gconf/gconftool.c:339
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Eyni anda data al覺b, oturda bilm��r��m\n"
 
-#: gconf/gconftool.c:346
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Eyni anda data oturdub, ala bilm��r��m\n"
 
-#: gconf/gconftool.c:354
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr ""
 "--get v�� ya --set'l�� birlikd�� --all-pairs istifad�� edil�� bilm��z\n"
 
-#: gconf/gconftool.c:362
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "--get v�� ya --set'l�� birlikd�� --all-dirs istifad�� edil�� bilm��z\n"
 
-#: gconf/gconftool.c:372
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1300,7 +1479,7 @@ msgstr ""
 "--recursive-list --get, --set, --unset, --all-pairs, v�� ya --all-dirs'l�� "
 "birlikd�� istifad�� edil�� bilm��z .\n"
 
-#: gconf/gconftool.c:382
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1308,64 +1487,64 @@ msgstr ""
 "--set_schema --get, --set, --unset, --all-pairs v�� ya --all-dirs'l�� "
 "birlikd�� istifad�� edil�� bilm��z .\n"
 
-#: gconf/gconftool.c:388
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "De��er n繹v羹 sad��c�� qiym��ti oturdurk��n vacibdir\n"
 
-#: gconf/gconftool.c:394
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "Bir qiym��ti oturdurk��n n繹v羹n羹 bildirm��k m��cburiyy��tind��s��n\n"
 
-#: gconf/gconftool.c:403
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 "Ping se癟��n��yi 繹z 繹z羹n�� istifad�� edilm��k m��cburiyy��tind��dir .\n"
 
-#: gconf/gconftool.c:412
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists 繹z 繹z羹n�� istifad�� edilm��k m��cburiyy��tind��dir .\n"
 
-#: gconf/gconftool.c:421
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 "--install-schema-file 繹z 繹z羹n�� istifad�� edilm��k m��cburiyy��tind��dir "
 ".\n"
 
-#: gconf/gconftool.c:431
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 "--makefile-install-rule 繹z 繹z羹n�� istifad�� edilm��k "
 "m��cburiyy��tind��dir .\n"
 
-#: gconf/gconftool.c:441
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key 繹z 繹z羹n�� istifad�� edilm��k m��cburiyy��tind��dir .\n"
 
-#: gconf/gconftool.c:451
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 "--break-directory 繹z 繹z羹n�� istifad�� edilm��k m��cburiyy��tind��dir .\n"
 
-#: gconf/gconftool.c:458
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "--direct'l�� --config-source istifad�� edildiyi vaxt bir qura��d覺rma "
 "qayna��覺n覺 bildir \n"
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf'un ba��lamas覺 iflas etdi: %s\n"
 
-#: gconf/gconftool.c:489
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE verisi bildirilmi�� olmaq m��cburiyy��tind��dir\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:504
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1379,37 +1558,37 @@ msgstr ""
 "i��l��m��diyi vaxt edilm��sit��biidir) .\n"
 "( n��z��ri olaraq he癟 bir f��rq olmamal覺d覺r) .\n"
 
-#: gconf/gconftool.c:526
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Qura��d覺rma fayllar覺na yeti��irk��n x��ta oldu : %s\n"
 
-#: gconf/gconftool.c:686
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Qapat覺lma x��tas覺 : %s\n"
 
-#: gconf/gconftool.c:729
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "Alt qovluqlarla g繹st��ril��c��k bir qovlu��u ya da qovluqlar覺 bildirm��k "
 "m��cburiyy��tind��s��n \n"
 
-#: gconf/gconftool.c:763
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "`%s''d��ki yolda��lar覺 s覺ralark��n x��ta oldu : %s"
 
-#: gconf/gconftool.c:781
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "( qiym��ti yoxdur )"
 
-#: gconf/gconftool.c:836
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Qura��d覺rma vericisini ( gconfd ) a癟d覺ra bilm��dim : %s\n"
 
-#: gconf/gconftool.c:850
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "Al覺nacak a癟ar(lar)覺 bildirm��k m��cburiyy��tind��s��n\n"
 
@@ -1433,178 +1612,172 @@ msgstr "Car n繹v羹 : %s\n"
 msgid "Cdr Type: %s\n"
 msgstr "Cdr n繹v羹 : %s\n"
 
-#: gconf/gconftool.c:893
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr "Ana Qiym��t: %s\n"
+msgid "Owner: %s\n"
+msgstr "Yiy�� : %s\n"
 
-#: gconf/gconftool.c:893 gconf/gconftool.c:895 gconf/gconftool.c:896
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "襤��ar��ti Qald覺r"
 
-#: gconf/gconftool.c:895
-#, c-format
-msgid "Owner: %s\n"
-msgstr "Yiy�� : %s\n"
-
-#: gconf/gconftool.c:896
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Q覺sa izahat : %s\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Uzun izahat : %s\n"
 
-#: gconf/gconftool.c:906
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "`%s' 羹癟羹n bir qiym��t bildirilm��yib\n"
 
-#: gconf/gconftool.c:910
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "`%s' 羹癟羹n bir qiym��t ala bilm��dim : %s\n"
 
-#: gconf/gconftool.c:953 gconf/gconftool.c:965
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "`%s' n繹v羹n羹 ba��a d羹��m羹r��m\n"
 
-#: gconf/gconftool.c:977
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 "Arqument olaraq d��yi����n a癟ar/qiym��tl��r verm��k m��cburiyy��tind��s��n\n"
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "`%s' a癟ar覺 羹癟羹n oturdulacaq bir qiym��t yoxdur\n"
 
-#: gconf/gconftool.c:1025
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Bir ����kli bir qiym��t olaraq oturda bilm��r��m\n"
 
-#: gconf/gconftool.c:1035
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 "Bir siyah覺y覺 bildirirk��n siyah覺 n繹v羹n羹 bildirm��k "
 "m��cburiyy��tind��s��n\n"
 
-#: gconf/gconftool.c:1049
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Bir c羹t羹 bildirirk��n car n繹v羹n羹 v�� cdr n繹v羹n羹 bildirm��k "
 "m��cburiyy��tind��s��n\n"
 
-#: gconf/gconftool.c:1064
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "X��ta : %s\n"
 
-#: gconf/gconftool.c:1077 gconf/gconftool.c:1210
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Qiym��ti oturdurk��n x��ta oldu : %s"
 
-#: gconf/gconftool.c:1095 gconf/gconftool.c:1224
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Sinxronla��d覺r覺l覺rk��n x��ta oldu : %s"
 
-#: gconf/gconftool.c:1113
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 "T��k arqument olaraq bir a癟ar覺 ( ����kli ) bildirm��k "
 "m��cburiyy��tind��s��n\n"
 
-#: gconf/gconftool.c:1155
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Siyah覺 n繹v羹 bu ��sas n繹vl��rd��n meydana g��lm��lidir: string, int, "
 "float ya da bool\n"
 
-#: gconf/gconftool.c:1175
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "C羹t羹n car n繹v羹 bu meydana g��lm��lidir: string, int, float ya da bool\n"
 
-#: gconf/gconftool.c:1195
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "C羹t羹n cdr n繹v羹 bu meydana g��lm��lidir: string, int, float ya da bool\n"
 
-#: gconf/gconftool.c:1239
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "A癟ar/qiym��t e��lemlerini g繹st��ril��c��k bir ya da daha 癟ox qovluqlar覺 "
 "bildirm��k m��cburiyy��tind��s��n .\n"
 
-#: gconf/gconftool.c:1253
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 "Silin��c��k bir ya da daha 癟ox a癟ar verm��k m��cburiyy��tind��s��n .\n"
 
-#: gconf/gconftool.c:1264
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "`%s''yi silinirk��n x��ta oldu : %s\n"
 
-#: gconf/gconftool.c:1287
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Alt qovluqlar覺 g繹st��ril��c��k bir ya da daha 癟ox qovluqlar覺 bildirm��k "
 "m��cburiyy��tind��s��n .\n"
 
-#: gconf/gconftool.c:1321
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Qovluqlar覺 s覺ralark��n x��ta oldu : %s\n"
 
-#: gconf/gconftool.c:1363
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "X��B��RDARLIQ : %s ����kli 羹癟羹n ke癟��rsiz ya da ��ksik n繹v\n"
 
-#: gconf/gconftool.c:1372
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 "X��B��RDARLIQ : %s ����kli 羹癟羹n ke癟��rsiz ya da ��ksik siyah覺 n繹v羹\n"
 
-#: gconf/gconftool.c:1383 gconf/gconftool.c:1413 gconf/gconftool.c:1442
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "X��B��RDARLIQ : ����kil %s 羹癟羹n ��sas qiym��t `%s''yi daramas覺nda x��ta "
 "oldu\n"
 
-#: gconf/gconftool.c:1401
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "X��B��RDARLIQ : %s ����kli 羹癟羹n ke癟��rsiz ya da ��ksik cdr n繹v羹\n"
 
-#: gconf/gconftool.c:1426
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "X��B��RDARLIQ : ����kil i��in ��sas qiym��ti aturda bilm��dim\n"
 
-#: gconf/gconftool.c:1455
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 "X��B��RDARLIQ : gconftool'd daxili bir x��ta oldu , nam��'lum "
 "GConfValueType\n"
 
-#: gconf/gconftool.c:1502 gconf/gconftool.c:1523 gconf/gconftool.c:1544
-#: gconf/gconftool.c:1565
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "X��B��RDARLIQ : n繹v ad覺 `%s''yi daraya bilm��dim\n"
 
-#: gconf/gconftool.c:1519
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1612,42 +1785,42 @@ msgstr ""
 "X��B��RDARLIQ : siyah覺 n繹v羹 int, float, string ya da bool ola bil��r, "
 "f��q��t `%s' ola bilm��z\n"
 
-#: gconf/gconftool.c:1540
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "X��B��RDARLIQ : car n繹v羹 int, float, string ya da bool ola bil��r, f��q��t "
 "`%s' ola bilm��z\n"
 
-#: gconf/gconftool.c:1561
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "X��B��RDARLIQ : cdr n繹v羹 int, float, string ya da bool ola bil��r, f��q��t "
 "`%s' ola bilm��z\n"
 
-#: gconf/gconftool.c:1589
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "X��B��RDARLIQ : bo��dur <applyto> n繹qt��si"
 
-#: gconf/gconftool.c:1592 gconf/gconftool.c:1855
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 "X��B��RDARLIQ : <schema>'n覺n alt覺ndak覺 <%s> n繹qt��sini ba��a "
 "d羹��m��dim\n"
 
-#: gconf/gconftool.c:1602
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "X��B��RDARLIQ : bu ����kil 羹癟羹n a癟ar bildirm��di\n"
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "X��B��RDARLIQ : <locale> n繹qt��sinin `name=\"locale\"' x羹susiyy��ti "
 "yoxdur, ke癟ir��m\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1655,59 +1828,59 @@ msgstr ""
 "X��B��RDARLIQ : `%s' lokalizasiyas覺 羹癟羹n 癟oxlu <locale> n繹qt��l��ri "
 "var, k繹hn�� ilkl��ri ke癟ir��m\n"
 
-#: gconf/gconftool.c:1722
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "X��B��RDARLIQ : <locale> n繹qt��sind�� ke癟��rsiz <%s> n繹qt��si\n"
 
-#: gconf/gconftool.c:1751
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 "X��B��RDARLIQ : `%s' ����kil fayl覺n覺n `%s' lokalizasiyas覺n覺n "
 "y羹kl��nm��sind�� x��ta var : %s\n"
 
-#: gconf/gconftool.c:1759
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "`%s' ��eklinde `%s' lokalizasiyas覺 y羹kl��ndi\n"
 
-#: gconf/gconftool.c:1781
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 "X��B��RDARLIQ : `%s' ����kil fayl覺n覺 `%s' a癟ar覺 il�� birl����dir�� "
 "bilm��dim : %s\n"
 
-#: gconf/gconftool.c:1789
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "`%s' ��ekilni `%s' anahtar覺na ekledim\n"
 
-#: gconf/gconftool.c:1868
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 "Bir <schema>'da ��n az覺ndan bir <locale> n繹qt��si olmaq "
 "m��cburiyy��tind��dir\n"
 
-#: gconf/gconftool.c:1897
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 "X��B��RDARLIQ : <schemalist>'in alt覺ndak覺 <%s> n繹qt��si ba��a "
 "d羹��羹lm��di\n"
 
-#: gconf/gconftool.c:1919
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "`%s''yi a癟a bilm��dim : %s\n"
 
-#: gconf/gconftool.c:1926
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "`%s' s��n��di yoxsa bo��dur mu ?\n"
 
-#: gconf/gconftool.c:1938
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1716,30 +1889,30 @@ msgstr ""
 "`%s' s��n��din ana n繹qt��si (<%s>'in, <gconfschemafile> olmal覺d覺r ) "
 "s��hvdir \n"
 
-#: gconf/gconftool.c:1951
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "`%s' s��n��dinin <gconfschemafile> ana n繹qt��si yoxdur \n"
 
-#: gconf/gconftool.c:1965
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 "X��B��RDARLIQ : <gconfschemafile> alt覺ndak覺 <%s> n繹qt��si ba��a "
 "d羹��羹lm��di\n"
 
-#: gconf/gconftool.c:1976 gconf/gconftool.c:2008
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 "Qura��durma m��'lumatlar覺n覺 sinxronla��d覺r覺l覺rk��n x��ta oldu : %s"
 
-#: gconf/gconftool.c:1992
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr ""
 "Y羹kl��n��c��k ����kil fayllar覺n覺 bildirm��k m��cburiyy��tind��s��n\n"
 
-#: gconf/gconftool.c:2029
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1748,16 +1921,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Q覺rma a癟ar覺 %s'yi sil�� bilm��dim : %s\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "Q覺r覺lacaq b��'zi a癟arlar覺 bildirm��k m��cburiyy��tind��s��n\n"
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1766,11 +1939,11 @@ msgstr ""
 "Proqram覺 b��'zi x��tal覺 qiym��tl��ri oturdaraq q覺rma��a c��hd edir��m : \n"
 "  %s\n"
 
-#: gconf/gconftool.c:2199
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "Q覺r覺lacaq b��'zi qovluqlar覺 bildirm��k m��cburiyy��tind��s��n\n"
 
-#: gconf/gconftool.c:2218
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1781,254 +1954,108 @@ msgstr ""
 "c��hd edir��m :\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "GConf X��tas覺 : %s\n"
-
-#: wrappers/gtk/gconf-client.c:795
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 "GConf x��b��rdarl覺��覺 : `%s''d��ki yolda��lar覺 s覺ralark��n x��ta oldu : "
 "%s"
 
-#: wrappers/gtk/gconf-client.c:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "%s g繹zl��y��rk��n, %s ald覺m, %s a癟ar覺 羹癟羹n"
 
-#~ msgid ""
-#~ "'<' or '>' character not allowed here; only allowed around tags, for example "
-#~ "<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
-#~ "&lt; and &gt;"
-#~ msgstr ""
-#~ "'<' v�� ya '>' xarakterl��ri burada istifad�� edil�� bilm��z: sad��ca olaraq "
-#~ "tagler ��traf覺nda ola bil��rl��r. Yoxsa bunlar &lt; v�� &gt; olaraq "
-#~ "kodlancaqlard覺r."
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "BerkeleyDB (BDB) \"backend\" modulunu 癟覺xar覺ram ."
 
-#~ msgid ""
-#~ "'=' character after attribute must be immediately followed by an '\"' "
-#~ "character"
-#~ msgstr ""
-#~ "simvoldan sonrak覺 '=' xarakteri m羹tl��q '\"' xatakteri ila davam "
-#~ "etdirilmalidir"
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "BerkeleyDB qayna��覺 k繹k \"%s\"da(d��) a癟覺ld覺"
 
-#~ msgid "Already-unregistered context ID %lu, request ignored"
-#~ msgstr ""
-#~ "Hal ID'si %lu onsuz da ayr覺lm覺��d覺r, ist��k diqq��t�� al覺nmayacaq"
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "BDB \"backend\" modulu ba��lad覺l覺r"
 
-#~ msgid "Attempt to unregister invalid context ID"
-#~ msgstr "Ke癟��rsiz hal ID'sini ay覺rmaya 癟al覺��d覺m"
-
-#~ msgid "Attempt to use already-unregistered context ID %lu"
-#~ msgstr "��oxdan ayr覺lm覺�� hal ID'si %lu i��l��dilm��y�� c��hd edilir"
-
-#~ msgid "Attempt to use invalid context ID %lu"
-#~ msgstr "Ke癟��rsiz hal ID'si %lu i��l��dilm��y�� c��hd edildi"
-
-#~ msgid "Attribute name must be immediately followed by an '=' character"
-#~ msgstr "Simvol ad覺 '=' xaraketri il�� davam etdirilm��lidir"
-
-#~ msgid "Bad context ID %lu, request ignored"
-#~ msgstr "X��tal覺 hal ID'si %lu, ist��k diqq��t�� al覺nmayacaq"
-
-#~ msgid ""
-#~ "Character '%c' found inside an attribute value; perhaps your attribute value "
-#~ "is missing the closing quotation mark '\"'"
-#~ msgstr ""
-#~ "Simvolun qiym��tini i癟ind�� '%c' tap覺ld覺; d��y��s��n sizin simvol "
-#~ "qiym��tinizd��n  sonra '\"' xarakteri g��lmir."
-
-#~ msgid "Character '%s' is not valid at the start of an attribute name"
-#~ msgstr "'%s' xarakteri simvolun ad覺n覺n ba��覺nda i��l��dilm��z"
-
-#~ msgid "Character '%s' is not valid at the start of an element name"
-#~ msgstr "'%s' xarakteri element ba��覺nda i��l��dilm��z"
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "`%s' 羹nvanda %s ana qovlu��unu tapa bilm��dim ."
 
 #~ msgid ""
-#~ "Character code %#lx is not allowed in XML documents or is not a valid "
-#~ "Unicode character"
+#~ "Can't read from or write to the %s root directory in the address `%s'"
 #~ msgstr ""
-#~ "%#lx H��rf kodu XML s��n��dl��rind�� yol veril��zdir ya da ke癟��siz Unicode "
-#~ "h��rfidir"
+#~ "`%s' 羹nvanda %s ana qovlu��unda oxuya bilm��dim v�� yaza bilm��dim ."
 
-#~ msgid ""
-#~ "Character reference contained non-digit '%s' ('&#' should begin a reference "
-#~ "to a unicode character, such as '&#2342;')"
-#~ msgstr ""
-#~ "H��rf b��hsi r��g��m olmayan '%s' h��rfini daxil edir ('&#' unicode olmayan "
-#~ "h��rfi g繹st��r��r��k  ba��lamal覺d覺r, '&#2342;'kimi)"
+#~ msgid "Failed to set mode on `%s': %s"
+#~ msgstr "`%s''da(d��) mod qurula bilm��di: %s"
 
-#~ msgid "Close tag '%s' does not match opening tag '%s'"
-#~ msgstr "'%s' Qapatma tag覺 '%s' a癟覺l覺�� tag覺na uy��un g��lmir"
+#~ msgid "No database available to save your configuration"
+#~ msgstr "Qur��ular覺n覺z覺n qeyd edil�� bil��c��yi bir databeyz yoxdur"
 
-#~ msgid "Close tag ends just after '/' character"
-#~ msgstr "Qapatma tag覺 '/' xarakterind��n h��m��n sonra qurtar覺r"
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "OAF problem izahat覺 : '%s'"
 
-#~ msgid "Close tag ends just after '<' character"
-#~ msgstr "Qapatma tag覺 '<' xarakterind��n sonra qurtar覺r"
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "'%s' a癟ar覺nda qiym��t saxlana bilm��di"
 
-#~ msgid "Close tag not found at end of element"
-#~ msgstr "Element ax覺r覺nda qapatma tag覺 tap覺lmad覺"
+#~ msgid "Adding client to server's list failed, CORBA error: %s"
+#~ msgstr ""
+#~ "Al覺c覺n覺n verici siyah覺s覺na ��lav��si bacar覺lmad覺, CORBA x��tas覺 : %s "
 
-#~ msgid "Close tag should begin with '</', '/' character is missing"
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
 #~ msgstr ""
-#~ "Qapatma tag覺 '</' v�� ya '/'  xarakterlari il�� ba��lamal覺d覺r, "
-#~ "xarakterl��r yoxdur"
+#~ "%d siqnal覺n覺 ald覺m, ay覺qlama m��'lumat覺n覺 t繹k羹r��m. L羹tf��n GConf "
+#~ "baq覺n覺 raport edin."
 
 #~ msgid ""
-#~ "Couldn't parse character reference '%s' ('&#' must begin a character "
-#~ "reference such as '&#2343;')"
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 #~ msgstr ""
-#~ "'%s'h��rf b��hsi darana bilm��di ('&#' '&#2343:' kimi h��rf g繹st��ricisinin "
-#~ "ba��覺nda olmal覺d覺r)"
+#~ "%d siqnal覺n覺 ald覺m, t��miz s羹r��td�� qapana bilmir��m. L羹tf��n GConf "
+#~ "x��tas覺n覺 raport edin."
 
-#~ msgid "Didn't understand line in saved state file: '%s'"
-#~ msgstr "Qeyd edilmi�� hal fayl覺ndak覺 bu s��tri ba��a d羹��m��dim: '%s'"
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "GConf vericisi istifad��d�� deyildir, qapan覺ram ."
 
-#~ msgid "Document ended just after '<' character"
-#~ msgstr "S��n��d '<' xarakterind��n sonra qurtard覺"
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "Qeyd edilmi�� v��ziyy��t fayl覺 oxunark��n x��ta oldu : %s"
 
-#~ msgid "Document ended just after attribute name"
-#~ msgstr "S��n��d simvol ad覺ndan h��m��n sonra qurtard覺"
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "IOR al覺c覺s覺 al覺nmas覺 bacar覺lmad覺: %s"
 
-#~ msgid "Document ended just after close tag name, no '>' seen"
-#~ msgstr "S��n��d qapatma tag覺 ad覺ndan sonra qurtard覺, '>' g繹r羹lm��di"
-
-#~ msgid "Document ended just after element name in close tag, no '>' seen"
-#~ msgstr ""
-#~ "S��n��d qapatma tag覺ndak覺 elemement ad覺ndan sonra qurtard覺, '>' "
-#~ "g繹r羹lm��di"
+#~ msgid "Failed to open saved state file: %s"
+#~ msgstr "Qeyd edilmi�� hal fayl覺 a癟覺la bilm��di:  %s"
 
-#~ msgid "Document ended just after element name, no '>' seen"
-#~ msgstr "S��n��d element ad覺ndan ham��n sonra qurtard覺, '>' g繹r羹lm��di"
+#~ msgid "Failed to write client add to saved state file: %s"
+#~ msgstr "Qeyd edilmi�� hal fayl覺na al覺c覺 qeyd edil�� bilm��di: %s"
 
-#~ msgid ""
-#~ "Documented ended just after an '&', '&' should begin an entity or character "
-#~ "reference."
+#~ msgid "Failed to flush client add to saved state file: %s"
 #~ msgstr ""
-#~ "S��n��d '&' d��n h��m��n qonra qurtarm覺��d覺r, '&' h��rf g繹st��ricisini "
-#~ "h��m��n ba��覺nda g��lm��lidir."
+#~ "Qeyd edilmi�� hal fayl覺na \"flush\" al覺c覺 qeyd edil�� bilm��di: %s"
 
 #~ msgid ""
-#~ "Element ended just after '/', no '>' seen; empty elements should end with "
-#~ "'/>'"
+#~ "Some client removed itself from the GConf server when it hadn't been added."
 #~ msgstr ""
-#~ "Element '/' dan sonra qurtard覺, '>' g繹rilm��di; bo�� elementl��r '/>' il�� "
-#~ "qurtarmal覺d覺rlar"
-
-#~ msgid "Elements should be closed with '>' or '/>', not with '%s'"
-#~ msgstr "Elementl��r '>' v�� ya '/>' il�� qurtarar, '%s' il�� deyil"
+#~ "Bir al覺c覺 繹z羹n羹 GConf vericisind��n 癟覺xard覺b v�� ona g繹r�� d�� "
+#~ "��lav�� edilm��yib."
 
-#~ msgid ""
-#~ "Error on line %d char %d: %s\n"
-#~ "(Some surrounding text was '%s')\n"
-#~ msgstr ""
-#~ "%d s��tiri %d h��rfind�� x��ta oldu: %s\n"
-#~ "(B��'zi m��tnl��r '%s' idi)\n"
+#~ msgid "Default Value: %s\n"
+#~ msgstr "Ana Qiym��t: %s\n"
 
-#~ msgid "Error reading file '%s': %s"
-#~ msgstr "`%s' dosyesi oxunark��n x��ta oldu : %s"
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "GConf X��tas覺 : %s\n"
 
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "`%s' fayl覺n覺 a癟ark��n x��ta oldu : %s"
-
-#~ msgid "Failed to parse connection ID in saved state file"
-#~ msgstr "Qeyd edilmi�� hal fayl覺nda ba��lant覺 ad覺 IDsi darana bilm��di"
-
-#~ msgid "Failed to unquote IOR from saved state file: %s"
-#~ msgstr "Qeyd edilmi�� hal dosyesind��n IOR ayr覺la bilm��di: %s"
-
-#~ msgid "Failed to unquote config source address from saved state file: %s"
-#~ msgstr ""
-#~ "Qeyd edilmi�� hal fayl覺ndan qura��d覺rma qaynaq 羹nvan覺 ayr覺la bilm��di: "
-#~ "%s"
-
-#~ msgid "Failed to unquote listener location from saved state file: %s"
-#~ msgstr "Qeyd edilmi�� hal dosyesind��n dinl��yici yeri ayr覺la bilm��di: %s"
-
-#~ msgid "GConf was built with debugging features enabled"
-#~ msgstr "FConf x��ta ay覺qlamas覺 qabilliy��ti il�� qurulub"
-
-#~ msgid ""
-#~ "Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
-#~ "bad character was '%s'"
-#~ msgstr ""
-#~ "Se癟ili m��tnd�� %d bayt覺nda ke癟��rsiz UTF-8 xarakteri var. X��tal覺 "
-#~ "xarakterd��n ��vv��lki bir qisim m��tn '%s' idi"
-
-#~ msgid ""
-#~ "Markup text ended in the middle of a character reference, just after '&#'"
+#~ msgid "Already-unregistered context ID %lu, request ignored"
 #~ msgstr ""
-#~ "Se癟ili m��tn h��rf referensinin ortas覺nda qurtard覺, '&#' dan h��man sonra"
+#~ "Hal ID'si %lu onsuz da ayr覺lm覺��d覺r, ist��k diqq��t�� al覺nmayacaq"
 
-#~ msgid "Missing '<' at start of element"
-#~ msgstr "Elementin ba��覺nda '<' yoxdur"
+#~ msgid "Attempt to unregister invalid context ID"
+#~ msgstr "Ke癟��rsiz hal ID'sini ay覺rmaya 癟al覺��d覺m"
 
-#~ msgid "No closing '>' found for a <? or <!"
-#~ msgstr "<? v�� ya <! 羹癟羹n ba��lay覺c覺 '<' tap覺lmad覺"
+#~ msgid "Attempt to use already-unregistered context ID %lu"
+#~ msgstr "��oxdan ayr覺lm覺�� hal ID'si %lu i��l��dilm��y�� c��hd edilir"
 
-#~ msgid "Pinging the server failed, CORBA error: %s"
-#~ msgstr "Vericinin pingl��nm��si iflas etdi( CORBA x��tas覺 : %s )"
+#~ msgid "Attempt to use invalid context ID %lu"
+#~ msgstr "Ke癟��rsiz hal ID'si %lu i��l��dilm��y�� c��hd edildi"
 
-#~ msgid ""
-#~ "Ran out of text before a quote mark ('\"') was seen at the end of an "
-#~ "attribute value"
-#~ msgstr ""
-#~ "'\"' dan ��vv��l m��tn qurtard覺: '\"' simvol qiym��tinin ax覺r覺nda "
-#~ "g繹r羹ld羹"
+#~ msgid "Bad context ID %lu, request ignored"
+#~ msgstr "X��tal覺 hal ID'si %lu, ist��k diqq��t�� al覺nmayacaq"
 
 #~ msgid "Received signal %d, ignoring"
 #~ msgstr "%d siqnal覺n覺 ald覺m, bunu ke癟ir��m"
-
-#~ msgid "Received signal %d, shutting down."
-#~ msgstr "%d siqnal覺n覺 ald覺m, qapan覺ram ."
-
-#~ msgid ""
-#~ "Saved state file had a removal of a listener that wasn't added; ignoring the "
-#~ "removal."
-#~ msgstr ""
-#~ "Qeyd edilmi�� hal fayl覺nda ��lav�� edilm��mi�� dinl��yicinin silindiyi "
-#~ "bildirilir: silinm��yi hesaba qatm覺ram"
-
-#~ msgid ""
-#~ "Saved state file records the same listener added twice; ignoring the second "
-#~ "instance"
-#~ msgstr ""
-#~ "Qeyd edilmi�� hal fayl覺nda eyni dinl��yici iki d��f�� ��lav�� edilmi��dir: "
-#~ "ikincisini hesaba qatm覺ram"
-
-#~ msgid ""
-#~ "Text ended in the middle of an character reference ('&#' should begin a "
-#~ "character reference such as '&#2342;')"
-#~ msgstr ""
-#~ "M��tn h��rf b��hsinin ortas覺nda q覺rtard覺 ('&#' '&#2342;'kimi h��rf "
-#~ "g繹st��ricisinin ba��覺nda olmal覺d覺r)"
-
-#~ msgid ""
-#~ "Text ended in the middle of an entity, or entity name too long to be valid "
-#~ "('&' should begin an entity such as '&quot;')"
-#~ msgstr ""
-#~ "Text ended in the middle of an entity, or entity name too long to be valid "
-#~ "('&' should begin an entity such as '&quot;')"
-
-#~ msgid ""
-#~ "Text ends immediately after an attribute value, before the element was closed"
-#~ msgstr ""
-#~ "M��tn element qapat覺lmadan ��vv��l sivvol qiym��tind��n h��m��n sonra "
-#~ "qurtarar"
-
-#~ msgid "The marked-up text contained nothing but whitespace."
-#~ msgstr "Se癟ili m��tnd�� bo��luqlardan ba��qa bir ��ey yoxdur"
-
-#~ msgid ""
-#~ "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
-#~ msgstr ""
-#~ "Nam��'lum '%s' giri��i ('&' &amo giri��i ila ba��lamal覺d覺r; &quot; &lt; "
-#~ "&gt; &apos;)"
-
-#~ msgid "found <local_schema> with no locale setting"
-#~ msgstr ""
-#~ "<local_scheme> bir yerl����m�� qur��ular覺 il�� ��laq��si olmayan bir yerd�� "
-#~ "tapd覺m"
diff --git a/po/cs.po b/po/cs.po
index 5553576e..2a084428 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf VERSION\n"
-"POT-Creation-Date: 2001-05-21 19:08+0200\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-03-09 14:58-0500\n"
 "Last-Translator: George Lebl <jirka@5z.com>\n"
 "Language-Team: czech <cs@li.org>\n"
@@ -13,34 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr ""
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr ""
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr ""
-
-#: backends/dir-utils.c:108
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr ""
-
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "Nelze vytvo鷡t adres暟 `%s': %s"
-
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr ""
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr ""
@@ -50,6 +22,11 @@ msgstr ""
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "Nelze vytvo鷡t adres暟 `%s': %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -64,7 +41,7 @@ msgstr ""
 msgid "Initializing XML backend module"
 msgstr ""
 
-#: backends/xml-backend.c:748
+#: backends/xml-backend.c:745
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Nelze otev齶t adres暟 `%s': %s"
@@ -73,18 +50,18 @@ msgstr "Nelze otev齶t adres暟 `%s': %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
-"%u items remain in the cache after cleaning already-synced items older than %"
-"u seconds"
+"%u items remain in the cache after cleaning already-synced items older than "
+"%u seconds"
 msgstr ""
 
 #: backends/xml-dir.c:164
@@ -97,79 +74,74 @@ msgstr "`stat' selhal na `%s': %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML soubor `%s' je adres暟"
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Nelze vymazat `%s': %s"
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, fuzzy, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Nelze zav齶t soubor `%s': %s"
 
-#: backends/xml-dir.c:359
-#, fuzzy, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr "Nelze otev齶t `%s': %s\n"
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Nelze p鷫jmenovat `%s' na `%s': %s"
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, fuzzy, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Nelze p鷫jmenovat `%s' na `%s': %s"
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Nelze smazat star� soubor `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "`stat' selhal na `%s': %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, fuzzy, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Zdvojen� polo餒a `%s' v `%s', vymaz嫛嫥"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, fuzzy, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Polo餒a beze jm幯a v XML souboru `%s', vymaz嫛嫥"
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, fuzzy, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Polo餒a beze jm幯a v XML souboru `%s', vymaz嫛嫥"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, fuzzy, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Nelze zav齶t soubor `%s': %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2443
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Nelze zav齶t soubor `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:149
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:200
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: backends/xml-entry.c:327
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr ""
@@ -177,81 +149,85 @@ msgstr ""
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:373
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 
-#: backends/xml-entry.c:724
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr ""
 
-#: backends/xml-entry.c:938
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:952
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: backends/xml-entry.c:967
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1015 backends/xml-entry.c:1091
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1049
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1080
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1132
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1141 backends/xml-entry.c:1164
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1154
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1173
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1191
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1204
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1209
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -284,28 +260,28 @@ msgstr ""
 msgid "Failed to shut down backend"
 msgstr ""
 
-#: gconf/gconf-database.c:231
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr ""
 
-#: gconf/gconf-database.c:239
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:517
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr ""
 
-#: gconf/gconf-database.c:534
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:601
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 
-#: gconf/gconf-database.c:760
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr ""
@@ -314,7 +290,7 @@ msgstr ""
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -322,59 +298,59 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:873
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr ""
 
-#: gconf/gconf-database.c:882
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:997 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1044
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1087
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1111
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1151
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1175
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1202
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1228
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1249
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr ""
@@ -440,29 +416,208 @@ msgstr ""
 msgid "Failed to get a lock"
 msgstr "Nelze vymazat `%s': %s"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
 msgstr ""
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Nelze zav齶t soubor `%s': %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Chyba v 鋈en� souboru `%s': %s\n"
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:445
 msgid "Failed to convert object to IOR"
 msgstr ""
 
@@ -471,186 +626,176 @@ msgstr ""
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:858
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Zdroj `%s' p鷡d嫕\n"
 
-#: gconf/gconf-internals.c:870
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Chyba v 鋈en� souboru `%s': %s\n"
 
-#: gconf/gconf-internals.c:1293
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1303
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1442
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1472
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1588
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1650
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2130 gconf/gconf.c:3002
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA chyba: %s"
 
-#: gconf/gconf-internals.c:2146
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr ""
-
-#: gconf/gconf-internals.c:2152
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2157
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2252
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2283
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2294
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2314
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2322
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2360
+#: gconf/gconf-internals.c:2385
 #, fuzzy, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "Nelze vytvo鷡t adres暟 `%s': %s"
 
-#: gconf/gconf-internals.c:2395
+#: gconf/gconf-internals.c:2420
 #, fuzzy, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Nelze vytvo鷡t soubor `%s': %s"
 
-#: gconf/gconf-internals.c:2431
+#: gconf/gconf-internals.c:2456
 #, fuzzy, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Nelze ps嫢 do souboru `%s': %s"
 
-#: gconf/gconf-internals.c:2474
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2491
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2501
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
 
-#: gconf/gconf-internals.c:2518
+#: gconf/gconf-internals.c:2543
 #, fuzzy, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Nelze otev齶t adres暟 `%s': %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, fuzzy, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Nelze zav齶t soubor `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:596
-#, fuzzy, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "Nelze zav齶t soubor `%s': %s"
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -720,518 +865,512 @@ msgstr ""
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1781
+#: gconf/gconf.c:1597
 #, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1797
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
 "Please file an OAF bug report."
 msgstr ""
 
-#: gconf/gconf.c:2108
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:2145
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2167
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:2169
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2190
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:2204
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2457
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2518
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2553
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2588
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2625
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2658
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:246
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:278
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:292
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:300
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:300
-msgid "/path"
-msgstr ""
-
-#: gconf/gconfd.c:313
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:325
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:342
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:368
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgid "Received signal %d, shutting down."
 msgstr ""
 
-#: gconf/gconfd.c:384
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-
-#: gconf/gconfd.c:401
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr ""
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:502
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:529
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:549
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:569
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:573
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:578
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:616
+#: gconf/gconfd.c:476
 #, fuzzy
 msgid "Exiting"
 msgstr "Norm嫮n� konec"
 
-#: gconf/gconfd.c:641
-msgid "GConf server is not in use, shutting down."
-msgstr ""
-
-#: gconf/gconfd.c:1000
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1135
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1204
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1218
+#: gconf/gconfd.c:980
 #, fuzzy, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Nelze ps嫢 do souboru `%s': %s"
 
-#: gconf/gconfd.c:1227
+#: gconf/gconfd.c:989
 #, fuzzy, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Nelze zav齶t soubor `%s': %s"
 
-#: gconf/gconfd.c:1241
+#: gconf/gconfd.c:1003
 #, fuzzy, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "`stat' selhal na `%s': %s"
 
-#: gconf/gconfd.c:1251
+#: gconf/gconfd.c:1013
 #, fuzzy, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Nelze zav齶t soubor `%s': %s"
 
-#: gconf/gconfd.c:1260
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1735
-#, c-format
-msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
-msgstr ""
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Nelze zav齶t soubor `%s': %s"
 
-#: gconf/gconfd.c:1781
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Nelze zav齶t soubor `%s': %s"
+
+#: gconf/gconfd.c:1140
 #, fuzzy, c-format
-msgid "Error reading saved state file: %s"
-msgstr "Chyba v 鋈en� souboru `%s': %s\n"
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr "Nelze zav齶t soubor `%s': %s"
 
-#: gconf/gconfd.c:1834
+#: gconf/gconfd.c:1160
 #, fuzzy, c-format
-msgid "Unable to open saved state file '%s': %s"
+msgid "Failed to unquote listener location from saved state file: %s"
 msgstr "Nelze zav齶t soubor `%s': %s"
 
-#: gconf/gconfd.c:1951
-#, c-format
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Nelze zav齶t soubor `%s': %s"
+
+#: gconf/gconfd.c:1204
 msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to re-"
-"add the listener if gconfd exits or shuts down (%s)"
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
 msgstr ""
 
-#: gconf/gconfd.c:1956
-#, c-format
+#: gconf/gconfd.c:1225
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously re-"
-"add the listener if gconfd exits or shuts down (%s)"
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
 msgstr ""
 
-#: gconf/gconfd.c:1979 gconf/gconfd.c:2144
-#, fuzzy, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "Nelze vymazat `%s': %s"
-
-#: gconf/gconfd.c:1994
-#, fuzzy, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "Nelze zav齶t soubor `%s': %s"
+#: gconf/gconfd.c:1346
+#, c-format
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
 
-#: gconf/gconfd.c:2007
+#: gconf/gconfd.c:1377
 #, fuzzy, c-format
-msgid "Failed to write client add to saved state file: %s"
+msgid "Unable to open saved state file '%s': %s"
 msgstr "Nelze zav齶t soubor `%s': %s"
 
-#: gconf/gconfd.c:2015
-#, fuzzy, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr "Nelze zav齶t soubor `%s': %s"
+#: gconf/gconfd.c:1476
+#, c-format
+msgid ""
+"Failed to log addition of listener to gconfd logfile; won't be able to "
+"re-add the listener if gconfd exits or shuts down (%s)"
+msgstr ""
 
-#: gconf/gconfd.c:2105
+#: gconf/gconfd.c:1481
+#, c-format
 msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
+"Failed to log removal of listener to gconfd logfile; might erroneously "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconftool.c:63
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr ""
 
-#: gconf/gconftool.c:72
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr ""
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid ""
-"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
-"type."
+"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
+"--type."
 msgstr ""
 
-#: gconf/gconftool.c:100
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr ""
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr ""
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:173
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr ""
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:182 gconf/gconftool.c:191 gconf/gconftool.c:200
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr ""
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr ""
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr ""
 
-#: gconf/gconftool.c:227
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr ""
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr ""
 
-#: gconf/gconftool.c:236
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr ""
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr ""
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
 "config source or set to the empty string to use the default."
 msgstr ""
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:330
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: gconf/gconftool.c:342
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:349
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:357
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:365
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:381
 msgid ""
-"--set_schema should not be used with --get, --set, --unset, --all-pairs, --"
-"all-dirs\n"
+"--set_schema should not be used with --get, --set, --unset, --all-pairs, "
+"--all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:391
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:397
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:406
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:415
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:424
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:461
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:467
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:492
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr ""
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:507
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1239,344 +1378,338 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:529
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:689
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:732
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:766
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr ""
 
-#: gconf/gconftool.c:784
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:839
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:853
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:886
 #, fuzzy, c-format
 msgid "List Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:887
 #, fuzzy, c-format
 msgid "Car Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:888
 #, fuzzy, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:896
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr ""
+msgid "Owner: %s\n"
+msgstr "Vlastn璭: %s\n"
 
-#: gconf/gconftool.c:896 gconf/gconftool.c:898 gconf/gconftool.c:899
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:898
-#, c-format
-msgid "Owner: %s\n"
-msgstr "Vlastn璭: %s\n"
-
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:909
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:913
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:956 gconf/gconftool.c:968
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:980
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1028
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1038
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1052
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1067
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Chyba: %s\n"
 
-#: gconf/gconftool.c:1080 gconf/gconftool.c:1213
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1098 gconf/gconftool.c:1227
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1116
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1158
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1178
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1198
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1242
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1256
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1267
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1290
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1324
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1375
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1386 gconf/gconftool.c:1416 gconf/gconftool.c:1445
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1404
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1429
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1458
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1505 gconf/gconftool.c:1526 gconf/gconftool.c:1547
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1522
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1543
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1564
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1592
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1595 gconf/gconftool.c:1858
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1605
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1638
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1644
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1725
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1754
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1762
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1784
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1792
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1871
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1900
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1922
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Nelze otev齶t `%s': %s\n"
 
-#: gconf/gconftool.c:1929
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument `%s' je pr嫙dn�?\n"
 
-#: gconf/gconftool.c:1941
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1954
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1968
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1979 gconf/gconftool.c:2011
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1995
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2032
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2052
+#: gconf/gconftool.c:2043
 #, fuzzy, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Nelze vytvo鷡t soubor `%s': %s"
 
-#: gconf/gconftool.c:2178
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2184
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2202
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2221
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1584,25 +1717,36 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: gconf/gconf-client.c:296 gconf/gconf-client.c:313
-#, fuzzy, c-format
-msgid "GConf Error: %s\n"
-msgstr "Chyba: %s\n"
-
-#: gconf/gconf-client.c:796
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-client.c:998
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Failed to open file '%s': %s"
+#~ msgid "Failed to set mode on `%s': %s"
+#~ msgstr "Nelze otev齶t `%s': %s\n"
+
+#, fuzzy
+#~ msgid "Unable to store a value at key '%s'"
 #~ msgstr "Nelze zav齶t soubor `%s': %s"
 
+#, fuzzy
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "Nelze vymazat `%s': %s"
+
+#, fuzzy
+#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgstr "Nelze zav齶t soubor `%s': %s"
+
+#, fuzzy
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "Chyba: %s\n"
+
 #~ msgid "Key"
 #~ msgstr "Kl膻"
 
diff --git a/po/da.po b/po/da.po
index e0732035..3d18c1d2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,34 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "Afl犘ser BerkeleyDB-backend-modulet."
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "鶴nede BerkeleyDB kilde med rod %s"
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "Opstarter BDB-backend-modul"
-
-#: backends/dir-utils.c:88
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "Kunne ikke finde %s-rodkatalog p� adressen '%s'"
-
-#: backends/dir-utils.c:104 backends/xml-backend.c:301 backends/xml-dir.c:1035
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "Kunne ikke oprette kataloget `%s': %s"
-
-#: backends/dir-utils.c:192
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "Kunne ikke l犘e fra eller skrive til %s-rodkatalog p� adressen '%s'"
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "L犘 XML-backend-modulet af."
@@ -51,6 +23,11 @@ msgstr "L犘 XML-backend-modulet af."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Kunne ikke finde XML-rodkatalog p� adressen '%s'"
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "Kunne ikke oprette kataloget `%s': %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -74,7 +51,7 @@ msgstr "Kunne ikke opgive l廛 p� XML-katalog '%s': %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "Usynkroniseret sletning af kataloger under nedlukning af XML-backenden"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -83,7 +60,7 @@ msgstr ""
 "Kunne ikke fjerne katalog `%s' fra XML-backend bufferen, fordi den ikke er "
 "synkroniseret til disk"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -128,32 +105,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "Kunne ikke slette gammel fil `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:790
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Kunne ikke stat '%s': %s"
 
-#: backends/xml-dir.c:934
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Duplikeret punkt `%s' i `%s', ignorerer"
 
-#: backends/xml-dir.c:956
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Punkt uden navn i XML-fil `%s', ignorerer"
 
-#: backends/xml-dir.c:963
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Topniveau-node i XML-fil `%s' er ikke et <punkt>, ignorerer"
 
-#: backends/xml-dir.c:1051
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Kunne ikke oprette filen `%s': %s"
 
-#: backends/xml-dir.c:1059 gconf/gconf-internals.c:2442
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Kunne ikke lukke filen `%s': %s"
@@ -164,7 +141,7 @@ msgstr "Kunne ikke lukke filen `%s': %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorerer XML-node med navn `%s': %s"
 
-#: backends/xml-entry.c:199
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -182,76 +159,80 @@ msgstr "ignorerer skemanavn `%s', ugyldig: %s"
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "Ignorerer XML-node `%s', bortset fra mulig skema navn:: %s"
 
-#: backends/xml-entry.c:723
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Kunne ikke l犘e standardv熳di for skema: %s"
 
-#: backends/xml-entry.c:937
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Ingen \"type\" attribut for <%s> node"
 
-#: backends/xml-entry.c:951
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "En node har ukendt \"type\" attribut `%s', ignorerer"
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "Ingen \"v熳di\" attribut for node"
 
-#: backends/xml-entry.c:1014 backends/xml-entry.c:1090
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Forstod ikke XML-node <%s> inde i en XML listenode"
 
-#: backends/xml-entry.c:1048
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Ugyldig type (liste, par, eller ukendt) i en listenode"
 
-#: backends/xml-entry.c:1071
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Ugyldig XML-node: %s"
 
-#: backends/xml-entry.c:1079
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Listen indeholder en fejlskrevet node (%s, skulle v熳e %s)"
 
-#: backends/xml-entry.c:1131
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorerer ugyldig car fra XML-par: %s"
 
-#: backends/xml-entry.c:1140 backends/xml-entry.c:1163
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "tolker XML-fil: lister og par kan ikke placeres inde i et par"
 
-#: backends/xml-entry.c:1153
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorerer ugyldig cdr fra XML-par: %s"
 
-#: backends/xml-entry.c:1172
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Forstod ikke XML-node <%s> inde i en XML-parnode"
 
-#: backends/xml-entry.c:1190
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Fandt ikke car og cdr for XML-parnode"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Manglende cdr fra v熳dipar i XML-fil"
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "Manglende car fra v熳dipar i XML-fil"
 
-#: backends/xml-entry.c:1208
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Mangler b嶟e car og cdr v熳dier fra par i XML-fil"
 
@@ -284,29 +265,29 @@ msgstr "Kunne ikke finde backend-modul for `%s'"
 msgid "Failed to shut down backend"
 msgstr "Kunne ikke lukke backend ned"
 
-#: gconf/gconf-database.c:233
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Modtog ugyldig v熳di i s犚-foresp鷨gsel"
 
-#: gconf/gconf-database.c:241
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Kunne ikke forst� CORBA-v熳dien modtaget i s犚-foresp鷨gsel efter n鷤le `%s'"
 
-#: gconf/gconf-database.c:521
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "Modtog foresp鷨gsel om at slippe alle mellemlagrede data"
 
-#: gconf/gconf-database.c:538
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Modtog foresp鷨gsel om at udf鷨e synkron synkronisering"
 
-#: gconf/gconf-database.c:605
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Fatal fejl: kunne ikke hente objektreference for ConfigDatabase"
 
-#: gconf/gconf-database.c:764
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Fejlede ved synkronisering af en eller flere kilder: %s"
@@ -315,7 +296,7 @@ msgstr "Fejlede ved synkronisering af en eller flere kilder: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -326,12 +307,12 @@ msgstr ""
 "lytter ved genstart af gconfd, noget som vil resultere i up嶚idelig "
 "notifikation af konfigurations熡dringer."
 
-#: gconf/gconf-database.c:871
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Lytter-ID %lu eksisterer ikke"
 
-#: gconf/gconf-database.c:880
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -340,47 +321,47 @@ msgstr ""
 "Kunne ikke logge fjernelse af lytter til logfil (h鷮st sandsynligt harml鷭t, "
 "kan resultere i at notifikation genindtr熠fer p� uforklarlig vis): %s"
 
-#: gconf/gconf-database.c:992 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fejl ved foresp鷨gsel p� v熳di af '%s': %s"
 
-#: gconf/gconf-database.c:1039
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Fejl ved ops犚ning af v熳di for '%s': %s"
 
-#: gconf/gconf-database.c:1082
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Fejl under nulstilling af `%s': %s"
 
-#: gconf/gconf-database.c:1106
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Fejl ved skafning af standard v熳di for '%s': %s"
 
-#: gconf/gconf-database.c:1145
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Fejl ved tjekning af eksisterende `%s': %s"
 
-#: gconf/gconf-database.c:1169
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Fejl under fjernelse af katalog '%s': %s"
 
-#: gconf/gconf-database.c:1195
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Kunne ikke f� alle indgange i '%s': %s"
 
-#: gconf/gconf-database.c:1221
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Fejl under listning af kataloger i `%s': %s"
 
-#: gconf/gconf-database.c:1242
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Fejl under ops犚ning af skema for `%s': %s"
@@ -445,9 +426,188 @@ msgstr "Operation ikke tilladt uden konfigurationstjener"
 msgid "Failed to get a lock"
 msgstr "Kunne ikke f� en l廛"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "Ingen database tilg熡gelig for lagring af din konfiguration"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Kunne ikke lukke filen `%s': %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Fejl under fjernelse af katalog '%s': %s"
 
 #: gconf/gconf-internals.c:85
 #, c-format
@@ -471,101 +631,96 @@ msgstr "Modtog liste fra gconfd med en ugyldig listetype"
 msgid "Failed to convert object to IOR"
 msgstr "Kunne ikke konvertere objekt til IOR"
 
-#: gconf/gconf-internals.c:809
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Kunne ikke 嶙ne sti-fil `%s': %s\n"
 
-#: gconf/gconf-internals.c:856
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Tilf鷮er kilde '%s'\n"
 
-#: gconf/gconf-internals.c:868
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "L犘efejl p� fil '%s': %s\n"
 
-#: gconf/gconf-internals.c:1292
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Forventede liste, fik %s"
 
-#: gconf/gconf-internals.c:1302
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Forventede liste af %s, fik liste af %s"
 
-#: gconf/gconf-internals.c:1441
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Forventede par, fik %s"
 
-#: gconf/gconf-internals.c:1455
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr "Forventede (%s,%s) par, fik par hvor 幯 eller begge v熳dier manglede"
 
-#: gconf/gconf-internals.c:1471
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Forventede par af typen (%s,%s) fik type (%s,%s)"
 
-#: gconf/gconf-internals.c:1587
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Tekst i anf鷨selstegn begynder ikke med anf鷨selstegn"
 
-#: gconf/gconf-internals.c:1649
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Tekst i anf鷨selstegn ender ikke p� anf鷨selstegn"
 
-#: gconf/gconf-internals.c:2129 gconf/gconf.c:2945
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-fejl: %s"
 
-#: gconf/gconf-internals.c:2145
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "OAF-problemsbeskrivelse: %s"
-
-#: gconf/gconf-internals.c:2151
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "fors鷤 p� at fjerne ikke-listet OAF-objektmappe"
 
-#: gconf/gconf-internals.c:2156
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "fors鷤 p� at tilf鷮e allerede-listet OAF-mappe"
 
-#: gconf/gconf-internals.c:2163
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF-fortolkningsfejl: %s"
 
-#: gconf/gconf-internals.c:2168
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Ukendt OAF-fejl"
 
-#: gconf/gconf-internals.c:2251
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Ingen ior-fil i '%s'"
 
-#: gconf/gconf-internals.c:2282
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd overtager l廛 '%s' fra en anden proces"
 
-#: gconf/gconf-internals.c:2293
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Et andet program har l廛 '%s'"
 
-#: gconf/gconf-internals.c:2313
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "kunne ikke kontakte ORB for at pinge eksisterende gconfd"
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -574,42 +729,42 @@ msgstr ""
 "Fjerner udg嶒t l廛 `%s' fordi IOR ikke kunne konverteres til "
 "objektreference, IOR `%s'"
 
-#: gconf/gconf-internals.c:2333
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr "Fjerner udg嶒t l廛 `%s' pga fejl under pingning af tjener: %s"
 
-#: gconf/gconf-internals.c:2345
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf-konfigurationsd熤on (gconfd) har l廛 '%s'"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "kunne ikke oprette kataloget '%s': %s"
 
-#: gconf/gconf-internals.c:2394
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Kan ikke oprette l廛 '%s': %s"
 
-#: gconf/gconf-internals.c:2430
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kan ikke skrive til filen '%s': %s"
 
-#: gconf/gconf-internals.c:2473
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "Kan ikke 嶙ne l廛efil '%s'; antager det ikke er vores: %s"
 
-#: gconf/gconf-internals.c:2490
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "厤elagt l廛efil '%s', fjerner alligevel"
 
-#: gconf/gconf-internals.c:2500
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -618,26 +773,26 @@ msgstr ""
 "Oprettede ikke l廛efil '%s' (skabers pid %u, vores pid %u; antager at en "
 "anden har overtaget vores l廛 "
 
-#: gconf/gconf-internals.c:2517
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Kunne ikke frigive l廛ekatalog '%s': %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Kunne ikke indl犘e kilden `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Skema `%s' specificeret for `%s' lagrer en v熳di som ikke er for skema"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Navnet '/' kan kun v熳e et katalog, ikke en n鷤le"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -646,22 +801,17 @@ msgstr ""
 "V熳di for `%s' sat i en skrivebeskyttet kilde i begyndelsen af din "
 "konfigurationssti."
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "Kunne ikke lagre v熳di i n鷤le '%s'"
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Fejl ved finding af metainfo: %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Fejl under hentning af metainfo: %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr "N鷤le `%s' listet som skema for n鷤le `%s' lagrer faktisk type `%s'"
@@ -731,21 +881,21 @@ msgstr "Forstod ikke `%s' (ekstra \"unescaped\" ')' fundet inde i par)"
 msgid "`%s': %s"
 msgstr "'%s': %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Server kunne ikke 嶙ne adressen '%s'"
 
-#: gconf/gconf.c:568
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "Kan ikke tilf鷮e notifikationer til en lokal konfigurationskilde"
 
-#: gconf/gconf.c:1724
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Tilf鷮else af klient til serverens liste mislykkedes, CORBA fejl: %s"
 
-#: gconf/gconf.c:1740
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -755,66 +905,66 @@ msgstr ""
 "fra oaf_activate_from_id() og satte ikke en undtagelse som forklarede "
 "problemet. Venligst udfyld en fejlrapport for OAF."
 
-#: gconf/gconf.c:2051
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Kunne ikke starte GConf, afslutter\n"
 
-#: gconf/gconf.c:2088
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Skal begynde med en skr廛treg (/)"
 
-#: gconf/gconf.c:2110
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan ikke have to skr廛treger (/) efter hinanden"
 
-#: gconf/gconf.c:2112
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan ikke have et punktum (.) lige efter en skr廛treg (/)"
 
-#: gconf/gconf.c:2133
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' er et ugyldigt tegn i n鷤le-/katalognavne"
 
-#: gconf/gconf.c:2147
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "N鷤le/katalog skal ikke ende med en skr廛treg (/)"
 
-#: gconf/gconf.c:2400
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fejl ved nedlukning af konfigtjener: %s"
 
-#: gconf/gconf.c:2461
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Forventede flydendetal, fik %s"
 
-#: gconf/gconf.c:2496
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Forventede heltal, fik %s"
 
-#: gconf/gconf.c:2531
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Forventede streng, fik %s"
 
-#: gconf/gconf.c:2568
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Forventede boolsk, fik %s"
 
-#: gconf/gconf.c:2601
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Forventede skema, fik %s"
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Nedlukningsforesp鷨gsel modtaget"
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -822,7 +972,7 @@ msgstr ""
 "gconfd kompileret med debugning; fors鷤er at hente gconf.sh fra "
 "kildekataloget"
 
-#: gconf/gconfd.c:293
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -830,10 +980,7 @@ msgstr ""
 "Ingen konfigurationsfiler fundet, fors鷤er at bruge standard "
 "konfigurationskilde `%s'"
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:301
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -841,12 +988,12 @@ msgstr ""
 "Ingen konfigurationskilder i kildestien, konfigurationen vil ikke blive "
 "gemt; redig廨"
 
-#: gconf/gconfd.c:314
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Fejl ved indl犘ning af nogle konfigkilder: %s"
 
-#: gconf/gconfd.c:326
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -854,7 +1001,7 @@ msgstr ""
 "Kunne ikke sl� nogen adresser op for konfigurationskilde, kan ikke hente "
 "eller gemme konfigurationsdata"
 
-#: gconf/gconfd.c:343
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -862,36 +1009,28 @@ msgstr ""
 "Ingen skrivbare konfigurationskilder fundet, kan ikke gemme dele af "
 "konfigurations熡dringene"
 
-#: gconf/gconfd.c:369
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-"Modtog signal %d, dumper hukommelsen. Rapport廨 venligst en GConf fejl."
-
-#: gconf/gconfd.c:385
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"Modtog signal %d, lukker unormalt ned. Rapport廨 venligst en GConf fejl."
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down."
+msgstr "Modtog signal %d, lukker ned p� rigtig m嶟e"
 
-#: gconf/gconfd.c:402
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Modtog signal %d, lukker ned p� rigtig m嶟e"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:451
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "starter (version %s), pid %u bruger '%s'"
 
-#: gconf/gconfd.c:455
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr "GConf er bygget med fejls鷤ningsfunktioner aktiveret"
 
-#: gconf/gconfd.c:478
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -899,11 +1038,11 @@ msgstr ""
 "Kunne ikke initialisere Object Activation Framework: venligst send en "
 "fejlrapport til OAF udviklerene"
 
-#: gconf/gconfd.c:498
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Kunne ikke hente objektreference for ConfigServer"
 
-#: gconf/gconfd.c:518
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -911,28 +1050,24 @@ msgstr ""
 "OAF kender ikke vor IID; indikerer fejl i installation; kan ikke\n"
 "registrere; afslutter\n"
 
-#: gconf/gconfd.c:522
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "En anden gconfd er allerede registreret hos OAF; afslutter\n"
 
-#: gconf/gconfd.c:527
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Ukendt fejl ved registrering af gconfd hos OAF, afslutter\n"
 
-#: gconf/gconfd.c:565
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Afslutter"
 
-#: gconf/gconfd.c:589
-msgid "GConf server is not in use, shutting down."
-msgstr "GConf server er ikke i brug, lukker ned."
-
-#: gconf/gconfd.c:924
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Returnerede undtagelse: %s"
 
-#: gconf/gconfd.c:1012
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -941,38 +1076,38 @@ msgstr ""
 "Kunne ikke 嶙ne gconfd logfil; vil ikke kunne genoprette lyttere efter "
 "nedlukning af gconfd (%s)"
 
-#: gconf/gconfd.c:1035
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr "Kunne ikke lukke gconfd logfil; data blev m廛ke ikke gemt rigtigt (%s)"
 
-#: gconf/gconfd.c:1098
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Kunne ikke 嶙ne tilstandsgemmefil '%s' for skriving: %s"
 
-#: gconf/gconfd.c:1112
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Kunne ikke skrive tilstandsgemmefil '%s' fd: %d: %s"
 
-#: gconf/gconfd.c:1121
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Kunne ikke lukke ny tilstandsgemmefil '%s': %s"
 
-#: gconf/gconfd.c:1135
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Kunne ikke flytte gammel tilstandsgemmefil '%s': %s"
 
-#: gconf/gconfd.c:1145
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Kunne ikke flytte ny tilstandsgemmefil p� plads: %s"
 
-#: gconf/gconfd.c:1154
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -980,24 +1115,56 @@ msgstr ""
 "Kunne ikke genoprette oprindelig tilstandsgemmefil som er blevet flyttet til "
 "'%s': %s"
 
-#: gconf/gconfd.c:1627
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Kunne ikke 嶙ne tilstandsgemmefil: %s"
+
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Kunne ikke 嶙ne tilstandsgemmefil: %s"
+
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr "Kunne ikke skrive tilf鷮else af klient til tilstandsgemmefil: %s"
+
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "Kunne ikke skrive tilf鷮else af klient til tilstandsgemmefil: %s"
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Kunne ikke 嶙ne tilstandsgemmefil: %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 "Kunne ikke genoprette en lytter p� adresse '%s', kunne ikke finde databasen"
 
-#: gconf/gconfd.c:1673
-#, c-format
-msgid "Error reading saved state file: %s"
-msgstr "Fejl ved l犘ning af tilstandsgemmefil: %s"
-
-#: gconf/gconfd.c:1726
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Kunne ikke 嶙ne tilstandsgemmefil '%s': %s"
 
-#: gconf/gconfd.c:1843
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to "
@@ -1006,7 +1173,7 @@ msgstr ""
 "Kunne ikke logge tilf鷮else af lytter til gconfd logfilen; vil ikke kunne "
 "tilf鷮e lytteren hvis gconfd afslutter eller lukker ned (%s)"
 
-#: gconf/gconfd.c:1848
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously "
@@ -1015,32 +1182,6 @@ msgstr ""
 "Kunne ikke logge fjernelse af lytter i gconfd-logfilen; kan medf鷨e at "
 "lytter l熚ges ind igen hvis gconfd afsluttes eller maskinen lukkes ned (%s)."
 
-#: gconf/gconfd.c:1871 gconf/gconfd.c:2032
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "Kunne ikke f� IOR for klient: %s"
-
-#: gconf/gconfd.c:1886
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "Kunne ikke 嶙ne tilstandsgemmefil: %s"
-
-#: gconf/gconfd.c:1899
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr "Kunne ikke skrive tilf鷮else af klient til tilstandsgemmefil: %s"
-
-#: gconf/gconfd.c:1907
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr "Kunne ikke afslutte tilf鷮else af klient til tilstandsgemmefil: %s"
-
-#: gconf/gconfd.c:1993
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr ""
-"En klient fjernede sig selv fra GConf serveren da den ikke blev tilf鷮et."
-
 #: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Hj熞peindstillinger"
@@ -1347,219 +1488,213 @@ msgstr "Fejl under splitning af konfigurationstjeneren (gconfd): %s\n"
 msgid "Must specify a key or keys to get\n"
 msgstr "Skal angive n鷤le eller n鷤ler for at f嫹n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Type: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listetype: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car-type: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr-type: %s\n"
 
-#: gconf/gconftool.c:894
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr "Standardv熳di: %s\n"
+msgid "Owner: %s\n"
+msgstr "Ejer: %s\n"
 
-#: gconf/gconftool.c:894 gconf/gconftool.c:896 gconf/gconftool.c:897
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Nulstil"
 
-#: gconf/gconftool.c:896
-#, c-format
-msgid "Owner: %s\n"
-msgstr "Ejer: %s\n"
-
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kort beskriv.: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Lang beskriv.: %s\n"
 
-#: gconf/gconftool.c:907
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Ingen v熳di sat for '%s'\n"
 
-#: gconf/gconftool.c:911
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Kunne ikke f� v熳di for '%s': %s\n"
 
-#: gconf/gconftool.c:954 gconf/gconftool.c:966
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Forst緳 ikke type `%s'\n"
 
-#: gconf/gconftool.c:978
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Skal angive skiftevis n鷤ler/v熳dier som argumenter\n"
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Ingen v熳di sat for n鷤le: `%s'\n"
 
-#: gconf/gconftool.c:1026
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Kan ikke s犚te skema som v熳di\n"
 
-#: gconf/gconftool.c:1036
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "N緳 en liste s犚tes skal du angive en primitiv liste-type\n"
 
-#: gconf/gconftool.c:1050
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "N緳 et par s犚tes skal du angive en primitiv car-type og cdr-type\n"
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fejl: %s\n"
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1211
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Fejl under s犚ning af v熳di: %s"
 
-#: gconf/gconftool.c:1096 gconf/gconftool.c:1225
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Fejl ved synkronisering: %s"
 
-#: gconf/gconftool.c:1114
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Du skal angive n鷤le (skemanavn) som eneste argument\n"
 
-#: gconf/gconftool.c:1156
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Listetype skal v熳e en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Parrets car-type skal v熳e en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1196
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Parrets cdr-type skal v熳e en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1240
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Der skal angives en eller flere kataloger der kan hentes n鷤le/v熳di-par "
 "fra.\n"
 
-#: gconf/gconftool.c:1254
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Der skal angives en eller flere n鷤ler som skal nulstilles.\n"
 
-#: gconf/gconftool.c:1265
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Fejl under nulstilling af `%s': %s\n"
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Der skal specificeres et eller flere kataloger som der skal hentes "
 "underkataloger fra.\n"
 
-#: gconf/gconftool.c:1322
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Fejl ved visning af kataloger: %s\n"
 
-#: gconf/gconftool.c:1364
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende type for skema (%s)\n"
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende list_type for skema (%s)\n"
 
-#: gconf/gconftool.c:1384 gconf/gconftool.c:1414 gconf/gconftool.c:1443
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "ADVARSEL: Kunne ikke fortolke standardv熳di `%s' for skema (%s)\n"
 
-#: gconf/gconftool.c:1402
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende car_type for skema (%s)\n"
 
-#: gconf/gconftool.c:1427
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "ADVARSEL: Du kan ikke s犚te en standardv熳di for et skema\n"
 
-#: gconf/gconftool.c:1456
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "ADVARSEL: gconftool, intern fejl, ukendt GConfValueType\n"
 
-#: gconf/gconftool.c:1504 gconf/gconftool.c:1525 gconf/gconftool.c:1546
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ADVARSEL: kunne ikke tolke typenavn '%s'\n"
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: list_type kan kun v熳e int, float, string eller bool og ikke `%s'\n"
 
-#: gconf/gconftool.c:1542
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: car_type kan kun v熳e int, float, string eller bool og ikke `%s'\n"
 
-#: gconf/gconftool.c:1563
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: cdr_type kan kun v熳e int, float, string eller bool og ikke `%s'\n"
 
-#: gconf/gconftool.c:1590
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "ADVARSEL: tom <applyto> node"
 
-#: gconf/gconftool.c:1593 gconf/gconftool.c:1856
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ADVARSEL: node <%s> ikke forst嶒t under <skema>\n"
 
-#: gconf/gconftool.c:1603
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "ADVARSEL: ingen n鷤le angivet for skema\n"
 
-#: gconf/gconftool.c:1636
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "ADVARSEL: <lokale> node har ingen 'navn=\"lokale\" attribut, ignorerer\n"
 
-#: gconf/gconftool.c:1642
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1567,51 +1702,51 @@ msgstr ""
 "ADVARSEL: flere <lokale> noder for lokale '%s', ignorerer alle andre end den "
 "f鷨ste\n"
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "ADVARSEL: Ugyldig node <%s> i en <lokale> node\n"
 
-#: gconf/gconftool.c:1752
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "ADVARSEL: Kunne ikke installere skema '%s' lokale '%s': %s\n"
 
-#: gconf/gconftool.c:1760
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Installerede skema '%s' for lokale '%s'\n"
 
-#: gconf/gconftool.c:1782
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "ADVARSEL: kunne ikke associere skema `%s' med n鷤le `%s': %s\n"
 
-#: gconf/gconftool.c:1790
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Vedh熠tede skema '%s' til n鷤le '%s'\n"
 
-#: gconf/gconftool.c:1869
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Du skal have mindst et <lokale> i et <skema>\n"
 
-#: gconf/gconftool.c:1898
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "ADVARSEL: node <%s> ikke forst嶒t under <skemaliste>\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Kunne ikke 嶙ne '%s': %s\n"
 
-#: gconf/gconftool.c:1927
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokumentet '%s' er tomt?\n"
 
-#: gconf/gconftool.c:1939
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1620,26 +1755,26 @@ msgstr ""
 "Dokument `%s' har forkert type rod-node (<%s>, skulle v熳e "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1952
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokument `%s' har ingen top niveau <gconfskemafil> node\n"
 
-#: gconf/gconftool.c:1966
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ADVARSEL: node <%s> herunder <gconfskemafil> ikke forst嶒t\n"
 
-#: gconf/gconftool.c:1977 gconf/gconftool.c:2009
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Fejl ved synkronisering af konfigdata: %s"
 
-#: gconf/gconftool.c:1993
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Skal angive nogen skema-filer til installering\n"
 
-#: gconf/gconftool.c:2030
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1648,16 +1783,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2050
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Kunne ikke fjerne afbrydelsesn鷤le %s: %s\n"
 
-#: gconf/gconftool.c:2176
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "Skal angive en eller flere n鷤ler for afbrydelse.\n"
 
-#: gconf/gconftool.c:2182
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1667,11 +1802,11 @@ msgstr ""
 "n鷤le:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2200
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "Skal angive nogle kataloger som skal kn熥kes\n"
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1682,17 +1817,69 @@ msgstr ""
 "n鷤ler i katalog:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "GConf fejl: %s\n"
-
-#: wrappers/gtk/gconf-client.c:795
+#: 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:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Forventede %s, fik %s for n鷤le %s"
+
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "Afl犘ser BerkeleyDB-backend-modulet."
+
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "鶴nede BerkeleyDB kilde med rod %s"
+
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "Opstarter BDB-backend-modul"
+
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "Kunne ikke finde %s-rodkatalog p� adressen '%s'"
+
+#~ msgid ""
+#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ msgstr "Kunne ikke l犘e fra eller skrive til %s-rodkatalog p� adressen '%s'"
+
+#~ msgid "No database available to save your configuration"
+#~ msgstr "Ingen database tilg熡gelig for lagring af din konfiguration"
+
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "OAF-problemsbeskrivelse: %s"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Kunne ikke lagre v熳di i n鷤le '%s'"
+
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgstr ""
+#~ "Modtog signal %d, dumper hukommelsen. Rapport廨 venligst en GConf fejl."
+
+#~ msgid ""
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ msgstr ""
+#~ "Modtog signal %d, lukker unormalt ned. Rapport廨 venligst en GConf fejl."
+
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "GConf server er ikke i brug, lukker ned."
+
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "Fejl ved l犘ning af tilstandsgemmefil: %s"
+
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "Kunne ikke f� IOR for klient: %s"
+
+#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgstr "Kunne ikke afslutte tilf鷮else af klient til tilstandsgemmefil: %s"
+
+#~ msgid ""
+#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ msgstr ""
+#~ "En klient fjernede sig selv fra GConf serveren da den ikke blev tilf鷮et."
+
+#~ msgid "Default Value: %s\n"
+#~ msgstr "Standardv熳di: %s\n"
+
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "GConf fejl: %s\n"
diff --git a/po/de.po b/po/de.po
index 60d60bc6..4ded5661 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gConf  0.10\n"
-"POT-Creation-Date: 2000-10-28 16:24+0200\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-10-28 16:26+0200\n"
 "Last-Translator: Kai Lahmann <kl@linuxfaqs.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -29,7 +29,7 @@ msgstr "XML-Backend-Modul wird aus dem Speicher entfernt."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Konnte das XML-Rootverzeichnis nicht an der Adresse `%s' finden"
 
-#: backends/xml-backend.c:301 backends/xml-dir.c:1035
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Konnte Verzeichnis `%s' nicht erstellen: %s"
@@ -60,7 +60,7 @@ msgstr ""
 "Unsynchronisiertes Verzeichnis wird gel飉cht, wenn das XML-Backend beendet "
 "wird"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -69,7 +69,7 @@ msgstr ""
 "Kann das Verzeichnis %s nicht vom XML-Backand-Cache entfernen, weil es nicht "
 "erfolgreich synchronisiert werden konnte"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -114,32 +114,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "l飉chen der alten Datei %s gescheitert: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:790
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Konnte `%s' nicht mit stat() untersuchen: %s"
 
-#: backends/xml-dir.c:934
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "doppelter Eintrag %s in %s, ignoriere"
 
-#: backends/xml-dir.c:956
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Eintrag ohne Namen in der XML-Datei %s, ignoriere"
 
-#: backends/xml-dir.c:963
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Oberstes Element in der XML-Datei `%s' ist kein <entry>, ignoriere"
 
-#: backends/xml-dir.c:1051
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Erstellen von Datei %s gescheitert: %s"
 
-#: backends/xml-dir.c:1059 gconf/gconf-internals.c:2470
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Konnte Datei `%s' nicht schlie絽n: %s"
@@ -150,7 +150,7 @@ msgstr "Konnte Datei `%s' nicht schlie絽n: %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignoriere XML-Element mit Namen %s: %s"
 
-#: backends/xml-entry.c:199
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -276,31 +276,30 @@ msgstr "Konnte Backend-Modul f�r `%s' nicht finden"
 msgid "Failed to shut down backend"
 msgstr "Konnte Backend nicht herunterfahren"
 
-#: gconf/gconf-database.c:233
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Habe ung�ltigen Wert in Einstellungsanfrage erhalten"
 
-#: gconf/gconf-database.c:241
+#: gconf/gconf-database.c:201
 #, c-format
-msgid ""
-"Couldn't make sense of CORBA value received in set request for key `%s'"
+msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Konnte Sinn des CORBA-Wertes in Einstellungsanfrage f�r Schl�ssel `%s' nicht "
 "ausmachen"
 
-#: gconf/gconf-database.c:518
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "Habe Anfrage zum Fallenlassen aller Daten im Cache erhalten"
 
-#: gconf/gconf-database.c:535
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Habe Anfrage zum synchronen Synchronisieren erhalten"
 
-#: gconf/gconf-database.c:602
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Schwere Fehler: Konnte Objektreferenz f�r ConfigServer nicht erhalten"
 
-#: gconf/gconf-database.c:761
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Konnte ein oder mehrere Quellen nicht synchronisieren: %s"
@@ -309,7 +308,7 @@ msgstr "Konnte ein oder mehrere Quellen nicht synchronisieren: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:843
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -317,16 +316,16 @@ msgid ""
 "configuration changes."
 msgstr ""
 "Konnte Hinzuf�gen eines Zuh顤ers (%s) nicht in Logdatei verzeichnen; werde "
-"nicht in der Lage sein, ihn bei einem Neustart von gconfd wiederherzustellen, "
-"was zu einer unzuverl酲sigen Benachrichtigung �ber Konfigurations鄚derungen "
-"f�hren wird."
+"nicht in der Lage sein, ihn bei einem Neustart von gconfd "
+"wiederherzustellen, was zu einer unzuverl酲sigen Benachrichtigung �ber "
+"Konfigurations鄚derungen f�hren wird."
 
-#: gconf/gconf-database.c:868
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Zuh顤er-ID %lu existiert nicht"
 
-#: gconf/gconf-database.c:877
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -336,47 +335,47 @@ msgstr ""
 "(wahrscheinlich harmlos, k霵nte zu einer seltsamerweise neu erscheinenden "
 "Benachrichtung f�hren): %s"
 
-#: gconf/gconf-database.c:989 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fehler beim Erhalten des Wertes f�r `%s': %s"
 
-#: gconf/gconf-database.c:1031
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Fehler beim Einstellen des Wertes f�r `%s': %s"
 
-#: gconf/gconf-database.c:1074
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Fehler beim L飉chen von `%s': %s"
 
-#: gconf/gconf-database.c:1098
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Fehler beim Erhalten des voreingestellten Wertes f�r `%s': %s"
 
-#: gconf/gconf-database.c:1137
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Fehler beim Pr�fen der Existenz von `%s': %s"
 
-#: gconf/gconf-database.c:1161
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Fehler beim Entfernen von Verzeichnis `%s': %s"
 
-#: gconf/gconf-database.c:1187
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Fehler beim Erhalten aller Eintr輍e in `%s': %s"
 
-#: gconf/gconf-database.c:1213
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Fehler beim Auflisten der Verzeichnisse in `%s': %s"
 
-#: gconf/gconf-database.c:1234
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Fehler beim Einstellen des Schemas f�r `%s': %s"
@@ -441,11 +440,7 @@ msgstr "Operation ohne Konfigurationsserver nicht erlaubt"
 msgid "Failed to get a lock"
 msgstr "Konnte kein Lock erhalten"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "Es wurde keine Datenbank gefunden, um die Konfiguration abzuspeichern."
-
-#: gconf/gconf-glib.c:657
+#: gconf/gconf-glib.c:629
 #, c-format
 msgid ""
 "Error on line %d char %d: %s\n"
@@ -454,29 +449,29 @@ msgstr ""
 "Fehler in Zeile %d, Zeichen %d: %s\n"
 "(Der umgebende Text war '%s')\n"
 
-#: gconf/gconf-glib.c:777
+#: gconf/gconf-glib.c:749
 msgid ""
 "Text ended in the middle of an entity, or entity name too long to be valid "
 "('&' should begin an entity such as '&quot;')"
 msgstr ""
-"Text endete mitten in einer Entity, oder Entityname ist zu lang, um g�ltig zu "
-"sein ('&' sollte am Anfang einer Entity wie '&quot;' stehen)"
+"Text endete mitten in einer Entity, oder Entityname ist zu lang, um g�ltig "
+"zu sein ('&' sollte am Anfang einer Entity wie '&quot;' stehen)"
 
-#: gconf/gconf-glib.c:829
+#: gconf/gconf-glib.c:801
 #, c-format
 msgid ""
 "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
 msgstr ""
-"Unbekannte Entity '%s' ('&' muss am Anfang einer Entity wie &amp; &quot; &lt; "
-"&gt; &apos; stehen)"
+"Unbekannte Entity '%s' ('&' muss am Anfang einer Entity wie &amp; &quot; "
+"&lt; &gt; &apos; stehen)"
 
-#: gconf/gconf-glib.c:869
+#: gconf/gconf-glib.c:841
 msgid ""
 "Markup text ended in the middle of a character reference, just after '&#'"
 msgstr ""
 "Markierter Text endete mitten in einer Zeichenreferenz, gleich nach '&#'"
 
-#: gconf/gconf-glib.c:895
+#: gconf/gconf-glib.c:867
 #, c-format
 msgid ""
 "Character reference contained non-digit '%s' ('&#' should begin a reference "
@@ -485,7 +480,7 @@ msgstr ""
 "Zeichenreferenz enhielt `non-digit' '%s' ('&#' sollte am Anfang einer "
 "Referenz mit einem Unicode-Zeichen stehen, z.B. '&#2342;')"
 
-#: gconf/gconf-glib.c:919
+#: gconf/gconf-glib.c:891
 msgid ""
 "Text ended in the middle of an character reference ('&#' should begin a "
 "character reference such as '&#2342;')"
@@ -493,7 +488,7 @@ msgstr ""
 "Text endete in der Mitte einer Zeichenreferenz ('&#' sollte am Anfang einer "
 "Zeichenreferenz wie '&#2342;' stehen)"
 
-#: gconf/gconf-glib.c:944
+#: gconf/gconf-glib.c:916
 #, c-format
 msgid ""
 "Couldn't parse character reference '%s' ('&#' must begin a character "
@@ -502,24 +497,25 @@ msgstr ""
 "Konnte Zeichenreferenz '%s' nicht parsen ('&#' muss am Anfang einer "
 "Zeichenreferenz stehen, z.B. '&#2342;')"
 
-#: gconf/gconf-glib.c:966
+#: gconf/gconf-glib.c:938
 #, c-format
 msgid ""
-"Character code %#lx is not allowed in XML documents or is not a valid Unicode "
-"character"
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
 msgstr ""
 "Zeichencode %#lx ist in XML-Dokumenten nicht erlaubt oder ist kein g�ltiges "
 "Unicode-Zeichen"
 
-#: gconf/gconf-glib.c:1041
+#: gconf/gconf-glib.c:1013
+#, fuzzy
 msgid ""
-"Document ended just after an '&', '&' should begin an entity or character "
+"Documented ended just after an '&', '&' should begin an entity or character "
 "reference."
 msgstr ""
 "Dokument endete genau nach einem '&', '&' sollte eine Entity oder eine "
 "Zeichenreferenz einleiten."
 
-#: gconf/gconf-glib.c:1055
+#: gconf/gconf-glib.c:1027
 msgid ""
 "'<' or '>' character not allowed here; only allowed around tags, for example "
 "<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
@@ -529,35 +525,35 @@ msgstr ""
 "<bold> oder <paragraph>. Um sie sonst zu verwenden, bitte &lt; and &gt; "
 "benutzen"
 
-#: gconf/gconf-glib.c:1110
+#: gconf/gconf-glib.c:1082
 #, c-format
 msgid "Character '%s' is not valid at the start of an attribute name"
 msgstr "Zeichen '%s' ist am Anfang eines Attributnamens ung�ltig"
 
-#: gconf/gconf-glib.c:1137
+#: gconf/gconf-glib.c:1109
 msgid "Document ended just after attribute name"
 msgstr "Dokument h顤te genau nach einem Attributnamen auf"
 
-#: gconf/gconf-glib.c:1148
+#: gconf/gconf-glib.c:1120
 msgid "Attribute name must be immediately followed by an '=' character"
 msgstr "Nach einem Attributnamen muss sofort ein '=' Zeichen folgen"
 
-#: gconf/gconf-glib.c:1163
+#: gconf/gconf-glib.c:1135
 msgid ""
 "'=' character after attribute must be immediately followed by an '\"' "
 "character"
 msgstr "'=' Zeichen muss unmittelbar nach einem'\"' Zeichen stehen"
 
-#: gconf/gconf-glib.c:1189
+#: gconf/gconf-glib.c:1161
 #, c-format
 msgid ""
 "Character '%c' found inside an attribute value; perhaps your attribute value "
 "is missing the closing quotation mark '\"'"
 msgstr ""
-"Zeichen '%c' wurde in einem Attributwert gefunden; vielleicht fehlt bei Ihrem "
-"Attributwert das schlie絽nde Anf�hrungszeichen '\"'"
+"Zeichen '%c' wurde in einem Attributwert gefunden; vielleicht fehlt bei "
+"Ihrem Attributwert das schlie絽nde Anf�hrungszeichen '\"'"
 
-#: gconf/gconf-glib.c:1209
+#: gconf/gconf-glib.c:1181
 msgid ""
 "Ran out of text before a quote mark ('\"') was seen at the end of an "
 "attribute value"
@@ -565,40 +561,40 @@ msgstr ""
 "Text ging �ber ein Anf�hrungszeichen ('\"') hinaus. Es wurde kein "
 "Anf�hrungszeichen gefunden"
 
-#: gconf/gconf-glib.c:1222
+#: gconf/gconf-glib.c:1194
 msgid ""
 "Text ends immediately after an attribute value, before the element was closed"
 msgstr ""
 "Text endete unmittelbar nach einem Attributwert, bevor �berhaupt das Element "
 "geschlossen wurde"
 
-#: gconf/gconf-glib.c:1536
+#: gconf/gconf-glib.c:1508
 msgid "Missing '<' at start of element"
 msgstr "'<' fehlt am Anfang des Elements"
 
-#: gconf/gconf-glib.c:1547
+#: gconf/gconf-glib.c:1519
 msgid "Document ended just after '<' character"
 msgstr "Dokument endete genau nach einem '<' Zeichen"
 
-#: gconf/gconf-glib.c:1575
+#: gconf/gconf-glib.c:1547
 msgid "No closing '>' found for a <? or <!"
 msgstr "Kein schlie絽ndes '>' gefunden f�r <? oder <!"
 
-#: gconf/gconf-glib.c:1604
+#: gconf/gconf-glib.c:1576
 #, c-format
 msgid "Character '%s' is not valid at the start of an element name"
 msgstr "Zeichen '%s' ist am Anfang eines Elementnamens nicht erlaubt"
 
-#: gconf/gconf-glib.c:1628 gconf/gconf-glib.c:1641
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
 msgid "Document ended just after element name, no '>' seen"
 msgstr "Dokument endete genau nach einem Elementnamen, kein '>' gefunden"
 
-#: gconf/gconf-glib.c:1666
+#: gconf/gconf-glib.c:1638
 #, c-format
 msgid "Elements should be closed with '>' or '/>', not with '%s'"
 msgstr "Elemente sollten mit '>' oder '/>' geschlossen werden, nicht mit '%s'"
 
-#: gconf/gconf-glib.c:1683
+#: gconf/gconf-glib.c:1655
 msgid ""
 "Element ended just after '/', no '>' seen; empty elements should end with "
 "'/>'"
@@ -606,40 +602,40 @@ msgstr ""
 "Element endete ganau nach '/', '>' wurde nicht gefunden; leere Elemente "
 "sollten mit einem '/>' geschlossen werden"
 
-#: gconf/gconf-glib.c:1722
+#: gconf/gconf-glib.c:1694
 msgid "Close tag not found at end of element"
 msgstr "Tag zum Schlie絽n am Ende des Elements nicht gefunden"
 
-#: gconf/gconf-glib.c:1737
+#: gconf/gconf-glib.c:1709
 msgid "Close tag ends just after '<' character"
 msgstr "Tag zum Schlie絽n endet genau nach '<' Zeichen"
 
-#: gconf/gconf-glib.c:1751
+#: gconf/gconf-glib.c:1723
 msgid "Close tag should begin with '</', '/' character is missing"
 msgstr ""
 "Tag zum Schlie絽n sollte mit einem '</' Zeichen beginnen, '/' Zeichen fehlt"
 
-#: gconf/gconf-glib.c:1765
+#: gconf/gconf-glib.c:1737
 msgid "Close tag ends just after '/' character"
 msgstr "Tag zum Schlie絽n endet genau nach einem '/' Zeichen"
 
-#: gconf/gconf-glib.c:1800
+#: gconf/gconf-glib.c:1772
 msgid "Document ended just after element name in close tag, no '>' seen"
 msgstr ""
-"Dokument endete genau nach Elementnamen im Tag f�r Schlie絽n, '>' wurde nicht "
-"gefunden"
+"Dokument endete genau nach Elementnamen im Tag f�r Schlie絽n, '>' wurde "
+"nicht gefunden"
 
-#: gconf/gconf-glib.c:1816
+#: gconf/gconf-glib.c:1788
 msgid "Document ended just after close tag name, no '>' seen"
 msgstr ""
 "Dokument endete genau nach Tag Name f�r Schlie絽n, '>' wurde nicht gefunden"
 
-#: gconf/gconf-glib.c:1835
+#: gconf/gconf-glib.c:1807
 #, c-format
 msgid "Close tag '%s' does not match opening tag '%s'"
 msgstr "Tag f�r Schlie絽n '%s' passt nicht zum Tag f�r 猈fnen '%s'"
 
-#: gconf/gconf-glib.c:2173
+#: gconf/gconf-glib.c:2145
 #, c-format
 msgid ""
 "Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
@@ -648,16 +644,16 @@ msgstr ""
 "Ung�ltiges UTF-8 Zeichen bei Byte %d im markierten Text. Der Text vor dem "
 "falschen Zeichen war '%s'"
 
-#: gconf/gconf-glib.c:2230
+#: gconf/gconf-glib.c:2202
 msgid "The marked-up text contained nothing but whitespace."
 msgstr "Dieser markierte Text enthielt nicht mehr als nur Leerzeichen."
 
-#: gconf/gconf-glib.c:10694
+#: gconf/gconf-glib.c:10666
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Konnte Datei `%s' nicht 鐪fnen: %s"
 
-#: gconf/gconf-glib.c:10711
+#: gconf/gconf-glib.c:10683
 #, c-format
 msgid "Error reading file '%s': %s"
 msgstr "Fehler beim Lesen der Datei '%s': %s"
@@ -734,54 +730,49 @@ 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:2157 gconf/gconf.c:2945
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-Fehler: %s"
 
-#: gconf/gconf-internals.c:2173
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "OAF Problembeschreibung: '%s'"
-
-#: gconf/gconf-internals.c:2179
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "Versuch, nicht aufgelistetes OAF-Objektverzeichnis zu entfernen"
 
-#: gconf/gconf-internals.c:2184
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "Versuch, bereits aufgelistetes OAF-Verzeichnis hinzuzuf�gen"
 
-#: gconf/gconf-internals.c:2191
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF-Parserfehler: %s"
 
-#: gconf/gconf-internals.c:2196
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Unbekannter OAF-Fehler"
 
-#: gconf/gconf-internals.c:2279
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Keine ior-Datei in `%s'"
 
-#: gconf/gconf-internals.c:2310
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd erh鄟t Sperre `%s' von einem anderen Prozess"
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Ein anderes Programm hat die Sperre `%s'"
 
-#: gconf/gconf-internals.c:2341
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 "Konnte keinen Kontakt mit ORB aufnehmen, um existierenden gconfd zu pingen"
 
-#: gconf/gconf-internals.c:2349
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -790,44 +781,44 @@ msgstr ""
 "Entferne verfallene Sperre `%s', da IOR nicht in Objektreferenz umgewandelt "
 "werden konnte, IOR `%s'"
 
-#: gconf/gconf-internals.c:2361
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "Entferne verfallene Sperre `%s' auf Grund Fehlers beim Pingen des Servers: %s"
 
-#: gconf/gconf-internals.c:2373
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf-Konfigurationsd鄝on (gconfd) hat Sperre `%s'"
 
-#: gconf/gconf-internals.c:2387
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "Konnte Verzeichnis `%s' nicht anlegen: %s"
 
-#: gconf/gconf-internals.c:2422
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Kann Sperre `%s' nicht anlegen: %s"
 
-#: gconf/gconf-internals.c:2458
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kann nicht in Datei `%s' schreiben: %s"
 
-#: gconf/gconf-internals.c:2501
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "Kann Sperrdatei `%s' nicht 鐪fnen; nehme an, dass sie nicht Ihnen geh顤t: %s"
 
-#: gconf/gconf-internals.c:2518
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Besch輐igte Sperrdatei `%s', entferne sie sowieso"
 
-#: gconf/gconf-internals.c:2528
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -836,26 +827,26 @@ msgstr ""
 "Habe Sperrdatei `%s' (Erzeuger-PID %u, unsere PID %u) nicht angelegt; nehme "
 "an, dass uns jemand die Sperre weggenommen hat"
 
-#: gconf/gconf-internals.c:2545
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Konnte Sperrverzeichnis `%s' nicht freigeben: %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Fehler beim Laden der Quelle %s: %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Schema %s, abgegeben f�r %s speichert einen nicht-schematischen Wert"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Der Name '/' kann nur ein Verzeichnis sein, kein Schl�ssel"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -864,22 +855,17 @@ msgstr ""
 "Wert f�r '%s' gesetzt in einem Read-Only Bereich am Anfang des "
 "Konfigurationspfades."
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "Speichern des Wertes bei Schl�ssel '%s' nicht m鐷lich"
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Fehler beim Finden der Meta-Informationen: %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Fehler beim Ermitteln der Meta-Informationen: %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -951,94 +937,95 @@ msgstr "Verstehe %s nicht (zus酹zliches Uncodiertes ')' im Paar gefunden)"
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Server konnte Adresse `%s' nicht aufl飉en"
 
-#: gconf/gconf.c:568
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 "Kann keine Benachrichtigungen zu einer lokalen Konfigurationsquelle "
 "hinzuf�gen"
 
-#: gconf/gconf.c:1724
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr ""
 "Das Hinzuf�gen des Clients zu der Serverliste ist fehlgeschlagen. "
 "CORBA-Fehler: %s"
 
-#: gconf/gconf.c:1740
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
 "Please file an OAF bug report."
 msgstr ""
 "Fehler beim Kontaktieren des Konfigurationsservers: OAF gab NULL aus "
-"oaf_activate_from_id() zur�ck und hat keinen Ausnahmezustand gesetzt, der das "
-"Problem erkl酺en w�rde. Bitte schicken Sie einen Fehlerbericht zu OAF ein."
+"oaf_activate_from_id() zur�ck und hat keinen Ausnahmezustand gesetzt, der "
+"das Problem erkl酺en w�rde. Bitte schicken Sie einen Fehlerbericht zu OAF "
+"ein."
 
-#: gconf/gconf.c:2051
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Konnte GConf nicht initialisieren, breche ab\n"
 
-#: gconf/gconf.c:2088
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Muss mit einem Schr輍strich beginnen (/)"
 
-#: gconf/gconf.c:2110
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kann keine zwei Schr輍striche (/) hintereinander haben"
 
-#: gconf/gconf.c:2112
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kann keinen Punkt (.) direkt hinter einem Schr輍strich (/) haben"
 
-#: gconf/gconf.c:2133
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' ist ein unerlaubtes Zeichen in Schl�ssel-/Verzeichnisnamen"
 
-#: gconf/gconf.c:2147
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Schl�ssel/Verzeichnis darf nicht mit einem Schr輍strich (/) enden"
 
-#: gconf/gconf.c:2400
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fehler beim Herunterfahren des Konfigurationsservers: %s"
 
-#: gconf/gconf.c:2461
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Habe float erwartet, erhielt %s"
 
-#: gconf/gconf.c:2496
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Habe int erwartet, erhielt %s"
 
-#: gconf/gconf.c:2531
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Habe Zeichenkette erwartet, erhielt %s"
 
-#: gconf/gconf.c:2568
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Habe bool erwartet, erhielt %s"
 
-#: gconf/gconf.c:2601
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Habe Schema erwartet, erhielt %s"
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Beendigungsanfrage empfangen"
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -1046,7 +1033,7 @@ msgstr ""
 "gconfd mit Fehlerdiagnose compiliert; versuche, gconf.path aus dem "
 "Quellverzeichnis zu laden"
 
-#: gconf/gconfd.c:297
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1054,7 +1041,7 @@ msgstr ""
 "Keine Konfigurationsdateien gefunden, versuche, die voreingestellte "
 "Konfigurationsquelle `%s' zu benutzen"
 
-#: gconf/gconfd.c:306
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1062,12 +1049,12 @@ msgstr ""
 "Keine Konfigurationsquellen im Quellpfad, Konfiguration wird nicht "
 "gespeichert werden; "
 
-#: gconf/gconfd.c:320
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Fehler beim Laden von Konfigurationsquellen: %s"
 
-#: gconf/gconfd.c:332
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1075,7 +1062,7 @@ msgstr ""
 "Keine Konfigurations-Quelladressen erfolgreich aufgel飉t, kann "
 "Konfigurationsdaten nicht laden oder speichern"
 
-#: gconf/gconfd.c:349
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1083,35 +1070,28 @@ msgstr ""
 "Keine schreibbaren Konfigurationsquellen konnten erfolgreich aufgel飉t "
 "werden; manche Konfigurations鄚derungen k霵nen nicht gespeichert werden"
 
-#: gconf/gconfd.c:375
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr "Signal %d erhalten, Absturz. Bitte melden Sie einen GConf-Bug."
-
-#: gconf/gconfd.c:391
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"Signal %d erhalten, unplanm魠iges Beenden. Bitte melden Sie einen GConf-Bug."
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down."
+msgstr "Signal %d erhalten, saubers Herunterfahren"
 
-#: gconf/gconfd.c:408
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Signal %d erhalten, saubers Herunterfahren"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:457
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "(version %s) wird gestartet, PID %u, Benutzer `%s'"
 
-#: gconf/gconfd.c:461
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr "GConf wurde mit Debugging Funktionen kompiliert"
 
-#: gconf/gconfd.c:484
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -1119,40 +1099,36 @@ msgstr ""
 "Konnte Object Activation Framework nicht initialisieren; bitte schicken Sie "
 "einen Fehlerbericht an die Paketpfleger von OAf"
 
-#: gconf/gconfd.c:504
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Konnte Objektreferenz f�r ConfigServer nicht erhalten"
 
-#: gconf/gconfd.c:524
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
 msgstr ""
-"OAF kennt unsere IID nicht; dies weist auf eine besch輐igte Installation hin; "
-"kann nicht registrieren; breche ab\n"
+"OAF kennt unsere IID nicht; dies weist auf eine besch輐igte Installation "
+"hin; kann nicht registrieren; breche ab\n"
 
-#: gconf/gconfd.c:528
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Ein anderer gconfd ist bereits im OAF registriert; breche ab\n"
 
-#: gconf/gconfd.c:533
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Unbekannter Fehler beim Registrieren von gconfd im OAF; breche ab\n"
 
-#: gconf/gconfd.c:571
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Breche ab"
 
-#: gconf/gconfd.c:595
-msgid "GConf server is not in use, shutting down."
-msgstr "GConf-Server wird nicht benutzt, wird beendet."
-
-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Ausnahmefehler: %s"
 
-#: gconf/gconfd.c:1018
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1161,7 +1137,7 @@ msgstr ""
 "Konnte gconfd-Logdatei nicht 鐪fnen; werde nicht in der Lage sein, Zuh顤er "
 "nach gconfd-Herunterfahren wiederherzustellen (%s)"
 
-#: gconf/gconfd.c:1041
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1169,108 +1145,113 @@ msgstr ""
 "Konnte gconfd-Logdatei nicht schlie絽n; Daten k霵nen evtl. nicht "
 "ordnungsgem魠 gespeichert worden sein (%s)"
 
-#: gconf/gconfd.c:1104
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Konnte Statusspeicherungs-Datei '%s' nicht zum Schreiben 鐪fnen: %s"
 
-#: gconf/gconfd.c:1118
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Konnte Statusspeicherungs-Datei '%s', FD %d, nicht schreiben: %s"
 
-#: gconf/gconfd.c:1127
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Konnte neue Statusspeicherungs-Datei '%s' nicht schlie絽n: %s"
 
-#: gconf/gconfd.c:1141
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Konnte alte Statusspeicherungs-Datei '%s' nicht wegbewegen: %s"
 
-#: gconf/gconfd.c:1151
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Konnte neue Statusspeicherungsdatei nicht auf ihren Platz bringen: %s"
 
-#: gconf/gconfd.c:1160
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
-"Konnte urspr�ngliche Statusspeicherungs-Datei, die auf '%s' verschoben worden "
-"war, nicht wiederherstellen: %s"
+"Konnte urspr�ngliche Statusspeicherungs-Datei, die auf '%s' verschoben "
+"worden war, nicht wiederherstellen: %s"
 
-#: gconf/gconfd.c:1633
-#, c-format
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "猈fnen der gespeicherten Status-Datei nicht m鐷lich: %s"
+
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "猈fnen der gespeicherten Status-Datei nicht m鐷lich: %s"
+
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr ""
+"Schreiben des Clients, der zur gespeicherten Statusdatei hinzugef�gt wurde, "
+"fehlgeschlagen: %s"
+
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr ""
+"Schreiben des Clients, der zur gespeicherten Statusdatei hinzugef�gt wurde, "
+"fehlgeschlagen: %s"
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "猈fnen der gespeicherten Status-Datei nicht m鐷lich: %s"
+
+#: gconf/gconfd.c:1204
 msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
 msgstr ""
-"Kann keinen Zuh顤er auf Adresse '%s' wiederherstellen, konnte Datenbank nicht "
-"aufl飉en"
 
-#: gconf/gconfd.c:1679
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Error reading saved state file: %s"
-msgstr "Lesen der gespeicherten Statusdatei fehlgeschlagen: %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
+"Kann keinen Zuh顤er auf Adresse '%s' wiederherstellen, konnte Datenbank "
+"nicht aufl飉en"
 
-#: gconf/gconfd.c:1732
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "猈fnen der gespeicherten Status Datei '%s' nicht m鐷lich: %s"
 
-#: gconf/gconfd.c:1849
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to re-add "
-"the listener if gconfd exits or shuts down (%s)"
+"Failed to log addition of listener to gconfd logfile; won't be able to "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 "Konnte Hinzuf�gen eines Zuh顤ers nicht in der gconfd-Logdatei verzeichnen; "
 "werde nicht in der Lage sein, ihn wieder hinzuzuf�gen, wenn gconfd beendet "
 "wird oder herunterf鄣rt (%s)"
 
-#: gconf/gconfd.c:1854
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously re-add "
-"the listener if gconfd exits or shuts down (%s)"
+"Failed to log removal of listener to gconfd logfile; might erroneously "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 "Konnte Entfernen eines Zuh顤ers nicht in der gconfd-Logdatei verzeichnen; "
 "werde ihn vielleicht irrt�mlich wieder hinzuf�gen, wenn gconfd beendet wird "
 "oder herunterf鄣rt (%s)"
 
-#: gconf/gconfd.c:1877 gconf/gconfd.c:2038
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "Empfangen des IOR f�r Client fehlgeschlagen: %s"
-
-#: gconf/gconfd.c:1892
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "猈fnen der gespeicherten Status-Datei nicht m鐷lich: %s"
-
-#: gconf/gconfd.c:1905
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr ""
-"Schreiben des Clients, der zur gespeicherten Statusdatei hinzugef�gt wurde, "
-"fehlgeschlagen: %s"
-
-#: gconf/gconfd.c:1913
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr ""
-"Entfernen des Clients, der zur gespeicherten Statusdatei hinzugef�gt wurde, "
-"fehlgeschlagen: %s"
-
-#: gconf/gconfd.c:1999
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr ""
-"Einige Clients entfernten sich selbst aus dem GConf-Server. Sie wurden jedoch "
-"nicht hinzugef�gt."
-
 #: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Hilfeoptionen"
@@ -1427,8 +1408,8 @@ msgid ""
 msgstr ""
 "Installiert Schemendateien auf der Kommandozeile korrekt in die Datenbank. "
 "Die Umgebungsvariable GCONF_CONFIG_SOURCE sollte auf eine andere "
-"Konfigurationsquelle als die voreingestellte gesetzt sein oder zur Verwendung "
-"der Voreinstellung die leere Zeichenkette enthalten."
+"Konfigurationsquelle als die voreingestellte gesetzt sein oder zur "
+"Verwendung der Voreinstellung die leere Zeichenkette enthalten."
 
 #: gconf/gconftool.c:270
 msgid ""
@@ -1679,7 +1660,8 @@ msgstr "Fehler beim Synchronisieren: %s"
 
 #: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
-msgstr "Sie m�ssen einen Schl�ssel (Schemaname) als einziges Argument angeben\n"
+msgstr ""
+"Sie m�ssen einen Schl�ssel (Schemaname) als einziges Argument angeben\n"
 
 #: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
@@ -1761,7 +1743,8 @@ msgstr "WARNUNG: konnte Typname `%s' nicht parsen\n"
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"Warnung: Listen-Typ can nur int, float, string oder bool sein, aber nicht %s\n"
+"Warnung: Listen-Typ can nur int, float, string oder bool sein, aber nicht "
+"%s\n"
 
 #: gconf/gconftool.c:1535
 #, c-format
@@ -1791,7 +1774,8 @@ msgstr "WARNUNG: kein Schl�ssel f�r Schema angegeben\n"
 #: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
-"WARNUNG: Knoten <locale> hat kein Attribut `name=\"locale\"', ignoriere dies\n"
+"WARNUNG: Knoten <locale> hat kein Attribut `name=\"locale\"', ignoriere "
+"dies\n"
 
 #: gconf/gconftool.c:1635
 #, c-format
@@ -1910,24 +1894,60 @@ msgstr "Sie m�ssen zu besch輐igende Verzeichnisse angeben\n"
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
-"directory:\n  %s\n"
+"directory:\n"
+"  %s\n"
 msgstr ""
 "Versuche, Ihre Anwendung durch Einstellen falscher Werte f�r Schl�ssel in "
 "einem Verzeichnis zu besch輐igen:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "GConf-Fehler: %s\n"
-
-#: wrappers/gtk/gconf-client.c:795
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf-Warnung: Fehler beim Auflisten von Paaren in `%s': %s"
 
-#: wrappers/gtk/gconf-client.c:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Erwartete %s, erhielt %s f�r den Schl�ssel %s"
 
+#~ msgid "No database available to save your configuration"
+#~ msgstr ""
+#~ "Es wurde keine Datenbank gefunden, um die Konfiguration abzuspeichern."
+
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "OAF Problembeschreibung: '%s'"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Speichern des Wertes bei Schl�ssel '%s' nicht m鐷lich"
+
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgstr "Signal %d erhalten, Absturz. Bitte melden Sie einen GConf-Bug."
+
+#~ msgid ""
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ msgstr ""
+#~ "Signal %d erhalten, unplanm魠iges Beenden. Bitte melden Sie einen GConf-Bug."
+
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "GConf-Server wird nicht benutzt, wird beendet."
+
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "Lesen der gespeicherten Statusdatei fehlgeschlagen: %s"
+
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "Empfangen des IOR f�r Client fehlgeschlagen: %s"
+
+#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgstr ""
+#~ "Entfernen des Clients, der zur gespeicherten Statusdatei hinzugef�gt wurde, "
+#~ "fehlgeschlagen: %s"
+
+#~ msgid ""
+#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ msgstr ""
+#~ "Einige Clients entfernten sich selbst aus dem GConf-Server. Sie wurden "
+#~ "jedoch nicht hinzugef�gt."
+
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "GConf-Fehler: %s\n"
diff --git a/po/el.po b/po/el.po
index 4b2472f5..9da590ab 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 1.1\n"
-"POT-Creation-Date: 2001-02-03 19:10+0000\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2001-02-03 19:49:58+0900\n"
 "Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -18,40 +18,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # backends/xml-backend.c:247
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "髑獿嚪�翴酃� � 斀縰魟 臝瀀轘齌鍡� BerkeleyDB (BDB)."
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "塘毉蘱賙� � 謦蜛 BerkeleyDB 黀� 齌縃蕓 罼轗錝蜧 %s"
-
-# backends/xml-backend.c:694
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "闌玃膬豵毇裎摋 � 斀縰魟 臝瀀轘齌鍡� BDB"
-
-# backends/xml-backend.c:300
-#: backends/dir-utils.c:88
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "鍵�罅鐋 � 濆鼫鵰 齌縃膬� 罼酃錪蜧� %s 黀� 僸濆儓薃� `%s'"
-
-# backends/xml-backend.c:315
-#: backends/dir-utils.c:104 backends/xml-backend.c:301 backends/xml-dir.c:1035
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "櫺擩瀦鼖葐 罼酃錪蜧� 撦�罅鐋 `%s': %s"
-
-# backends/xml-backend.c:400
-#: backends/dir-utils.c:192
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr ""
-"鍵�罅鐋 � 摿塨薋鵰 � 樍蜤暡� 黀� 齌縃蕓 罼轗錝蜧 %s 黀� 僸濆儓薃� `%s'"
-
-# backends/xml-backend.c:247
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "髑獿嚪�翴酃� � 斀縰魟 臝瀀轘齌鍡� XML"
@@ -62,6 +28,12 @@ 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:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "櫺擩瀦鼖葐 罼酃錪蜧� 撦�罅鐋 `%s': %s"
+
 # backends/xml-backend.c:400
 #: backends/xml-backend.c:386
 #, c-format
@@ -92,14 +64,14 @@ msgstr "鍵�罅鐋 � 謯鵘儌鵰 膹樥噘憼鐐� 黀瀍 罼轗錝蜧 XML `%s': %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -149,34 +121,34 @@ msgstr "鍵�罅鐋 僸摦鼁巑 鐐� 謯錆濈� 摙灚蜍� `%s': %s"
 
 # gconf/gconftool.c:1639
 #. These are all fatal errors
-#: backends/xml-dir.c:790
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "闋濻蘙葐 貘瀀謳錆鵰� 鐐� `%s': %s"
 
-#: backends/xml-dir.c:934
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:956
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:963
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
 # gconf/gconf-internals.c:2416
-#: backends/xml-dir.c:1051
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "鍵�罅鐋 � 儃擩瀦鼖葐 鐐� 摙灚蜍� `%s': %s"
 
 # gconf/gconf-internals.c:2416
-#: backends/xml-dir.c:1059 gconf/gconf-internals.c:2442
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "鍵�罅鐐 鐐 膹橀鶅斀 鐐� 摙灚蜍� `%s': %s"
@@ -189,7 +161,7 @@ msgid "Ignoring XML node with name `%s': %s"
 msgstr "錨薤踠� 蕓懧瀦 XML 懤 �臩憼 `%s': %s"
 
 # gconf/gconf-internals.c:2120
-#: backends/xml-entry.c:199
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -208,80 +180,82 @@ msgstr "錨薤踠� 瀍�憼鐐� 齀碡敳濿 `%s', 懞 楯艕厴: %s"
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
 # gconf/gconftool.c:1243
-#: backends/xml-entry.c:723
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
-msgstr ""
-"闋濻蘙葐 黀賝 摿塨薋鵰 鐋� 槴' 瀎澞斀� 鏻徻� 蜒� 鐐 齀碡�: %s"
+msgstr "闋濻蘙葐 黀賝 摿塨薋鵰 鐋� 槴' 瀎澞斀� 鏻徻� 蜒� 鐐 齀碡�: %s"
 
-#: backends/xml-entry.c:937
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
 # gconf/gconftool.c:1373
-#: backends/xml-entry.c:951
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
-msgstr "貲摥 蕓懧濿 歃樥 塨薋黀� 毈濏鐋酃 \"橀儌瀙" `%s', "
-"摦臩橀酃�"
+msgstr "貲摥 蕓懧濿 歃樥 塨薋黀� 毈濏鐋酃 \"橀儌瀙" `%s', 摦臩橀酃�"
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1014 backends/xml-entry.c:1090
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1048
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1071
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1079
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1131
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1140 backends/xml-entry.c:1163
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1153
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1172
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1190
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1208
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -322,12 +296,12 @@ msgid "Failed to shut down backend"
 msgstr "鍵罍摐葐 膹樥鵸憼鐐� 鐋� 臝瀀轘齌鍡� (backend)"
 
 # gconf/gconfd.c:511
-#: gconf/gconf-database.c:233
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "咑灕賙� 塎蘘� 鏻徻 黀賝 摲鐋鵰 罼酃觾鼩鵰�"
 
 # gconf/gconfd.c:519
-#: gconf/gconf-database.c:241
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
@@ -335,22 +309,23 @@ msgstr ""
 "蜒� 鐐 膹樥魠 `%s"
 
 # gconf/gconfd.c:802
-#: gconf/gconf-database.c:521
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "咑灕賙� 摲鐋鵰 摫�嚭澮趛 �錩� 鐒� 樇酃擩氁徾薋� 麧儌徾薋�"
 
 # gconf/gconfd.c:822
-#: gconf/gconf-database.c:538
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "咑灕賙� 摲鐋鵰 蜒� 匷裱厴臩 黼裱厴臄鶂�"
 
 # gconf/gconfd.c:1056
-#: gconf/gconf-database.c:605
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
-msgstr "泬濄摲� 鼭塝憼: 摫濻蘙葐 錞鸄� 摿暡瀎壼 摿鏻耪濇楜瀦 蜒� 鐐 ConfigDatabase"
+msgstr ""
+"泬濄摲� 鼭塝憼: 摫濻蘙葐 錞鸄� 摿暡瀎壼 摿鏻耪濇楜瀦 蜒� 鐐 ConfigDatabase"
 
 # gconf/gconfd.c:1194
-#: gconf/gconf-database.c:764
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "闋濻蘙葐 黼裱厴臄鶂燽 懃摥 � 謥齌麑濻楒�� 謦裻�: %s"
@@ -359,7 +334,7 @@ msgstr "闋濻蘙葐 黼裱厴臄鶂燽 懃摥 � 謥齌麑濻楒�� 謦裻�: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -367,12 +342,12 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:871
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr ""
 
-#: gconf/gconf-database.c:880
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -380,55 +355,55 @@ msgid ""
 msgstr ""
 
 # gconf/gconfd.c:1523
-#: gconf/gconf-database.c:992 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "郣塝憼 罼轗 鐋 錞鸄 鏻徻� 蜒� `%s': %s"
 
 # gconf/gconfd.c:1561
-#: gconf/gconf-database.c:1039
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "郣塝憼 罼轗 鐋� 摿塯殢� 鏻徻� 蜒� `%s': %s"
 
 # gconf/gconfd.c:1593
-#: gconf/gconf-database.c:1082
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "郣塝憼 僸摦鼁巑� `%s': %s"
 
 # gconf/gconfd.c:1614
-#: gconf/gconf-database.c:1106
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "郣塝憼 罼轗 鐋 錞鸄 槴 瀎澞斀� 鏻徻� 蜒� `%s': %s"
 
 # gconf/gconfd.c:1652
-#: gconf/gconf-database.c:1145
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "郣塝憼 槶楯艬� �謯勷趛 `%s': %s"
 
 # gconf/gconfd.c:1676
-#: gconf/gconf-database.c:1169
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "郣塝憼 暡摲鼫鵰� 罼酃錪蜧� `%s': %s"
 
 # gconf/gconfd.c:1701
-#: gconf/gconf-database.c:1195
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "闋濻蘙葐 錞鸄� �錩� 鐒� 樍蜤暡�� 黀� `%s': %s"
 
 # gconf/gconfd.c:1725
-#: gconf/gconf-database.c:1221
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "郣塝憼 摫摙蛵懞鵰� 罼酃錪裺� 黀� `%s': %s"
 
 # gconf/gconfd.c:1745
-#: gconf/gconf-database.c:1242
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "郣塝憼 摿塯殢趛 齀碡敳濿 蜒� `%s': %s"
@@ -496,10 +471,191 @@ msgstr ""
 msgid "Failed to get a lock"
 msgstr "闋濻蘙葐 鐐豵魦鐋鵰� 膹樥噘憼鐐�"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
 msgstr ""
 
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+# gconf/gconf-internals.c:2416
+#: gconf/gconf-glib.c:10666
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "鍵�罅鐐 鐐 膹橀鶅斀 鐐� 摙灚蜍� `%s': %s"
+
+# gconf/gconfd.c:1676
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "郣塝憼 暡摲鼫鵰� 罼酃錪蜧� `%s': %s"
+
 # gconf/gconf-internals.c:100
 #: gconf/gconf-internals.c:85
 #, c-format
@@ -528,43 +684,43 @@ msgid "Failed to convert object to IOR"
 msgstr "闋濻蘙葐 懤酃鐙瀔硻 摿鏻耪濇楜瀦 鵴 IOR"
 
 # gconf/gconf-internals.c:789
-#: gconf/gconf-internals.c:809
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "鍵�罅鐐 鐐 塥毉蜵� 鐐� 摙灚蜍� 僸撦厴徻� `%s': %s\n"
 
 # gconf/gconf-internals.c:844
-#: gconf/gconf-internals.c:856
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "哢瀀轚鳺酃� 謦蝁蜍� 蕘僸罼� `%s'\n"
 
 # gconf/gconf-internals.c:856
-#: gconf/gconf-internals.c:868
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "郣塝憼 摿塨薋鵰� 黀� 摙灚蜍 `%s': %s\n"
 
 # gconf/gconf-internals.c:1282
-#: gconf/gconf-internals.c:1292
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "鍚摐樇�酃� 錈黀�, 錞灕賙� %s"
 
 # gconf/gconf-internals.c:1292
-#: gconf/gconf-internals.c:1302
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "鍚摐樇�酃� 錈黀� 摫� %s, 錞灕賙� 錈黀� 摫� %s"
 
 # gconf/gconf-internals.c:1431
-#: gconf/gconf-internals.c:1441
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "鍚摐樇�酃� 緪�蜧�, 錞灕賙� %s"
 
 # gconf/gconf-internals.c:1445
-#: gconf/gconf-internals.c:1455
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
@@ -572,79 +728,73 @@ msgstr ""
 "鏻徾�"
 
 # gconf/gconf-internals.c:1461
-#: gconf/gconf-internals.c:1471
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "鍚摐樇�酃� 緪�蜧� 鐊豵� (%s,%s), 錞灕賙� 鐊豵� (%s,%s)"
 
 # gconf/gconf-internals.c:1577
-#: gconf/gconf-internals.c:1587
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "孲 謯鼁鏻魦懤臩 摠攠齌鳻踣濋� 麧� 摙曫緪� 懤 樥鶋裺蜒蕓 鵰懤蜍"
 
 # gconf/gconf-internals.c:1639
-#: gconf/gconf-internals.c:1649
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "孲 謯鼁鏻魦懤臩 摠攠齌鳻踣濋� 麧� 醲錼澸翴� 懤 樥鶋裺蜒蕓 鵰懤蜍"
 
 # gconf/gconf-internals.c:2105 gconf/gconf.c:2607
-#: gconf/gconf-internals.c:2129 gconf/gconf.c:2945
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "郣塝憼 CORBA: %s"
 
-# gconf/gconf-internals.c:2137
-#: gconf/gconf-internals.c:2145
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "凎齌蜤暡� 貘檺錞憼鐐� OAF: '%s'"
-
 # gconf/gconf-internals.c:2125
-#: gconf/gconf-internals.c:2151
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "貘瀀謣鳺殧 暡摲鼫鵰� 懞 罼酃蠮鼩徾臩� 罼酃錪蜧� 摿鏻耪濇楜�� OAF"
 
 # gconf/gconf-internals.c:2130
-#: gconf/gconf-internals.c:2156
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "貘瀀謣鳺殧 貘�鵩殢趛 碇� 罼酃蠮鼩徾臩� 罼酃錪蜧� OAF"
 
 # gconf/gconf-internals.c:2137
-#: gconf/gconf-internals.c:2163
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "郣塝憼 蜤摐憼鏻縤� 摿塝蘦趛 OAF: %s"
 
 # gconf/gconf-internals.c:2142
-#: gconf/gconf-internals.c:2168
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "嗚薋黀� 鼭塝憼 OAF"
 
 # gconf/gconf-internals.c:2225
-#: gconf/gconf-internals.c:2251
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "櫻� 臝塱灚� 摙灚蜍 ior 黀� `%s'"
 
 # gconf/gconf-internals.c:2256
-#: gconf/gconf-internals.c:2282
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "鐐 gconfd 謯裖翴� 鐐 膹橀嘵憼 `%s' 摫� 縔豵殧 塝錣 僸殥蝁鵸�"
 
 # gconf/gconf-internals.c:2267
-#: gconf/gconf-internals.c:2293
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "忳豵濈 塝錝 貘�蜤摐憼 歃樥 鐐 膹橀嘵憼 `%s'"
 
 # gconf/gconf-internals.c:2287
-#: gconf/gconf-internals.c:2313
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "撦�罅鐋 � 歑暡� 懤 鐐 ORB 蜒� 摿裚翴蘦� 臝塱艬薀濿 gconfd"
 
 # gconf/gconf-internals.c:2295
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -654,38 +804,38 @@ msgstr ""
 "摿暡瀎� 摿鏻耪濇楜瀦, IOR `%s'"
 
 # gconf/gconf-internals.c:2307
-#: gconf/gconf-internals.c:2333
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "雖摋鼫裎摋 鐐 謯錁� 膹橀嘵憼 `%s' 錪裺 鼭塝憼鐐� 摿裚翴蘦趛 槴臝趡椼�: %s"
 
 # gconf/gconf-internals.c:2319
-#: gconf/gconf-internals.c:2345
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "� 魟蜉瀍摥 僸摐�壚�鵰� GConf (gconfd) 歃樥 鐐 膹橀嘵憼 `%s'"
 
 # gconf/gconf-internals.c:2333
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "撦�罅鐋 � 儃擩瀦鼖葐 罼酃錪蜧� `%s': %s"
 
 # gconf/gconf-internals.c:2368
-#: gconf/gconf-internals.c:2394
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "鍵�罅鐋 � 儃擩瀦鼖葐 膹樥噘憼鐐� `%s': %s"
 
 # gconf/gconf-internals.c:2404
-#: gconf/gconf-internals.c:2430
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "鍵�罅鐋 � 樍蜤暡� 黀� 摙灚蜍 `%s': %s"
 
 # gconf/gconf-internals.c:2447
-#: gconf/gconf-internals.c:2473
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
@@ -693,13 +843,13 @@ msgstr ""
 "僸蕓 憼�: %s"
 
 # gconf/gconf-internals.c:2464
-#: gconf/gconf-internals.c:2490
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "紬摙徾臩 摙灚蜍 膹樥噘憼鐐� `%s', 暡摋鼫裎摋 燽鐒� � 塝錩�"
 
 # gconf/gconf-internals.c:2474
-#: gconf/gconf-internals.c:2500
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -709,52 +859,46 @@ msgstr ""
 "%u� 臝歞椼瀦懤 �鏻 縔豵濈� 謰鼫 鐐 膹橀嘵憼 憼�"
 
 # gconf/gconf-internals.c:2491
-#: gconf/gconf-internals.c:2517
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "鍵�罅鐋 � 摫檷楻懤蘦� 膹樥噘憼鐐� 罼酃錪蜧� `%s': %s"
 
 # gconf/gconf-internals.c:2416
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "鍵�罅鐋 � 籙嚪�鵰 鐋� 謦蜛� `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-# gconf/gconf-internals.c:2416
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "鍵�罅鐋 � 摫歞碅氁鵰 鏻徻� 黀� 膹樥魠 `%s'"
-
 # gconf/gconftool.c:1181
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "郣塝憼 黀賝 濆鼫鵰 懤酃謻趡濼瀎葐�: %s"
 
 # gconf/gconftool.c:964 gconf/gconftool.c:1070
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "郣塝憼 黀賝 錞鸄 懤酃謻趡濼瀎葐�: %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -826,24 +970,25 @@ msgid "`%s': %s"
 msgstr "`%s': %s"
 
 # gconf/gconf.c:261
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "� 槴臝趡椼趛 麧� 斶�鼫鵴 罅 摿摠�鵴� 鐋 僸濆儓薃� `%s'"
 
 # gconf/gconf.c:391
-#: gconf/gconf.c:568
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "鍵�罅鐋 � 貘�鵩殢� 樥儌豵歕鵴�� 鵴 楜� 鐐謮蕓 謦蝁蜍 僸摐�壚�鵰�"
 
 # gconf/gconf.c:1449
-#: gconf/gconf.c:1724
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
-msgstr "� 貘瀀魶聬 鐐� 謥醏鐋 黀� 錈黀� 鐐� 槴臝趡殦踣� 摫椼蘙�, 鼭塝憼 CORBA: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
+msgstr ""
+"� 貘瀀魶聬 鐐� 謥醏鐋 黀� 錈黀� 鐐� 槴臝趡殦踣� 摫椼蘙�, 鼭塝憼 CORBA: %s"
 
 # gconf/gconf.c:1463
-#: gconf/gconf.c:1740
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -854,79 +999,79 @@ msgstr ""
 "貘�碲賚�. 凊鼁罼錌 黀橀鋷� 擩� 摿暡瀎� 鼭塝憼鐐� OAF"
 
 # gconf-editor/gconf-editor.c:69 gconf/gconftool.c:447
-#: gconf/gconf.c:2051
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "闋濻蘙葐 摙玃膬豵蛖鵰� GConf, 醲儵敳澞檇瀙n"
 
 # gconf/gconf.c:1689
-#: gconf/gconf.c:2088
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "哢椲樥 罅 摙曫緪� 懤 擩� 縔鳺鐐 (/)"
 
 # gconf/gconf.c:1711
-#: gconf/gconf.c:2110
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "櫻 蝃翴酃� 罅 臝塱艬罍 噆� 縔鳺鐐� (/) 黀� 鵴濄�"
 
 # gconf/gconf.c:1713
-#: gconf/gconf.c:2112
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "櫻 蝃翴酃� 罅 臝塱灚� 擩� 醲錼葐 (.) 摐楻�� 懤轗 摫� 懃� 縔鳺鐐 (/)"
 
 # gconf/gconf.c:1734
-#: gconf/gconf.c:2133
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' 麧� 橀罅� 楯艕厴� 欒鼁臲碖摥 鵴 瀍�憼酃 膹樥僸��/罼酃錪裺�"
 
 # gconf/gconf.c:1748
-#: gconf/gconf.c:2147
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "孲 膹樥魠/罼轗錝蜧� 麧� 斶瀎橀 罅 醲錼澸翴� 懤 縔鳺鐐 (/)"
 
 # gconf/gconf.c:2079
-#: gconf/gconf.c:2400
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "鍵�罅鐐 鐐 膹橀鶅斀 鐐� 槴臝趡椼� 僸摐�壚�鵰�: %s"
 
 # gconf/gconf.c:2140
-#: gconf/gconf.c:2461
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "鍚摐樇�酃� 摙氆檇� 膦耬轘� 臝檷殧黀瀇硻, 錞灕賙� %s"
 
 # gconf/gconf.c:2175
-#: gconf/gconf.c:2496
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "鍚摐樇�酃� 摓楒摋濿, 錞灕賙� %s"
 
 # gconf/gconf.c:2210
-#: gconf/gconf.c:2531
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "鍚摐樇�酃� 摠攠齌鳻踣濋�, 錞灕賙� %s"
 
 # gconf/gconf.c:2247
-#: gconf/gconf.c:2568
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "鍚摐樇�酃� 勯撦濋� 鏻徻, 錞灕賙� %s"
 
 # gconf/gconf.c:2280
-#: gconf/gconf.c:2601
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "鍚摐樇�酃� 齀碡�, 錞灕賙� %s"
 
 # gconf/gconfd.c:789
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "咑灕賙� 摲鐋鵰 膹樥鵸憼鐐�"
 
 # gconf/gconfd.c:861
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -935,7 +1080,7 @@ msgstr ""
 "獿嚪�鳺� 鐐 gconf.path 摫� 鐐� 謦蝁蜍 罼轗錝蜧"
 
 # gconf/gconfd.c:879
-#: gconf/gconfd.c:293
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -944,10 +1089,7 @@ msgstr ""
 "僸摐�壚�鵰� `%s'"
 
 # gconf/gconfd.c:888
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:301
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -956,13 +1098,13 @@ msgstr ""
 "摫歞賙氁醲葽 歑槴殥蝁鵸� "
 
 # gconf/gconfd.c:901
-#: gconf/gconfd.c:314
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "郣塝憼 罼轗 鐐 籙嚪�憼 縔豵澺� 謦蝁裐� 僸摐瀎籚鵴��: %s"
 
 # gconf/gconfd.c:913
-#: gconf/gconfd.c:326
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -971,29 +1113,22 @@ msgstr ""
 "摫歞碅氁鵰 麧儌徾薋� 僸摐�壚�鵰�"
 
 # gconf/gconfd.c:930
-#: gconf/gconfd.c:343
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
-"櫻� 摿摠�鳿罼� 歑濊蘙�� 樍蜤媱濇殣 謦蜙� 僸摐瀎籚鵴��, 謮魨薤 罅 懞� "
-"斶瀎燽� 罅 摫歞賙氁鴄�� 懤齌縥� 摠錆蜙� 僸摐�壚�鵰�"
+"櫻� 摿摠�鳿罼� 歑濊蘙�� 樍蜤媱濇殣 謦蜙� 僸摐瀎籚鵴��, 謮魨薤 罅 懞� 斶瀎燽� "
+"罅 摫歞賙氁鴄�� 懤齌縥� 摠錆蜙� 僸摐�壚�鵰�"
 
 # gconf/gconfd.c:955 gconf/gconfd.c:967
-#: gconf/gconfd.c:369
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr "咑灕賙� 鶀憼 %d, 摓瀇瀦鳺� 摫濻�蹠鵰 擨碡趛. 凊鼁罼錌 摿暡楒敳� 鐐 鼭塝憼 GConf."
-
-# gconf/gconfd.c:955 gconf/gconfd.c:967
-#: gconf/gconfd.c:385
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr "咑灕賙� 鶀憼 %d, 摫�鐐斀 膹橀鶅斀. 凊鼁罼錌 摿暡楒敳� 鐐 鼭塝憼 GConf."
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down."
+msgstr "咑灕賙� 鶀憼 %d, 瀌摠� 膹橀鶅斀"
 
 # gconf/gconfd.c:955 gconf/gconfd.c:967
-#: gconf/gconfd.c:402
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "咑灕賙� 鶀憼 %d, 瀌摠� 膹橀鶅斀"
@@ -1001,17 +1136,17 @@ msgstr "咑灕賙� 鶀憼 %d, 瀌摠� 膹橀鶅斀"
 # gconf/gconfd.c:1013
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:451
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "樏膦翴裎摋 (椻儌鵰 %s), 酃蘟. 僸殥�. %u 虀祼鐋� `%s'"
 
-#: gconf/gconfd.c:455
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr ""
 
 # gconf/gconfd.c:1036
-#: gconf/gconfd.c:478
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -1020,12 +1155,12 @@ msgstr ""
 "黀橀錼醲 摿暡瀎� 貘檺錞憼鐐� 黀瀦� 黼薀趡踣椯 鐐� 陓� (OAF)"
 
 # gconf/gconfd.c:1056
-#: gconf/gconfd.c:498
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "鍵�罅鐋 � 錞鸄 摿暡瀎壼 摿鏻耪濇楜瀦 蜒� 鐐� 鷥臝趡椼� 灌摐�壚�鵰�"
 
 # gconf/gconfd.c:1075
-#: gconf/gconfd.c:518
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -1034,139 +1169,148 @@ msgstr ""
 "膹橀鶅斀\n"
 
 # gconf/gconfd.c:1079
-#: gconf/gconfd.c:522
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "貲� 塝錝 gconfd 橀罅� 碇� 罼酃蠮鼩徾臩 黀� 陓� (OAF)� 膹橀鶅斀\n"
 
 # gconf/gconfd.c:1084
-#: gconf/gconfd.c:527
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "嗚薋黀� 醏鴄� 罼酃觾鼩鵰� 鐐� gconfd 黀� 陓� (OAF)� 膹橀鶅斀\n"
 
 # gconf/gconfd.c:1100
-#: gconf/gconfd.c:565
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "抔橀鶅斀"
 
-# gconf/gconfd.c:955 gconf/gconfd.c:967
-#: gconf/gconfd.c:589
-msgid "GConf server is not in use, shutting down."
-msgstr "� 槴臝趡殦踣硻 GConf 麧� 橀罅� 鵴 虀祼�, 醲儵敳澞檇�."
-
 # gconf/gconfd.c:2115
-#: gconf/gconfd.c:924
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "黴澞鐙歅殦摋 槴摲鼫鵰: %s"
 
-#: gconf/gconfd.c:1012
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1035
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
 # gconf/gconf-internals.c:789
-#: gconf/gconfd.c:1098
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
-msgstr "鍵�罅鐐 鐐 塥毉蜵� 摫歞賙氁徾臩� 摙灚蜍� 罼轗黀摷趛 `%s' 蜒� 樍蜤暡�: %s"
+msgstr ""
+"鍵�罅鐐 鐐 塥毉蜵� 摫歞賙氁徾臩� 摙灚蜍� 罼轗黀摷趛 `%s' 蜒� 樍蜤暡�: %s"
 
 # gconf/gconf-internals.c:2404
-#: gconf/gconfd.c:1112
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
-msgstr "鍵�罅鐋 � 樍蜤暡� 摫歞賙氁徾臩� 摙灚蜍� 罼轗黀摷趛 `%s' 謥齌�. 摙灚蜍�: %d: %s"
+msgstr ""
+"鍵�罅鐋 � 樍蜤暡� 摫歞賙氁徾臩� 摙灚蜍� 罼轗黀摷趛 `%s' 謥齌�. 摙灚蜍�: %d: "
+"%s"
 
 # gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:1121
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "闋濻蘙葐 膹樥鵸憼鐐� 縻瀦 摫歞賙氁徾臩� 摙灚蜍� 罼轗黀摷趛 `%s': %s"
 
 # gconf/gconf-internals.c:789
-#: gconf/gconfd.c:1135
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
-msgstr "鍵�罅鐋 � 鐐豵魦鐋鵰 黀賝 塎鼩 鐐� 謯錆濈� 摫歞賙氁徾臩� 摙灚蜍� 罼轗黀摷趛 `%s': %s"
+msgstr ""
+"鍵�罅鐋 � 鐐豵魦鐋鵰 黀賝 塎鼩 鐐� 謯錆濈� 摫歞賙氁徾臩� 摙灚蜍� 罼轗黀摷趛 "
+"`%s': %s"
 
 # gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:1145
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "鍵�罅鐋 � 懤酃獿鵘 縻瀦 摫歞賙氁徾臩� 摙灚蜍� 罼轗黀摷趛 黀� 魦鵰: %s"
 
-#: gconf/gconfd.c:1154
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1627
-#, c-format
-msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+# gconf/gconf-internals.c:2416
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "闋濻蘙葐 塥毉蜵敳濿 摙灚蜍� 摫歞賙氁徾耬� 罼轗黀摷趛: %s"
+
+# gconf/gconf-internals.c:2416
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "闋濻蘙葐 塥毉蜵敳濿 摙灚蜍� 摫歞賙氁徾耬� 罼轗黀摷趛: %s"
+
+# gconf/gconf-internals.c:2416
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
 msgstr ""
+"闋濻蘙葐 樍蜤暡硻 貘瀀魶聬� 謥醏鐋 黀� 摙灚蜍 摫歞賙氁徾薃趛 罼轗黀摷趛: %s"
 
-# gconf/gconfd.c:1676
-#: gconf/gconfd.c:1673
-#, c-format
-msgid "Error reading saved state file: %s"
-msgstr "郣塝憼 摿塨薋鵰� 摫歞賙氁徾臩� 摙灚蜍� 罼轗黀摷趛: %s"
+# gconf/gconf-internals.c:2416
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr ""
+"闋濻蘙葐 樍蜤暡硻 貘瀀魶聬� 謥醏鐋 黀� 摙灚蜍 摫歞賙氁徾薃趛 罼轗黀摷趛: %s"
 
 # gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:1726
-#, c-format
-msgid "Unable to open saved state file '%s': %s"
-msgstr "鍵�罅鐐 鐐 塥毉蜵� 摙灚蜍� 摫歞賙氁徾耬� 罼轗黀摷趛 `%s': %s"
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "闋濻蘙葐 塥毉蜵敳濿 摙灚蜍� 摫歞賙氁徾耬� 罼轗黀摷趛: %s"
 
-#: gconf/gconfd.c:1843
-#, c-format
+#: gconf/gconfd.c:1204
 msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
 msgstr ""
 
-#: gconf/gconfd.c:1848
-#, c-format
+#: gconf/gconfd.c:1225
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
 msgstr ""
 
-# gconf/gconftool.c:881
-#: gconf/gconfd.c:1871 gconf/gconfd.c:2032
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "闋濻蘙葐 錞鸄� IOR 蜒� 鐐 謥醏鐋: %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
 
 # gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:1886
+#: gconf/gconfd.c:1377
 #, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "闋濻蘙葐 塥毉蜵敳濿 摙灚蜍� 摫歞賙氁徾耬� 罼轗黀摷趛: %s"
+msgid "Unable to open saved state file '%s': %s"
+msgstr "鍵�罅鐐 鐐 塥毉蜵� 摙灚蜍� 摫歞賙氁徾耬� 罼轗黀摷趛 `%s': %s"
 
-# gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:1899
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr "闋濻蘙葐 樍蜤暡硻 貘瀀魶聬� 謥醏鐋 黀� 摙灚蜍 摫歞賙氁徾薃趛 罼轗黀摷趛: %s"
+msgid ""
+"Failed to log addition of listener to gconfd logfile; won't be able to "
+"re-add the listener if gconfd exits or shuts down (%s)"
+msgstr ""
 
-# gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:1907
+#: gconf/gconfd.c:1481
 #, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr "闋濻蘙葐 瀇氋錞夒鵰� 貘瀀魶聬� 謥醏鐋 黀� 摙灚蜍 摫歞賙氁徾薃趛 罼轗黀摷趛: %s"
-
-#: gconf/gconfd.c:1993
 msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
+"Failed to log removal of listener to gconfd logfile; might erroneously "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
 # gconf/gconftool.c:73
@@ -1259,8 +1403,8 @@ msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"忯鴄齌鶂�� 鐐� 鐊豵� 鐋� 鏻徻� 鐋� 錈黀摥 豵� 摿敳蛵殦摋 � 鐐� 鐊豵 鐋� 鏻徻� 豵� "
-"謥齌蜤媺樥 楜� 齀碡�. 泬臩鶀憼薀殣 黼薀瀌濆鵴澽 橀罅� 樇轗鍷�."
+"忯鴄齌鶂�� 鐐� 鐊豵� 鐋� 鏻徻� 鐋� 錈黀摥 豵� 摿敳蛵殦摋 � 鐐� 鐊豵 鐋� "
+"鏻徻� 豵� 謥齌蜤媺樥 楜� 齀碡�. 泬臩鶀憼薀殣 黼薀瀌濆鵴澽 橀罅� 樇轗鍷�."
 
 # gconf/gconftool.c:183
 #: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
@@ -1538,180 +1682,174 @@ msgid "Must specify a key or keys to get\n"
 msgstr "哢椲樥 罅 罼鴄齌黀橀 楜� 膹樥魠 � 膹樥僸� 蜒� 錞鸄\n"
 
 # gconf/gconftool.c:865
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "崥豵�: %s\n"
 
 # gconf/gconftool.c:865
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "鑣儌� 咂黀摥: %s\n"
 
 # gconf/gconftool.c:865
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "鑣儌� Car: %s\n"
 
 # gconf/gconftool.c:865
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "鑣儌� Cdr: %s\n"
 
-#: gconf/gconftool.c:894
+# gconf/gconftool.c:866
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr "鷥' 瀎澞斀� 婩徻: %s\n"
+msgid "Owner: %s\n"
+msgstr "扞濈臲禂趛: %s\n"
 
 # gconf/gconftool.c:866 gconf/gconftool.c:867 gconf/gconftool.c:868
-#: gconf/gconftool.c:894 gconf/gconftool.c:896 gconf/gconftool.c:897
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "雖摲鼫鵰"
 
-# gconf/gconftool.c:866
-#: gconf/gconftool.c:896
-#, c-format
-msgid "Owner: %s\n"
-msgstr "扞濈臲禂趛: %s\n"
-
 # gconf/gconftool.c:867
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "郤薀瀌� 凎齌蜤暡�: %s\n"
 
 # gconf/gconftool.c:868
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "枑膲� 凎齌蜤暡�: %s\n"
 
 # gconf/gconftool.c:877
-#: gconf/gconftool.c:907
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "櫻� 歃樥 醲鳺� 鏻徻 蜒� `%s'\n"
 
 # gconf/gconftool.c:881
-#: gconf/gconftool.c:911
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "闋濻蘙葐 錞鸄� 鏻徻� 蜒� `%s': %s\n"
 
 # gconf/gconftool.c:940 gconf/gconftool.c:1052 gconf/gconftool.c:1056
-#: gconf/gconftool.c:954 gconf/gconftool.c:966
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "櫻� 橀罅� 罼酃臩踣�� � 鐊豵� `%s'\n"
 
 # gconf/gconftool.c:900
-#: gconf/gconftool.c:978
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "哢椲樥 罅 罼鴄齌黀燽� 樇摠錆麑�懤罅 膹樥僸�/鏻徾� �� 瀎裍憼酃\n"
 
 # gconf/gconftool.c:917
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "櫻� 歃樥 醲鳺� 鏻徻 蜒� 鐐 膹樥魠: `%s'\n"
 
-#: gconf/gconftool.c:1026
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1036
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1050
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
 # gconf/gconftool.c:951
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "郣塝憼: %s\n"
 
 # gconf/gconftool.c:964 gconf/gconftool.c:1070
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1211
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "郣塝憼 罼轗 鐋� 摿塯殢� 鏻徻�: %s"
 
 # gconf/gconftool.c:982 gconf/gconftool.c:1084
-#: gconf/gconftool.c:1096 gconf/gconftool.c:1225
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "郣塝憼 黀� 黼裱厴臄鶂�: %s"
 
 # gconf/gconftool.c:1000
-#: gconf/gconftool.c:1114
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "哢椲樥 罅 罼鴄齌黀橀 膹樥魠 (�臩憼 齀碡敳濿) �� 斀罅僸蕓 �齌鶂塿n"
 
-#: gconf/gconftool.c:1156
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1196
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
 # gconf/gconftool.c:1099
-#: gconf/gconftool.c:1240
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "哢椲樥 罅 罼鴄齌黀燽� 楜摥 � 謥齌麑�醲厴� 罼轗錝蜧� 摫� �豵� 罅 錣灕燽� 酃 "
 "緪�蜭 膹樥僸��/鏻檎�.\n"
 
 # gconf/gconftool.c:1113
-#: gconf/gconftool.c:1254
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "哢椲樥 罅 罼鴄齌黀燽� 楜� � 謥齌麑�醲鼁 膹樥僸� 貘濿 暡摲鼫鵰.\n"
 
 # gconf/gconftool.c:1124
-#: gconf/gconftool.c:1265
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "郣塝憼 黀賝 暡摲鼫鵰 `%s': %s\n"
 
 # gconf/gconftool.c:1147
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "哢椲樥 罅 罼鴄齌黀燽� 楜摥 � 謥齌麑�醲厴� 罼轗錝蜧� 摫� �豵� 罅 錣灕燽� 毉 "
 "臝氋敳塝檶毉.\n"
 
 # gconf/gconftool.c:1181
-#: gconf/gconftool.c:1322
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "郣塝憼 黀賝 摫摙蛵懞鵰 罼酃錪裺�: %s\n"
 
 # gconf/gconftool.c:1220
-#: gconf/gconftool.c:1364
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "倳狣厊玿珈к�: 圓蘘濿 � 摫�� 鐊豵� 蜒� 鐐 齀碡� (%s)\n"
 
 # gconf/gconftool.c:1220
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "倳狣厊玿珈к�: 塎蘘� � 摫�� list_type 蜒� 鐐 齀碡� (%s)\n"
 
 # gconf/gconftool.c:1243
-#: gconf/gconftool.c:1384 gconf/gconftool.c:1414 gconf/gconftool.c:1443
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
@@ -1719,53 +1857,53 @@ msgstr ""
 "(%s)\n"
 
 # gconf/gconftool.c:1220
-#: gconf/gconftool.c:1402
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "倳狣厊玿珈к�: 塎蘘� � 摫�� car_type � cdr_type 蜒� 鐐 齀碡� (%s)\n"
 
 # gconf/gconftool.c:1243
-#: gconf/gconftool.c:1427
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 "倳狣厊玿珈к�: 櫻� 橀罅� 勯罅鏸 罅 醲鳺� 槴' 瀎澞斀� 鏻徻 蜒� 楜� 齀碡塿n"
 
 # gconf/gconftool.c:1256
-#: gconf/gconftool.c:1456
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 "倳狣厊玿珈к�: 攬�醲齌蕓 鼭塝憼 鐐� gconftool, 塨薋黀� GConfValueType\n"
 
 # gconf/gconftool.c:1304
-#: gconf/gconftool.c:1504 gconf/gconftool.c:1525 gconf/gconftool.c:1546
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "倳狣厊玿珈к�: 闋濻蘙葐 蜤摐憼鏻縤� 摿塝蘦趛 瀍�憼鐐� 鐊豵� `%s'\n"
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1542
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1563
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
 # gconf/gconftool.c:1327
-#: gconf/gconftool.c:1590
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "倳狣厊玿珈к�: 耪薤� 蕓懧濿 <applyto>"
 
 # gconf/gconftool.c:1330 gconf/gconftool.c:1575
-#: gconf/gconftool.c:1593 gconf/gconftool.c:1856
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
@@ -1773,19 +1911,19 @@ msgstr ""
 "<schema>\n"
 
 # gconf/gconftool.c:1340
-#: gconf/gconftool.c:1603
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "倳狣厊玿珈к�: 麧� 歃樥 罼鴄齌黀橀 膹樥魠 蜒� 鐐 齀碡塿n"
 
 # gconf/gconftool.c:1373
-#: gconf/gconftool.c:1636
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "倳狣厊玿珈к�: � 蕓懧濿 <locale> 麧� 歃樥 鐋� 毈濏鐋酃 `name=\"locale\", "
 "摦臩橀酃嬞n"
 
 # gconf/gconftool.c:1379
-#: gconf/gconftool.c:1642
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1794,13 +1932,13 @@ msgstr ""
 "摦臩燽薀摋 �錝� 懤轗 鐐� 貘�鐐\n"
 
 # gconf/gconftool.c:1451
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "倳狣厊玿珈к�: 圓蘘濿 蕓懧濿 <%s> 鵴 楜� 蕓懧� <locale>\n"
 
 # gconf/gconftool.c:1480
-#: gconf/gconftool.c:1752
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
@@ -1808,32 +1946,32 @@ msgstr ""
 "%s\n"
 
 # gconf/gconftool.c:1488
-#: gconf/gconftool.c:1760
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "顯罼醲黀賚楜� 齀碡� `%s' 蜒� 鐋� 鐐謮縤 巃鳻澞� `%s'\n"
 
 # gconf/gconftool.c:1510
-#: gconf/gconftool.c:1782
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 "倳狣厊玿珈к�: 闋濻蘙葐 黼齀椼澞趛 齀碡敳濿 `%s' 懤 鐐 膹樥魠 `%s': %s\n"
 
 # gconf/gconftool.c:1518
-#: gconf/gconftool.c:1790
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "郟碡� `%s' 歑澞罍媺鐋耪 黀� 膹樥魠 `%s'\n"
 
 # gconf/gconftool.c:1588
-#: gconf/gconftool.c:1869
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 "哢椲樥 罅 臝塱灚� 鐐纆媸澞鐐� 懃� 罼酃觾鼩鵰 <locale> 鵴 楜� <schema>\n"
 
 # gconf/gconftool.c:1617
-#: gconf/gconftool.c:1898
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
@@ -1841,19 +1979,19 @@ msgstr ""
 "<schemalist>\n"
 
 # gconf/gconftool.c:1639
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "闋濻蘙葐 摿檽蜵敳濿 `%s': %s\n"
 
 # gconf/gconftool.c:1646
-#: gconf/gconftool.c:1927
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "孲 楯蜤暡� `%s' 橀罅� 耪薤;\n"
 
 # gconf/gconftool.c:1658
-#: gconf/gconftool.c:1939
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1863,13 +2001,13 @@ msgstr ""
 "橀罅� <gconfschemafile>)\n"
 
 # gconf/gconftool.c:1671
-#: gconf/gconftool.c:1952
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "孲 楯蜤暡� `%s' 麧� 歃樥 蕓懧� <gconfschemafile> 膬嚬攠蜍� 歑潞楄瀦\n"
 
 # gconf/gconftool.c:1685
-#: gconf/gconftool.c:1966
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
@@ -1877,18 +2015,18 @@ msgstr ""
 "<gconfschemafile>\n"
 
 # gconf/gconftool.c:1696 gconf/gconftool.c:1728
-#: gconf/gconftool.c:1977 gconf/gconftool.c:2009
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "郣塝憼 黀� 黼裱厴臄鶂� 麧儌徾薋� 僸摐�壚�鵰�: %s"
 
 # gconf/gconftool.c:1712
-#: gconf/gconftool.c:1993
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "哢椲樥 罅 罼鴄齌黀燽� 懤齌縔 摙灚葐 齀碡敳濿 貘濿 樍罼轗黀摷蔌n"
 
 # gconf/gconftool.c:1749
-#: gconf/gconftool.c:2030
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1898,18 +2036,18 @@ msgstr ""
 "%s\n"
 
 # gconf/gconftool.c:1769
-#: gconf/gconftool.c:2050
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "闋濻蘙葐 黀賝 暡摲鼫鵰 膹樥僸燽 鶇摷蜉敳濿 %s: %s\n"
 
 # gconf/gconftool.c:1895
-#: gconf/gconftool.c:2176
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "哢椲樥 罅 罼鴄齌黀燽� 懤齌縔 膹樥僸� 蜒� 鶇嫇濇駹n"
 
 # gconf/gconftool.c:1901
-#: gconf/gconftool.c:2182
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1920,12 +2058,12 @@ msgstr ""
 "  %s\n"
 
 # gconf/gconftool.c:1919
-#: gconf/gconftool.c:2200
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "哢椲樥 罅 罼鴄齌黀燽� 懤齌膬� 罼轗錝蜧� 貘濿 鶇嫇濇駹n"
 
 # gconf/gconftool.c:1938
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1936,27 +2074,83 @@ msgstr ""
 "鐐 膹樥魠 黀瀍 罼轗錝蜧:\n"
 "  %s\n"
 
-# gconf/gconftool.c:951
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "郣塝憼 GConf: %s\n"
-
 # gconf/gconftool.c:749
-#: wrappers/gtk/gconf-client.c:795
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "哢櫇毈瀔檽踠� GConf: 摫濻蘙葐 摫摙蛵懞鵰� 緪礯�� 黀� `%s': %s"
 
 # gconf/gconf-internals.c:1292
-#: wrappers/gtk/gconf-client.c:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "鍚摐樇�酃� `%s' 錞灕賙� `%s' 蜒� 鐐 膹樥魠 %s"
 
+# backends/xml-backend.c:247
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "髑獿嚪�翴酃� � 斀縰魟 臝瀀轘齌鍡� BerkeleyDB (BDB)."
+
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "塘毉蘱賙� � 謦蜛 BerkeleyDB 黀� 齌縃蕓 罼轗錝蜧 %s"
+
+# backends/xml-backend.c:694
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "闌玃膬豵毇裎摋 � 斀縰魟 臝瀀轘齌鍡� BDB"
+
+# backends/xml-backend.c:300
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "鍵�罅鐋 � 濆鼫鵰 齌縃膬� 罼酃錪蜧� %s 黀� 僸濆儓薃� `%s'"
+
+# backends/xml-backend.c:400
+#~ msgid ""
+#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ msgstr ""
+#~ "鍵�罅鐋 � 摿塨薋鵰 � 樍蜤暡� 黀� 齌縃蕓 罼轗錝蜧 %s 黀� 僸濆儓薃� `%s'"
+
+# gconf/gconf-internals.c:2137
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "凎齌蜤暡� 貘檺錞憼鐐� OAF: '%s'"
+
+# gconf/gconf-internals.c:2416
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "鍵�罅鐋 � 摫歞碅氁鵰 鏻徻� 黀� 膹樥魠 `%s'"
+
+# gconf/gconfd.c:955 gconf/gconfd.c:967
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgstr ""
+#~ "咑灕賙� 鶀憼 %d, 摓瀇瀦鳺� 摫濻�蹠鵰 擨碡趛. 凊鼁罼錌 摿暡楒敳� 鐐 鼭塝憼 "
+#~ "GConf."
+
+# gconf/gconfd.c:955 gconf/gconfd.c:967
+#~ msgid ""
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ msgstr ""
+#~ "咑灕賙� 鶀憼 %d, 摫�鐐斀 膹橀鶅斀. 凊鼁罼錌 摿暡楒敳� 鐐 鼭塝憼 GConf."
+
+# gconf/gconfd.c:955 gconf/gconfd.c:967
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "� 槴臝趡殦踣硻 GConf 麧� 橀罅� 鵴 虀祼�, 醲儵敳澞檇�."
+
+# gconf/gconfd.c:1676
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "郣塝憼 摿塨薋鵰� 摫歞賙氁徾臩� 摙灚蜍� 罼轗黀摷趛: %s"
+
+# gconf/gconftool.c:881
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "闋濻蘙葐 錞鸄� IOR 蜒� 鐐 謥醏鐋: %s"
+
 # gconf/gconf-internals.c:2416
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "鍵�罅鐐 鐐 膹橀鶅斀 鐐� 摙灚蜍� `%s': %s"
+#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgstr ""
+#~ "闋濻蘙葐 瀇氋錞夒鵰� 貘瀀魶聬� 謥醏鐋 黀� 摙灚蜍 摫歞賙氁徾薃趛 罼轗黀摷趛: "
+#~ "%s"
+
+#~ msgid "Default Value: %s\n"
+#~ msgstr "鷥' 瀎澞斀� 婩徻: %s\n"
+
+# gconf/gconftool.c:951
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "郣塝憼 GConf: %s\n"
 
 # gconf/gconfd.c:972
 #~ msgid "Received signal %d, ignoring"
diff --git a/po/es.po b/po/es.po
index c6c9aea1..4983301e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 0.12\n"
-"POT-Creation-Date: 2001-03-10 18:52+0100\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2001-01-23 16:58-04:00\n"
 "Last-Translator: H嶰tor Garc燰 翼varez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -13,34 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "Descargando el m鏚ulo de soporte de BerkeleyDB (BDB)."
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "Fuente de BerkeleyDB abierta en %s"
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "Inicializando el m鏚ulo BDB"
-
-#: backends/dir-utils.c:108
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "No pude encontrar el directorio ra瞵 %s en la direcci鏮 `%s'"
-
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "No pude crear el directorio `%s': %s"
-
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "No puedo leer ni escribir la directorio ra瞵 %s en la direcci鏮 `%s'"
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Descargando el m鏚ulo de soporte de XML."
@@ -50,6 +22,11 @@ msgstr "Descargando el m鏚ulo de soporte de XML."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "No pude encontrar el directorio ra瞵 XML en la direcci鏮 `%s'"
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "No pude crear el directorio `%s': %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -73,7 +50,7 @@ msgstr "Fallo al liberar el bloqueo en el directorio XML `%s': %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "Directorios borrados no sincronizados al descargar el m鏚ulo de XML"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -82,7 +59,7 @@ msgstr ""
 "No pude eliminar el directorio `%s' de la cache del m鏚ulo XML, porque no ha "
 "sido sincronizado con la informaci鏮 del disco"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -101,64 +78,59 @@ msgstr "No pude obtener datos de `%s': %s"
 msgid "XML filename `%s' is a directory"
 msgstr "El archivo XML `%s' es un directorio"
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Error al borrar `%s': %s"
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Error al escribir el archivo `%s': %s"
 
-#: backends/xml-dir.c:359
-#, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr "Error al poner el modo en `%s': %s"
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Error al renombrar `%s' a `%s': %s"
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Fallo al recuperar `%s' de `%s': %s"
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Error al borrar el archivo antiguo `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Error al pedir la informaci鏮 de `%s': %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Entrada duplicada `%s' en `%s', ignor嫕dola"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Entrada sin nombre en el archivo XML `%s', ignor嫕dola"
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 "El nodo de alto nivel en el archivo XML `%s' no es un <entry>, ignor嫕dolo"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Error al crear el archivo `%s': %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2442
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Error al cerrar el archivo `%s': %s"
@@ -169,7 +141,7 @@ msgstr "Error al cerrar el archivo `%s': %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorando el nodo XML con nombre `%s': %s"
 
-#: backends/xml-entry.c:199
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -188,77 +160,81 @@ msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 "Ignorando el nodo XML `%s', excepto para el posible esquema llamado: %s"
 
-#: backends/xml-entry.c:723
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Fallo al leer los valores por defecto del esquema: %s"
 
-#: backends/xml-entry.c:937
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "No hay atributo \"type\" para el nodo <%s>"
 
-#: backends/xml-entry.c:951
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Un nodo tienen el atributo \"type\" desconocido `%s', ignor嫕dolo"
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "No hay atributo \"value\" para el nodo"
 
-#: backends/xml-entry.c:1014 backends/xml-entry.c:1090
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "No entend� el nodo XML <%s> dentro de una lista de nodos XML"
 
-#: backends/xml-entry.c:1048
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Tipo inv嫮ido (lista, pareja, o desconocido) en un nodo lista"
 
-#: backends/xml-entry.c:1071
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Nodo XML err鏮eo: %s"
 
-#: backends/xml-entry.c:1079
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "La lista contiene un nodo mal escrito (%s, deber燰 ser %s)"
 
-#: backends/xml-entry.c:1131
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorando car err鏮eo para la pareja XML: %s"
 
-#: backends/xml-entry.c:1140 backends/xml-entry.c:1163
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "parseando archivo XML: listas y parejas pueden no ser incluidas en una pareja"
 
-#: backends/xml-entry.c:1153
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorando cdr err鏮eo de la pareja XML: %s"
 
-#: backends/xml-entry.c:1172
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "No entend� el nodo XML <%s> dentro de un nodo XML pareja"
 
-#: backends/xml-entry.c:1190
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "No encontr� car y cdr en el par del nodo XML"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Falta cdr en el par de valores en el archivo XML"
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "Falta car en el par de valores en el archivo XML"
 
-#: backends/xml-entry.c:1208
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Faltan ambos valores car y cdr del par en el archivo XML"
 
@@ -291,29 +267,29 @@ msgstr "No pude localizar el m鏚ulo de soporte para `%s'"
 msgid "Failed to shut down backend"
 msgstr "Fallo al descargar el m鏚ulo"
 
-#: gconf/gconf-database.c:231
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Recib� un valor err鏮eo al realizar la petici鏮"
 
-#: gconf/gconf-database.c:239
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "No entend� el valor CORBA recibido al realizar la petici鏮 para la clave `%s'"
 
-#: gconf/gconf-database.c:517
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "Recib� una petici鏮 para eliminar todos los datos de la cache"
 
-#: gconf/gconf-database.c:534
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Recib� una petici鏮 para sincronizar s璯cronamente"
 
-#: gconf/gconf-database.c:601
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Error fatal: error al obtener la referencia del objeto ConfigDatabase"
 
-#: gconf/gconf-database.c:760
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Error al sincronizar uno o m嫳 recursos: %s"
@@ -322,7 +298,7 @@ msgstr "Error al sincronizar uno o m嫳 recursos: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -333,12 +309,12 @@ msgstr ""
 "este control al reiniciar gconfd, resultando en una mala notificaci鏮 de los "
 "cambios de configuraci鏮."
 
-#: gconf/gconf-database.c:873
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "El ID %lu de control no existe"
 
-#: gconf/gconf-database.c:882
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -348,47 +324,47 @@ msgstr ""
 "(aunque lo m嫳 probable es que no ocurra nada, puede que surjan extra鎙s "
 "notificaciones): %s"
 
-#: gconf/gconf-database.c:997 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Error al obtener el valor para `%s': %s"
 
-#: gconf/gconf-database.c:1044
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Error al poner el valor para `%s': %s"
 
-#: gconf/gconf-database.c:1087
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Error eliminando `%s': %s"
 
-#: gconf/gconf-database.c:1111
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Error al obtener el valor por defecto para `%s': %s"
 
-#: gconf/gconf-database.c:1151
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Error al comprobar la existencia de `%s': %s"
 
-#: gconf/gconf-database.c:1175
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Error al eliminar el directorio `%s': %s"
 
-#: gconf/gconf-database.c:1202
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Error al poner todas las entradas en `%s': %s"
 
-#: gconf/gconf-database.c:1228
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Error al listar directorios en `%s': %s"
 
-#: gconf/gconf-database.c:1249
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Error al componer el esquema para `%s': %s"
@@ -453,9 +429,188 @@ msgstr "Operaci鏮 no permitida sin servidor de configuraci鏮"
 msgid "Failed to get a lock"
 msgstr "Error al obtener un bloqueo"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "No hay bases de datos disponibles para guardar su configuraci鏮"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Error al cerrar el archivo `%s': %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Error al eliminar el directorio `%s': %s"
 
 #: gconf/gconf-internals.c:85
 #, c-format
@@ -479,101 +634,96 @@ msgstr "Recib� una lista de gconfd con un tipo de lista err鏮eo"
 msgid "Failed to convert object to IOR"
 msgstr "Error al convertir el objeto a IOR"
 
-#: gconf/gconf-internals.c:809
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "No pude abrir el directorio del archivo `%s': %s\n"
 
-#: gconf/gconf-internals.c:856
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "A鎙diendo la fuente `%s'\n"
 
-#: gconf/gconf-internals.c:868
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Error de lectura en el archivo `%s': %s\n"
 
-#: gconf/gconf-internals.c:1292
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Esperaba un lista, tengo %s"
 
-#: gconf/gconf-internals.c:1302
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Esperaba una lista de %s, tengo una de %s"
 
-#: gconf/gconf-internals.c:1441
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Esperaba un par, tengo %s"
 
-#: gconf/gconf-internals.c:1455
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr "Esperaba el par (%s,%s), tengo un par sin uno o sin los dos valores"
 
-#: gconf/gconf-internals.c:1471
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Esperaba un par del tipo (%s,%s) tengo uno del tipo (%s,%s)"
 
-#: gconf/gconf-internals.c:1587
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Cadena entrecomillada no comienza con una marca de comillas"
 
-#: gconf/gconf-internals.c:1649
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Cadena entrecomillada no finaliza con una marca de comillas"
 
-#: gconf/gconf-internals.c:2129 gconf/gconf.c:2999
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Error CORBA: %s"
 
-#: gconf/gconf-internals.c:2145
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "Descripci鏮 del problema OAF: `%s'"
-
-#: gconf/gconf-internals.c:2151
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "intento de eliminar un directorio de objetos OAF no listado"
 
-#: gconf/gconf-internals.c:2156
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "intento de a鎙dir un directorio OAF ya listado"
 
-#: gconf/gconf-internals.c:2163
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Error de sintaxis en OAF: %s"
 
-#: gconf/gconf-internals.c:2168
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Error de OAF desconocido"
 
-#: gconf/gconf-internals.c:2251
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "No hay archivo ior en `%s'"
 
-#: gconf/gconf-internals.c:2282
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd tomando bloqueo `%s' de otro proceso"
 
-#: gconf/gconf-internals.c:2293
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Otro programa tiene un bloqueo en `%s'"
 
-#: gconf/gconf-internals.c:2313
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "no pude contactar con ORB para probar el gconfd existente"
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -582,43 +732,43 @@ msgstr ""
 "Eliminando el bloqueo `%s' porque IOR no pudo ser convertido a una "
 "referencia de objeto, IOR `%s'"
 
-#: gconf/gconf-internals.c:2333
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "Eliminando bloqueo `%s' debido a un error haciendo ping al servidor: %s"
 
-#: gconf/gconf-internals.c:2345
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "El demonio de configuraci鏮 GConf (gconfd) tiene un bloqueo en `%s'"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "no pude crear el directorio `%s': %s"
 
-#: gconf/gconf-internals.c:2394
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "No pude crear un bloqueo en `%s': %s"
 
-#: gconf/gconf-internals.c:2430
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "No pude escribir al archivo `%s': %s"
 
-#: gconf/gconf-internals.c:2473
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "No puedo abrir el archivo bloqueado `%s'; asumo que no es nuestro: %s"
 
-#: gconf/gconf-internals.c:2490
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Archivo de bloqueo `%s' corrupto, eliminando de todos modos"
 
-#: gconf/gconf-internals.c:2500
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -627,26 +777,26 @@ msgstr ""
 "No cree el bloqueo de archivo `%s' (pid del creador %u, nuestro pid %u; "
 "asumiendo que alguien tomo nuestro bloqueo"
 
-#: gconf/gconf-internals.c:2517
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Error el liberar el bloqueo al directorio `%s': %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Error al cargar la fuente `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Esquema `%s' especificado por `%s' guarda un valor no esquem嫢ico"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "El nombre '/' solo puede ser un directorio, no una clave"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -655,22 +805,17 @@ msgstr ""
 "El valor de `%s' est� definido en una fuente de solo lectura en la parte "
 "superior de su configuraci鏮."
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "No pude guardar un valor para la clave `%s'"
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Error buscando menta-informaci鏮: %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Error obteniendo meta-informaci鏮: %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr "Clave `%s' listada como esquema por la clave `%s' es de tipo `%s'"
@@ -740,21 +885,21 @@ msgstr "No entend� `%s' (hay un ')' extra dentro del par)"
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "El servidor no pudo resolver la direcci鏮 `%s'"
 
-#: gconf/gconf.c:571
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "No puedo a鎙dir notificaciones a una fuente de configuraci鏮 local"
 
-#: gconf/gconf.c:1778
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Fallo al a鎙dir el cliente a la lista del servidor, error CORBA: %s"
 
-#: gconf/gconf.c:1794
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -764,66 +909,66 @@ msgstr ""
 "oaf_activate_from_id() y no produjo una excepci鏮 explicando el problema. "
 "Por favor reporte un fallo en OAF."
 
-#: gconf/gconf.c:2105
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Fallo al iniciar GConf, saliendo\n"
 
-#: gconf/gconf.c:2142
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Debe comenzar con una barra (/)"
 
-#: gconf/gconf.c:2164
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "No puede haber dos barras (/) en una fila"
 
-#: gconf/gconf.c:2166
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "No puede haber un punto (.) tras una barra (/)"
 
-#: gconf/gconf.c:2187
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' es un car塶ter no v嫮ido en los nombres de claves/directorios"
 
-#: gconf/gconf.c:2201
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Las Claves/directorios no pueden terminar con una barra (/)"
 
-#: gconf/gconf.c:2454
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fallo al terminar el servidor de configuraciones: %s"
 
-#: gconf/gconf.c:2515
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Esperaba un float, obtuve %s"
 
-#: gconf/gconf.c:2550
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Esperaba un entero, obtuve %s"
 
-#: gconf/gconf.c:2585
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Esperaba una cadena, obtuve %s"
 
-#: gconf/gconf.c:2622
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Esperaba un booleano, obtuve %s"
 
-#: gconf/gconf.c:2655
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Esperaba un esquema, obtuve %s"
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Recibida petici鏮 de finalizaci鏮"
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -831,7 +976,7 @@ msgstr ""
 "gconfd compilado con opciones de depuraci鏮: tratando de cargar gconf.path "
 "directorio de fuentes"
 
-#: gconf/gconfd.c:293
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -839,10 +984,7 @@ msgstr ""
 "No se encontraron archivos de configuraci鏮, intentado usar la fuente por "
 "defecto `%s'"
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:301
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -850,16 +992,12 @@ msgstr ""
 "No hay fuentes de configuraci鏮 en el path, la configuraci鏮 no se guardar�; "
 "editar "
 
-#: gconf/gconfd.c:301
-msgid "/path"
-msgstr "/path"
-
-#: gconf/gconfd.c:314
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Error al cargar alguna fuente de configuraci鏮: %s"
 
-#: gconf/gconfd.c:326
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -867,7 +1005,7 @@ msgstr ""
 "No se ha resuelto ninguna fuente de correo satisfactoriamente, no puedo "
 "cargar ni guardar datos de configuraci鏮"
 
-#: gconf/gconfd.c:343
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -876,33 +1014,28 @@ msgstr ""
 "pueda escribir, puede que no sea capaz de guardar los cambios de la "
 "configuraci鏮"
 
-#: gconf/gconfd.c:369
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-"Recibida la se鎙l %d, volcando core. Por favor reporte un fallo en GConf."
-
-#: gconf/gconfd.c:385
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"Recibida la se鎙l %d, acabando anormalmente. Por favor reporte un fallo en "
-"GConf."
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down."
+msgstr "Recibida la se鎙l %d, acabando limpiamente"
 
-#: gconf/gconfd.c:402
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Recibida la se鎙l %d, acabando limpiamente"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:498
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "comenzando (versi鏮  %s), pid %u usuario '%s'"
 
-#: gconf/gconfd.c:525
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -910,11 +1043,11 @@ msgstr ""
 "Fallo al iniciar el sistema de activaci鏮 de objetos: por favor reporte un "
 "fallo en OAF a sus desarrolladores"
 
-#: gconf/gconfd.c:545
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Fallo al obtener la referencia de un objeto para ConfigServer"
 
-#: gconf/gconfd.c:565
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -922,28 +1055,24 @@ msgstr ""
 "OAF no sabe acerca de nuestro IID. Indica una instalaci鏮 estropeada. No "
 "puedo registrarme. Saliendo\n"
 
-#: gconf/gconfd.c:569
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Ya hay otro gconfd registrado con OAF. Finalizando\n"
 
-#: gconf/gconfd.c:574
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Error desconocido al registrar gconfd con OAF. Finalizando\n"
 
-#: gconf/gconfd.c:612
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Finalizando"
 
-#: gconf/gconfd.c:637
-msgid "GConf server is not in use, shutting down."
-msgstr "El servidor GConf no se est� usando, cerr嫕dolo"
-
-#: gconf/gconfd.c:996
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Devolviendo la excepci鏮: %s"
 
-#: gconf/gconfd.c:1096
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -952,7 +1081,7 @@ msgstr ""
 "Fall� al abrir el archivo de log de gconfd. No ser� capaz de restaurar los "
 "servicios  despu廥 de acabar gconfd (%s)"
 
-#: gconf/gconfd.c:1131
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -960,39 +1089,76 @@ msgstr ""
 "Fall� al cerrar el archivo de log de gconfd. Puede que los datos no se hayan "
 "guardado apropiadamente (%s)"
 
-#: gconf/gconfd.c:1200
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "No pude abrir el archivo de estado '%s' para escritura: %s"
 
-#: gconf/gconfd.c:1214
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "No pude escribir en el archivo de estado guardado '%s' fd: %d: %s"
 
-#: gconf/gconfd.c:1223
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Error al cerrar el nuevo archivo de estado '%s': %s"
 
-#: gconf/gconfd.c:1237
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "No pude apartar el antiguo archivo de estado '%s': %s"
 
-#: gconf/gconfd.c:1247
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Error al mover el nuevo archivo de estado a su sitio: %s"
 
-#: gconf/gconfd.c:1256
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 "Error reponiendo archivo de estado original que hab燰 sido movido a '%s': %s"
 
-#: gconf/gconfd.c:1731
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Error al abrir el archivo de estado: %s"
+
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Error al abrir el archivo de estado: %s"
+
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr "Error al escribir la adici鏮 del cliente al archivo de estado: %s"
+
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "Error al escribir la adici鏮 del cliente al archivo de estado: %s"
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Error al abrir el archivo de estado: %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1000,17 +1166,12 @@ msgstr ""
 "No pude reponer un servicio en la direcci鏮 '%s', no pude encontrar la base "
 "de datos"
 
-#: gconf/gconfd.c:1777
-#, c-format
-msgid "Error reading saved state file: %s"
-msgstr "Error leyendo el archivo de estado: %s"
-
-#: gconf/gconfd.c:1830
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "No pude abrir el archivo de estado '%s': %s"
 
-#: gconf/gconfd.c:1947
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to "
@@ -1019,7 +1180,7 @@ msgstr ""
 "Error al anotar la adici鏮 de un servicio al archivo de log de gconfd. No "
 "ser� capaz de restaurar el servicio si se cierra gconfd (%s)"
 
-#: gconf/gconfd.c:1952
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously "
@@ -1028,32 +1189,6 @@ msgstr ""
 "Error al anotar la sustracci鏮 de un servicio al archivo de log de gconfd. "
 "Puede que restaure err鏮eamente el servicio si se cierra gconfd (%s)"
 
-#: gconf/gconfd.c:1975 gconf/gconfd.c:2140
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "Error al obtener IOR para el cliente: %s"
-
-#: gconf/gconfd.c:1990
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "Error al abrir el archivo de estado: %s"
-
-#: gconf/gconfd.c:2003
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr "Error al escribir la adici鏮 del cliente al archivo de estado: %s"
-
-#: gconf/gconfd.c:2011
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr "Error al escribir la adici鏮 del cliente al archivo de estado: %s"
-
-#: gconf/gconfd.c:2101
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr ""
-"Se elimin� alg�n cliente del servidor GConf cuando no hab燰 sido a鎙dido."
-
 #: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Opciones de la ayuda"
@@ -1338,239 +1473,233 @@ msgstr "Error al acceder a la(s) fuente(s) de configuraci鏮: %s\n"
 msgid "Shutdown error: %s\n"
 msgstr "Error al cerrar el programa: %s\n"
 
-#: gconf/gconftool.c:728
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Debe especificar uno o mas directorios para listar recursivamente.\n"
 
-#: gconf/gconftool.c:762
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "Error al listar los pares en `%s': %s"
 
-#: gconf/gconftool.c:780
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(no hay valor asignado)"
 
-#: gconf/gconftool.c:835
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Error al reiniciar el servidor de configuraciones (gconfd): %s\n"
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "Debe especificar una clave o claves para obtener\n"
 
-#: gconf/gconftool.c:884
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tipo: %s\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Tipo de Lista: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Tipo de Car: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Tipo de Cdr: %s\n"
 
-#: gconf/gconftool.c:892
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr "Valor por defecto: %s\n"
+msgid "Owner: %s\n"
+msgstr "Due隳: %s\n"
 
-#: gconf/gconftool.c:892 gconf/gconftool.c:894 gconf/gconftool.c:895
-#: gconf/gconftool.c:896
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Sin asignar"
 
-#: gconf/gconftool.c:894
-#, c-format
-msgid "Owner: %s\n"
-msgstr "Due隳: %s\n"
-
-#: gconf/gconftool.c:895
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Descripci鏮 corta: %s\n"
 
-#: gconf/gconftool.c:896
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Descripci鏮 larga: %s\n"
 
-#: gconf/gconftool.c:905
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "No se ha asignado valor a `%s'\n"
 
-#: gconf/gconftool.c:909
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Error al obtener un valor para `%s': %s\n"
 
-#: gconf/gconftool.c:952 gconf/gconftool.c:964
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "No entiendo el tipo `%s'\n"
 
-#: gconf/gconftool.c:976
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Debe especificar alternativamente claves/valores como argumentos\n"
 
-#: gconf/gconftool.c:996
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "No hay valor asignado para la clave: `%s'\n"
 
-#: gconf/gconftool.c:1024
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "No puede asignar un esquema como valor\n"
 
-#: gconf/gconftool.c:1034
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Cuando asigne una lista debe especificar un tipo de lista primitivo\n"
 
-#: gconf/gconftool.c:1048
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Cuando asigne un par debe especificar un tipo car y un tipo cdr primitivos\n"
 
-#: gconf/gconftool.c:1063
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Error: %s\n"
 
-#: gconf/gconftool.c:1076 gconf/gconftool.c:1209
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Error asignando valor: %s"
 
-#: gconf/gconftool.c:1094 gconf/gconftool.c:1223
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Error sincronizando: %s"
 
-#: gconf/gconftool.c:1112
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Debe especificar una clave (nombre de esquema) como �nico argumento\n"
 
-#: gconf/gconftool.c:1154
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "El tipo de la lista debe ser primitivo: string, int, float o bool\n"
 
-#: gconf/gconftool.c:1174
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr "El tipo del par car debe ser primitivo: string, int, float o bool\n"
 
-#: gconf/gconftool.c:1194
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr "El tipo del par cdr debe ser primitivo: string, int, float o bool\n"
 
-#: gconf/gconftool.c:1238
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Debe especificar uno o m嫳 directorios donde obtener los pares clave/valor.\n"
 
-#: gconf/gconftool.c:1252
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Debe especificar una o m嫳 claves para des-asignar.\n"
 
-#: gconf/gconftool.c:1263
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Error des-asignando `%s': %s\n"
 
-#: gconf/gconftool.c:1286
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Debe especificar uno o m嫳 directorios de los que obtener subdirectorios.\n"
 
-#: gconf/gconftool.c:1320
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Error listando directorios: %s\n"
 
-#: gconf/gconftool.c:1362
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "AVISO: falta tipo o es err鏮eo para el esquema (%s)\n"
 
-#: gconf/gconftool.c:1371
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "AVISO: falta tipo de lista o es err鏮eo para el esquema (%s)\n"
 
-#: gconf/gconftool.c:1382 gconf/gconftool.c:1412 gconf/gconftool.c:1441
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "AVISO: Error al parsear el valor por defecto `%s' para el esquema (%s)\n"
 
-#: gconf/gconftool.c:1400
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "AVISO: falta tipo car o cdr o es err鏮eo para el esquema (%s)\n"
 
-#: gconf/gconftool.c:1425
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "AVISO: No puede asignar un valor por defecto para el esquema\n"
 
-#: gconf/gconftool.c:1454
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "AVISO: error interno en gconftool, GConfValueType desconocido\n"
 
-#: gconf/gconftool.c:1502 gconf/gconftool.c:1523 gconf/gconftool.c:1544
-#: gconf/gconftool.c:1565
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "AVISO: error al parsear el nombre del tipo `%s'\n"
 
-#: gconf/gconftool.c:1519
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVISO: el tipo de lista solo puede ser int, float, string o bool y no `%s'\n"
 
-#: gconf/gconftool.c:1540
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVISO: el tipo de car solo puede ser int, float, string o bool y no `%s'\n"
 
-#: gconf/gconftool.c:1561
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVISO: el tipo de cdr solo puede ser int, float, string o bool y no `%s'\n"
 
-#: gconf/gconftool.c:1588
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "AVISO: nodo <applyto> vac甐"
 
-#: gconf/gconftool.c:1591 gconf/gconftool.c:1854
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "AVISO: nodo <%s> no comprendido en <schema>\n"
 
-#: gconf/gconftool.c:1601
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "AVISO: no hay clave especificada para el esquema\n"
 
-#: gconf/gconftool.c:1634
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "AVISO: nodo <locale> no tiene atributo `name=\"locale\"', ignor嫕dolo\n"
 
-#: gconf/gconftool.c:1640
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1578,51 +1707,51 @@ msgstr ""
 "AVISO: m�ltiples nodos <locale> para el locale `%s', ignorando todos despu廥 "
 "del primero\n"
 
-#: gconf/gconftool.c:1721
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "AVISO: Nodo <%s> inv嫮ido en un nodo <locale>\n"
 
-#: gconf/gconftool.c:1750
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "AVISO: error al instalar esquema `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:1758
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Instalado el esquema `%s' para el locale `%s'\n"
 
-#: gconf/gconftool.c:1780
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "AVISO: error al asociar el esquema `%s' con la clave `%s': %s\n"
 
-#: gconf/gconftool.c:1788
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Adjuntado esquema `%s' a la clave `%s'\n"
 
-#: gconf/gconftool.c:1867
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Debe tener al menos una entrada <locale> en un <schema>\n"
 
-#: gconf/gconftool.c:1896
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "AVISO: no comprend� el nodo <%s> bajo <schemalist>\n"
 
-#: gconf/gconftool.c:1918
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Error al abrir `%s': %s\n"
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "激l documento `%s' esta vac甐?\n"
 
-#: gconf/gconftool.c:1937
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1631,26 +1760,26 @@ msgstr ""
 "El documento `%s' tiene un tipo err鏮eo para el nodo ra瞵 (<%s>, debe ser "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1950
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "El documento `%s' no tiene node <gconfschemafile> de nivel superior\n"
 
-#: gconf/gconftool.c:1964
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "AVISO: no comprend� el nodo <%s> bajo <gconfschemafile>\n"
 
-#: gconf/gconftool.c:1975 gconf/gconftool.c:2007
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Error sincronizando datos: %s"
 
-#: gconf/gconftool.c:1991
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Debe especificar algunos archivos de esquema a instalar\n"
 
-#: gconf/gconftool.c:2028
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1659,16 +1788,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2048
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Error al des-asignar la clave de rotura %s: %s\n"
 
-#: gconf/gconftool.c:2174
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "Debe especificar algunas claves a romper\n"
 
-#: gconf/gconftool.c:2180
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1677,11 +1806,11 @@ msgstr ""
 "Tratando de romper su aplicaci鏮 asignando valores err鏮eos para la clave:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2198
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "Debe especificar algunos directorios a romper\n"
 
-#: gconf/gconftool.c:2217
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1692,17 +1821,77 @@ msgstr ""
 "directorio:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "Error en GConf: %s\n"
-
-#: wrappers/gtk/gconf-client.c:795
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Aviso GConf: error al listar los pares en `%s': %s"
 
-#: wrappers/gtk/gconf-client.c:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Esperaba `%s' y obtuve `%s' para la clave %s"
+
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "Descargando el m鏚ulo de soporte de BerkeleyDB (BDB)."
+
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "Fuente de BerkeleyDB abierta en %s"
+
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "Inicializando el m鏚ulo BDB"
+
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "No pude encontrar el directorio ra瞵 %s en la direcci鏮 `%s'"
+
+#~ msgid ""
+#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ msgstr ""
+#~ "No puedo leer ni escribir la directorio ra瞵 %s en la direcci鏮 `%s'"
+
+#~ msgid "Failed to set mode on `%s': %s"
+#~ msgstr "Error al poner el modo en `%s': %s"
+
+#~ msgid "No database available to save your configuration"
+#~ msgstr "No hay bases de datos disponibles para guardar su configuraci鏮"
+
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "Descripci鏮 del problema OAF: `%s'"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "No pude guardar un valor para la clave `%s'"
+
+#~ msgid "/path"
+#~ msgstr "/path"
+
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgstr ""
+#~ "Recibida la se鎙l %d, volcando core. Por favor reporte un fallo en GConf."
+
+#~ msgid ""
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ msgstr ""
+#~ "Recibida la se鎙l %d, acabando anormalmente. Por favor reporte un fallo en "
+#~ "GConf."
+
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "El servidor GConf no se est� usando, cerr嫕dolo"
+
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "Error leyendo el archivo de estado: %s"
+
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "Error al obtener IOR para el cliente: %s"
+
+#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgstr "Error al escribir la adici鏮 del cliente al archivo de estado: %s"
+
+#~ msgid ""
+#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ msgstr ""
+#~ "Se elimin� alg�n cliente del servidor GConf cuando no hab燰 sido a鎙dido."
+
+#~ msgid "Default Value: %s\n"
+#~ msgstr "Valor por defecto: %s\n"
+
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "Error en GConf: %s\n"
diff --git a/po/fi.po b/po/fi.po
index fd8381b0..1d7da1c5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 0.9\n"
-"POT-Creation-Date: 2000-12-11 20:11+0200\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-12-09 22:00+02:00\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -18,36 +18,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "BerkeleyDB (BDB) -taustamoduuli poistuu muistista."
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "BerkeleyDB-l鄣teen juuri %s avattu."
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "BDB-taustamoduuli k銛nnistyy"
-
-#: backends/dir-utils.c:88
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "%s-juurihakemistoa ei l騽tynyt osoitteesta \"%s\""
-
-#: backends/dir-utils.c:104 backends/xml-backend.c:301 backends/xml-dir.c:1035
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "Hakemistoa '%s' ei voitu luoda: %s"
-
-#: backends/dir-utils.c:192
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr ""
-"%s-juurihakemistosta osoitteessa \"%s\" ei voi lukea, eik� sinne voi "
-"kirjoittaa"
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "XML-taustamoduuli poistuu muistista."
@@ -57,6 +27,11 @@ msgstr "XML-taustamoduuli poistuu muistista."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "XML-juurihakemistoa ei l騽tynyt osoitteesta '%s'"
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "Hakemistoa '%s' ei voitu luoda: %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -82,7 +57,7 @@ msgstr "XML-hakemiston '%s' lukituksen luovutus ep鄤nnistui: %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "Synkronoimattomia hakemistoja poistui XML-taustamoduulia sammuttaessa"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -91,7 +66,7 @@ msgstr ""
 "Hakemiston '%s' poistaminen XML-taustamoduulin v鄟imuistista ei onnistu, "
 "koska se ei ole onnistuneesti synkronoitunut levylle"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -136,32 +111,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "Vanhan tiedoston '%s' poisto ep鄤nnistui: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:790
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Tiedoston '%s' tilatietojen lukeminen ep鄤nnistui: %s"
 
-#: backends/xml-dir.c:934
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Toinenkin '%s'-merkint� tiedostossa '%s': se j鳵 huomiotta"
 
-#: backends/xml-dir.c:956
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Nimet霵 merkint� XML-tiedostossa '%s': se j鳵 huomiotta"
 
-#: backends/xml-dir.c:963
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Yl酹ason solmu XML-tiedostossa '%s' ei ole <entry>: se j鳵 huomiotta"
 
-#: backends/xml-dir.c:1051
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Tiedoston '%s' luominen ep鄤nnistui: %s"
 
-#: backends/xml-dir.c:1059 gconf/gconf-internals.c:2471
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Tiedoston '%s' sulkeminen ep鄤nnistui: %s"
@@ -172,7 +147,7 @@ msgstr "Tiedoston '%s' sulkeminen ep鄤nnistui: %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "'%s'-niminen XML-solmu j鳵 huomiotta: %s"
 
-#: backends/xml-entry.c:199
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -297,28 +272,28 @@ msgstr "Taustamoduulia '%s' ei l騽tynyt"
 msgid "Failed to shut down backend"
 msgstr "Taustamoduulin sammutus ep鄤nnistui"
 
-#: gconf/gconf-database.c:233
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Asetuspyynt礵n vastaanotettiin virheellinen arvo."
 
-#: gconf/gconf-database.c:241
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr "Avaimen '%s' asetuspyynn飉t� saatu CORBA-arvo ei ole j酺kev�"
 
-#: gconf/gconf-database.c:518
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "Pyynt� kaiken v鄟ivarastoidun tiedon hylk鳵miseen vastaanotettu"
 
-#: gconf/gconf-database.c:535
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Synkronointipyynt� vastaanotettu"
 
-#: gconf/gconf-database.c:602
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Vakava virhe: objektiin ConfigDatabase ei saatu viittausta"
 
-#: gconf/gconf-database.c:761
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Yhden tai useamman l鄣teen synkronointi ep鄤nnistui: %s"
@@ -327,7 +302,7 @@ msgstr "Yhden tai useamman l鄣teen synkronointi ep鄤nnistui: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:843
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -338,12 +313,12 @@ msgstr ""
 "palauttaa gconfd:n k銛nnistyess� uudestaan, mik� johtaa ep鄟uotettavaan "
 "asetusten muutosten ilmoittamiseen."
 
-#: gconf/gconf-database.c:868
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Kuuntelija ID %lu ei ole olemassa"
 
-#: gconf/gconf-database.c:877
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -353,47 +328,47 @@ msgstr ""
 "harmitonta, mutta saattaa johtaa ilmoituksen kummalliseen uudelleen "
 "ilmaantumiseen): %s"
 
-#: gconf/gconf-database.c:989 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Virhe avaimen '%s' arvoa hakiessa: %s"
 
-#: gconf/gconf-database.c:1031
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Virhe avaimen '%s' arvoa asettaessa: %s"
 
-#: gconf/gconf-database.c:1074
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Virhe avaimen '%s' arvoa poistaessa: %s"
 
-#: gconf/gconf-database.c:1098
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Virhe avaimen '%s' oletusarvoa hakiessa: %s"
 
-#: gconf/gconf-database.c:1137
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Virhe hakemiston '%s' olemassaoloa tarkistaessa: %s"
 
-#: gconf/gconf-database.c:1161
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Virhe hakemistoa '%s' poistaessa: %s"
 
-#: gconf/gconf-database.c:1187
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Kaikkien hakemiston '%s' merkint鐱en saaminen ep鄤nnistui: %s"
 
-#: gconf/gconf-database.c:1213
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Virhe hakemiston '%s' hakemistoja luetteloidessa: %s"
 
-#: gconf/gconf-database.c:1234
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Virhe avaimen '%s' kaavainta asettaessa: %s"
@@ -458,9 +433,188 @@ msgstr "Toiminto ei ole sallittu ilman asetuspalvelinta"
 msgid "Failed to get a lock"
 msgstr "Lukituksen saaminen ep鄤nnistui"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "Tietokantaa ei ole asetusten tallentamista varten."
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Tiedoston '%s' sulkeminen ep鄤nnistui: %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Virhe hakemistoa '%s' poistaessa: %s"
 
 #: gconf/gconf-internals.c:85
 #, c-format
@@ -499,89 +653,84 @@ msgstr "Lis酹鳵n l鄣de '%s'\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "Virhe luettaessa tiedostoa '%s': %s\n"
 
-#: gconf/gconf-internals.c:1321
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Odotettiin luetteloa, saatiin %s"
 
-#: gconf/gconf-internals.c:1331
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Odotettiin %s:n listaa, mutta saatiin %s:n lista"
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Odotettiin paria, saatiin %s"
 
-#: gconf/gconf-internals.c:1484
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Odotettiin (%s,%s) -paria, mutta saatiin pari, josta toinen tai molemmat "
 "osat puuttuvat"
 
-#: gconf/gconf-internals.c:1500
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Odotettiin (%s,%s) -tyyppist� paria, saatiin tyyppi� (%s,%s) oleva"
 
-#: gconf/gconf-internals.c:1616
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Lainattu merkkijono ei ala lainausmerkill�"
 
-#: gconf/gconf-internals.c:1678
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Lainattu merkkijono ei lopu lainausmerkkiin"
 
-#: gconf/gconf-internals.c:2158 gconf/gconf.c:2945
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-virhe: %s"
 
-#: gconf/gconf-internals.c:2174
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "OAF:n ongelman kuvaus: '%s'"
-
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "yritettiin poistaa luetteloimaton OAF-olio hakemistosta"
 
-#: gconf/gconf-internals.c:2185
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "yritettiin lis酹� jo luetteloitu OAF hakemisto"
 
-#: gconf/gconf-internals.c:2192
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF-j酲ennysvirhe: %s"
 
-#: gconf/gconf-internals.c:2197
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Tuntematon OAF-virhe"
 
-#: gconf/gconf-internals.c:2280
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Ei IOR-tiedostoa hakemistossa '%s'"
 
-#: gconf/gconf-internals.c:2311
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd vei lukituksen '%s' toiselta prosessilta"
 
-#: gconf/gconf-internals.c:2322
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Toinen ohjelma on jo lukinnut hakemiston '%s'"
 
-#: gconf/gconf-internals.c:2342
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 "ORB:iin ei saatu yhteytt� yritett輑ss� ping:i� olemassaolevaan gconfd:hen"
 
-#: gconf/gconf-internals.c:2350
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -590,43 +739,43 @@ msgstr ""
 "Poistetaan tyhj� lukitus '%s', koska IOR:ia ei voitu muuntaa "
 "olioviittaukseksi. IOR '%s'"
 
-#: gconf/gconf-internals.c:2362
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr "Poistetaan tyhj� lukitus '%s' ping:in ep鄤nnistuttua palvelimeen: %s"
 
-#: gconf/gconf-internals.c:2374
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf asetusdemoni (gconfd) omistaa lukituksen '%s'"
 
-#: gconf/gconf-internals.c:2388
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "hakemistoa '%s' ei voitu luoda: %s"
 
-#: gconf/gconf-internals.c:2423
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Lukitusta '%s' ei voi luoda: %s"
 
-#: gconf/gconf-internals.c:2459
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Tiedostoon '%s' ei voi kirjoittaa: %s"
 
-#: gconf/gconf-internals.c:2502
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "Lukitustiedostoa '%s' ei voi avata; oletetaan ettei se kuulu meille: %s"
 
-#: gconf/gconf-internals.c:2519
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Virheellinen lukitustiedosto '%s': poistetaan"
 
-#: gconf/gconf-internals.c:2529
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -635,28 +784,28 @@ msgstr ""
 "Lukitustiedostoa '%s' ei luotu. (luojan pid %u, oma pid %u; oletetaan jonkin "
 "vieneen lukituksen)"
 
-#: gconf/gconf-internals.c:2546
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Lukitushakemiston '%s' palauttaminen ep鄤nnistui: %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "L鄣teen '%s' lataaminen ep鄤nnistui: %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 "Kaavain '%s', joka on m鳵ritelty arvolle '%s' sis鄟t鳵 arvon, joka ei ole "
 "kaavain."
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Nimi '/' voi olla vain hakemisto, ei avain"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -664,22 +813,17 @@ msgid ""
 msgstr ""
 "Arvo avaimelle '%s' on asetettu vain-luku-l鄣teess� asetuspolkusi alussa."
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "Avaimen '%s' arvon tallentaminen ei onnistu"
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Virhe metainfoa etsiess�: %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Virhe metainfoa saadessa: %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -752,22 +896,22 @@ msgstr "En ymm酺t鄚yt arvoa '%s' (ylim鳵r鄜nen lainaamaton ')' parin sis鄟l�)"
 msgid "`%s': %s"
 msgstr "'%s': %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Palvelin ei voinut selvitt鳵 osoitetta '%s'"
 
-#: gconf/gconf.c:568
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "Paikalliseen asetusl鄣teeseen ei voi lis酹� huomautuksia"
 
-#: gconf/gconf.c:1724
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr ""
 "Asiakkaan lis鳵minen palvelimen luetteloon ep鄤nnistui, CORBA-virhe: %s"
 
-#: gconf/gconf.c:1740
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -777,66 +921,66 @@ msgstr ""
 "oaf_activate_from_id() ja ei asettanut ongelmaa selitt銥鳵 virhekeskeytyst�. "
 "Olkaa hyv�, ja tehk鳵 OAF:ista virheilmoitus."
 
-#: gconf/gconf.c:2051
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConfin k銛nnistyminen ep鄤nnistui, lopetetaan\n"
 
-#: gconf/gconf.c:2088
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "T銛tyy alkaa kauttaviivalla (/)"
 
-#: gconf/gconf.c:2110
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kahta kauttaviivaa (/) ei voi olla per鄢k鄜n"
 
-#: gconf/gconf.c:2112
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Pistett� (.) ei voi olla heti kauttaviivan (/) j鄟keen"
 
-#: gconf/gconf.c:2133
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' on virheellinen merkki avaimien ja hakemistojen nimiss�"
 
-#: gconf/gconf.c:2147
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Avaimen tai hakemiston nimi ei voi p鳵tty� kauttaviivaan (/)"
 
-#: gconf/gconf.c:2400
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Asetuspalvelimen sammutus ep鄤nnistui: %s"
 
-#: gconf/gconf.c:2461
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Odotettiin liukulukua, saatiin %s"
 
-#: gconf/gconf.c:2496
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Odotettiin kokonaislukua, mutta saatiin %s"
 
-#: gconf/gconf.c:2531
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Odotettiin merkkijonoa, mutta saatiin %s"
 
-#: gconf/gconf.c:2568
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Odotettiin totuusarvoa, mutta saatiin %s"
 
-#: gconf/gconf.c:2601
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Odotettiin kaavainta, mutta saatiin %s"
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Sammutuspyynt� vastaanotettu"
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -844,25 +988,25 @@ msgstr ""
 "gconfd k鳵nnetty debug-tietojen kanssa. Yritet鳵n ladata gconf.path "
 "l鄣dekoodihakemistosta"
 
-#: gconf/gconfd.c:297
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 "Asetustiedostoja ei l騽tynyt: yritet鳵n k銛tt鳵 oletusasetusl鄣dett� '%s'"
 
-#: gconf/gconfd.c:306
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr "Ei asetusl鄣teit� l鄣dehakemistossa: asetuksia ei tallenneta. Muokkaa "
 
-#: gconf/gconfd.c:320
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Virhe joitakin asetusl鄣teit� ladatessa: %s"
 
-#: gconf/gconfd.c:332
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -870,7 +1014,7 @@ msgstr ""
 "L鄣dehakemistoja ei saatu selville: asetustietoja ei voi ladata eik� "
 "tallentaa"
 
-#: gconf/gconfd.c:349
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -878,38 +1022,28 @@ msgstr ""
 "Kirjoitettavissa olevia asetusl鄣teit� ei saatu selville: joitakin asetusten "
 "muutoksia ei v鄟tt鄝酹t� voi tallentaa "
 
-#: gconf/gconfd.c:375
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-"Signaali %d vastaanotettu, core-tiedosto kirjoitetaan. Tee ilmoitus GConfin "
-"virheest�."
-
-#: gconf/gconfd.c:391
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"Signaali %d vastaanotettu: sammutetaan ep鄚ormaalisti. Tee ilmoitus GConfin "
-"virheest�."
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down."
+msgstr "Signaali %d vastaanotettu: sammutetaan siististi"
 
-#: gconf/gconfd.c:408
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Signaali %d vastaanotettu: sammutetaan siististi"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:457
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "k銛nnistyy (versio %s), pid %u, k銛tt鄠� '%s'"
 
-#: gconf/gconfd.c:461
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr "GConf on k鳵nnetty virheenetsint鄤minaisuuksineen"
 
-#: gconf/gconfd.c:484
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -917,11 +1051,11 @@ msgstr ""
 "Object Activation Frameworkin k銛nnistys ep鄤nnistui: olkaa hyv� ja "
 "l鄣ett鄢鳵 virheilmoitus OAF:in yll鄡it鄠ille"
 
-#: gconf/gconfd.c:504
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Olioon ConfigServer ei saatu viittausta"
 
-#: gconf/gconfd.c:524
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -929,28 +1063,24 @@ msgstr ""
 "OAF ei tunne IID:t鄝me, joten asennus on virheellinen. Ei voitu "
 "rekister鑀ty�: poistutaan\n"
 
-#: gconf/gconfd.c:528
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Toinen gconfd on jo rekister鑀tynyt OAF:iin: poistutaan\n"
 
-#: gconf/gconfd.c:533
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Tuntematon virhe rekister鑀t輑ss� gconfd:t� OAF:iin: poistutaan\n"
 
-#: gconf/gconfd.c:571
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Poistutaan"
 
-#: gconf/gconfd.c:595
-msgid "GConf server is not in use, shutting down."
-msgstr "GConf-palvelin ei ole k銛t飉s�: sammutetaan"
-
-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Palautetaan poikkeus: %s"
 
-#: gconf/gconfd.c:1018
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -959,7 +1089,7 @@ msgstr ""
 "gconfd:n lokitiedoston avaaminen ep鄤nnistui: kuuntelijoita ei voi palauttaa "
 "gconfd:n sammutuksen j鄟keen (%s)"
 
-#: gconf/gconfd.c:1041
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -967,32 +1097,32 @@ msgstr ""
 "gconfd:n lokitiedoston sulkeminen ep鄤nnistui: tietoja saattaa olla h銥innyt "
 "(%s)"
 
-#: gconf/gconfd.c:1104
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Tilatiedostoa '%s' ei voitu avata kirjoittamista varten: %s"
 
-#: gconf/gconfd.c:1118
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Tilatiedostoa '%s', fd: %d, ei voitu kirjoittaa: %s"
 
-#: gconf/gconfd.c:1127
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Uuden tilatiedoston '%s' sulkeminen ep鄤nnistui: %s"
 
-#: gconf/gconfd.c:1141
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Vanhaa tilatiedostoa '%s' ei voitu siirt鳵 syrj鳵n: %s"
 
-#: gconf/gconfd.c:1151
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Uuden tilatiedoston siirt鄝inen paikalleen ep鄤nnistui: %s"
 
-#: gconf/gconfd.c:1160
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1000,7 +1130,44 @@ msgstr ""
 "Alkuper鄜sen tilatiedoston, joka on nimetty tiedostoksi '%s', palauttaminen "
 "ep鄤nnistui: %s"
 
-#: gconf/gconfd.c:1633
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Tilatiedoston avaaminen ep鄤nnistui: %s"
+
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Tilatiedoston avaaminen ep鄤nnistui: %s"
+
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr "Asiakkaan lis鳵misen kirjoittaminen tilatiedostoon ep鄤nnistui: %s"
+
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "Asiakkaan lis鳵misen kirjoittaminen tilatiedostoon ep鄤nnistui: %s"
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Tilatiedoston avaaminen ep鄤nnistui: %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1008,17 +1175,12 @@ msgstr ""
 "Kuuntelijan, osoitteessa '%s', palauttaminen ei onnistu: tietokannan "
 "selvitt鄝inen ei onnistunut"
 
-#: gconf/gconfd.c:1679
-#, c-format
-msgid "Error reading saved state file: %s"
-msgstr "Virhe tilatiedostoa lukiessa: %s"
-
-#: gconf/gconfd.c:1732
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Tilatiedoston '%s' avaaminen ei onnistu: %s"
 
-#: gconf/gconfd.c:1849
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to "
@@ -1027,7 +1189,7 @@ msgstr ""
 "Kuuntelijan lis鳵misen kirjaaminen gconfd:n lokitiedostoon ep鄤nnistui: sit� "
 "ei voi lis酹� uudestaan, kun gconfd lopetetaan tai sammuu (%s)"
 
-#: gconf/gconfd.c:1854
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously "
@@ -1037,32 +1199,6 @@ msgstr ""
 "saattaa virheellisesti tulla lis酹yksi uudestaan, kun gconfd lopetetaan tai "
 "sammuu (%s)"
 
-#: gconf/gconfd.c:1877 gconf/gconfd.c:2038
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "Asiakkaan IOR:n saaminen ep鄤nnistui: '%s'"
-
-#: gconf/gconfd.c:1892
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "Tilatiedoston avaaminen ep鄤nnistui: %s"
-
-#: gconf/gconfd.c:1905
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr "Asiakkaan lis鳵misen kirjoittaminen tilatiedostoon ep鄤nnistui: %s"
-
-#: gconf/gconfd.c:1913
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr "Asiakkaan lis鳵misen fflush() tilatiedostoon ep鄤nnistui: '%s'"
-
-#: gconf/gconfd.c:1999
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr ""
-"Jokin asiakas poisti itsens� GConf-palvelimesta, kun sit� ei oltu lis酹ty."
-
 #: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Ohjevalitsimet"
@@ -1699,17 +1835,70 @@ msgstr ""
 "hakemistossa:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "GConf-virhe: %s\n"
-
-#: wrappers/gtk/gconf-client.c:795
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf-varoitus: Hakemiston '%s' parien luetteloiminen ep鄤nnistui: %s"
 
-#: wrappers/gtk/gconf-client.c:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Odotettiin tyyppi� '%s', saatiin tyyppi '%s' avaimelle %s"
+
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "BerkeleyDB (BDB) -taustamoduuli poistuu muistista."
+
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "BerkeleyDB-l鄣teen juuri %s avattu."
+
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "BDB-taustamoduuli k銛nnistyy"
+
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "%s-juurihakemistoa ei l騽tynyt osoitteesta \"%s\""
+
+#~ msgid ""
+#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ msgstr ""
+#~ "%s-juurihakemistosta osoitteessa \"%s\" ei voi lukea, eik� sinne voi "
+#~ "kirjoittaa"
+
+#~ msgid "No database available to save your configuration"
+#~ msgstr "Tietokantaa ei ole asetusten tallentamista varten."
+
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "OAF:n ongelman kuvaus: '%s'"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Avaimen '%s' arvon tallentaminen ei onnistu"
+
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgstr ""
+#~ "Signaali %d vastaanotettu, core-tiedosto kirjoitetaan. Tee ilmoitus GConfin "
+#~ "virheest�."
+
+#~ msgid ""
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ msgstr ""
+#~ "Signaali %d vastaanotettu: sammutetaan ep鄚ormaalisti. Tee ilmoitus GConfin "
+#~ "virheest�."
+
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "GConf-palvelin ei ole k銛t飉s�: sammutetaan"
+
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "Virhe tilatiedostoa lukiessa: %s"
+
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "Asiakkaan IOR:n saaminen ep鄤nnistui: '%s'"
+
+#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgstr "Asiakkaan lis鳵misen fflush() tilatiedostoon ep鄤nnistui: '%s'"
+
+#~ msgid ""
+#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ msgstr ""
+#~ "Jokin asiakas poisti itsens� GConf-palvelimesta, kun sit� ei oltu lis酹ty."
+
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "GConf-virhe: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 20cfd997..275269c5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.1\n"
-"POT-Creation-Date: 2001-05-30 17:06+0200\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2001-05-30 17:07+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n"
 "Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
@@ -14,34 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "D嶰hargement du module BerkeleyDB (BDB)."
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "Source BerkeleyDB ouverte � la racine %s"
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "Initialisation du module BDB"
-
-#: backends/dir-utils.c:108
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "Ne peut trouver le r廧ertoire racine %s � l'adresse � %s �"
-
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "Ne peut cr嶪r le r廧ertoire � %s � : %s"
-
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "Ne peut lire ou 嶰rire vers le r廧ertoire racine %s � l'adresse � %s �"
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "D嶰hargement du module XML."
@@ -51,6 +23,11 @@ msgstr "D嶰hargement du module XML."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Ne peut trouver le r廧ertoire racine XML � l'adresse � %s �"
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "Ne peut cr嶪r le r廧ertoire � %s � : %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -68,7 +45,7 @@ msgstr ""
 msgid "Initializing XML backend module"
 msgstr "Initialisation du module XML"
 
-#: backends/xml-backend.c:748
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "丱hec pour donner le verrou sur le r廧ertoire XML � %s � : %s"
@@ -79,7 +56,7 @@ msgstr ""
 "Suppressions de r廧ertoire non synchronis嶪s durant l'extinction du module "
 "XML"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -88,7 +65,7 @@ msgstr ""
 "Ne peut supprimer le r廧ertoire � %s � depuis le cache XML, parce qu'il n'a "
 "pas 彋� convenablement synchronis� sur le disque"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -107,80 +84,75 @@ msgstr "Ne peut avoir les statistiques � %s � : %s"
 msgid "XML filename `%s' is a directory"
 msgstr "Le nom de fichier XML � %s � est un r廧ertoire"
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Impossible de supprimer � %s � : %s"
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Impossible d'嶰rire le fichier � %s � : %s"
 
-#: backends/xml-dir.c:359
-#, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr "Impossible de d嶨inir le mode de � %s � : %s"
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Impossible de renommer � %s � vers � %s � : %s"
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Impossible de restaurer � %s � depuis � %s � : %s"
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Impossible de supprimer l'ancien fichier � %s � : %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "丱hec de statistiques � %s � : %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Ignore l'entr嶪 � %s � dupliqu嶪 dans � %s �"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Ignore l'entr嶪 sans nom dans le fichier XML � %s �"
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 "Le noeud racine dans le fichier XML � %s � n'est pas une <entry>, ignore"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Impossible de cr嶪r le fichier � %s � : %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2443
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Impossible de fermer le fichier � %s � : %s"
 
 #. There was an error
-#: backends/xml-entry.c:149
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignore le noeud XML nomm� � %s � : %s"
 
-#: backends/xml-entry.c:200
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:327
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignore le nom de sch幦a � %s �, invalide : %s"
@@ -188,87 +160,91 @@ msgstr "Ignore le nom de sch幦a � %s �, invalide : %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:373
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "Ignore le noeud XML � %s �, � part pour le nom possible de sch幦a : %s"
 
-#: backends/xml-entry.c:724
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr "a trouv� <local_schema> avec aucun r嶲lage de locale"
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "丱hec durant la lecture de la valeur par d嶨aut pour le sch幦a : %s"
 
-#: backends/xml-entry.c:938
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Aucun attribut \"type\" pour le noeud <%s>"
 
-#: backends/xml-entry.c:952
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Un noeud a un attribut \"type\" � %s � inconnu, ignore"
 
-#: backends/xml-entry.c:967
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "Aucun attribut \"value\" pour le noeud"
 
-#: backends/xml-entry.c:1015 backends/xml-entry.c:1091
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 "Impossible de comprendre le noeud XML <%s> � l'int廨ieur d'un noeud XML list"
 
-#: backends/xml-entry.c:1049
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Type invalide (list, pair, ou inconnu) dans un noeud liste"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Mauvais noeud XML : %s"
 
-#: backends/xml-entry.c:1080
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "La liste contient un noeud mal form� (%s, devrait 皻re %s)"
 
-#: backends/xml-entry.c:1132
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignore le mauvais car de la paire XML : %s"
 
-#: backends/xml-entry.c:1141 backends/xml-entry.c:1164
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "analyse le fichier XML : listes et paires ne doivent pas 皻re situ嶪s � "
 "l'int廨ieur d'une paire"
 
-#: backends/xml-entry.c:1154
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignore le mauvais cdr de la paire XML : %s"
 
-#: backends/xml-entry.c:1173
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 "Impossible de comprendre le noeud XML <%s> � l'int廨ieur du noeud de paire "
 "XML"
 
-#: backends/xml-entry.c:1191
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 "Impossible de trouver les valeurs car et cdr pour le noeud de paire XML"
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Il manque la valeur cdr de la paire de valeur dans le fichier XML"
 
-#: backends/xml-entry.c:1204
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "Il manque la valeur car de la paire de valeur dans le fichier XML"
 
-#: backends/xml-entry.c:1209
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Il manque les valeurs car et cdr de la paire dans le fichier XML"
 
@@ -302,32 +278,32 @@ msgstr "Ne peut trouver le module pour � %s �"
 msgid "Failed to shut down backend"
 msgstr "Impossible d'etteindre le module"
 
-#: gconf/gconf-database.c:231
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "R嶰eption d'une valeur invalide dans la requ皻e de d嶨inition"
 
-#: gconf/gconf-database.c:239
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Impossible de comprendre le sens de la valeur CORBA re蓰 dans la requ皻e de "
 "d嶨inition de la cl� � %s �"
 
-#: gconf/gconf-database.c:517
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "R嶰eption de la requ皻e d'abandonner toutes les donn嶪s cach嶪s"
 
-#: gconf/gconf-database.c:534
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "R嶰eption de la requ皻e de synchronisation synchrone"
 
-#: gconf/gconf-database.c:601
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "Erreur fatale : impossible d'obtenir la r嶨廨ence de l'objet pour "
 "ConfigDatabase"
 
-#: gconf/gconf-database.c:760
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Impossible de synchroniser une ou plusieurs sources : %s"
@@ -336,7 +312,7 @@ msgstr "Impossible de synchroniser une ou plusieurs sources : %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -347,12 +323,12 @@ msgstr ""
 "restorer cet 嶰outeur au red幦arrage de gconfd, r廥ultant en une "
 "notification non s�r de changements de configuration."
 
-#: gconf/gconf-database.c:873
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "L'嶰outeur ID %lu n'existe pas"
 
-#: gconf/gconf-database.c:882
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -362,47 +338,47 @@ msgstr ""
 "d'historique (la plupart du temps sans probl鋗e, mais peut r廥ulter � la "
 "r嶧pparition d'une notification g幯ante) : %s"
 
-#: gconf/gconf-database.c:997 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Erreur durant l'obtention de la valeur de � %s � : %s"
 
-#: gconf/gconf-database.c:1044
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Erreur durant la d嶨inition de la valeur de � %s � : %s"
 
-#: gconf/gconf-database.c:1087
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Erreur durant l'annulation de � %s � : %s"
 
-#: gconf/gconf-database.c:1111
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Erreur durant l'obtention de la valeur par d嶨aut de � %s � : %s"
 
-#: gconf/gconf-database.c:1151
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Erreur durant la v廨ification de l'existence de � %s � : %s"
 
-#: gconf/gconf-database.c:1175
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Erreur durant la suppression du r廧ertoire � %s � : %s"
 
-#: gconf/gconf-database.c:1202
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Impossible d'obtenir toutes les entr嶪s dans � %s � : %s"
 
-#: gconf/gconf-database.c:1228
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Erreur durant le listage des r廧ertoires dans � %s � : %s"
 
-#: gconf/gconf-database.c:1249
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Erreur durant la definition du sch幦a pour � %s � : %s"
@@ -467,29 +443,250 @@ msgstr "Op廨ation interdite sans un serveur de configuration"
 msgid "Failed to get a lock"
 msgstr "Impossible d'obtenir un verrou"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "Aucune base de donn嶪s disponible pour sauvegarder votre configuration"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+"Erreur � la ligne %d caract鋨es %d : %s\n"
+"(Le texte englobant est � %s �)\n"
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+"Le texte finit au milieu d'une entit�, ou le nom de l'entit� est trop long "
+"pour 皻re valide ('&' doit commencer une entit� comme '&quot;')"
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+"Entit� inconnue � %s � ('&' doit commencer les entit廥 &amps; &quot; &lt; "
+"&gt; &apos;)"
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+"Le texte marqu� finit au mileu d'une r嶨廨ence de caract鋨e, just apr廥 '&#'"
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+"La r嶨廨ence du caract鋨e n'est pas un nombre � %s � ('&#' doit commencer "
+"une r嶨廨ence vers un caract鋨e unicode, comme '&#2342;')"
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+"Le texte finit au milieu d'une r嶨廨ence de caract鋨e ('&#' doit commencer "
+"une r嶨廨ence de caract鋨e comme '&#2342;')"
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+"Ne peut analyser la r嶨廨ence de caract鋨e � %s � ('&#' doit commencer une "
+"r嶨廨ence de caract鋨e comme '%#2343;')"
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+"Le code du caract鋨e %#lx n'est pas permis dans les documents XML ou n'est "
+"pas un caract鋨e Unicode valide."
+
+#: gconf/gconf-glib.c:1013
+#, fuzzy
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+"Le document finit juste apr廥 un '&', '&' doit commencer une entit� ou une "
+"r嶨廨ence de caract鋨e."
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+"Les caract鋨es '<' ou '>' ne sont pas permis ici; il ne sont permis "
+"qu'autour de balises, par exemple <bold> ou <paragraph>. Sinon, encodez ces "
+"caract鋨es comme les entit廥 &lt; et &gt;"
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr "Le caract鋨e � %s � n'est pas valide au d嶵ut d'un nom d'attribut"
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr "Le document finit just apr廥 un nom d'attribut"
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr "Le nom d'attribut doit 皻re imm嶮iatement suivi par un caract鋨e '='"
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+"Le caract鋨e '=' apr廥 un attribut doit 皻re imm嶮iatement suivi par le "
+"caract鋨e '\"'"
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+"Le caract鋨e '%c' a 彋� trouv� a l'int廨ieur d'une valeur d'attribut; peut "
+"皻re qu'il manque � votre valeur d'attibut le guillemet de fermeture '\"'"
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+"La fin du texte a 彋� rencontr嶪 avant le guillement final � \" � � "
+"l'int廨ieur d'une valeur d'attribut."
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+"Le texte finit imm嶮iatement apr廥 une valeur d'attribut avant que l'幨幦ent "
+"soit ferm�"
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr "Le caract鋨e � < � est manquant au d嶵ut de l'幨幦ent"
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr "Le document finit juste apr廥 le caract鋨e � < �"
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr "Aucun caract鋨e � > � trouv� pour <? ou <!"
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr "Le caract鋨e � %s � n'est pas valide au d嶵ut du nom d'un 幨幦ent"
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr "Le document finit juste apr廥 un nom d'幨幦ent, aucun � > � vu"
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+"Les 幨幦ents doivent 皻re ferm� avec � > � ou � /> �, et non avec � %s �"
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+"L'幨幦ent finit juste apr廥 � / �, aucun � > � vu; les 幨幦ents vides "
+"doivent finir avec � /> �"
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr "Balise de fermeture non trouv� � la fin de l'幨幦ent"
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr "Une balise de fermeture finit juste apr廥 le caract鋨e � < �"
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+"Une balise de fermeture doit commencer avec � </ �, le caract鋨e � / � est "
+"manquant"
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr "Une balise de fermeture finit juste apr廥 le caract鋨e � / �"
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+"Le document finit juste apr廥 un nom d'幨幦ent dans une balise de fermeture, "
+"aucun � > � vu"
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+"Le document finit juste apr廥 le nom d'une balise de fermeture, aucun � > � "
+"vu"
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+"La balise de fermeture � %s � ne correspond pas � la balise d'ouverture � %s "
+"�"
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+"Caract鋨e UTF-8 invalide � l'octet %d du texte marqu�. Une portion du texte "
+"avant le mauvais caract鋨e est � %s �"
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr "Le texte marqu� ne contient rien d'autres que des espaces."
+
+#: gconf/gconf-glib.c:10666
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Impossible d'ouvrir le fichier � %s � : %s"
+
+#: gconf/gconf-glib.c:10683
+#, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Erreur durant la lecture du fichier � %s � : %s"
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Pas de � / � dans la cl� � %s �"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Impossible d'interpr彋er la valeur CORBA pour l'幨幦ent de liste"
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Type incorrect pour un 幨幦ent de liste dans %s"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "R嶰eption d'une liste depuis gconfd avec un mauvais type de liste"
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:445
 msgid "Failed to convert object to IOR"
 msgstr "Impossible de convertir l'objet vers IOR"
 
@@ -498,97 +695,92 @@ msgstr "Impossible de convertir l'objet vers IOR"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Ne peut ouvrir le chemin d'acc鋊 des fichiers � %s � : %s\n"
 
-#: gconf/gconf-internals.c:858
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Ajout de la source � %s 蓋n"
 
-#: gconf/gconf-internals.c:870
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Erreur lu dans le fichier � %s � : %s\n"
 
-#: gconf/gconf-internals.c:1293
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Attend une liste, obtient %s"
 
-#: gconf/gconf-internals.c:1303
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Attend une liste de %s, obtient une liste de %s"
 
-#: gconf/gconf-internals.c:1442
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Attend une paire, obtient %s"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Attend une paire (%s,%s), obtient une paire avec une ou deux valeur manquante"
 
-#: gconf/gconf-internals.c:1472
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Attend une paire de type (%s,%s), obtient type (%s,%s)"
 
-#: gconf/gconf-internals.c:1588
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "La cha螽e guillemet嶪 ne commence pas avec une marque de citation"
 
-#: gconf/gconf-internals.c:1650
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "La cha螽e guillemet嶪 ne se finit pas avec une marque de citation"
 
-#: gconf/gconf-internals.c:2130 gconf/gconf.c:3002
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Erreur CORBA : %s"
 
-#: gconf/gconf-internals.c:2146
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "Description du probl鋗e OAF : � %s �"
-
-#: gconf/gconf-internals.c:2152
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "tentative de supprimer un objet r廧ertoire OAF non list�"
 
-#: gconf/gconf-internals.c:2157
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "tentative d'ajouter un r廧ertoire OAF d嶴� list�"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Erreur OAF d'analyse : %s"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Erreur OAF inconnu"
 
-#: gconf/gconf-internals.c:2252
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Pas de fichier ior dans � %s �"
 
-#: gconf/gconf-internals.c:2283
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd a pris le verrou � %s � d'un autre processus"
 
-#: gconf/gconf-internals.c:2294
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Un autre programme a le verrou � %s �"
 
-#: gconf/gconf-internals.c:2314
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "impossible de contacter ORB pour � pinger � le gconfd existant"
 
-#: gconf/gconf-internals.c:2322
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -597,46 +789,46 @@ msgstr ""
 "Suppression du verrrou p廨im� � %s � parce que IOR ne peut 皻re converti "
 "vers une r嶨廨ence d'objet, IOR � %s �"
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "Suppression du verrou p廨im� � %s � � cause d'une erreur de contact du "
 "serveur : %s"
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "Le d幦on de configuration GConf (gconfd) a le verrou � %s �"
 
-#: gconf/gconf-internals.c:2360
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "impossible de cr嶪r le r廧ertoire � %s � : %s"
 
-#: gconf/gconf-internals.c:2395
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Impossible de cr嶪r le verrou � %s � : %s"
 
-#: gconf/gconf-internals.c:2431
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Impossible d'嶰rire vers le fichier � %s � : %s"
 
-#: gconf/gconf-internals.c:2474
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "Impossible d'ouvrir le verrou de fichier � %s � ; pr廥ume que ce n'est pas "
 "le notre : %s"
 
-#: gconf/gconf-internals.c:2491
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Verrou de fichier � %s � corrompu, supprim�"
 
-#: gconf/gconf-internals.c:2501
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -645,27 +837,27 @@ msgstr ""
 "Impossible de cr嶪r le verrou de fichier � %s � (pid du cr嶧teur %u, votre "
 "pid %u; pr廥ume que quelqu'un � pris votre verrou"
 
-#: gconf/gconf-internals.c:2518
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Impossible de lib廨er le verrou de r廧ertoire � %s � : %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Impossible de charger la source � %s � : %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 "Le sch幦a � %s � sp嶰ifi� pour � %s � ne contient pas une valeur de sch幦a"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Le nom � / � peut seulement 皻re un r廧ertoire, pas une cl�"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -674,22 +866,17 @@ msgstr ""
 "La valeur pour � %s � est d嶨ini dans une source en lecture seulement en "
 "premier dans votre chemin d'acc鋊 de configuration."
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "Incapable d'enregistrer une valeur � la cl� � %s �"
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Erreur lors de la recherche de la m彋ainfo : %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Erreur durant l'obtention de la m彋ainfo : %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -766,22 +953,22 @@ msgstr ""
 msgid "`%s': %s"
 msgstr "� %s � : %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Le serveur ne peut r廥oudre l'adresse � %s �"
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 "Impossible d'ajouter des notifications � une source de configuration locale"
 
-#: gconf/gconf.c:1781
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr "L'ajout de client � la liste de serveurs a 嶰hou�, erreur CORBA : %s"
 
-#: gconf/gconf.c:1797
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -791,66 +978,66 @@ msgstr ""
 "oaf_activate_from_id() et ne d嶨init pas une exception expliquant le "
 "probl鋗e. Envoyez par courrier 幨ectronique un rapport d'anomalies, SVP."
 
-#: gconf/gconf.c:2108
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Impossible d'initialiser GConf, quitte\n"
 
-#: gconf/gconf.c:2145
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Doit commencer avec un slash (/)"
 
-#: gconf/gconf.c:2167
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Impossible d'avoir deux slashs (/) dans une rang嶪"
 
-#: gconf/gconf.c:2169
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Impossible d'avoir un point (.) juste apr廥 un slash (/)"
 
-#: gconf/gconf.c:2190
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "� %c � est un caract鋨e invalide dans un nom de cl�/r廧ertoire"
 
-#: gconf/gconf.c:2204
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Une cl�/r廧ertoire ne peut se finir avec un slash (/)"
 
-#: gconf/gconf.c:2457
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "丱hec d'extinction du serveur de configuration : %s"
 
-#: gconf/gconf.c:2518
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Flottant attendu, obtenu %s"
 
-#: gconf/gconf.c:2553
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Entier attendu, obtenu %s"
 
-#: gconf/gconf.c:2588
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Cha螽e attendu, obtenu %s"
 
-#: gconf/gconf.c:2625
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Bool嶧in attendu, obtenu %s"
 
-#: gconf/gconf.c:2658
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Sch幦a attendu, obtenu %s"
 
-#: gconf/gconfd.c:246
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "R嶰eption de la requ皻e d'extinction"
 
-#: gconf/gconfd.c:278
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -858,7 +1045,7 @@ msgstr ""
 "gconfd compil� avec d嶵ogage; tente de charger gconf.path depuis le "
 "r廧ertoire de source"
 
-#: gconf/gconfd.c:292
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -866,10 +1053,7 @@ msgstr ""
 "Aucuns fichiers de configuration trouv廥, tente d'utiliser la source de "
 "configuration par d嶨aut � %s �"
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:300
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -877,12 +1061,12 @@ msgstr ""
 "Aucunes sources de configuration dans le chemin d'acc鋊 des sources, "
 "configuration ne seront pas sauv嶪s; 嶮itez "
 
-#: gconf/gconfd.c:313
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Erreur lors du chargement de quelques sources de configuration : %s"
 
-#: gconf/gconfd.c:325
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -890,7 +1074,7 @@ msgstr ""
 "Aucunes adresses de source de configuration correctement r廥olues, "
 "impossible de charger ou d'enregistrer de donn嶪s de configuration."
 
-#: gconf/gconfd.c:342
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -899,34 +1083,28 @@ msgstr ""
 "il est possible que quelques changements de configuration ne puissent 皻re "
 "sauv廥"
 
-#: gconf/gconfd.c:368
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-"R嶰eption du signal %d, cr嶪 un fichier core. Veuillez rapporter l'anomalie "
-"GConf."
+msgid "Received signal %d, shutting down."
+msgstr "R嶰eption du signal %d, acheve."
 
-#: gconf/gconfd.c:384
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"R嶰eption du signal %d, s'彋eind anormalement. Veuillez faire un rapport "
-"d'anomalie GConf."
-
-#: gconf/gconfd.c:401
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "R嶰eption du signal %d, s'etteind proprement"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:502
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "d幦arrage (version %s), pid %u utilisateur � %s �"
 
-#: gconf/gconfd.c:529
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr "GConf a 彋� compil� avec les fonctionnalit廥 de d嶵ogage activ嶪s"
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -934,11 +1112,11 @@ msgstr ""
 "Impossible d'initialiser � Object Activation Framework � : envoyer un "
 "rapport d'anomalies par courrier 幨ectronique aux mainteneurs d'OAF, SVP."
 
-#: gconf/gconfd.c:549
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Impossible d'obtenir la r嶨廨ence de l'objet pour ConfigServer"
 
-#: gconf/gconfd.c:569
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -946,29 +1124,25 @@ msgstr ""
 "OAF ne connait rien de votre IID ; s�rement une mauvaise installation ; "
 "impossible de s'enregistrer ; quitte\n"
 
-#: gconf/gconfd.c:573
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Un autre gconfd est d嶴� enregistr� aupr廥 de OAF ; quitte\n"
 
-#: gconf/gconfd.c:578
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr ""
 "Erreur inconnu durant l'enregistrement de gconfd aupr廥 de OAF ; quitte\n"
 
-#: gconf/gconfd.c:616
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Quitte"
 
-#: gconf/gconfd.c:641
-msgid "GConf server is not in use, shutting down."
-msgstr "Le serveur GConf n'est pas en cours d'utilisation, extinction."
-
-#: gconf/gconfd.c:1000
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Exception retourn嶪 : %s"
 
-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -977,7 +1151,7 @@ msgstr ""
 "Impossible d'ouvrir le fichier de trace de gconfd ; ne sera pas capable de "
 "restorer les 嶰outeurs apr廥 l'extinction de gconfd (%s)"
 
-#: gconf/gconfd.c:1135
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -985,32 +1159,32 @@ msgstr ""
 "Impossible de fermer le fichier de trace de gconfd ; des donn嶪s peuvent ne "
 "pas avoir 彋� correctement enregistr嶪s (%s)"
 
-#: gconf/gconfd.c:1204
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Ne peut ouvrir le fichier d'彋at enregistr� � %s � pour 嶰riture : %s"
 
-#: gconf/gconfd.c:1218
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Ne peut 嶰rire le fichier d'彋at enregistr� � %s � fd : %d : %s"
 
-#: gconf/gconfd.c:1227
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Ne peut fermer le nouveau fichier d'彋at enregistr� � %s � : %s"
 
-#: gconf/gconfd.c:1241
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Ne peut d廧lacer le vieux fichier d'彋at enregistr� � %s � : %s"
 
-#: gconf/gconfd.c:1251
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Ne peut d廧lacer le nouveau fichier d'彋at enregistr� � la place : %s"
 
-#: gconf/gconfd.c:1260
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1018,7 +1192,52 @@ msgstr ""
 "Impossible de restorer le fichier d'彋at original enregistr� qui a 彋� "
 "d廧lac� vers � %s � : %s"
 
-#: gconf/gconfd.c:1735
+#: gconf/gconfd.c:1110
+#, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Ne peut comprendre une ligne du fichier d'彋at enregistr� : � %s �"
+
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
+msgstr ""
+"Impossible d'analyser l'ID de connection dans le fichier d'彋at enregistr�"
+
+#: gconf/gconfd.c:1140
+#, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr ""
+"Impossible de d嶲uillemetter l'adresse de la source de configuration du "
+"fichier d'彋at enregistr� : %s"
+
+#: gconf/gconfd.c:1160
+#, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr ""
+"Impossible de d嶲uillemetter l'emplacement de l'嶰outeur du fichier d'彋at "
+"enregistr� : %s"
+
+#: gconf/gconfd.c:1180
+#, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Impossible de d嶲uillemetter l'IOR du fichier d'彋at enregistr� : %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+"Le fichier d'彋at enregistr� enregistre le m瘱e 嶰outeur ajout� deux fois ; "
+"Ignore la seconde instance"
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+"Le fichier d'彋at enregistr� a une suppression d'un 嶰outeur qui n'a pas 彋� "
+"ajout� ; ignore la suppression"
+
+#: gconf/gconfd.c:1346
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1026,17 +1245,12 @@ msgstr ""
 "Incapable de restorer un 嶰outeur � l'adresse � %s �, ne peut r廥oudre la "
 "base de donn嶪s"
 
-#: gconf/gconfd.c:1781
-#, c-format
-msgid "Error reading saved state file: %s"
-msgstr "Erreur de lecture du fichier d'彋at enregistr� : %s"
-
-#: gconf/gconfd.c:1834
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Incapable d'ouvrir le fichier d'彋at enregistr� � %s � : %s"
 
-#: gconf/gconfd.c:1951
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to "
@@ -1046,7 +1260,7 @@ msgstr ""
 "gconfd; ne sera pas capable de r嶧jouter l'嶰outeur si gconfd quitte ou "
 "s'eteinds (%s)"
 
-#: gconf/gconfd.c:1956
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously "
@@ -1056,48 +1270,19 @@ msgstr ""
 "gconfd; peut r嶧jouter par erreur l'嶰outeur si gconfd quitte ou s'彋einds "
 "(%s)"
 
-#: gconf/gconfd.c:1979 gconf/gconfd.c:2144
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "Impossible d'obtenir l'IOR pour le client : %s"
-
-#: gconf/gconfd.c:1994
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "Impossible d'ouvrir le fichier d'彋at enregistr� : %s"
-
-#: gconf/gconfd.c:2007
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr ""
-"Impossible d'嶰rire l'ajout du client au fichier d'彋at enregistr� : %s"
-
-#: gconf/gconfd.c:2015
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr ""
-"Impossible de vider l'ajout du client au fichier d'彋at enregistr� : %s"
-
-#: gconf/gconfd.c:2105
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr ""
-"Quelque client se sont supprim� d'eux-m瘱e du serveur GConf alors qu'ils "
-"n'avaient m瘱e pas 彋� ajout廥"
-
-#: gconf/gconftool.c:63
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Options d'aide"
 
-#: gconf/gconftool.c:72
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "D嶨init une valeur � une cl� et synchronise. � utiliser avec --type."
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Affiche la valeeur d'une cl� sur la sortie standard."
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -1105,36 +1290,36 @@ msgstr ""
 "D嶨init un sch幦a et synchronise. � utiliser avec --short-desc, --long-desc, "
 "--owner, et --type."
 
-#: gconf/gconftool.c:100
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "Annule les cl廥 pr廥entes sur la ligne de commande."
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Affiche toutes les paires cl�/valeur d'un r廧ertoire."
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Affiche tous les sous-r廧ertoires d'un r廧ertoire."
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Affiche tous les sous-r廧ertoires et entr嶪s d'un r廧ertoire, recursivement."
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Retourne 0 si le r廧ertoire existe, sinon 2."
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Ach鋦e gconfd. N'UTILISEZ PAS CETTE OPTION SANS UNE BONNE RAISON."
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Retourne 0 si gconfd fonctionne, sinon 2."
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1142,7 +1327,7 @@ msgstr ""
 "Ex嶰ute le serveur de configuration (gconfd). (Normallement cela ce fait "
 "automatiquement quand c'est n嶰essaire.)"
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1150,11 +1335,11 @@ msgstr ""
 "Sp嶰ifie le type d'une valeur � d嶨inir, ou le type d'une valeur que d嶰rit "
 "un sch幦a.  Abbr憝iation unique OK."
 
-#: gconf/gconftool.c:173
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1162,11 +1347,11 @@ msgstr ""
 "Sp嶰ifie le type d'une liste de valeur � d嶨inir, ou le type d'une valeur "
 "que d嶰rit un sch幦a. Abbr憝iation unique OK."
 
-#: gconf/gconftool.c:182 gconf/gconftool.c:191 gconf/gconftool.c:200
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1174,7 +1359,7 @@ msgstr ""
 "Sp嶰ifie le type de la valeur du premier 幨幦ent d'une paire � d嶨inir, ou "
 "le type d'une valeur que d嶰rit un sch幦a. Abbr憝iation unique OK."
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1182,46 +1367,46 @@ msgstr ""
 "Sp嶰ifie le type de la valeur du second 幨幦ent d'une paire � d嶨inir, ou le "
 "type d'une valeur que d嶰rit un sch幦a. Abbr憝iation unique OK."
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "Sp嶰ifie une courte description d'une demi-ligne allant dans un sch幦a."
 
-#: gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "Sp嶰ifie une description de plusieurs ligne allant dans un sch幦a."
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "Sp嶰ifie le propri彋aire d'un sch幦a."
 
-#: gconf/gconftool.c:227
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "PROPRI仈AIRE"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "Sp嶰ifie le fichier du sch幦a � installer."
 
-#: gconf/gconftool.c:236
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "NOMDUFICHIER"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Sp嶰ifie une source de configuration � utiliser plut矌 que le chemin par "
 "d嶨aut."
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "SOURCE"
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1229,7 +1414,7 @@ msgstr ""
 "Acc鋄e directement � la base de donn嶪s de configuration, outrepassant le "
 "serveur. Il est n嶰essaire que gconfd ne fonctionne pas."
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1240,7 +1425,7 @@ msgstr ""
 "皻re d嶨ini sur la source de configuration par d嶨aut ou doit 皻re d嶨ini � "
 "une cha螽e vide pour utiliser la valeur par d嶨aut."
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1248,7 +1433,7 @@ msgstr ""
 "Torture-test une application en d嶨inissant et annulant un ensemble de "
 "valeurs de diff廨ents types pour les cl廥 de la ligne de commande."
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1256,7 +1441,7 @@ msgstr ""
 "Torture-test une application en d嶨inissant et annulant un ensemble de cl廥 "
 "� l'int廨ieur des r廧ertoires de la ligne de commande."
 
-#: gconf/gconftool.c:330
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1266,23 +1451,23 @@ msgstr ""
 "Executez � %s --help � pour voir la liste compl鋈e des options en ligne de "
 "commande disponibles.\n"
 
-#: gconf/gconftool.c:342
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Impossible d'obtenir ou d嶨inir/annuler simultanement\n"
 
-#: gconf/gconftool.c:349
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Impossible de d嶨inir ou d'obtenir/annuler simultan幦ent\n"
 
-#: gconf/gconftool.c:357
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "Impossible d'utiliser --all-pairs avec --get ou --set\n"
 
-#: gconf/gconftool.c:365
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Impossible d'utiliser --all-dirs avec --get ou --set\n"
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1290,7 +1475,7 @@ msgstr ""
 "--recursive-list ne devrait pas 皻re utilis� avec --get, --set, --unset, "
 "--all-pairs, ou --all-dirs\n"
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1298,59 +1483,59 @@ msgstr ""
 "--set_schema ne devrait pas 皻re utilis� avec --get, --set, --unset, "
 "--all-pairs, et --all-dirs\n"
 
-#: gconf/gconftool.c:391
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 "Le type de valeur est n嶰essaire seulement lorsque l'on d嶨inie une valeur\n"
 
-#: gconf/gconftool.c:397
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "Vous devez sp嶰ifier un type lorsque vous d嶨inissez une valeur\n"
 
-#: gconf/gconftool.c:406
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "L'option ping doit 皻re utilis嶪 seule.\n"
 
-#: gconf/gconftool.c:415
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "L'option --dir-exists doit 皻re utilis嶪 seule.\n"
 
-#: gconf/gconftool.c:424
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "L'option --install-schema-file doit 皻re utilis嶪 seule.\n"
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "L'option --makefile-install-rule doit 皻re utilis嶪 seule.\n"
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "L'option --break-key doit 皻re utilis嶪 seule.\n"
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "L'option --break-directory doit 皻re utilis嶪 seule.\n"
 
-#: gconf/gconftool.c:461
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "You devez sp嶰ifier une source de configuration avec --config-source quand "
 "vous utilisez --direct\n"
 
-#: gconf/gconftool.c:467
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Echec � l'initialisation de GConf : %s\n"
 
-#: gconf/gconftool.c:492
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Vous devez d嶨inir la variable d'environnement GCONF_CONFIG_SOURCE\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:507
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1363,224 +1548,218 @@ msgstr ""
 "qu'aucune applications ne fonctionne (cepandant, th廩riquement, cela devrait "
 "fonctionner m瘱e si des applications sont en cours de fonctionnement).\n"
 
-#: gconf/gconftool.c:529
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Impossible d'acc嶮er a(ux) source(s) de configuration : %s\n"
 
-#: gconf/gconftool.c:689
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Erreur d'extinction : %s\n"
 
-#: gconf/gconftool.c:732
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "Vous devez sp嶰ifier un ou plusieurs r廧ertoires � lister r嶰ursivement.\n"
 
-#: gconf/gconftool.c:766
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "丱hec lors du listage des paires dans � %s � : %s"
 
-#: gconf/gconftool.c:784
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(aucune valeur d嶨ini)"
 
-#: gconf/gconftool.c:839
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Impossible de 'spawner' le serveur de configuration (gconfd) : %s\n"
 
-#: gconf/gconftool.c:853
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "Vous devez sp嶰ifier une ou plusieurs cl廥 � d嶨inir\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Type : %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Type Liste : %s\n"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Type Car : %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Type Cdr : %s\n"
 
-#: gconf/gconftool.c:896
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr "Valeur par d嶨aut : %s\n"
+msgid "Owner: %s\n"
+msgstr "Propri彋aire : %s\n"
 
-#: gconf/gconftool.c:896 gconf/gconftool.c:898 gconf/gconftool.c:899
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Ind嶨ini"
 
-#: gconf/gconftool.c:898
-#, c-format
-msgid "Owner: %s\n"
-msgstr "Propri彋aire : %s\n"
-
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Courte desc. : %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Longue desc. : %s\n"
 
-#: gconf/gconftool.c:909
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Aucune valeur d嶨inie pour � %s 蓋n"
 
-#: gconf/gconftool.c:913
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Impossible d'obtenir de valeur pour � %s � : %s\n"
 
-#: gconf/gconftool.c:956 gconf/gconftool.c:968
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Ne comprend pas le type � %s 蓋n"
 
-#: gconf/gconftool.c:980
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Vous devez sp嶰ifier au choix des cl廥/valeurs comme param鋈res\n"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Aucune valeur � d嶨inir pour la cl� : � %s 蓋n"
 
-#: gconf/gconftool.c:1028
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Impossible de d嶨inir le sch幦a comme valeur\n"
 
-#: gconf/gconftool.c:1038
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 "Quand vous d嶨inissez une liste vous devez sp嶰ifier une primitive "
 "list-type\n"
 
-#: gconf/gconftool.c:1052
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Quand vous d嶨inissez une paire vous devez sp嶰ifier une primitive car-type "
 "et cdr-type\n"
 
-#: gconf/gconftool.c:1067
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erreur : %s\n"
 
-#: gconf/gconftool.c:1080 gconf/gconftool.c:1213
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Erreur � l'attribution de la valeur : %s"
 
-#: gconf/gconftool.c:1098 gconf/gconftool.c:1227
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Erreur de synchronisation : %s"
 
-#: gconf/gconftool.c:1116
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Vous devez sp嶰ifier un cl� (nom du sch幦a) comme seul param鋈re\n"
 
-#: gconf/gconftool.c:1158
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Le type de la liste doit 皻re un type primitif : string, int, float ou bool\n"
 
-#: gconf/gconftool.c:1178
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Le type car de la paire doit 皻re un type primitif : string, int, float ou "
 "bool\n"
 
-#: gconf/gconftool.c:1198
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Le type cdr de la paire doit 皻re un type primitif : string, int, float ou "
 "bool\n"
 
-#: gconf/gconftool.c:1242
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Vous devez sp嶰ifier un ou plusieurs r廧ertoires pour en obtenir les paires "
 "cl廥/valeurs.\n"
 
-#: gconf/gconftool.c:1256
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Vous devez sp嶰ifier une ou plusieurs cl廥 � annuler.\n"
 
-#: gconf/gconftool.c:1267
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Erreur d'annulation de � %s � : %s\n"
 
-#: gconf/gconftool.c:1290
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Vous devez sp嶰ifier un ou plusieurs r廧ertoires pour en obtenir les "
 "sous-r廧ertoires.\n"
 
-#: gconf/gconftool.c:1324
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Erreur lors du listage des r廧ertoires : %s\n"
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "AVERT. : type invalide ou manquant pour le sch幦a (%s)\n"
 
-#: gconf/gconftool.c:1375
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "AVERT. : list_type invalide ou manquant pour le sch幦a (%s)\n"
 
-#: gconf/gconftool.c:1386 gconf/gconftool.c:1416 gconf/gconftool.c:1445
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "AVERT. : 丱hec d'analyse de la valeur par d嶨aut � %s � pour le sch幦a (%s)\n"
 
-#: gconf/gconftool.c:1404
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "AVERT. : car_type ou cdr_type invalide ou manquant pour le sch幦a (%s)\n"
 
-#: gconf/gconftool.c:1429
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "AVERT. : Vous ne pouvez d嶨inir une valeur par d嶨aut pour un sch幦a\n"
 
-#: gconf/gconftool.c:1458
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "AVERT. : erreur interne gconftool, GConfValueType inconnu\n"
 
-#: gconf/gconftool.c:1505 gconf/gconftool.c:1526 gconf/gconftool.c:1547
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "AVERT. : impossible d'analyser le nom du type � %s 蓋n"
 
-#: gconf/gconftool.c:1522
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1588,39 +1767,39 @@ msgstr ""
 "AVERT. : list_type peur seulement 皻re int, float, string ou bool et non � "
 "%s 蓋n"
 
-#: gconf/gconftool.c:1543
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVERT. : car_type peur seulement 皻re int, float, string ou bool et non � %s "
 "蓋n"
 
-#: gconf/gconftool.c:1564
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVERT. : cdr_type peur seulement 皻re int, float, string ou bool et non � %s "
 "蓋n"
 
-#: gconf/gconftool.c:1592
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "AVERT. : noeud <applyto> vide"
 
-#: gconf/gconftool.c:1595 gconf/gconftool.c:1858
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "AVERT. : le noeud <%s> n'est pas compris sous <schema>\n"
 
-#: gconf/gconftool.c:1605
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "AVERT. : aucune cl� sp嶰ifi� pour le sch幦a\n"
 
-#: gconf/gconftool.c:1638
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "AVERT. : le noeud <locale> n'a aucun attribut � name=\"locale\" �, ignor嬞n"
 
-#: gconf/gconftool.c:1644
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1628,53 +1807,53 @@ msgstr ""
 "AVERT. : plusieurs noeuds <locale> pour la locale � %s �, ignore tous sauf "
 "le premier\n"
 
-#: gconf/gconftool.c:1725
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "AVERT. : Noeud <%s> invalide dans un noeud <locale>\n"
 
-#: gconf/gconftool.c:1754
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 "AVERT. : impossible d'installer le sch幦a � %s � pour la locale � %s � : %s\n"
 
-#: gconf/gconftool.c:1762
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Sch幦a � %s � install� pour la locale � %s 蓋n"
 
-#: gconf/gconftool.c:1784
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 "AVERT. : impossible d'associer le sch幦a � %s � avec la cl� � %s � : %s\n"
 
-#: gconf/gconftool.c:1792
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Sch幦a � %s � attach� � la cl� � %s 蓋n"
 
-#: gconf/gconftool.c:1871
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Vous devez avoir au moins une entr嶪 <locale> dans un <schema>\n"
 
-#: gconf/gconftool.c:1900
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "AVERT. : le noeud <%s> n'est pas compris sous <schemalist>\n"
 
-#: gconf/gconftool.c:1922
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Impossible d'ouvrir � %s � : %s\n"
 
-#: gconf/gconftool.c:1929
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Le document � %s � est vide ?\n"
 
-#: gconf/gconftool.c:1941
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1683,26 +1862,26 @@ msgstr ""
 "Le document � %s � a le mauvais type de noeud racine (<%s>, devrait 皻re "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1954
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Le document � %s � n'a pas de noeud racine <gconfschemafile>\n"
 
-#: gconf/gconftool.c:1968
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "AVERT. : le noeud <%s> sous <gconfschemafile> n'est pas compris\n"
 
-#: gconf/gconftool.c:1979 gconf/gconftool.c:2011
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Erreur de synchronisation des donn嶪s de configuration : %s"
 
-#: gconf/gconftool.c:1995
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Vous devez sp嶰ifier quelques fichiers de sch幦a � installer\n"
 
-#: gconf/gconftool.c:2032
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1711,16 +1890,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2052
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "丱hec de l'annulation de la cl� de torture %s : %s\n"
 
-#: gconf/gconftool.c:2178
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "Vous devez sp嶰ifier quelques cl廥 � torturer\n"
 
-#: gconf/gconftool.c:2184
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1730,11 +1909,11 @@ msgstr ""
 "valeurs pour les cl廥 :\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2202
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "Vous devez sp嶰ifier quelques r廧ertoires � torturer\n"
 
-#: gconf/gconftool.c:2221
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1745,243 +1924,89 @@ msgstr ""
 "valeurs pour les cl廥 dans le r廧ertoire :\n"
 "  %s\n"
 
-#: gconf/gconf-client.c:296 gconf/gconf-client.c:313
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "Erreur GConf : %s\n"
-
-#: gconf/gconf-client.c:796
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 "Avertissement GConf : 嶰hec lors du listage des paires dans � %s � : %s"
 
-#: gconf/gconf-client.c:998
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "� %s � attendu, obtenu � %s � pour la cl� %s"
 
-#~ msgid "GConf was built with debugging features enabled"
-#~ msgstr "GConf a 彋� compil� avec les fonctionnalit廥 de d嶵ogage activ嶪s"
-
-#~ msgid "found <local_schema> with no locale setting"
-#~ msgstr "a trouv� <local_schema> avec aucun r嶲lage de locale"
-
-#~ msgid ""
-#~ "Error on line %d char %d: %s\n"
-#~ "(Some surrounding text was '%s')\n"
-#~ msgstr ""
-#~ "Erreur � la ligne %d caract鋨es %d : %s\n"
-#~ "(Le texte englobant est � %s �)\n"
-
-#~ msgid ""
-#~ "Text ended in the middle of an entity, or entity name too long to be valid "
-#~ "('&' should begin an entity such as '&quot;')"
-#~ msgstr ""
-#~ "Le texte finit au milieu d'une entit�, ou le nom de l'entit� est trop long "
-#~ "pour 皻re valide ('&' doit commencer une entit� comme '&quot;')"
-
-#~ msgid ""
-#~ "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
-#~ msgstr ""
-#~ "Entit� inconnue � %s � ('&' doit commencer les entit廥 &amps; &quot; &lt; "
-#~ "&gt; &apos;)"
-
-#~ msgid ""
-#~ "Markup text ended in the middle of a character reference, just after '&#'"
-#~ msgstr ""
-#~ "Le texte marqu� finit au mileu d'une r嶨廨ence de caract鋨e, just apr廥 '&#'"
-
-#~ msgid ""
-#~ "Character reference contained non-digit '%s' ('&#' should begin a reference "
-#~ "to a unicode character, such as '&#2342;')"
-#~ msgstr ""
-#~ "La r嶨廨ence du caract鋨e n'est pas un nombre � %s � ('&#' doit commencer "
-#~ "une r嶨廨ence vers un caract鋨e unicode, comme '&#2342;')"
-
-#~ msgid ""
-#~ "Text ended in the middle of an character reference ('&#' should begin a "
-#~ "character reference such as '&#2342;')"
-#~ msgstr ""
-#~ "Le texte finit au milieu d'une r嶨廨ence de caract鋨e ('&#' doit commencer "
-#~ "une r嶨廨ence de caract鋨e comme '&#2342;')"
-
-#~ msgid ""
-#~ "Couldn't parse character reference '%s' ('&#' must begin a character "
-#~ "reference such as '&#2343;')"
-#~ msgstr ""
-#~ "Ne peut analyser la r嶨廨ence de caract鋨e � %s � ('&#' doit commencer une "
-#~ "r嶨廨ence de caract鋨e comme '%#2343;')"
-
-#~ msgid ""
-#~ "Character code %#lx is not allowed in XML documents or is not a valid "
-#~ "Unicode character"
-#~ msgstr ""
-#~ "Le code du caract鋨e %#lx n'est pas permis dans les documents XML ou n'est "
-#~ "pas un caract鋨e Unicode valide."
-
-#, fuzzy
-#~ msgid ""
-#~ "Documented ended just after an '&', '&' should begin an entity or character "
-#~ "reference."
-#~ msgstr ""
-#~ "Le document finit juste apr廥 un '&', '&' doit commencer une entit� ou une "
-#~ "r嶨廨ence de caract鋨e."
-
-#~ msgid ""
-#~ "'<' or '>' character not allowed here; only allowed around tags, for example "
-#~ "<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
-#~ "&lt; and &gt;"
-#~ msgstr ""
-#~ "Les caract鋨es '<' ou '>' ne sont pas permis ici; il ne sont permis "
-#~ "qu'autour de balises, par exemple <bold> ou <paragraph>. Sinon, encodez ces "
-#~ "caract鋨es comme les entit廥 &lt; et &gt;"
-
-#~ msgid "Character '%s' is not valid at the start of an attribute name"
-#~ msgstr "Le caract鋨e � %s � n'est pas valide au d嶵ut d'un nom d'attribut"
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "D嶰hargement du module BerkeleyDB (BDB)."
 
-#~ msgid "Document ended just after attribute name"
-#~ msgstr "Le document finit just apr廥 un nom d'attribut"
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "Source BerkeleyDB ouverte � la racine %s"
 
-#~ msgid "Attribute name must be immediately followed by an '=' character"
-#~ msgstr ""
-#~ "Le nom d'attribut doit 皻re imm嶮iatement suivi par un caract鋨e '='"
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "Initialisation du module BDB"
 
-#~ msgid ""
-#~ "'=' character after attribute must be immediately followed by an '\"' "
-#~ "character"
-#~ msgstr ""
-#~ "Le caract鋨e '=' apr廥 un attribut doit 皻re imm嶮iatement suivi par le "
-#~ "caract鋨e '\"'"
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "Ne peut trouver le r廧ertoire racine %s � l'adresse � %s �"
 
 #~ msgid ""
-#~ "Character '%c' found inside an attribute value; perhaps your attribute value "
-#~ "is missing the closing quotation mark '\"'"
+#~ "Can't read from or write to the %s root directory in the address `%s'"
 #~ msgstr ""
-#~ "Le caract鋨e '%c' a 彋� trouv� a l'int廨ieur d'une valeur d'attribut; peut "
-#~ "皻re qu'il manque � votre valeur d'attibut le guillemet de fermeture '\"'"
+#~ "Ne peut lire ou 嶰rire vers le r廧ertoire racine %s � l'adresse � %s �"
 
-#~ msgid ""
-#~ "Ran out of text before a quote mark ('\"') was seen at the end of an "
-#~ "attribute value"
-#~ msgstr ""
-#~ "La fin du texte a 彋� rencontr嶪 avant le guillement final � \" � � "
-#~ "l'int廨ieur d'une valeur d'attribut."
+#~ msgid "Failed to set mode on `%s': %s"
+#~ msgstr "Impossible de d嶨inir le mode de � %s � : %s"
 
-#~ msgid ""
-#~ "Text ends immediately after an attribute value, before the element was closed"
+#~ msgid "No database available to save your configuration"
 #~ msgstr ""
-#~ "Le texte finit imm嶮iatement apr廥 une valeur d'attribut avant que l'幨幦ent "
-#~ "soit ferm�"
-
-#~ msgid "Missing '<' at start of element"
-#~ msgstr "Le caract鋨e � < � est manquant au d嶵ut de l'幨幦ent"
-
-#~ msgid "Document ended just after '<' character"
-#~ msgstr "Le document finit juste apr廥 le caract鋨e � < �"
+#~ "Aucune base de donn嶪s disponible pour sauvegarder votre configuration"
 
-#~ msgid "No closing '>' found for a <? or <!"
-#~ msgstr "Aucun caract鋨e � > � trouv� pour <? ou <!"
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "Description du probl鋗e OAF : � %s �"
 
-#~ msgid "Character '%s' is not valid at the start of an element name"
-#~ msgstr "Le caract鋨e � %s � n'est pas valide au d嶵ut du nom d'un 幨幦ent"
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Incapable d'enregistrer une valeur � la cl� � %s �"
 
-#~ msgid "Document ended just after element name, no '>' seen"
-#~ msgstr "Le document finit juste apr廥 un nom d'幨幦ent, aucun � > � vu"
-
-#~ msgid "Elements should be closed with '>' or '/>', not with '%s'"
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
 #~ msgstr ""
-#~ "Les 幨幦ents doivent 皻re ferm� avec � > � ou � /> �, et non avec � %s �"
+#~ "R嶰eption du signal %d, cr嶪 un fichier core. Veuillez rapporter l'anomalie "
+#~ "GConf."
 
 #~ msgid ""
-#~ "Element ended just after '/', no '>' seen; empty elements should end with "
-#~ "'/>'"
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 #~ msgstr ""
-#~ "L'幨幦ent finit juste apr廥 � / �, aucun � > � vu; les 幨幦ents vides "
-#~ "doivent finir avec � /> �"
-
-#~ msgid "Close tag not found at end of element"
-#~ msgstr "Balise de fermeture non trouv� � la fin de l'幨幦ent"
+#~ "R嶰eption du signal %d, s'彋eind anormalement. Veuillez faire un rapport "
+#~ "d'anomalie GConf."
 
-#~ msgid "Close tag ends just after '<' character"
-#~ msgstr "Une balise de fermeture finit juste apr廥 le caract鋨e � < �"
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "Le serveur GConf n'est pas en cours d'utilisation, extinction."
 
-#~ msgid "Close tag should begin with '</', '/' character is missing"
-#~ msgstr ""
-#~ "Une balise de fermeture doit commencer avec � </ �, le caract鋨e � / � est "
-#~ "manquant"
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "Erreur de lecture du fichier d'彋at enregistr� : %s"
 
-#~ msgid "Close tag ends just after '/' character"
-#~ msgstr "Une balise de fermeture finit juste apr廥 le caract鋨e � / �"
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "Impossible d'obtenir l'IOR pour le client : %s"
 
-#~ msgid "Document ended just after element name in close tag, no '>' seen"
-#~ msgstr ""
-#~ "Le document finit juste apr廥 un nom d'幨幦ent dans une balise de fermeture, "
-#~ "aucun � > � vu"
+#~ msgid "Failed to open saved state file: %s"
+#~ msgstr "Impossible d'ouvrir le fichier d'彋at enregistr� : %s"
 
-#~ msgid "Document ended just after close tag name, no '>' seen"
+#~ msgid "Failed to write client add to saved state file: %s"
 #~ msgstr ""
-#~ "Le document finit juste apr廥 le nom d'une balise de fermeture, aucun � > � "
-#~ "vu"
+#~ "Impossible d'嶰rire l'ajout du client au fichier d'彋at enregistr� : %s"
 
-#~ msgid "Close tag '%s' does not match opening tag '%s'"
+#~ msgid "Failed to flush client add to saved state file: %s"
 #~ msgstr ""
-#~ "La balise de fermeture � %s � ne correspond pas � la balise d'ouverture � %s "
-#~ "�"
+#~ "Impossible de vider l'ajout du client au fichier d'彋at enregistr� : %s"
 
 #~ msgid ""
-#~ "Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
-#~ "bad character was '%s'"
+#~ "Some client removed itself from the GConf server when it hadn't been added."
 #~ msgstr ""
-#~ "Caract鋨e UTF-8 invalide � l'octet %d du texte marqu�. Une portion du texte "
-#~ "avant le mauvais caract鋨e est � %s �"
-
-#~ msgid "The marked-up text contained nothing but whitespace."
-#~ msgstr "Le texte marqu� ne contient rien d'autres que des espaces."
-
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Impossible d'ouvrir le fichier � %s � : %s"
-
-#~ msgid "Error reading file '%s': %s"
-#~ msgstr "Erreur durant la lecture du fichier � %s � : %s"
-
-#~ msgid "Received signal %d, shutting down."
-#~ msgstr "R嶰eption du signal %d, acheve."
+#~ "Quelque client se sont supprim� d'eux-m瘱e du serveur GConf alors qu'ils "
+#~ "n'avaient m瘱e pas 彋� ajout廥"
 
-#~ msgid "Didn't understand line in saved state file: '%s'"
-#~ msgstr "Ne peut comprendre une ligne du fichier d'彋at enregistr� : � %s �"
+#~ msgid "Default Value: %s\n"
+#~ msgstr "Valeur par d嶨aut : %s\n"
 
-#~ msgid "Failed to parse connection ID in saved state file"
-#~ msgstr ""
-#~ "Impossible d'analyser l'ID de connection dans le fichier d'彋at enregistr�"
-
-#~ msgid "Failed to unquote config source address from saved state file: %s"
-#~ msgstr ""
-#~ "Impossible de d嶲uillemetter l'adresse de la source de configuration du "
-#~ "fichier d'彋at enregistr� : %s"
-
-#~ msgid "Failed to unquote listener location from saved state file: %s"
-#~ msgstr ""
-#~ "Impossible de d嶲uillemetter l'emplacement de l'嶰outeur du fichier d'彋at "
-#~ "enregistr� : %s"
-
-#~ msgid "Failed to unquote IOR from saved state file: %s"
-#~ msgstr ""
-#~ "Impossible de d嶲uillemetter l'IOR du fichier d'彋at enregistr� : %s"
-
-#~ msgid ""
-#~ "Saved state file records the same listener added twice; ignoring the second "
-#~ "instance"
-#~ msgstr ""
-#~ "Le fichier d'彋at enregistr� enregistre le m瘱e 嶰outeur ajout� deux fois ; "
-#~ "Ignore la seconde instance"
-
-#~ msgid ""
-#~ "Saved state file had a removal of a listener that wasn't added; ignoring the "
-#~ "removal."
-#~ msgstr ""
-#~ "Le fichier d'彋at enregistr� a une suppression d'un 嶰outeur qui n'a pas 彋� "
-#~ "ajout� ; ignore la suppression"
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "Erreur GConf : %s\n"
 
 #~ msgid ""
 #~ "Saved state file records the same client added twice; ignoring the second "
diff --git a/po/hu.po b/po/hu.po
index 29358b9f..861f405e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 0.6\n"
-"POT-Creation-Date: 2001-02-05 16:04-0500\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2001-02-07 19:01+01:00\n"
 "Last-Translator: Gabor Laszlo Kiss <docy@levele.com>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -12,34 +12,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "BerkeleyDB (BDB) backend-modul elt嫛ol癃嫳a."
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "BerkeleyDB forr嫳 nyitva van a gy闥廨ben %s"
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "BDB backend-modul ind癃嫳a"
-
-#: backends/dir-utils.c:108
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "Nem tal嫮hat� a %s gy闥廨 k霵yvt嫫 a `%s' c璥en"
-
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "Nem lehet a k霵yvt嫫at l彋rehozni `%s': %s"
-
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "Nem tudok olvasni vagy irni a %s gy闥廨 k霵yvt嫫ban a `%s' c璥en"
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Nincs bet闤tve az XML h嫢t廨 modul."
@@ -49,6 +21,11 @@ msgstr "Nincs bet闤tve az XML h嫢t廨 modul."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nem tal嫮hat� az XML gy闥廨 k霵yvt嫫 a `%s' c璥en"
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "Nem lehet a k霵yvt嫫at l彋rehozni `%s': %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -72,7 +49,7 @@ msgstr "Sikertelen az XML `%s' k霵yvt嫫 z嫫ol嫳嫕ak felold嫳a: %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "Szinkroniz嫮atlan k霵yvt嫫 t顤l廥ek az XML h嫢t廨 le嫮l癃嫳akor"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -81,7 +58,7 @@ msgstr ""
 "Lehetetlen a `%s' k霵yvt嫫 t顤l廥e az XML h嫢t廨 gyorst嫫b鏊, mert nem "
 "lehetett eredm幯yesen szinkroniz嫮ni a lemezhez"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -98,63 +75,58 @@ msgstr "Nem siker�lt a `%s' f奫l adatait lek廨dezni: %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML `%s' f奫ln憝 egy k霵yvt嫫"
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Sikertelen `%s' t顤l廥e: %s"
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Nem tudom 甏ni `%s' f奫lt: %s"
 
-#: backends/xml-dir.c:359
-#, fuzzy, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr "Sikertelen `%s' t顤l廥e: %s"
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Sikertelen 嫢nevez廥 `%s'-r鯷 `%s'-re: %s"
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Sikertelen vissza嫮l癃嫳 `%s'-re `%s'-r鯷: %s"
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Sikertelen a r嶲i `%s' f奫l t顤l廥e: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Sikertelen adat lek廨dez廥 a `%s'-r鯷: %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Kett鰆 bejegyz廥 `%s' a `%s'-ben, elvetem"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "N憝 n幨k�li bejegyz廥 az XML `%s' f奫lban, elvetem"
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Fels� szint� node az XML `%s' f奫lban nem <bejegyez廥>, elvetem"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Sikertelen a `%s' f奫l l彋rehoz嫳a: %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2471
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Sikertelen a `%s' f奫l bez嫫嫳a: %s"
@@ -165,7 +137,7 @@ msgstr "Sikertelen a `%s' f奫l bez嫫嫳a: %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Figyelmen k癉�l hagyott XML node `%s' n憝vel: %s"
 
-#: backends/xml-entry.c:199
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -184,78 +156,82 @@ msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 "Figyelmen k癉�l hagyott XML node `%s', kiv憝e a lehets嶲es s幦a n憝: %s"
 
-#: backends/xml-entry.c:723
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr "Tal嫮tam <helyi_s幦a>-t nem helyi be嫮l癃嫳okkal"
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Sikertelen beolvas嫳a a s幦a alap廨t幧einek: %s"
 
-#: backends/xml-entry.c:937
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:951
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1014 backends/xml-entry.c:1090
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Nem 廨telmeztem az XML node <%s>-t egy XML lista node-on bel�l"
 
-#: backends/xml-entry.c:1048
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "宁v幯ytelen t甑us (lista, p嫫, vagy ismeretlen) a lista node-ban"
 
-#: backends/xml-entry.c:1071
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Rossz XML node: %s"
 
-#: backends/xml-entry.c:1079
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "A lista tartalmaz egy rosszul-g廧elt node-t (%s, kellene lenni %s)"
 
-#: backends/xml-entry.c:1131
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Figyelmen k癉�l hagyott rossz car az XML p嫫b鏊: %s"
 
-#: backends/xml-entry.c:1140 backends/xml-entry.c:1163
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "XML f奫l 廨telmez廥e: a list嫜at 廥 a p嫫okat nem lehet egy p嫫on bel�lre "
 "helyezni"
 
-#: backends/xml-entry.c:1153
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Figyelmen k癉�l hagyott rossz cdr az XML p嫫b鏊: %s"
 
-#: backends/xml-entry.c:1172
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Nem 廨telmeztem az XML node <%s>-t egy XML p嫫 node-on bel�l"
 
-#: backends/xml-entry.c:1190
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Nem tal嫮tam az XML p嫫 node-nak car-t 廥 cdr-t"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Hi嫕yzik a cdr 廨t幧e a p嫫b鏊 az XML f奫lban"
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "Hi嫕yzik a car 廨t幧e a p嫫b鏊 az XML f奫lban"
 
-#: backends/xml-entry.c:1208
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Hi嫕yzik a car 廥 a cdr 廨t幧ek is a p嫫b鏊 az XML f奫lban"
 
@@ -288,28 +264,28 @@ msgstr "Nem tal嫮tam a h嫢t廨 modult `%s' sz嫥嫫a"
 msgid "Failed to shut down backend"
 msgstr "Nem siker�lt le嫮l癃ani a h嫢t廨t"
 
-#: gconf/gconf-database.c:233
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr ""
 
-#: gconf/gconf-database.c:241
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:521
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr ""
 
-#: gconf/gconf-database.c:538
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:605
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 
-#: gconf/gconf-database.c:764
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Nem siker�lt szinkroniz嫮ni egy vagy t鐽b forr嫳t: %s"
@@ -318,7 +294,7 @@ msgstr "Nem siker�lt szinkroniz嫮ni egy vagy t鐽b forr嫳t: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -326,59 +302,59 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:871
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr ""
 
-#: gconf/gconf-database.c:880
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:992 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1039
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Hiba az 廨t幧 be嫮l癃嫳kor `%s' sz嫥嫫a: %s"
 
-#: gconf/gconf-database.c:1082
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1106
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1145
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1169
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Hiba k霵yvt嫫 t顤l廥ekor `%s': %s"
 
-#: gconf/gconf-database.c:1195
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1221
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Hiba a k霵yvt嫫ak list嫙嫳akor a `%s'-ban: %s"
 
-#: gconf/gconf-database.c:1242
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Hiba a s幦a be嫮l癃嫳akor `%s': %s"
@@ -443,10 +419,189 @@ msgstr "A m�velet nem enged幨yezett a konfigur塶i鏀 szerver n幨k�l"
 msgid "Failed to get a lock"
 msgstr "Nem siker�lt lez嫫ni"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
 msgstr ""
 
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Sikertelen a `%s' f奫l bez嫫嫳a: %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Hiba k霵yvt嫫 t顤l廥ekor `%s': %s"
+
 #: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
@@ -484,176 +639,166 @@ msgstr ""
 msgid "Read error on file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:1321
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1331
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1484
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1500
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1616
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1678
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2158 gconf/gconf.c:2945
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2174
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr ""
-
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2185
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2192
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2197
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2280
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2311
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2322
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2342
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2350
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2362
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2374
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2388
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2423
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2459
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2502
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2519
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2529
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
 
-#: gconf/gconf-internals.c:2546
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr ""
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -723,282 +868,278 @@ msgstr ""
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:568
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1724
+#: gconf/gconf.c:1597
 #, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1740
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
 "Please file an OAF bug report."
 msgstr ""
 
-#: gconf/gconf.c:2051
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:2088
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2110
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:2112
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2133
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:2147
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2400
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2461
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2496
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2531
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2568
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2601
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:297
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:306
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:320
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:332
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:349
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:375
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-
-#: gconf/gconfd.c:391
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgid "Received signal %d, shutting down."
 msgstr ""
 
-#: gconf/gconfd.c:408
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr ""
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:457
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:461
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr ""
 
-#: gconf/gconfd.c:484
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:504
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:524
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:528
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:533
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:571
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr ""
 
-#: gconf/gconfd.c:595
-msgid "GConf server is not in use, shutting down."
-msgstr ""
-
-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1018
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1041
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1104
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1118
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1127
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1141
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1151
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1160
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1633
+#: gconf/gconfd.c:1110
 #, c-format
-msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgid "Didn't understand line in saved state file: '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:1679
-#, c-format
-msgid "Error reading saved state file: %s"
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
 msgstr ""
 
-#: gconf/gconfd.c:1732
+#: gconf/gconfd.c:1140
 #, c-format
-msgid "Unable to open saved state file '%s': %s"
+msgid "Failed to unquote config source address from saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1849
+#: gconf/gconfd.c:1160
 #, c-format
-msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to "
-"re-add the listener if gconfd exits or shuts down (%s)"
+msgid "Failed to unquote listener location from saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1854
-#, c-format
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Sikertelen a `%s' f奫l l彋rehoz嫳a: %s"
+
+#: gconf/gconfd.c:1204
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
 msgstr ""
 
-#: gconf/gconfd.c:1877 gconf/gconfd.c:2038
-#, c-format
-msgid "Failed to get IOR for client: %s"
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
 msgstr ""
 
-#: gconf/gconfd.c:1892
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Failed to open saved state file: %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1905
+#: gconf/gconfd.c:1377
 #, c-format
-msgid "Failed to write client add to saved state file: %s"
+msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1913
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Failed to flush client add to saved state file: %s"
+msgid ""
+"Failed to log addition of listener to gconfd logfile; won't be able to "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1999
+#: gconf/gconfd.c:1481
+#, c-format
 msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
+"Failed to log removal of listener to gconfd logfile; might erroneously "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
 #: gconf/gconftool.c:62
@@ -1270,312 +1411,306 @@ msgstr ""
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:894
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
+msgid "Owner: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:894 gconf/gconftool.c:896 gconf/gconftool.c:897
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:896
-#, c-format
-msgid "Owner: %s\n"
-msgstr ""
-
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:907
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:911
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:954 gconf/gconftool.c:966
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:978
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1026
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1036
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1050
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1211
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1096 gconf/gconftool.c:1225
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1114
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1156
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1196
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1240
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1254
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1265
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1322
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1364
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1384 gconf/gconftool.c:1414 gconf/gconftool.c:1443
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1402
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1427
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1456
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1504 gconf/gconftool.c:1525 gconf/gconftool.c:1546
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1542
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1563
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1590
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1593 gconf/gconftool.c:1856
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1603
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1636
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1642
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1752
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1760
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1782
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1790
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1869
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1898
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1927
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr ""
 
-#: gconf/gconftool.c:1939
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1952
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1966
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1977 gconf/gconftool.c:2009
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1993
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2030
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2050
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2176
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2182
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2200
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1583,20 +1718,32 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr ""
-
-#: wrappers/gtk/gconf-client.c:795
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
 
-#~ msgid "found <local_schema> with no locale setting"
-#~ msgstr "Tal嫮tam <helyi_s幦a>-t nem helyi be嫮l癃嫳okkal"
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "BerkeleyDB (BDB) backend-modul elt嫛ol癃嫳a."
+
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "BerkeleyDB forr嫳 nyitva van a gy闥廨ben %s"
+
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "BDB backend-modul ind癃嫳a"
+
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "Nem tal嫮hat� a %s gy闥廨 k霵yvt嫫 a `%s' c璥en"
+
+#~ msgid ""
+#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ msgstr "Nem tudok olvasni vagy irni a %s gy闥廨 k霵yvt嫫ban a `%s' c璥en"
+
+#, fuzzy
+#~ msgid "Failed to set mode on `%s': %s"
+#~ msgstr "Sikertelen `%s' t顤l廥e: %s"
diff --git a/po/it.po b/po/it.po
index dae21d84..ddfe706c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 0.5\n"
-"POT-Creation-Date: 2001-02-05 16:04-0500\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2001-02-15 06:57+01:00\n"
 "Last-Translator: Christopher R. Gabriel <cgabriel@softwarelibero.org>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -13,34 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "Scaricamento del modulo backend BerkeleyDB (BDB)."
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "Aperto sorgente BerkeleyDB alla radice %s"
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "Inizializzo il modulo backend BDB"
-
-#: backends/dir-utils.c:108
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr ""
-
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr ""
-
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr ""
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr ""
@@ -50,6 +22,11 @@ msgstr ""
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr ""
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -73,14 +50,14 @@ msgstr ""
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -97,63 +74,58 @@ msgstr ""
 msgid "XML filename `%s' is a directory"
 msgstr ""
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:359
-#, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr ""
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr ""
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2471
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr ""
@@ -164,7 +136,7 @@ msgstr ""
 msgid "Ignoring XML node with name `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:199
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr ""
@@ -182,76 +154,80 @@ msgstr ""
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 
-#: backends/xml-entry.c:723
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr ""
 
-#: backends/xml-entry.c:937
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:951
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1014 backends/xml-entry.c:1090
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1048
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1071
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1079
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1131
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1140 backends/xml-entry.c:1163
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1153
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1172
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1190
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1208
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -284,28 +260,28 @@ msgstr ""
 msgid "Failed to shut down backend"
 msgstr ""
 
-#: gconf/gconf-database.c:233
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr ""
 
-#: gconf/gconf-database.c:241
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:521
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr ""
 
-#: gconf/gconf-database.c:538
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:605
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 
-#: gconf/gconf-database.c:764
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr ""
@@ -314,7 +290,7 @@ msgstr ""
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -322,59 +298,59 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:871
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr ""
 
-#: gconf/gconf-database.c:880
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:992 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1039
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1082
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1106
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1145
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1169
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1195
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1221
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1242
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr ""
@@ -439,8 +415,187 @@ msgstr ""
 msgid "Failed to get a lock"
 msgstr ""
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr ""
+
+#: gconf/gconf-glib.c:10683
+#, c-format
+msgid "Error reading file '%s': %s"
 msgstr ""
 
 #: gconf/gconf-internals.c:85
@@ -480,176 +635,166 @@ msgstr ""
 msgid "Read error on file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:1321
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1331
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1484
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1500
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1616
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1678
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2158 gconf/gconf.c:2945
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2174
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr ""
-
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2185
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2192
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2197
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2280
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2311
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2322
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2342
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2350
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2362
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2374
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2388
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2423
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2459
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2502
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2519
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2529
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
 
-#: gconf/gconf-internals.c:2546
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr ""
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -719,282 +864,278 @@ msgstr ""
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:568
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1724
+#: gconf/gconf.c:1597
 #, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1740
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
 "Please file an OAF bug report."
 msgstr ""
 
-#: gconf/gconf.c:2051
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:2088
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2110
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:2112
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2133
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:2147
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2400
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2461
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2496
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2531
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2568
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2601
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:297
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:306
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:320
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:332
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:349
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:375
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgid "Received signal %d, shutting down."
 msgstr ""
 
-#: gconf/gconfd.c:391
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-
-#: gconf/gconfd.c:408
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr ""
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:457
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:461
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr ""
 
-#: gconf/gconfd.c:484
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:504
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:524
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:528
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:533
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:571
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr ""
 
-#: gconf/gconfd.c:595
-msgid "GConf server is not in use, shutting down."
-msgstr ""
-
-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1018
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1041
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1104
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1118
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1127
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1141
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1151
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1160
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1633
+#: gconf/gconfd.c:1110
 #, c-format
-msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgid "Didn't understand line in saved state file: '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:1679
-#, c-format
-msgid "Error reading saved state file: %s"
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
 msgstr ""
 
-#: gconf/gconfd.c:1732
+#: gconf/gconfd.c:1140
 #, c-format
-msgid "Unable to open saved state file '%s': %s"
+msgid "Failed to unquote config source address from saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1849
+#: gconf/gconfd.c:1160
 #, c-format
-msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to "
-"re-add the listener if gconfd exits or shuts down (%s)"
+msgid "Failed to unquote listener location from saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1854
+#: gconf/gconfd.c:1180
 #, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr ""
+
+#: gconf/gconfd.c:1204
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
 msgstr ""
 
-#: gconf/gconfd.c:1877 gconf/gconfd.c:2038
-#, c-format
-msgid "Failed to get IOR for client: %s"
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
 msgstr ""
 
-#: gconf/gconfd.c:1892
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Failed to open saved state file: %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1905
+#: gconf/gconfd.c:1377
 #, c-format
-msgid "Failed to write client add to saved state file: %s"
+msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1913
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Failed to flush client add to saved state file: %s"
+msgid ""
+"Failed to log addition of listener to gconfd logfile; won't be able to "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1999
+#: gconf/gconfd.c:1481
+#, c-format
 msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
+"Failed to log removal of listener to gconfd logfile; might erroneously "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
 #: gconf/gconftool.c:62
@@ -1266,312 +1407,306 @@ msgstr ""
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:894
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
+msgid "Owner: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:894 gconf/gconftool.c:896 gconf/gconftool.c:897
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:896
-#, c-format
-msgid "Owner: %s\n"
-msgstr ""
-
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:907
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:911
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:954 gconf/gconftool.c:966
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:978
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1026
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1036
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1050
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1211
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1096 gconf/gconftool.c:1225
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1114
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1156
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1196
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1240
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1254
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1265
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1322
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1364
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1384 gconf/gconftool.c:1414 gconf/gconftool.c:1443
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1402
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1427
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1456
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1504 gconf/gconftool.c:1525 gconf/gconftool.c:1546
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1542
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1563
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1590
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1593 gconf/gconftool.c:1856
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1603
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1636
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1642
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1752
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1760
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1782
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1790
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1869
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1898
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1927
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr ""
 
-#: gconf/gconftool.c:1939
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1952
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1966
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1977 gconf/gconftool.c:2009
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1993
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2030
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2050
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2176
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2182
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2200
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1579,17 +1714,21 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr ""
-
-#: wrappers/gtk/gconf-client.c:795
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
+
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "Scaricamento del modulo backend BerkeleyDB (BDB)."
+
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "Aperto sorgente BerkeleyDB alla radice %s"
+
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "Inizializzo il modulo backend BDB"
diff --git a/po/ja.po b/po/ja.po
index 96336347..46c09532 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 0.11\n"
-"POT-Creation-Date: 2001-03-08 16:12+0900\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-11-09 11:04+09:00\n"
 "Last-Translator: Takeshi Aihana <aihana@muc.biglobe.ne.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -13,34 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "BerkeleyDB (BDB) 田永弁巨件玉乒斥亙□伙毛荸旵醱匹允﹝"
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "%s 及伙□玄卞釩井木凶 BerkeleyDB 末□旦"
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "BDB 田永弁巨件玉乒斥亙□伙及賡渝祭醱匹允﹝"
-
-#: backends/dir-utils.c:108
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "%s 伙□玄犯奴伊弁玄伉反失玉伊旦 '%s' 醱卞葦勾井曰引六氏匹仄凶﹝"
-
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "犯奴伊弁玄伉 '%s' 毛綜嶽匹五引六氏匹仄凶: %s"
-
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "%s 伙□玄犯奴伊弁玄伉尺及づ心潸曰/踏五慇心反 失玉伊旦 '%s' 匹反匹五引六氏﹝"
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "XML 田永弁巨件玉乒斥亙□伙毛荸旵醱匹允﹝"
@@ -50,6 +22,11 @@ msgstr "XML 田永弁巨件玉乒斥亙□伙毛荸旵醱匹允﹝"
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "失玉伊旦 '%s' 醱及 XML 伙□玄犯奴伊弁玄伉互葦勾井曰引六氏匹仄凶﹝"
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "犯奴伊弁玄伉 '%s' 毛綜嶽匹五引六氏匹仄凶: %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -75,7 +52,7 @@ msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 "XML 田永弁巨件玉乒斥亙□伙毛蔽弇仄凶樺寧﹜き渝仄凶犯奴伊弁玄伉毛綽輪仄引允﹝"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -84,7 +61,7 @@ msgstr ""
 "犯奴旦弁午及き渝卞撩л仄凶凶戶﹜XML 田永弁巨件玉及平乓永扑亙井日犯奴伊弁玄伉 "
 "'%s' 毛綽輪匹五引六氏﹝"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -103,66 +80,61 @@ msgstr "'%s' 及橇謫毛潸ぜ匹五引六氏匹仄凶: %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML 白央奶伙抩 '%s' 反犯奴伊弁玄伉匹允﹝"
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "'%s' 及綽輪卞撩л仄引仄凶: %s"
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "白央奶伙 '%s' 尺及踏五慇心卞撩л仄引仄凶: %s"
 
-#: backends/xml-dir.c:359
-#, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr "'%s' 及乒□玉澀爛互撩л仄引仄凶: %s"
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "抩蟆 '%s' 井日 '%s' 及庍凳卞撩л仄引仄凶: %s"
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "'%s' 井日 '%s' 及汊窖卞撩л仄引仄凶: %s"
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "衙中白央奶伙 '%s' 及綽輪卞撩л仄引仄凶: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "'%s' 及橇謫互潸ぜ匹五引六氏匹仄凶: %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "'%s' 互 '%s' 及醱匹褐呁仄化中引允﹝拑骰仄引允﹝"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 "XML 白央奶伙 '%s' 及醱卞抩蟆及拑中巨件玄伉互殖引木化中引允﹝拑骰仄引允﹝"
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 "XML 白央奶伙 '%s' 及醱及玄永皿伊矛伙用□玉互 1 勾及 <entry> "
 "匹反丐曰引六氏﹝拑骰仄引允﹝"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "白央奶伙 '%s' 及綜嶽卞撩л仄引仄凶: %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2442
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "白央奶伙 '%s' 毛岉元月及卞撩л仄引仄凶: %s"
@@ -173,7 +145,7 @@ msgstr "白央奶伙 '%s' 毛岉元月及卞撩л仄引仄凶: %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "抩蟆 '%s' 及 XML 用□玉毛拑骰仄引允: %s"
 
-#: backends/xml-entry.c:199
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -191,80 +163,84 @@ msgstr "旦平□穴抩 '%s' 毛拑骰仄引允﹝尕懇卅旦平□穴: %s"
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "XML 用□玉 '%s' 毛拑骰仄引允﹝肣躲卅旦平□穴抩 '%s' 反拺陸匹允﹝"
 
-#: backends/xml-entry.c:723
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr "伕□弗伙澀爛拑仄及 <local_schema> 毛�站咫楔牏楔縑�"
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "旦平□穴及犯白巧伙玄襖及づ心慇心卞撩л仄引仄凶: %s"
 
-#: backends/xml-entry.c:937
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "<%s> 用□玉及 \"type\" 簞嶺互丐曰引六氏﹝"
 
-#: backends/xml-entry.c:951
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "用□玉互尕抸卅 \"type\" 簞嶺 '%s' 毛儅勻化中引允﹝拑骰仄引允﹝"
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "用□玉卞 \"value\" 簞嶺互丐曰引六氏﹝"
 
-#: backends/xml-entry.c:1014 backends/xml-entry.c:1090
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "XML 伉旦玄用□玉及醱卞丐月 XML 用□玉 <%s> 毛荸澄仄引六氏匹仄凶﹝"
 
-#: backends/xml-entry.c:1048
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 "伉旦玄用□玉及醱卞尕懇卅滇 (伉旦玄﹜平□午襖及矢失﹜手仄仁反尕抸卅滇) "
 "互丐曰引允﹝"
 
-#: backends/xml-entry.c:1071
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "銀迕匹五卅中 XML 用□玉: %s"
 
-#: backends/xml-entry.c:1079
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "伉旦玄反銀迕匹五卅中滇及用□玉毛殖氏匹中引允﹝(%s 反 %s 匹丐月屯五)"
 
-#: backends/xml-entry.c:1131
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "XML (平□午襖及)矢失井日銀迕匹五卅中 car 毛拑骰仄引允: %s"
 
-#: backends/xml-entry.c:1140 backends/xml-entry.c:1163
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "XML 白央奶伙毛荸橾醱: "
 "伉旦玄午(平□午襖及)矢失反(平□午襖及)矢失及票匏伊矛伙卞拑中井手仄木引六氏﹝"
 
-#: backends/xml-entry.c:1153
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "XML (平□午襖及)矢失井日銀迕匹五卅中 cdr 毛拑骰仄引允: %s"
 
-#: backends/xml-entry.c:1172
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "XML 矢失用□玉及票匏卞丐月 XML 用□玉 <%s> 毛荸澄仄引六氏匹仄凶﹝"
 
-#: backends/xml-entry.c:1190
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "XML 矢失用□玉及 car 午 cdr 毛葦勾仃日木引六氏匹仄凶﹝"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "XML 白央奶伙及醱卞丐月襖及矢失卞 cdr 互丐曰引六氏﹝"
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "XML 白央奶伙及醱卞丐月襖及矢失卞 cdr 互丐曰引六氏﹝"
 
-#: backends/xml-entry.c:1208
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "XML 白央奶伙及醱卞丐月矢失卞 car 午 cdr 及襖互丐曰引六氏﹝"
 
@@ -297,31 +273,31 @@ msgstr "'%s' 迕及田永弁巨件玉乒斥亙□伙互た爛匹五引六氏﹝"
 msgid "Failed to shut down backend"
 msgstr "田永弁巨件玉乒斥亙□伙及扑乓永玄母它件卞撩л仄引仄凶﹝"
 
-#: gconf/gconf-database.c:231
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "澀爛仄凶邰菲及醱卞尕懇卅襖毛熬仃潸曰引仄凶﹝"
 
-#: gconf/gconf-database.c:239
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "平□ '%s' 迕卞澀爛今木凶邰菲匹熬仃潸勻凶 CORBA 襖毛荸澄匹五引六氏匹仄凶﹝"
 
-#: gconf/gconf-database.c:517
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "蟈化及平乓永扑亙犯□正毛樁化月邰菲毛熬仃潸曰引仄凶﹝"
 
-#: gconf/gconf-database.c:534
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "き渝允月邰菲毛熬仃潸曰引仄凶﹝"
 
-#: gconf/gconf-database.c:601
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "譙抰讀卅巨仿□: ConfigDatabase "
 "迕及左皮斥尼弁玄伉白央伊件旦及潸ぜ卞撩л仄引仄凶"
 
-#: gconf/gconf-database.c:760
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "1 勾動曉及白央奶伙及き渝匹巨仿□: %s"
@@ -330,7 +306,7 @@ msgstr "1 勾動曉及白央奶伙及き渝匹巨仿□: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -340,12 +316,12 @@ msgstr ""
 "伉旦瓜□(%s)及伕弘馨笛卞撩л仄引仄凶﹝gconf "
 "毛瘋粟が仄化手﹜澀爛庍凳及尕割爛卅騷襞及瑛絆﹜伉旦瓜□及汊窖反匹五引六氏﹝"
 
-#: gconf/gconf-database.c:873
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "伉旦瓜□ ID %lu 反繡箕仄引六氏"
 
-#: gconf/gconf-database.c:882
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -354,47 +330,47 @@ msgstr ""
 "伕弘白央奶伙尺伉旦瓜□及伕弘啖が卞撩л仄引仄凶 "
 "(匼升撢陴反丐曰引六氏﹜瘋蘸云井仄卅騷襞互丐月井手仄木引六氏六氏互): %s"
 
-#: gconf/gconf-database.c:997 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "'%s' 及襖及潸ぜ匹巨仿□: %s"
 
-#: gconf/gconf-database.c:1044
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "'%s' 及襖及本永玄匹巨仿□: %s"
 
-#: gconf/gconf-database.c:1087
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "'%s' 及拑躲祭匹巨仿□: %s"
 
-#: gconf/gconf-database.c:1111
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "'%s' 及犯白巧伙玄襖及潸ぜ匹巨仿□: %s"
 
-#: gconf/gconf-database.c:1151
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "'%s' 及繡箕割ロ匹巨仿□: %s"
 
-#: gconf/gconf-database.c:1175
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "犯奴伊弁玄伉 '%s' 及綽輪匹巨仿□: %s"
 
-#: gconf/gconf-database.c:1202
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "'%s' 匹蟈化及巨件玄伉及潸ぜ卞撩л: %s"
 
-#: gconf/gconf-database.c:1228
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "'%s' 及醱及犯奴伊弁玄伉及伉旦玄祭匹巨仿□: %s"
 
-#: gconf/gconf-database.c:1249
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "'%s'迕及旦平□穴澀爛匹巨仿□: %s"
@@ -459,9 +435,214 @@ msgstr "澀爛扔□田□拑仄匹及醜綜反匹五引六氏﹝"
 msgid "Failed to get a lock"
 msgstr "伕永弁及潸ぜ卞撩л仄引仄凶﹝"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "澀爛毛忡繡允月凶戶及犯□正矛□旦互肣躲匹反丐曰引六氏﹝"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+"仿奶件 %d 及 %d 妐儂杴匹巨仿□: %s\n"
+"(區引木化中月妐反 '%s')\n"
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+"蕞氏醱及巨件玄伉匹蔽弇仄化中月井﹜巨件玄伉抩互贏允亢引允 ('&' 反 '&quot;' "
+"及方丹卞巨件玄伉及燮え卞尥仃引允)"
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+"'%s' 反尕抸卅巨件玄伉匹允 ('&' 反巨件玄伉及燮え卞尥仃月优邰肣曰 拺: &amp; "
+"&quot; &lt; &gt; &apos;)"
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+"妐儂輔寰及蕞氏醱 (切斤丹升 '&#' 及詨欠) 匹穴□弁失永皿妐互蔽弇仄化中引允"
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+"妐儂輔寰匹醒儂匹卅中坁 '%s' 互殖引木化中引允 ('&#' 反 '&#2342;' "
+"及方丹卞輔寰允月 Unicode 妐儂及燮え卞尥仃引允)"
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+"妐互妐儂輔寰及蕞氏醱匹蔽弇仄化引允 ('&#' 反 '&#2342' "
+"及方丹卞輔寰允月妐儂及燮え卞尥仃月优邰肣曰)"
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+"妐儂輔寰 '%s' 毛荸橾匹五引六氏匹仄凶 ('&#' 反 '&#2343' "
+"及方丹卞輔寰允月妐儂及燮え卞尥仃月优邰肣曰)"
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+"妐儂戊□玉 '%#lx' 反 XML 妐踏匹反銀尹卅中井﹜手仄仁反棉啜勻凶 Unicode 妐儂匹允"
+
+#: gconf/gconf-glib.c:1013
+#, fuzzy
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+"'&' 及躂什詨匹妐踏互蔽弇仄化中引允﹝'&' "
+"反巨件玄伉井妐儂輔寰及燮え卞尥仃月优邰互丐曰引允﹝"
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+"妐儂 '<' 午 '>' 反仇仇匹反銀尹引六氏﹝正弘午域踝卞銀中引允﹝拺尹壬 <bold> "
+"午井 <paragraph> 匹允﹝公及幻井卞﹜&lt; 午 &gt; "
+"巨件玄伉午仄化仇木日及妐儂毛剪寞祭仄引允﹝"
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr "妐儂 '%s' 毛簞嶺抩及燮え卞尥仃月仇午反匹五引六氏"
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr "妐互簞嶺抩及躂什詨欠匹蔽弇仄化中引允"
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr "妐儂 '=' 及躂什詨卞簞嶺抩毛筏課允月优邰互丐曰引允"
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr "妐儂 '\"' 及躂什詨欠卞妐儂 '=' 毛筏課允月优邰互丐曰引允"
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+"簞嶺襖及醱卞妐儂 '%c' 互丐曰引允﹝簞嶺襖互 婁迕扞 '\"' "
+"匹岉元日木化中卅中方丹匹允﹝"
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr "隙爛仄凶簞嶺襖及瘉詨毛憎允婁迕扞 '\"' 及蟆匹妐互濠木化中引允"
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr "簞嶺襖及躂什詨欠﹜正弘互岉元日木月蟆卞妐互蔽歹勻化中引允﹝"
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr "正弘抩及燮え卞 '<' 互丐曰引六氏"
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr "妐儂 '<' 及躂什詨欠匹妐互蔽歹勻化中引允"
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr "<? 引凶反 <! 卞覆殺允月 '>' 互丐曰引六氏"
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr "妐儂 '%s' 毛正弘抩及燮え卞尥仃月仇午反匹五引六氏"
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr "正弘抩及躂什詨欠匹妐互蔽歹勻化中引允﹝ '>' 互丐曰引六氏"
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr "正弘反 '%s' 匹反卅仁 '>' 井 '/>' 匹岉元月优邰互丐曰引允﹝"
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+"'>' 拑仄及 '/' 及躂什詨欠匹正弘互蔽歹勻化中引允﹝塢及正弘反 '/>' "
+"匹蔽弇允月优邰互丐曰引允"
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr "正弘及瘉詨卞蔽弇正弘互丐曰引六氏"
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr "妐儂 '<' 及躂什詨欠卞蔽弇正弘互丐曰引允"
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr "蔽弇正弘反 '</' 匹釩銨允月优邰互丐曰引允﹝妐儂 '/' 互丐曰引六氏"
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr "妐儂 '/' 及躂什詨欠卞蔽弇正弘互丐曰引允"
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr "蔽弇正弘及正弘抩及躂什詨欠匹妐互蔽歹勻化中引允﹝'>' 互拑中方丹匹允﹝"
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr "蔽弇正弘抩及躂什詨欠匹妐互蔽歹勻化引允﹝'>' 互拑中方丹匹允﹝"
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr "蔽弇正弘 '%s' 互釩銨正弘 '%s' 卞域譙仄引六氏"
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+"穴□弁失永皿妐及 %d 田奶玄杴卞尕懇卅 UTF-8 妐儂互丐曰引允﹝%s "
+"反云井仄卅妐儂及蟆卞丐曰引允﹝"
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr "穴□弁失永皿妐反塢⑩分仃匹允﹝"
+
+#: gconf/gconf-glib.c:10666
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "白央奶伙 '%s' 及左□皿件卞撩л仄引仄凶: %s"
+
+#: gconf/gconf-glib.c:10683
+#, c-format
+msgid "Error reading file '%s': %s"
+msgstr "白央奶伙 '%s' 及づ心慇心匹巨仿□: %s"
 
 #: gconf/gconf-internals.c:85
 #, c-format
@@ -485,105 +666,99 @@ msgstr "gconfd 井日云井仄卅伉旦玄正奶皿毛熬仃潸曰引仄凶﹝"
 msgid "Failed to convert object to IOR"
 msgstr "IOR 尺及左皮斥尼弁玄庍晶卞撩л仄引仄凶"
 
-#: gconf/gconf-internals.c:809
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "白央奶伙 '%s' 互釩仃引六氏匹仄凶: %s\n"
 
-#: gconf/gconf-internals.c:856
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "末□旦 '%s' 毛馨笛仄化中引允﹝\n"
 
-#: gconf/gconf-internals.c:868
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "白央奶伙 '%s' 曉卞巨仿□互丐曰引允: %s\n"
 
-#: gconf/gconf-internals.c:1292
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "伉旦玄毛渝謹今木凶互﹜ぜ日木凶及反 %s 匹允﹝"
 
-#: gconf/gconf-internals.c:1302
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "%s 及伉旦玄毛渝謹今木凶互﹜ぜ日木凶及反 %s 及伉旦玄匹允﹝"
 
-#: gconf/gconf-internals.c:1441
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "(平□午襖及)矢失毛渝謹今木凶互﹜ぜ日木凶及反 %s 匹允﹝"
 
-#: gconf/gconf-internals.c:1455
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
-"(%s 午 "
-"%s)及矢失毛渝謹今木凶互﹜ぜ日木凶及反ㄠ勾卅中仄徆杅及襖互拑中矢失匹允﹝"
+"(%s 午 %s)及矢失毛渝謹今木凶互﹜ぜ日木凶及反ㄠ勾卅中仄徆杅及襖互拑中矢失匹允﹝"
 
-#: gconf/gconf-internals.c:1471
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 "(%s 午 %s)及正奶皿及矢失毛渝謹今木凶互﹜ぜ日木凶及反(%s 午 %s)及正奶皿匹允﹝"
 
-#: gconf/gconf-internals.c:1587
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "婁迕今木凶妐儂昫反弁巧□氾□扑亦件筏寞(')匹銨引勻化中引六氏﹝"
 
-#: gconf/gconf-internals.c:1649
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "婁迕今木凶妐儂昫反弁巧□氾□扑亦件筏寞(')匹蔽歹勻化中引六氏﹝"
 
-#: gconf/gconf-internals.c:2129 gconf/gconf.c:2999
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA 巨仿□: %s"
 
-#: gconf/gconf-internals.c:2145
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "OAF 及杽鎖: '%s'"
-
-#: gconf/gconf-internals.c:2151
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 "伉旦玄祭今木化中卅中 OAF 左皮斥尼弁玄犯奴伊弁玄伉毛綽輪仄方丹午仄化中引允﹝"
 
-#: gconf/gconf-internals.c:2156
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "湃卞伉旦玄祭今木凶 OAF 犯奴伊弁玄伉毛馨笛仄方丹午仄化中引允﹝"
 
-#: gconf/gconf-internals.c:2163
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF 荸橾巨仿□: %s"
 
-#: gconf/gconf-internals.c:2168
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "尕抸卅 OAF 巨仿□"
 
-#: gconf/gconf-internals.c:2251
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "'%s' 及醱卞反 ior 白央奶伙互丐曰引六氏﹝"
 
-#: gconf/gconf-internals.c:2282
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd 反職及皿伕本旦井日 伕永弁 '%s' 毛潸ぜ醱匹允﹝"
 
-#: gconf/gconf-internals.c:2293
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "公及職及皿伕弘仿丞反伕永弁 '%s' 毛儅勻化中引允﹝"
 
-#: gconf/gconf-internals.c:2313
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "繡箕仄化中月 gconfd 卞疋件弘允月凶戶及 ORB 卞濤糧匹五引六氏匹仄凶﹝"
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -592,45 +767,45 @@ msgstr ""
 "衙中伕永弁 '%s' 毛綽輪仄引仄凶﹝(IOR 互左皮斥尼弁玄伉白央伊件旦﹜IOR '%s' "
 "卞庍晶匹五卅井勻凶凶戶)"
 
-#: gconf/gconf-internals.c:2333
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "衙中伕永弁 '%s' 毛綽輪仄引仄凶﹝(Ping扔□田□卞巨仿□互�素舅楔縣縣�: %s)"
 
-#: gconf/gconf-internals.c:2345
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf 澀爛犯□乒件(gconfd)互伕永弁 '%s' 毛儅勻化中引允﹝"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "犯奴伊弁玄伉 '%s' 互綜嶽匹五引六氏匹仄凶: %s"
 
-#: gconf/gconf-internals.c:2394
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "伕永弁 '%s' 互綜嶽匹五引六氏匹仄凶: %s"
 
-#: gconf/gconf-internals.c:2430
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "白央奶伙 '%s' 互踏五慇戶引六氏匹仄凶: %s"
 
-#: gconf/gconf-internals.c:2473
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "伕永弁白央奶伙 '%s' 互釩仃引六氏匹仄凶﹝公及伕永弁反 GConf 及坁匹反拑中匹允: "
 "%s"
 
-#: gconf/gconf-internals.c:2490
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "尕懇卅伕永弁白央奶伙 '%s'匹允﹝綽輪仄化中引允﹝"
 
-#: gconf/gconf-internals.c:2500
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -639,48 +814,43 @@ msgstr ""
 "伕永弁白央奶伙 '%s' 互綜嶽匹五引六氏匹仄凶﹝ (綜嶽葭PID: %u GConf PID: %u  "
 "簿井互脫★及伕永弁毛荸輪仄凶午移爛仄凶樺寧)"
 
-#: gconf/gconf-internals.c:2517
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "伕永弁犯奴伊弁玄伉 '%s' 及荸旵卞撩л仄引仄凶: %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "白央奶伙 '%s' 及づ心慇心卞撩л仄引仄凶: %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "旦平□穴 '%s' 反旦平□穴匹反拑中襖 '%s' 毛忡繡允月方丹隙爛今木引仄凶﹝"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "抩蟆 '/' 反犯奴伊弁玄伉及樺寧分仃匹﹜平□卞反銀尹引六氏﹝"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr "'%s' 及襖反澀爛由旦及蟆卞づ心慇心燬迕匹本永玄仄引允﹝"
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "平□ '%s' 匹襖毛忡繡允月仇午互請侳引六氏"
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "丟正樹扷及腹綢醱卞巨仿□: %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "丟正樹扷及潸ぜ醱卞巨仿□: %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -753,21 +923,21 @@ msgstr ""
 msgid "`%s': %s"
 msgstr "'%s' : %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "扔□田□反失玉伊旦 '%s' 及荸瑁互匹五引六氏匹仄凶﹝"
 
-#: gconf/gconf.c:571
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "伕□市伙澀爛卞騷襞毛馨笛匹五引六氏﹝"
 
-#: gconf/gconf.c:1778
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr "扔□田□伉旦玄尺及弁仿奶失件玄馨笛卞撩л仄引仄凶﹝CORBA巨仿□: %s"
 
-#: gconf/gconf.c:1794
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -777,66 +947,66 @@ msgstr ""
 "毛忒仄化五引仄凶﹝凳卞公及杽鎖毛濩抸允月拺陸毛本永玄仄引六氏匹仄凶﹝ "
 "仇及白央奶伙毛 OAF 田弘伊禾□玄卞霜尥仄化票今中﹝"
 
-#: gconf/gconf.c:2105
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConf 及賡渝祭卞撩л仄引仄凶﹝蔽弇仄引允﹝\n"
 
-#: gconf/gconf.c:2142
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "旦仿永扑亙 '/' 匹銨戶月优邰互丐曰引允﹝"
 
-#: gconf/gconf.c:2164
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "墊醱卞ㄡ勾及旦仿永扑亙 '/' 互丐曰引六氏﹝"
 
-#: gconf/gconf.c:2166
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "旦仿永扑亙 '/' 及惘礎卞疋伉左玉 '.' 互丐曰引六氏﹝"
 
-#: gconf/gconf.c:2187
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' 反 平□/犯奴伊弁玄伉抩及醱匹反尕懇卅妐儂匹允﹝"
 
-#: gconf/gconf.c:2201
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "平□/犯奴伊弁玄伉反旦仿永扑亙 '/' 匹蔽弇仄化中卅中井手仄木引六氏﹝"
 
-#: gconf/gconf.c:2454
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "澀爛扔□田□及扑乓永玄母它件卞撩л仄引仄凶: %s"
 
-#: gconf/gconf.c:2515
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "'float' 滇毛渝謹今木凶互﹜ぜ日木凶及反 %s 匹允﹝"
 
-#: gconf/gconf.c:2550
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "'int' 滇毛渝謹今木凶互﹜ぜ日木凶及反 %s 匹允﹝"
 
-#: gconf/gconf.c:2585
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "'string' 滇毛渝謹今木凶互﹜ぜ日木凶及反 %s 匹允﹝"
 
-#: gconf/gconf.c:2622
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "'bool' 滇毛渝謹今木凶互﹜ぜ日木凶及反 %s 匹允﹝"
 
-#: gconf/gconf.c:2655
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "'schema' 滇毛渝謹今木凶互﹜ぜ日木凶及反 %s 匹允﹝"
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "扑乓永玄母它件邰菲毛熬仃潸曰引仄凶﹝"
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -844,7 +1014,7 @@ msgstr ""
 "犯田永弘樹扷尥五匹戊件由奶伙今木凶 gconfd; 末□旦犯奴伊弁玄伉井日 gconf.path "
 "毛づ心慇手丹午仄化中引允﹝"
 
-#: gconf/gconfd.c:293
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -852,25 +1022,18 @@ msgstr ""
 "澀爛白央奶伙互葦勾井曰引六氏﹝犯白巧伙玄澀爛白央奶伙 '%s' "
 "毛銀云丹午仄化中引允﹝"
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:301
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr "末□旦由旦及醱卞澀爛白央奶伙互丐曰引六氏﹝澀爛反忡繡今木引六氏﹝; "
 
-#: gconf/gconfd.c:301
-msgid "/path"
-msgstr "/path 毛彸螂仄化仁分今中"
-
-#: gconf/gconfd.c:314
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "湯勾井及澀爛白央奶伙及づ心慇心卞撩л仄引仄凶: %s"
 
-#: gconf/gconfd.c:326
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -878,7 +1041,7 @@ msgstr ""
 "澀爛白央奶伙反失玉伊旦毛需仁荸瑁仄化中引六氏﹝ "
 "犯□正及づ心慇心引凶反忡繡互匹五引六氏﹝"
 
-#: gconf/gconfd.c:343
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -886,33 +1049,28 @@ msgstr ""
 "需仁荸瑁今木凶踏五慇心第Х卅澀爛白央奶伙匹反卅中及匹﹜ "
 "湯勾井及澀爛毛忡繡匹五卅中井手仄木引六氏﹝"
 
-#: gconf/gconfd.c:369
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-"扑弘瓜伙 %d 毛熬仃潸曰引仄凶﹝戊失母件皿匹允﹝GConf "
-"田弘午仄化扷屢仄化票今中﹝"
-
-#: gconf/gconfd.c:385
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"扑弘瓜伙 %d 毛熬仃潸曰引仄凶﹝唱橘蔽弇匹允﹝GConf 田弘午仄化扷屢仄化票今中﹝"
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down."
+msgstr "扑弘瓜伙 %d 毛熬仃潸曰引仄凶﹝扑乓永玄母它件仄引允"
 
-#: gconf/gconfd.c:402
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "扑弘瓜伙 %d 毛熬仃潸曰引仄凶﹝扑乓永玄母它件仄引允"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:498
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "粟が醱 (田□斥亦件 %s), PID %u 交□扒□ '%s'"
 
-#: gconf/gconfd.c:525
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr "GConf 反犯田永弘窗Х互肣躲匹允"
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -920,11 +1078,11 @@ msgstr ""
 "左皮斥尼弁玄唾嶺祭白伊□丞伐□弁及賡渝祭卞撩л仄引仄凶: OAF "
 "丟件氾瓜□卞田弘扷屢毛仄化仁分今中﹝"
 
-#: gconf/gconfd.c:545
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "澀爛扔□田□迕及左皮斥尼弁玄伉白央伊件旦及潸ぜ卞撩л仄引仄凶﹝"
 
-#: gconf/gconfd.c:565
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -932,28 +1090,24 @@ msgstr ""
 "OAF 反 GConf 及 IID 卞勾中化反荸日卅中匹允﹝; "
 "奶件旦玄□伙互撩л仄凶仇午毛憎仄引允﹝; 瓚狤匹五引六氏﹝; 蔽弇仄引允﹝\n"
 
-#: gconf/gconfd.c:569
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "職及 gconfd 互湃卞 OAF 卞瓚狤今木化中引允﹝; 蔽弇仄引允﹝\n"
 
-#: gconf/gconfd.c:574
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "OAF 卞瓚狤醱及 gconfd 及尕抸卅巨仿□匹允﹝; 蔽弇仄引允﹝\n"
 
-#: gconf/gconfd.c:612
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "蔽弇仄引允﹝"
 
-#: gconf/gconfd.c:637
-msgid "GConf server is not in use, shutting down."
-msgstr "GConf 扔□田□互銀迕今木化中引六氏﹝扑乓永玄母它件仄引允﹝"
-
-#: gconf/gconfd.c:996
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "忒今木凶拺陸: %s"
 
-#: gconf/gconfd.c:1096
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -962,7 +1116,7 @@ msgstr ""
 "gconfd 伕弘白央奶伙及左□皿件卞撩л仄引仄凶: gconf "
 "毛扑乓永玄母它件仄凶詨卞伕弘毛汊唾允月仇午反匹五引六氏 (%s)"
 
-#: gconf/gconfd.c:1131
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -970,56 +1124,87 @@ msgstr ""
 "gconfd 伕弘白央奶伙及弁伕□朮卞撩л仄引仄凶: 云公日仁犯□正反忡繡今木引六氏 "
 "(%s)"
 
-#: gconf/gconfd.c:1200
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "橇謫忡儅白央奶伙 '%s' 毛踏五慇心乒□玉匹釩仃引六氏匹仄凶: %s"
 
-#: gconf/gconfd.c:1214
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "橇謫忡儅白央奶伙 '%s' 卞踏五慇戶引六氏匹仄凶﹛fd: %d: %s"
 
-#: gconf/gconfd.c:1223
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "蕙仄中橇謫忡儅白央奶伙 '%s' 毛岉元月及卞撩л仄引仄凶: %s"
 
-#: gconf/gconfd.c:1237
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "衙中橇謫忡儅白央奶伙 '%s' 毛帎及樺赭卞啖が匹五引六氏匹仄凶: %s"
 
-#: gconf/gconfd.c:1247
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "蕙仄中橇謫忡儅白央奶伙及啖が卞撩л仄引仄凶: %s"
 
-#: gconf/gconfd.c:1256
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr "'%s' 卞啖が仄凶橇謫忡儅白央奶伙及汊窖卞撩л仄引仄凶: %s"
 
-#: gconf/gconfd.c:1731
-#, c-format
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "橇謫忡儅白央奶伙 及左□皿件卞撩л仄引仄凶: %s"
+
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "橇謫忡儅白央奶伙 及左□皿件卞撩л仄引仄凶: %s"
+
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr "橇謫忡儅白央奶伙尺及馨笛弁仿奶失件玄及踏五慇心卞撩л仄引仄凶: %s"
+
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "橇謫忡儅白央奶伙尺及馨笛弁仿奶失件玄及踏五慇心卞撩л仄引仄凶: %s"
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "橇謫忡儅白央奶伙 及左□皿件卞撩л仄引仄凶: %s"
+
+#: gconf/gconfd.c:1204
 msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
 msgstr ""
-"失玉伊旦 '%s' "
-"及伉旦瓜□及汊窖互匹五引六氏﹝犯□正矛□旦毛荸瑁匹五引六氏匹仄凶"
 
-#: gconf/gconfd.c:1777
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Error reading saved state file: %s"
-msgstr "橇謫忡儅白央奶伙及づ心慇心匹巨仿□: %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
+"失玉伊旦 '%s' 及伉旦瓜□及汊窖互匹五引六氏﹝犯□正矛□旦毛荸瑁匹五引六氏匹仄凶"
 
-#: gconf/gconfd.c:1830
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "橇謫忡儅白央奶伙 '%s' 及左□皿件卞撩л仄引仄凶: %s"
 
-#: gconf/gconfd.c:1947
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to "
@@ -1028,7 +1213,7 @@ msgstr ""
 "gconfd 伕弘白央奶伙尺及伕弘及馨笛卞撩л仄引仄凶﹝gconfd "
 "毛蔽弇引凶反扑乓永玄母它件仄凶日伉旦瓜□及馨笛反匹五引六氏 (%s)"
 
-#: gconf/gconfd.c:1952
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously "
@@ -1038,33 +1223,6 @@ msgstr ""
 "毛蔽弇引凶反扑乓永玄母它件仄凶日伉旦瓜□及瘋馨笛反巨仿□卞卅月井手仄木引六氏 "
 "(%s)"
 
-#: gconf/gconfd.c:1975 gconf/gconfd.c:2140
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "弁仿奶失件玄及 IOR 潸ぜ卞撩л仄引仄凶: %s"
-
-#: gconf/gconfd.c:1990
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "橇謫忡儅白央奶伙 及左□皿件卞撩л仄引仄凶: %s"
-
-#: gconf/gconfd.c:2003
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr "橇謫忡儅白央奶伙尺及馨笛弁仿奶失件玄及踏五慇心卞撩л仄引仄凶: %s"
-
-#: gconf/gconfd.c:2011
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr "橇謫忡儅白央奶伙尺及馨笛弁仿奶失件玄及白仿永扑亙卞撩л仄引仄凶: %s"
-
-#: gconf/gconfd.c:2101
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr ""
-"湯勾井及弁仿奶失件玄反馨笛今木卅井勻凶及匹﹜GConf "
-"扔□田□井日憤坌憤褥毛綽輪仄引仄凶﹝"
-
 #: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "目伙皿左皿扑亦件"
@@ -1349,202 +1507,196 @@ msgstr "澀爛白央奶伙及失弁本旦卞撩л: %s\n"
 msgid "Shutdown error: %s\n"
 msgstr "扑乓永玄母它件巨仿□: %s\n"
 
-#: gconf/gconftool.c:728
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "瘋窖伉旦玄卞ㄠ勾動曉及犯奴伊弁玄伉毛隙爛允月优邰互丐曰引允﹝\n"
 
-#: gconf/gconftool.c:762
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "'%s' 及矢失毛伉旦玄祭醱卞巨仿□: %s"
 
-#: gconf/gconftool.c:780
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(窒手本永玄今木化中引六氏)"
 
-#: gconf/gconftool.c:835
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "澀爛扔□田□(gconfd)及粟が卞撩л: %s\n"
 
-#: gconf/gconftool.c:849
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "ㄠ勾及平□引凶反潸ぜ允月凶戶及平□毛隙爛允月优邰互丐曰引允﹝\n"
 
-#: gconf/gconftool.c:884
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "滇: %s\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "伉旦玄滇: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car 滇: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr 滇: %s\n"
 
-#: gconf/gconftool.c:892
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr "賡渝襖: %s\n"
+msgid "Owner: %s\n"
+msgstr "左□瓜□: %s\n"
 
-#: gconf/gconftool.c:892 gconf/gconftool.c:894 gconf/gconftool.c:895
-#: gconf/gconftool.c:896
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "怳澀爛"
 
-#: gconf/gconftool.c:894
-#, c-format
-msgid "Owner: %s\n"
-msgstr "左□瓜□: %s\n"
-
-#: gconf/gconftool.c:895
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "扑亦□玄Desc: %s\n"
 
-#: gconf/gconftool.c:896
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "伕件弘Desc: %s\n"
 
-#: gconf/gconftool.c:905
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "'%s' 卞窒手襖互澀爛今木化中引六氏﹝\n"
 
-#: gconf/gconftool.c:909
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "'%s' 及襖及潸ぜ卞撩л: %s\n"
 
-#: gconf/gconftool.c:952 gconf/gconftool.c:964
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "'%s' 及滇互尕抸匹允﹝\n"
 
-#: gconf/gconftool.c:976
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "婁醒匹平□/襖及跟晶毛隙爛允月优邰互丐曰引允﹝\n"
 
-#: gconf/gconftool.c:996
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "平□卞窒手襖互本永玄今木化中引六氏: '%s'\n"
 
-#: gconf/gconftool.c:1024
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "襖午仄化旦平□穴毛本永玄匹五引六氏\n"
 
-#: gconf/gconftool.c:1034
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "伉旦玄及澀爛匹反﹜衙中伉旦玄滇毛隙爛允月优邰互丐曰引允\n"
 
-#: gconf/gconftool.c:1048
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "矢失及澀爛匹反﹜衙中 car 滇午 cdr 滇毛隙爛允月优邰互丐曰引允\n"
 
-#: gconf/gconftool.c:1063
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "巨仿□: %s\n"
 
-#: gconf/gconftool.c:1076 gconf/gconftool.c:1209
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "襖及澀爛巨仿□: %s"
 
-#: gconf/gconftool.c:1094 gconf/gconftool.c:1223
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "き渝醱卞巨仿□: %s"
 
-#: gconf/gconftool.c:1112
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "婁醒匹及心平□(旦平□穴抩)毛隙爛允月优邰互丐曰引允﹝\n"
 
-#: gconf/gconftool.c:1154
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "伉旦玄滇反衙中滇卞允月优邰互丐曰引允: string, int, float 引凶反 bool\n"
 
-#: gconf/gconftool.c:1174
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "car 滇及矢失反衙中滇卞允月优邰互丐曰引允: string, int, float 引凶反 bool\n"
 
-#: gconf/gconftool.c:1194
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "cdr 滇及矢失反衙中滇卞允月优邰互丐曰引允: string, int, float 引凶反 bool\n"
 
-#: gconf/gconftool.c:1238
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "平□/襖及矢失毛潸ぜ允月凶戶卞反ㄠ動曉及犯奴伊弁玄伉及隙爛互优邰匹允﹝\n"
 
-#: gconf/gconftool.c:1252
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "拑躲卞允月凶戶卞ㄠ蜊動曉及平□毛隙爛允月优邰互丐曰引允﹝\n"
 
-#: gconf/gconftool.c:1263
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "'%s' 怳澀爛醱卞巨仿□: %s\n"
 
-#: gconf/gconftool.c:1286
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "扔皮犯奴伊弁玄伉毛潸ぜ允月凶戶卞ㄠ勾動曉及犯奴伊弁玄伉及隙爛互优邰匹允﹝\n"
 
-#: gconf/gconftool.c:1320
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "犯奴伊弁玄伉及伉旦玄祭醱卞巨仿□: %s\n"
 
-#: gconf/gconftool.c:1362
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "煞屢: 尕懇手仄仁反滇及拑中旦平□穴(%s)匹允﹝\n"
 
-#: gconf/gconftool.c:1371
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "煞屢: 尕懇手仄仁反伉旦玄滇及拑中旦平□穴(%s)匹允﹝\n"
 
-#: gconf/gconftool.c:1382 gconf/gconftool.c:1412 gconf/gconftool.c:1441
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "煞屢: 犯白巧伙玄襖 '%s' 及荸橾卞撩л: (旦平□穴反 %s)\n"
 
-#: gconf/gconftool.c:1400
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "煞屢: 尕懇手仄仁反 Car 滇引凶反 Cdr 滇及拑中旦平□穴(%s)匹允﹝\n"
 
-#: gconf/gconftool.c:1425
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "煞屢: 旦平□穴及犯白巧伙玄襖卞澀爛匹五引六氏\n"
 
-#: gconf/gconftool.c:1454
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "煞屢: gconftool 及ま朿巨仿□匹允﹝尕抸卅 GConfValueType 匹允﹝\n"
 
-#: gconf/gconftool.c:1502 gconf/gconftool.c:1523 gconf/gconftool.c:1544
-#: gconf/gconftool.c:1565
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "煞屢: 滇抩 '%s' 及荸橾卞撩л仄引仄凶\n"
 
-#: gconf/gconftool.c:1519
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1552,91 +1704,91 @@ msgstr ""
 "煞屢: list_type 反 '%s' 匹反卅仁﹜int, float, string 引凶反 bool "
 "分仃卞卅木引允﹝\n"
 
-#: gconf/gconftool.c:1540
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "煞屢: car_type 反 '%s' 匹反卅仁﹜int, float, string 引凶反 bool "
 "分仃卞卅木引允﹝\n"
 
-#: gconf/gconftool.c:1561
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "煞屢: cdr_type 反 '%s' 匹反卅仁 int, float, string 引凶反 bool "
 "卞分仃卅木引允﹝\n"
 
-#: gconf/gconftool.c:1588
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "煞屢: 塢及用□玉"
 
-#: gconf/gconftool.c:1591 gconf/gconftool.c:1854
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "煞屢: 用□玉 <%s> 反旦平□穴匹反荸づ匹五引六氏﹝\n"
 
-#: gconf/gconftool.c:1601
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "煞屢: 旦平□穴卞隙爛今木凶平□反丐曰引六氏﹝\n"
 
-#: gconf/gconftool.c:1634
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "煞屢: <locale> 用□玉卞反 簞嶺 'name = "
 "\"伕弗□伙抩\"互丐曰引六氏﹝拑骰仄引允﹝\n"
 
-#: gconf/gconftool.c:1640
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 "煞屢: 伕□弗伙 '%s' 迕及聶褐 <locale> 用□玉匹允﹝蟈化及瘉賡毛拑骰仄引允﹝\n"
 
-#: gconf/gconftool.c:1721
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "煞屢: <locale>用□玉醱卞尕懇卅用□玉 <%s> 互丐曰引允﹝\n"
 
-#: gconf/gconftool.c:1750
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "煞屢: 旦平□穴 '%s' 及奶件旦玄□伙卞撩л(伕弗□伙反 '%s'): %s\n"
 
-#: gconf/gconftool.c:1758
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "旦平□穴 '%s' 及奶件旦玄□伙 (伕□弗伙 '%s'迕)\n"
 
-#: gconf/gconftool.c:1780
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "煞屢: 旦平□穴 '%s' 及洘瑛卞撩л(平□反'%s'): %s\n"
 
-#: gconf/gconftool.c:1788
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "旦平□穴 '%s' 及洘瑛 (平□反 '%s')\n"
 
-#: gconf/gconftool.c:1867
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "ㄠ勾及 <schema> 卞尥五ㄠ勾及 <locale> 巨件玄伉互优邰匹允﹝\n"
 
-#: gconf/gconftool.c:1896
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "煞屢: 用□玉 <%s> 反 <schemalist> 匹反荸橾匹五引六氏匹仄凶﹝\n"
 
-#: gconf/gconftool.c:1918
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "'%s' 互釩仃引六氏匹仄凶: %s\n"
 
-#: gconf/gconftool.c:1925
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "玉平亙丟件玄 '%s' 反塢匹允井?\n"
 
-#: gconf/gconftool.c:1937
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1645,28 +1797,28 @@ msgstr ""
 "玉平亙丟件玄 '%s' 及伙□玄用□玉及滇互棉啜勻化中引允﹝( "
 "<%s>反<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1950
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 "玉平亙丟件玄 '%s' 卞反玄永皿伊矛伙 <gconfshemafile> 用□玉互丐曰引六氏﹝\n"
 
-#: gconf/gconftool.c:1964
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "煞屢: <gconfshemafile> 票及用□玉 <%s> 反荸橾匹五引六氏匹仄凶﹝\n"
 
-#: gconf/gconftool.c:1975 gconf/gconftool.c:2007
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "澀爛犯□正及き渝匹巨仿□: %s"
 
-#: gconf/gconftool.c:1991
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr ""
 "奶件旦玄□伙允月凶戶卞湯勾井及旦平□穴白央奶伙毛隙爛允月优邰互丐曰引允﹝\n"
 
-#: gconf/gconftool.c:2028
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1675,16 +1827,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2048
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "尕敦蟈卅平□ '%s' 及拑躲祭卞撩л: %s\n"
 
-#: gconf/gconftool.c:2174
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "蔽弇允月凶戶卞反湯勾井及平□毛隙爛允月优邰互丐曰引允﹝\n"
 
-#: gconf/gconftool.c:2180
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1694,11 +1846,11 @@ msgstr ""
 "失皿伉弗□扑亦件毛蔽弇今六方丹午仄化中引允:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2198
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "蔽弇允月凶戶卞反湯勾井及犯奴伊弁玄伉毛隙爛允月优邰互丐曰引允﹝\n"
 
-#: gconf/gconftool.c:2217
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1709,185 +1861,77 @@ msgstr ""
 "失皿伉弗□扑亦件毛蔽弇今六方丹午仄化中引允:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "GConf 巨仿□: %s\n"
-
-#: wrappers/gtk/gconf-client.c:795
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf 井日煞屢: '%s' 及醱及矢失及伉旦玄祭卞撩л: %s"
 
-#: wrappers/gtk/gconf-client.c:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "'%s' 毛渝謹今木凶互﹜ぜ日木凶及反 '%s'(平□反'%s')匹允﹝"
 
-#~ msgid "found <local_schema> with no locale setting"
-#~ msgstr "伕□弗伙澀爛拑仄及 <local_schema> 毛�站咫楔牏楔縑�"
-
-#~ msgid "GConf was built with debugging features enabled"
-#~ msgstr "GConf 反犯田永弘窗Х互肣躲匹允"
-
-#~ msgid ""
-#~ "Error on line %d char %d: %s\n"
-#~ "(Some surrounding text was '%s')\n"
-#~ msgstr ""
-#~ "仿奶件 %d 及 %d 妐儂杴匹巨仿□: %s\n"
-#~ "(區引木化中月妐反 '%s')\n"
-
-#~ msgid ""
-#~ "Text ended in the middle of an entity, or entity name too long to be valid "
-#~ "('&' should begin an entity such as '&quot;')"
-#~ msgstr ""
-#~ "蕞氏醱及巨件玄伉匹蔽弇仄化中月井﹜巨件玄伉抩互贏允亢引允 ('&' 反 '&quot;' "
-#~ "及方丹卞巨件玄伉及燮え卞尥仃引允)"
-
-#~ msgid ""
-#~ "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
-#~ msgstr ""
-#~ "'%s' 反尕抸卅巨件玄伉匹允 ('&' 反巨件玄伉及燮え卞尥仃月优邰肣曰 拺: &amp; "
-#~ "&quot; &lt; &gt; &apos;)"
-
-#~ msgid ""
-#~ "Markup text ended in the middle of a character reference, just after '&#'"
-#~ msgstr ""
-#~ "妐儂輔寰及蕞氏醱 (切斤丹升 '&#' 及詨欠) 匹穴□弁失永皿妐互蔽弇仄化中引允"
-
-#~ msgid ""
-#~ "Character reference contained non-digit '%s' ('&#' should begin a reference "
-#~ "to a unicode character, such as '&#2342;')"
-#~ msgstr ""
-#~ "妐儂輔寰匹醒儂匹卅中坁 '%s' 互殖引木化中引允 ('&#' 反 '&#2342;' "
-#~ "及方丹卞輔寰允月 Unicode 妐儂及燮え卞尥仃引允)"
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "BerkeleyDB (BDB) 田永弁巨件玉乒斥亙□伙毛荸旵醱匹允﹝"
 
-#~ msgid ""
-#~ "Text ended in the middle of an character reference ('&#' should begin a "
-#~ "character reference such as '&#2342;')"
-#~ msgstr ""
-#~ "妐互妐儂輔寰及蕞氏醱匹蔽弇仄化引允 ('&#' 反 '&#2342' "
-#~ "及方丹卞輔寰允月妐儂及燮え卞尥仃月优邰肣曰)"
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "%s 及伙□玄卞釩井木凶 BerkeleyDB 末□旦"
 
-#~ msgid ""
-#~ "Couldn't parse character reference '%s' ('&#' must begin a character "
-#~ "reference such as '&#2343;')"
-#~ msgstr ""
-#~ "妐儂輔寰 '%s' 毛荸橾匹五引六氏匹仄凶 ('&#' 反 '&#2343' "
-#~ "及方丹卞輔寰允月妐儂及燮え卞尥仃月优邰肣曰)"
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "BDB 田永弁巨件玉乒斥亙□伙及賡渝祭醱匹允﹝"
 
-#~ msgid ""
-#~ "Character code %#lx is not allowed in XML documents or is not a valid "
-#~ "Unicode character"
-#~ msgstr ""
-#~ "妐儂戊□玉 '%#lx' 反 XML 妐踏匹反銀尹卅中井﹜手仄仁反棉啜勻凶 Unicode "
-#~ "妐儂匹允"
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "%s 伙□玄犯奴伊弁玄伉反失玉伊旦 '%s' 醱卞葦勾井曰引六氏匹仄凶﹝"
 
 #~ msgid ""
-#~ "Document ended just after an '&', '&' should begin an entity or character "
-#~ "reference."
+#~ "Can't read from or write to the %s root directory in the address `%s'"
 #~ msgstr ""
-#~ "'&' 及躂什詨匹妐踏互蔽弇仄化中引允﹝'&' "
-#~ "反巨件玄伉井妐儂輔寰及燮え卞尥仃月优邰互丐曰引允﹝"
+#~ "%s 伙□玄犯奴伊弁玄伉尺及づ心潸曰/踏五慇心反 失玉伊旦 '%s' 匹反匹五引六氏﹝"
 
-#~ msgid ""
-#~ "'<' or '>' character not allowed here; only allowed around tags, for example "
-#~ "<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
-#~ "&lt; and &gt;"
-#~ msgstr ""
-#~ "妐儂 '<' 午 '>' 反仇仇匹反銀尹引六氏﹝正弘午域踝卞銀中引允﹝拺尹壬 <bold> "
-#~ "午井 <paragraph> 匹允﹝公及幻井卞﹜&lt; 午 &gt; "
-#~ "巨件玄伉午仄化仇木日及妐儂毛剪寞祭仄引允﹝"
+#~ msgid "Failed to set mode on `%s': %s"
+#~ msgstr "'%s' 及乒□玉澀爛互撩л仄引仄凶: %s"
 
-#~ msgid "Character '%s' is not valid at the start of an attribute name"
-#~ msgstr "妐儂 '%s' 毛簞嶺抩及燮え卞尥仃月仇午反匹五引六氏"
+#~ msgid "No database available to save your configuration"
+#~ msgstr "澀爛毛忡繡允月凶戶及犯□正矛□旦互肣躲匹反丐曰引六氏﹝"
 
-#~ msgid "Document ended just after attribute name"
-#~ msgstr "妐互簞嶺抩及躂什詨欠匹蔽弇仄化中引允"
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "OAF 及杽鎖: '%s'"
 
-#~ msgid "Attribute name must be immediately followed by an '=' character"
-#~ msgstr "妐儂 '=' 及躂什詨卞簞嶺抩毛筏課允月优邰互丐曰引允"
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "平□ '%s' 匹襖毛忡繡允月仇午互請侳引六氏"
 
-#~ msgid ""
-#~ "'=' character after attribute must be immediately followed by an '\"' "
-#~ "character"
-#~ msgstr "妐儂 '\"' 及躂什詨欠卞妐儂 '=' 毛筏課允月优邰互丐曰引允"
+#~ msgid "/path"
+#~ msgstr "/path 毛彸螂仄化仁分今中"
 
-#~ msgid ""
-#~ "Character '%c' found inside an attribute value; perhaps your attribute value "
-#~ "is missing the closing quotation mark '\"'"
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
 #~ msgstr ""
-#~ "簞嶺襖及醱卞妐儂 '%c' 互丐曰引允﹝簞嶺襖互 婁迕扞 '\"' "
-#~ "匹岉元日木化中卅中方丹匹允﹝"
+#~ "扑弘瓜伙 %d 毛熬仃潸曰引仄凶﹝戊失母件皿匹允﹝GConf 田弘午仄化扷屢仄化票今中﹝"
 
 #~ msgid ""
-#~ "Ran out of text before a quote mark ('\"') was seen at the end of an "
-#~ "attribute value"
-#~ msgstr "隙爛仄凶簞嶺襖及瘉詨毛憎允婁迕扞 '\"' 及蟆匹妐互濠木化中引允"
-
-#~ msgid ""
-#~ "Text ends immediately after an attribute value, before the element was closed"
-#~ msgstr "簞嶺襖及躂什詨欠﹜正弘互岉元日木月蟆卞妐互蔽歹勻化中引允﹝"
-
-#~ msgid "Missing '<' at start of element"
-#~ msgstr "正弘抩及燮え卞 '<' 互丐曰引六氏"
-
-#~ msgid "Document ended just after '<' character"
-#~ msgstr "妐儂 '<' 及躂什詨欠匹妐互蔽歹勻化中引允"
-
-#~ msgid "No closing '>' found for a <? or <!"
-#~ msgstr "<? 引凶反 <! 卞覆殺允月 '>' 互丐曰引六氏"
-
-#~ msgid "Character '%s' is not valid at the start of an element name"
-#~ msgstr "妐儂 '%s' 毛正弘抩及燮え卞尥仃月仇午反匹五引六氏"
-
-#~ msgid "Document ended just after element name, no '>' seen"
-#~ msgstr "正弘抩及躂什詨欠匹妐互蔽歹勻化中引允﹝ '>' 互丐曰引六氏"
-
-#~ msgid "Elements should be closed with '>' or '/>', not with '%s'"
-#~ msgstr "正弘反 '%s' 匹反卅仁 '>' 井 '/>' 匹岉元月优邰互丐曰引允﹝"
-
-#~ msgid ""
-#~ "Element ended just after '/', no '>' seen; empty elements should end with "
-#~ "'/>'"
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 #~ msgstr ""
-#~ "'>' 拑仄及 '/' 及躂什詨欠匹正弘互蔽歹勻化中引允﹝塢及正弘反 '/>' "
-#~ "匹蔽弇允月优邰互丐曰引允"
-
-#~ msgid "Close tag not found at end of element"
-#~ msgstr "正弘及瘉詨卞蔽弇正弘互丐曰引六氏"
-
-#~ msgid "Close tag ends just after '<' character"
-#~ msgstr "妐儂 '<' 及躂什詨欠卞蔽弇正弘互丐曰引允"
+#~ "扑弘瓜伙 %d 毛熬仃潸曰引仄凶﹝唱橘蔽弇匹允﹝GConf 田弘午仄化扷屢仄化票今中﹝"
 
-#~ msgid "Close tag should begin with '</', '/' character is missing"
-#~ msgstr "蔽弇正弘反 '</' 匹釩銨允月优邰互丐曰引允﹝妐儂 '/' 互丐曰引六氏"
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "GConf 扔□田□互銀迕今木化中引六氏﹝扑乓永玄母它件仄引允﹝"
 
-#~ msgid "Close tag ends just after '/' character"
-#~ msgstr "妐儂 '/' 及躂什詨欠卞蔽弇正弘互丐曰引允"
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "橇謫忡儅白央奶伙及づ心慇心匹巨仿□: %s"
 
-#~ msgid "Document ended just after element name in close tag, no '>' seen"
-#~ msgstr ""
-#~ "蔽弇正弘及正弘抩及躂什詨欠匹妐互蔽歹勻化中引允﹝'>' 互拑中方丹匹允﹝"
-
-#~ msgid "Document ended just after close tag name, no '>' seen"
-#~ msgstr "蔽弇正弘抩及躂什詨欠匹妐互蔽歹勻化引允﹝'>' 互拑中方丹匹允﹝"
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "弁仿奶失件玄及 IOR 潸ぜ卞撩л仄引仄凶: %s"
 
-#~ msgid "Close tag '%s' does not match opening tag '%s'"
-#~ msgstr "蔽弇正弘 '%s' 互釩銨正弘 '%s' 卞域譙仄引六氏"
+#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgstr "橇謫忡儅白央奶伙尺及馨笛弁仿奶失件玄及白仿永扑亙卞撩л仄引仄凶: %s"
 
 #~ msgid ""
-#~ "Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
-#~ "bad character was '%s'"
+#~ "Some client removed itself from the GConf server when it hadn't been added."
 #~ msgstr ""
-#~ "穴□弁失永皿妐及 %d 田奶玄杴卞尕懇卅 UTF-8 妐儂互丐曰引允﹝%s "
-#~ "反云井仄卅妐儂及蟆卞丐曰引允﹝"
-
-#~ msgid "The marked-up text contained nothing but whitespace."
-#~ msgstr "穴□弁失永皿妐反塢⑩分仃匹允﹝"
+#~ "湯勾井及弁仿奶失件玄反馨笛今木卅井勻凶及匹﹜GConf "
+#~ "扔□田□井日憤坌憤褥毛綽輪仄引仄凶﹝"
 
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "白央奶伙 '%s' 及左□皿件卞撩л仄引仄凶: %s"
+#~ msgid "Default Value: %s\n"
+#~ msgstr "賡渝襖: %s\n"
 
-#~ msgid "Error reading file '%s': %s"
-#~ msgstr "白央奶伙 '%s' 及づ心慇心匹巨仿□: %s"
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "GConf 巨仿□: %s\n"
diff --git a/po/nl.po b/po/nl.po
index 6b71b301..fe9f10d1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf cvs\n"
-"POT-Creation-Date: 2000-11-19 19:21+0100\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-11-19 18:25+0100\n"
 "Last-Translator: Almer S. Tigelaar <almer1@dds.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -22,7 +22,7 @@ msgstr "Bezig met ontladen XML backend module."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Kon de XML root directory niet vinden in het adres `%s'"
 
-#: backends/xml-backend.c:301 backends/xml-dir.c:1035
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kon directory `%s' niet maken: %s"
@@ -53,7 +53,7 @@ msgstr ""
 "Ongesynchronizeerde verwijderde directories tijdens het afsluiten van het "
 "XML backend"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -63,7 +63,7 @@ msgstr ""
 "synchroniseren\n"
 "naar de schijf niet successvol is verlopen"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -108,33 +108,33 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "Fout bij het verwijderen van oud bestand `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:790
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Fout bij vergaren status van `%s': %s"
 
-#: backends/xml-dir.c:934
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Dubbele \"entry\" `%s' in `%s', wordt genegeerd"
 
-#: backends/xml-dir.c:956
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "\"Entry\" zonder naam in XML bestand `%s', word genegeerd"
 
-#: backends/xml-dir.c:963
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 "Hoogste node in XML bestand `%s' is niet van type \"<entry>\", word genegeerd"
 
-#: backends/xml-dir.c:1051
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Fout bij maken bestand `%s': %s"
 
-#: backends/xml-dir.c:1059 gconf/gconf-internals.c:2471
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Fout bij sluiten bestand `%s': %s"
@@ -145,7 +145,7 @@ msgstr "Fout bij sluiten bestand `%s': %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "XML node met naam `%s' word genegeerd: %s"
 
-#: backends/xml-entry.c:199
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -273,31 +273,31 @@ msgstr "Kon backend module voor `%s' niet vinden"
 msgid "Failed to shut down backend"
 msgstr "Fout bij stoppen van backend"
 
-#: gconf/gconf-database.c:233
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Ongeldige waarde ontvangen in instel verzoek"
 
-#: gconf/gconf-database.c:241
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Kon geen wijs maken uit de CORBA waarde die ontvangen werd in een instel "
 "verzoek voor sleutel `%s'"
 
-#: gconf/gconf-database.c:518
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "Verzoek om alle gecachede gegevens te laten vallen"
 
-#: gconf/gconf-database.c:535
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Verzoek ontvangen om synchroon te synchronizeren"
 
-#: gconf/gconf-database.c:602
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "Fatale fout: fout bij het vergaren van object referentie naar ConfigDatabase"
 
-#: gconf/gconf-database.c:761
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Fout bij synchronizeren van een of meer bronnen: %s"
@@ -306,7 +306,7 @@ msgstr "Fout bij synchronizeren van een of meer bronnen: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:843
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -317,12 +317,12 @@ msgstr ""
 "hersteld als gconfd word herstart, dit resulteert in onbetrouwbare "
 "notificatie van configuratie wijzingen."
 
-#: gconf/gconf-database.c:868
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Luisteraar ID %lu bestaat niet"
 
-#: gconf/gconf-database.c:877
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -332,47 +332,47 @@ msgstr ""
 "(waarschijnlijk niet gevaarlijk, kan resulteren in een notificatie die "
 "opnieuw weer verschijnt): %s"
 
-#: gconf/gconf-database.c:989 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fout bij het vergaren van waarde voor `%s': %s"
 
-#: gconf/gconf-database.c:1031
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Fout bij het instellen van waarde voor `%s': %s"
 
-#: gconf/gconf-database.c:1074
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Fout bij het ontzetten `%s': %s"
 
-#: gconf/gconf-database.c:1098
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Fout bij het vergaren van de standaardwaarde voor `%s': %s"
 
-#: gconf/gconf-database.c:1137
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Fout bij het controleren van bestaan van `%s': %s"
 
-#: gconf/gconf-database.c:1161
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Fout bij het verwijderen van directory `%s': %s"
 
-#: gconf/gconf-database.c:1187
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Fout bij het vergaren van alle \"entries\" in `%s': %s"
 
-#: gconf/gconf-database.c:1213
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Fout bij het vergaren van directorylijst in `%s': %s"
 
-#: gconf/gconf-database.c:1234
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Fout bij het instellen van schema voor `%s': %s"
@@ -437,9 +437,219 @@ msgstr "Bewerking niet toegestaan zonder configuratie server"
 msgid "Failed to get a lock"
 msgstr "Fout bij verkrijgen van vergrendeling"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "Geen databank beschikbaar om configuratie naar op te slaan"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+"Fout op regel %d karakter %d: %s\n"
+"(De omringende tekst is '%s')\n"
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+"Text eindigde in het midden van een entiteit, of entiteitsnaam is te lang om "
+"geldig te zijn (Karakter '&' zou in een entiteitsnaam '&quot;' moeten zijn)"
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+"Onbekende entiteit '%s' ('&' moet entiteiten beginnen met &amp; &quot; &lt; "
+"&gt; &apos;)"
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+"Opmaak tekst eindigde in het midden van een karakter referentie, net na '&#'"
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+"Karakter referentie bevatte niet-numeriek teken '%s' ('&#' zou een "
+"referentie moeten beginnen naar een unicode karakter, zoals '&#2342;')"
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+"Tekst eindigde in het midden van een karakter referentie ('&#' zou een "
+"karakter referentie moeten beginnen, zoals '&#2342;')"
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+"Kon karakter referentie '%s' niet ontleden ('&#' moet beginnen met een "
+"karakter referentie, zoals '&#2343;')"
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+"Karakter code %#lx is niet toegestaan in XML documenten of is geen geldig "
+"Unicode karakter"
+
+#: gconf/gconf-glib.c:1013
+#, fuzzy
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+"Document eindigde net na een '&', '&' moet beginnen met een entiteits of "
+"karakter referentie."
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+"'<' of '>' zijn hier niet toegestaan; deze zijn alleen om tags toegestaan, "
+"bijvoorbeeld <bold> of <paragraph>. Op andere plekken moeten deze karakters "
+"als &lt; en &gt; worden geschreven"
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr "Karakter '%s' is niet geldig aan het begin van een attribuutnaam"
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr "Document eindigde net na attribuut naam"
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr "Attribuutnaam moet direct gevolgd worden door een '=' karakter"
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+"'=' karakter na attribuut moet direct gevolgd worden door een '\"' karakter"
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+"Karakter '%c' gevonden binnen een attribuutwaarde; misschien mist van de "
+"attribuut waarde een sluitend quotatie teken '\"'"
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+"Einde van tekst alvorens een quotatie teken ('\"') gezien werd op het einde "
+"van een attribuut waarde"
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+"Tekst eindigt direct na een attribuut waarde, voor het element werd gesloten"
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr "Ontbrekend '<' teken bij de start van element"
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr "Document eindigde net na '<' karakter"
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr "Geen sluitende '>' gevonden voor een <? of <!"
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr "Karakter '%s' is niet geldig aan het begin van een elementnaam"
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr "Document eindigde net na een elementnaam, geen '>' gezien"
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr "Elementen moeten tussen '>' of '/>' tekens staan, niet met '%s'"
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+"Element eindigde net na '/', geen '>' gezien; lege elementen moeten eindigen "
+"met '/>'"
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr "Sluit tag niet gevonden bij element einde"
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr "Sluit tag stopt net na '<' karakter"
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr "Sluit tag moet beginnen met '</', '/' karakter ontbreekt"
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr "Sluit tag stopt net na '/' karakter"
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr "Document eindigde net na elementnaam in sluit tag, geen '>' gezien"
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr "Document eindigde net na sluit tag naam, geen '>' gezien"
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr "Sluit tag '%s' is niet gelijk aan openings tag '%s'"
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+"Ongeldig UTF-8 karakter bij byte %d in opgemaakte tekst. Een tekstfragment "
+"net voor het ongeldige karakter : %s"
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr "De opgemaakte tekst bevatte niets dan spaties."
+
+#: gconf/gconf-glib.c:10666
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Fout bij openen bestand '%s': %s"
+
+#: gconf/gconf-glib.c:10683
+#, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Fout bij lezen bestand '%s': %s"
 
 #: gconf/gconf-internals.c:85
 #, c-format
@@ -478,89 +688,84 @@ msgstr "Bezig met bron `%s'\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "Leesfout op bestand `%s': %s\n"
 
-#: gconf/gconf-internals.c:1321
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Verwachtte lijst, kreeg %s"
 
-#: gconf/gconf-internals.c:1331
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Verwachtte lijst van %s, kreeg lijst van %s"
 
-#: gconf/gconf-internals.c:1470
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Verwachtte paar, kreeg %s"
 
-#: gconf/gconf-internals.c:1484
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Verwachte (%s,%s) paar, kreeg een paar waarbij een of beide waarden ontbraken"
 
-#: gconf/gconf-internals.c:1500
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Verwachtte paar van type (%s,%s) kreeg type (%s,%s)"
 
-#: gconf/gconf-internals.c:1616
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Gequoteerde tekenreeks begint niet met een quotatie teken"
 
-#: gconf/gconf-internals.c:1678
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Gequoteerde tekenreeks eindigt niet met een quotatie teken"
 
-#: gconf/gconf-internals.c:2158 gconf/gconf.c:2945
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA fout: %s"
 
-#: gconf/gconf-internals.c:2174
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "OAF probleem omschrijving: '%s'"
-
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 "poging tot verwijderen van een OAF object directory die niet op de lijst "
 "voorkomt"
 
-#: gconf/gconf-internals.c:2185
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "poging tot toevoegen van OAf directory die al op de lijst voorkomt"
 
-#: gconf/gconf-internals.c:2192
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF ontleed fout: %s"
 
-#: gconf/gconf-internals.c:2197
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Onbekende OAF fout"
 
-#: gconf/gconf-internals.c:2280
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "geen ior bestand in `%s'"
 
-#: gconf/gconf-internals.c:2311
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd neemt vergrendeling `%s' van een andere proces"
 
-#: gconf/gconf-internals.c:2322
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Een andere programma heeft vergrendeling `%s'"
 
-#: gconf/gconf-internals.c:2342
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "Kon geen contact opnemen met ORB om de bestaande gconfd te 'pingen'"
 
-#: gconf/gconf-internals.c:2350
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -569,46 +774,46 @@ msgstr ""
 "Overgebleven vergrendelingsbestand verwijdert `%s' omdat IOR niet naar "
 "object referentie geconverteerd kon worden, IOR `%s'"
 
-#: gconf/gconf-internals.c:2362
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "Overgebleven vergrendelingsbestand `%s' verwijdert als gevolg van een fout "
 "bij het 'pingen' van de server: %s"
 
-#: gconf/gconf-internals.c:2374
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf configuratie daemon (gconfd) heeft vergrendeling `%s'"
 
-#: gconf/gconf-internals.c:2388
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "kon directory `%s' niet maken: %s"
 
-#: gconf/gconf-internals.c:2423
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Kon vergrendeling `%s' niet maken: %s"
 
-#: gconf/gconf-internals.c:2459
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kon niet schrijven naar bestand `%s': %s"
 
-#: gconf/gconf-internals.c:2502
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "Kon vergrendelingsbestand `%s' niet openen; aangenomen wordt dat dit niet "
 "ons bestand is: %s"
 
-#: gconf/gconf-internals.c:2519
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Vergrendelingsbestand `%s' beschadigt, word toch verwijdert"
 
-#: gconf/gconf-internals.c:2529
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -617,26 +822,26 @@ msgstr ""
 "Kon vergrendelingsbestand `%s' niet maken (aanmaak proces id %u, of proces "
 "id %u, aangenomen word dat iemand onze vergrendeling heeft overgenomen"
 
-#: gconf/gconf-internals.c:2546
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Fout bij het vrijgegeven van vergrendelings directory `%s': %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Fout bij het laden bron `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Schema `%s' gespecificeerd voor `%s', slaat een niet schema waarde op"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "De '/' naam kan alleen een directory zijn, geen sleutel"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -645,22 +850,17 @@ msgstr ""
 "Waarde voor `%s' ingesteld op een alleen-lezen bron aan de voorkant van je "
 "configuratie pad."
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "Kon waarde op sleutel '%s' niet opslaan"
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Fout bij het zoeken van metainfo: %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Fout bij het vergaren van metainfo: %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -732,22 +932,22 @@ msgstr "`%s' niet begrepen (extra ')' gevonden binnen paar)"
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Server kon adres `%s' niet vinden"
 
-#: gconf/gconf.c:568
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "Kan notificaties niet toevoegen aan lokale configuratie bron"
 
-#: gconf/gconf.c:1724
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr ""
 "Toevoegen van client aan de lijst van de server mislukt, CORBA fout: %s"
 
-#: gconf/gconf.c:1740
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -757,66 +957,66 @@ msgstr ""
 "oaf_activate_from_id() en gaf geen uitzondering met een uitleg van het "
 "probleem. Rapporteer a.u.b. een OAF bug."
 
-#: gconf/gconf.c:2051
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Fout bij initialiseren GConf, er word nu gestopt\n"
 
-#: gconf/gconf.c:2088
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Moet beginnen met een schuine streep (/)"
 
-#: gconf/gconf.c:2110
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan geen twee schuine strepen (/) achter elkaar hebben"
 
-#: gconf/gconf.c:2112
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan geen punt (.) na een schuine streep (/) hebben"
 
-#: gconf/gconf.c:2133
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' is een ongeldig karakter in sleutel/directory namen"
 
-#: gconf/gconf.c:2147
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Sleutel/directory mag niet eindigen op een schuine streep (/)"
 
-#: gconf/gconf.c:2400
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fout bij sluiten configuratie server: %s"
 
-#: gconf/gconf.c:2461
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Verwachte 'float', kreeg %s"
 
-#: gconf/gconf.c:2496
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Verwachte 'int', kreeg %s"
 
-#: gconf/gconf.c:2531
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Verwachte 'string', kreeg %s"
 
-#: gconf/gconf.c:2568
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Verwachte 'bool', kreeg %s"
 
-#: gconf/gconf.c:2601
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Verwachte 'schema', kreeg %s"
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Afsluitings verzoek ontvangen"
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -824,7 +1024,7 @@ msgstr ""
 "gconfd gecompileerd met debug informatie; bezig met proberen laden van "
 "gconf.path uit de broncode directory"
 
-#: gconf/gconfd.c:297
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -832,7 +1032,7 @@ msgstr ""
 "Geen configuratie bestanden gevonden, terugval op standaard configuratie "
 "bron `%s'"
 
-#: gconf/gconfd.c:306
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -841,12 +1041,12 @@ msgstr ""
 "opgeslagen;\n"
 "bewerken "
 
-#: gconf/gconfd.c:320
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Fout bij het laden van enkele configuratie bronnen: %s"
 
-#: gconf/gconfd.c:332
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -855,7 +1055,7 @@ msgstr ""
 "data niet\n"
 "laden en opslaan"
 
-#: gconf/gconfd.c:349
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -864,36 +1064,28 @@ msgstr ""
 "niet\n"
 "in staat om sommige wijzingen op te slaan"
 
-#: gconf/gconfd.c:375
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-"Signaal %d ontvangen, kern word gedumpt. Rapporteer a.u.b. een GConf bug."
-
-#: gconf/gconfd.c:391
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"Signaal %d ontvangen, abnormale afsluiting. Rapporteer a.u.b. een GConf bug."
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down."
+msgstr "Signaal %d ontvangen, normale afsluiting"
 
-#: gconf/gconfd.c:408
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Signaal %d ontvangen, normale afsluiting"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:457
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "(versie %s) gestart, pid %u gebruiker '%s'"
 
-#: gconf/gconfd.c:461
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr "GConf is gebouwd met debug mogelijkheden"
 
-#: gconf/gconfd.c:484
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -901,11 +1093,11 @@ msgstr ""
 "Fout bij initializeren Object Activatie Framework: rapporteer een bug aan de "
 "OAF beheerders"
 
-#: gconf/gconfd.c:504
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Fout bij het verkrijgen van object referentie voor ConfigServer"
 
-#: gconf/gconfd.c:524
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -913,28 +1105,24 @@ msgstr ""
 "OAF kent onze IID niet; Dit geeft een corrupte installatie aan; Kan niet "
 "registreren; gestopt\n"
 
-#: gconf/gconfd.c:528
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Er is al een andere gconfd registreert bij OAF; gestopt\n"
 
-#: gconf/gconfd.c:533
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Onbekende fout bij het registreren van gconfd bij OAF; gestopt\n"
 
-#: gconf/gconfd.c:571
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Gestopt"
 
-#: gconf/gconfd.c:595
-msgid "GConf server is not in use, shutting down."
-msgstr "GConf server word niet gebruikt, bezig met afsluiten."
-
-#: gconf/gconfd.c:930
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Uitzondering: %s"
 
-#: gconf/gconfd.c:1018
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -943,7 +1131,7 @@ msgstr ""
 "Fout bij het openen van gconfd log bestand; kan luisteraars naar gconfd "
 "afsluiting niet herstarten (%s)"
 
-#: gconf/gconfd.c:1041
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -951,34 +1139,34 @@ msgstr ""
 "Fout bij sluiten van gconfd log bestand; gegevens zijn misschien niet goed "
 "opgeslagen (%s)"
 
-#: gconf/gconfd.c:1104
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Kon opslag status bestand '%s' niet openen voor schrijven: %s"
 
-#: gconf/gconfd.c:1118
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 "Kon de opslag status bestand '%s' niet wegschrijven bestands-descriptor: %d: "
 "%s"
 
-#: gconf/gconfd.c:1127
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Fout bij sluiten van nieuw opslag status bestand '%s': %s"
 
-#: gconf/gconfd.c:1141
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Kon oud opslag status bestand niet verplaatsen '%s': %s"
 
-#: gconf/gconfd.c:1151
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Fout bij verplaatsen van nieuw opslag status bestand: %s"
 
-#: gconf/gconfd.c:1160
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -986,7 +1174,48 @@ msgstr ""
 "Fout bij het herstellen van origineel opslag status bestand dat was "
 "verplaatst naar '%s': %s"
 
-#: gconf/gconfd.c:1633
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Fout bij het openen van opslag status bestand: %s"
+
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Fout bij het openen van opslag status bestand: %s"
+
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr ""
+"Fout bij het wegschrijven van toe te voegen client in het opslag status "
+"bestand: %s"
+
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr ""
+"Fout bij het wegschrijven van toe te voegen client in het opslag status "
+"bestand: %s"
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Fout bij het openen van opslag status bestand: %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -994,17 +1223,12 @@ msgstr ""
 "Fout bij het herstellen van luisteraar op adres '%s', kon de databank niet "
 "vinden"
 
-#: gconf/gconfd.c:1679
-#, c-format
-msgid "Error reading saved state file: %s"
-msgstr "Fout bij lezen opslag status bestand: %s"
-
-#: gconf/gconfd.c:1732
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Fout bij openen opslag status bestand '%s': %s"
 
-#: gconf/gconfd.c:1849
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to "
@@ -1013,7 +1237,7 @@ msgstr ""
 "Fout bij het loggen van toevoeging van luisteraars aan het gconfd log "
 "bestand; kan luisteraar niet opnieuw toevoegen als gconfd stopt (%s)"
 
-#: gconf/gconfd.c:1854
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously "
@@ -1023,36 +1247,6 @@ msgstr ""
 "bestand; misschien word de luisteraar foutief opnieuw toegevoegd als gconfd "
 "stopt (%s)"
 
-#: gconf/gconfd.c:1877 gconf/gconfd.c:2038
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "Fout bij vergaren van IOR voor client: %s"
-
-#: gconf/gconfd.c:1892
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "Fout bij het openen van opslag status bestand: %s"
-
-#: gconf/gconfd.c:1905
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr ""
-"Fout bij het wegschrijven van toe te voegen client in het opslag status "
-"bestand: %s"
-
-#: gconf/gconfd.c:1913
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr ""
-"Fout bij spoelen van toevoeging van client aan het opslag status bestand: %s"
-
-#: gconf/gconfd.c:1999
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr ""
-"Enkele clienten verwijderden zichzelf van de GConf server terwijl ze niet "
-"waren toegevoegd."
-
 #: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Help opties"
@@ -1700,182 +1894,52 @@ msgstr ""
 "voor sleutels in directory:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "GConf Fout: %s\n"
-
-#: wrappers/gtk/gconf-client.c:795
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf waarschuwing: fout bij het weergeven van paren in `%s': %s"
 
-#: wrappers/gtk/gconf-client.c:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Verwachte `%s' kreeg `%s' voor sleutel %s"
 
-#~ msgid ""
-#~ "Error on line %d char %d: %s\n"
-#~ "(Some surrounding text was '%s')\n"
-#~ msgstr ""
-#~ "Fout op regel %d karakter %d: %s\n"
-#~ "(De omringende tekst is '%s')\n"
-
-#~ msgid ""
-#~ "Text ended in the middle of an entity, or entity name too long to be valid "
-#~ "('&' should begin an entity such as '&quot;')"
-#~ msgstr ""
-#~ "Text eindigde in het midden van een entiteit, of entiteitsnaam is te lang om "
-#~ "geldig te zijn (Karakter '&' zou in een entiteitsnaam '&quot;' moeten zijn)"
-
-#~ msgid ""
-#~ "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
-#~ msgstr ""
-#~ "Onbekende entiteit '%s' ('&' moet entiteiten beginnen met &amp; &quot; &lt; "
-#~ "&gt; &apos;)"
-
-#~ msgid ""
-#~ "Markup text ended in the middle of a character reference, just after '&#'"
-#~ msgstr ""
-#~ "Opmaak tekst eindigde in het midden van een karakter referentie, net na '&#'"
-
-#~ msgid ""
-#~ "Character reference contained non-digit '%s' ('&#' should begin a reference "
-#~ "to a unicode character, such as '&#2342;')"
-#~ msgstr ""
-#~ "Karakter referentie bevatte niet-numeriek teken '%s' ('&#' zou een "
-#~ "referentie moeten beginnen naar een unicode karakter, zoals '&#2342;')"
-
-#~ msgid ""
-#~ "Text ended in the middle of an character reference ('&#' should begin a "
-#~ "character reference such as '&#2342;')"
-#~ msgstr ""
-#~ "Tekst eindigde in het midden van een karakter referentie ('&#' zou een "
-#~ "karakter referentie moeten beginnen, zoals '&#2342;')"
-
-#~ msgid ""
-#~ "Couldn't parse character reference '%s' ('&#' must begin a character "
-#~ "reference such as '&#2343;')"
-#~ msgstr ""
-#~ "Kon karakter referentie '%s' niet ontleden ('&#' moet beginnen met een "
-#~ "karakter referentie, zoals '&#2343;')"
-
-#~ msgid ""
-#~ "Character code %#lx is not allowed in XML documents or is not a valid "
-#~ "Unicode character"
-#~ msgstr ""
-#~ "Karakter code %#lx is niet toegestaan in XML documenten of is geen geldig "
-#~ "Unicode karakter"
-
-#~ msgid ""
-#~ "Document ended just after an '&', '&' should begin an entity or character "
-#~ "reference."
-#~ msgstr ""
-#~ "Document eindigde net na een '&', '&' moet beginnen met een entiteits of "
-#~ "karakter referentie."
-
-#~ msgid ""
-#~ "'<' or '>' character not allowed here; only allowed around tags, for example "
-#~ "<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
-#~ "&lt; and &gt;"
-#~ msgstr ""
-#~ "'<' of '>' zijn hier niet toegestaan; deze zijn alleen om tags toegestaan, "
-#~ "bijvoorbeeld <bold> of <paragraph>. Op andere plekken moeten deze karakters "
-#~ "als &lt; en &gt; worden geschreven"
-
-#~ msgid "Character '%s' is not valid at the start of an attribute name"
-#~ msgstr "Karakter '%s' is niet geldig aan het begin van een attribuutnaam"
+#~ msgid "No database available to save your configuration"
+#~ msgstr "Geen databank beschikbaar om configuratie naar op te slaan"
 
-#~ msgid "Document ended just after attribute name"
-#~ msgstr "Document eindigde net na attribuut naam"
-
-#~ msgid "Attribute name must be immediately followed by an '=' character"
-#~ msgstr "Attribuutnaam moet direct gevolgd worden door een '=' karakter"
-
-#~ msgid ""
-#~ "'=' character after attribute must be immediately followed by an '\"' "
-#~ "character"
-#~ msgstr ""
-#~ "'=' karakter na attribuut moet direct gevolgd worden door een '\"' karakter"
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "OAF probleem omschrijving: '%s'"
 
-#~ msgid ""
-#~ "Character '%c' found inside an attribute value; perhaps your attribute value "
-#~ "is missing the closing quotation mark '\"'"
-#~ msgstr ""
-#~ "Karakter '%c' gevonden binnen een attribuutwaarde; misschien mist van de "
-#~ "attribuut waarde een sluitend quotatie teken '\"'"
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Kon waarde op sleutel '%s' niet opslaan"
 
-#~ msgid ""
-#~ "Ran out of text before a quote mark ('\"') was seen at the end of an "
-#~ "attribute value"
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
 #~ msgstr ""
-#~ "Einde van tekst alvorens een quotatie teken ('\"') gezien werd op het einde "
-#~ "van een attribuut waarde"
+#~ "Signaal %d ontvangen, kern word gedumpt. Rapporteer a.u.b. een GConf bug."
 
 #~ msgid ""
-#~ "Text ends immediately after an attribute value, before the element was closed"
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 #~ msgstr ""
-#~ "Tekst eindigt direct na een attribuut waarde, voor het element werd gesloten"
-
-#~ msgid "Missing '<' at start of element"
-#~ msgstr "Ontbrekend '<' teken bij de start van element"
-
-#~ msgid "Document ended just after '<' character"
-#~ msgstr "Document eindigde net na '<' karakter"
+#~ "Signaal %d ontvangen, abnormale afsluiting. Rapporteer a.u.b. een GConf bug."
 
-#~ msgid "No closing '>' found for a <? or <!"
-#~ msgstr "Geen sluitende '>' gevonden voor een <? of <!"
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "GConf server word niet gebruikt, bezig met afsluiten."
 
-#~ msgid "Character '%s' is not valid at the start of an element name"
-#~ msgstr "Karakter '%s' is niet geldig aan het begin van een elementnaam"
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "Fout bij lezen opslag status bestand: %s"
 
-#~ msgid "Document ended just after element name, no '>' seen"
-#~ msgstr "Document eindigde net na een elementnaam, geen '>' gezien"
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "Fout bij vergaren van IOR voor client: %s"
 
-#~ msgid "Elements should be closed with '>' or '/>', not with '%s'"
-#~ msgstr "Elementen moeten tussen '>' of '/>' tekens staan, niet met '%s'"
-
-#~ msgid ""
-#~ "Element ended just after '/', no '>' seen; empty elements should end with "
-#~ "'/>'"
+#~ msgid "Failed to flush client add to saved state file: %s"
 #~ msgstr ""
-#~ "Element eindigde net na '/', geen '>' gezien; lege elementen moeten eindigen "
-#~ "met '/>'"
-
-#~ msgid "Close tag not found at end of element"
-#~ msgstr "Sluit tag niet gevonden bij element einde"
-
-#~ msgid "Close tag ends just after '<' character"
-#~ msgstr "Sluit tag stopt net na '<' karakter"
-
-#~ msgid "Close tag should begin with '</', '/' character is missing"
-#~ msgstr "Sluit tag moet beginnen met '</', '/' karakter ontbreekt"
-
-#~ msgid "Close tag ends just after '/' character"
-#~ msgstr "Sluit tag stopt net na '/' karakter"
-
-#~ msgid "Document ended just after element name in close tag, no '>' seen"
-#~ msgstr "Document eindigde net na elementnaam in sluit tag, geen '>' gezien"
-
-#~ msgid "Document ended just after close tag name, no '>' seen"
-#~ msgstr "Document eindigde net na sluit tag naam, geen '>' gezien"
-
-#~ msgid "Close tag '%s' does not match opening tag '%s'"
-#~ msgstr "Sluit tag '%s' is niet gelijk aan openings tag '%s'"
+#~ "Fout bij spoelen van toevoeging van client aan het opslag status bestand: %s"
 
 #~ msgid ""
-#~ "Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
-#~ "bad character was '%s'"
+#~ "Some client removed itself from the GConf server when it hadn't been added."
 #~ msgstr ""
-#~ "Ongeldig UTF-8 karakter bij byte %d in opgemaakte tekst. Een tekstfragment "
-#~ "net voor het ongeldige karakter : %s"
-
-#~ msgid "The marked-up text contained nothing but whitespace."
-#~ msgstr "De opgemaakte tekst bevatte niets dan spaties."
-
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Fout bij openen bestand '%s': %s"
+#~ "Enkele clienten verwijderden zichzelf van de GConf server terwijl ze niet "
+#~ "waren toegevoegd."
 
-#~ msgid "Error reading file '%s': %s"
-#~ msgstr "Fout bij lezen bestand '%s': %s"
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "GConf Fout: %s\n"
diff --git a/po/nn.po b/po/nn.po
index 38b9ecf5..9e2fa6ee 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2000 Gaute Hvoslef Kvalnes.
 # Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>, 2000
 # Kjartan Maraas  <kmaraas@gnome.org>
-
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf 0.6.5\n"
-"POT-Creation-Date: 2001-07-14 20:18+0200\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2001-06-25 18:55+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
@@ -14,46 +13,22 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr ""
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
+#: backends/xml-backend.c:233
+msgid "Unloading XML backend module."
 msgstr ""
 
-#: backends/bdb-backend.c:574
-#, fuzzy
-msgid "Initializing BDB backend module"
-msgstr "Initialiserer modem"
-
-#: backends/dir-utils.c:108
+#: backends/xml-backend.c:286
 #, fuzzy, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
+msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Fann ikkje heimekatalogen til brukaren"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
 #, fuzzy, c-format
 msgid "Could not make directory `%s': %s"
 msgstr ""
 "Kunne ikkje laga katalog\n"
 "%1"
 
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr ""
-
-#: backends/xml-backend.c:233
-msgid "Unloading XML backend module."
-msgstr ""
-
-#: backends/xml-backend.c:286
-#, fuzzy, c-format
-msgid "Couldn't find the XML root directory in the address `%s'"
-msgstr "Fann ikkje heimekatalogen til brukaren"
-
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -78,18 +53,18 @@ msgstr ""
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
-"%u items remain in the cache after cleaning already-synced items older than %"
-"u seconds"
+"%u items remain in the cache after cleaning already-synced items older than "
+"%u seconds"
 msgstr ""
 
 #: backends/xml-dir.c:164
@@ -102,60 +77,55 @@ msgstr "Kunne ikkje starta %1."
 msgid "XML filename `%s' is a directory"
 msgstr "Finst alt som katalog"
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, fuzzy, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Kunne ikkje fjerna temaet '%1'"
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, fuzzy, c-format
 msgid "Failed to write file `%s': %s"
 msgstr ""
 "Kunne ikkje skriva til fil:\n"
 "%s"
 
-#: backends/xml-dir.c:359
-#, fuzzy, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr "Kunne ikkje fjerna temaet '%1'"
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, fuzzy, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Kunne ikkje fjerna temaet '%1'"
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, fuzzy, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Kunne ikkje fjerna temaet '%1'"
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, fuzzy, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Kan ikkje sletta fil."
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, fuzzy, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Kunne ikkje lagra %1."
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, fuzzy, c-format
 msgid "Failed to create file `%s': %s"
 msgstr ""
@@ -163,23 +133,23 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2472
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, fuzzy, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Kunne ikkje lasta biletefil."
 
 #. There was an error
-#: backends/xml-entry.c:149
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:200
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, fuzzy, c-format
 msgid "%s"
 msgstr "%1 s"
 
-#: backends/xml-entry.c:327
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr ""
@@ -187,82 +157,86 @@ msgstr ""
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:373
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 
-#: backends/xml-entry.c:724
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr ""
 
-#: backends/xml-entry.c:938
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:952
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: backends/xml-entry.c:967
+#: backends/xml-entry.c:959
 #, fuzzy
 msgid "No \"value\" attribute for node"
 msgstr "Ulike filattributt"
 
-#: backends/xml-entry.c:1015 backends/xml-entry.c:1091
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1049
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1080
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1132
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1141 backends/xml-entry.c:1164
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1154
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1173
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1191
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1204
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1209
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -296,28 +270,28 @@ msgstr "Kan ikkje laga reservekopifil for %1"
 msgid "Failed to shut down backend"
 msgstr "Kunne ikkje akseptera innkommande klient"
 
-#: gconf/gconf-database.c:231
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr ""
 
-#: gconf/gconf-database.c:239
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:517
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr ""
 
-#: gconf/gconf-database.c:534
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:601
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 
-#: gconf/gconf-database.c:760
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr ""
@@ -326,7 +300,7 @@ msgstr ""
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -334,63 +308,63 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:873
+#: gconf/gconf-database.c:724
 #, fuzzy, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Fila %1 finst ikkje"
 
-#: gconf/gconf-database.c:882
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:997 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, fuzzy, c-format
 msgid "Error getting value for `%s': %s"
 msgstr ""
 "Feil ved henting av fil for overf鷨ing:\n"
 "%1"
 
-#: gconf/gconf-database.c:1044
+#: gconf/gconf-database.c:875
 #, fuzzy, c-format
 msgid "Error setting value for `%s': %s"
 msgstr ""
 "Feil ved henting av fil for overf鷨ing:\n"
 "%1"
 
-#: gconf/gconf-database.c:1087
+#: gconf/gconf-database.c:910
 #, fuzzy, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "koplar til tenar"
 
-#: gconf/gconf-database.c:1111
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1151
+#: gconf/gconf-database.c:969
 #, fuzzy, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "koplar til tenar"
 
-#: gconf/gconf-database.c:1175
+#: gconf/gconf-database.c:993
 #, fuzzy, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Feil ved fjerning av oppsett"
 
-#: gconf/gconf-database.c:1202
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1228
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1249
+#: gconf/gconf-database.c:1066
 #, fuzzy, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Feil ved lagring av oppsett"
@@ -464,226 +438,394 @@ msgstr "&Gi 廞varing dersom oppsettet ikkje kan skrivast"
 msgid "Failed to get a lock"
 msgstr "Kunne ikkje lagra %1."
 
-#: gconf/gconf-error.c:40
-#, fuzzy
-msgid "No database available to save your configuration"
-msgstr "Comment=Oppsett av databasemilj鷫t ODBC"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Kunne ikkje lasta biletefil."
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Feil ved fjerning av oppsett"
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:251
 #, fuzzy, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Feil portnummer."
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:445
 #, fuzzy
 msgid "Failed to convert object to IOR"
 msgstr "Kunne ikkje kopla til."
 
-#: gconf/gconf-internals.c:813
+#: gconf/gconf-internals.c:811
 #, fuzzy, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 "Kunne ikkje opna fil:\n"
 "%s"
 
-#: gconf/gconf-internals.c:868
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:880
+#: gconf/gconf-internals.c:878
 #, fuzzy, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Feil ved opning av fila '%1': %2"
 
-#: gconf/gconf-internals.c:1322
+#: gconf/gconf-internals.c:1320
 #, fuzzy, c-format
 msgid "Expected list, got %s"
 msgstr "Forventar %1"
 
-#: gconf/gconf-internals.c:1332
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1471
+#: gconf/gconf-internals.c:1469
 #, fuzzy, c-format
 msgid "Expected pair, got %s"
 msgstr "Standard alarmtid:"
 
-#: gconf/gconf-internals.c:1485
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1501
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1617
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1679
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2159 gconf/gconf.c:3002
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2175
-#, fuzzy, c-format
-msgid "OAF problem description: '%s'"
-msgstr "Problemskildring"
-
-#: gconf/gconf-internals.c:2181
+#: gconf/gconf-internals.c:2177
 #, fuzzy
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "Hugs � fjerna 'spool'-katalogen\n"
 
-#: gconf/gconf-internals.c:2186
+#: gconf/gconf-internals.c:2182
 #, fuzzy
 msgid "attempt to add already-listed OAF directory"
 msgstr "Kunne ikkje laga katalog"
 
-#: gconf/gconf-internals.c:2193
+#: gconf/gconf-internals.c:2189
 #, fuzzy, c-format
 msgid "OAF parse error: %s"
 msgstr "Kprocess-feil:%1"
 
-#: gconf/gconf-internals.c:2198
+#: gconf/gconf-internals.c:2194
 #, fuzzy
 msgid "Unknown OAF error"
 msgstr "Ukjend feil."
 
-#: gconf/gconf-internals.c:2281
+#: gconf/gconf-internals.c:2277
 #, fuzzy, c-format
 msgid "No ior file in `%s'"
 msgstr "Tal p� filer i bruk:"
 
-#: gconf/gconf-internals.c:2312
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2323
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2343
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2351
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2363
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2375
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2389
+#: gconf/gconf-internals.c:2385
 #, fuzzy, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: gconf/gconf-internals.c:2424
+#: gconf/gconf-internals.c:2420
 #, fuzzy, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Kan ikkje laga %1: %2"
 
-#: gconf/gconf-internals.c:2460
+#: gconf/gconf-internals.c:2456
 #, fuzzy, c-format
 msgid "Can't write to file `%s': %s"
 msgstr ""
 "Kunne ikkje skriva til fil:\n"
 "%s"
 
-#: gconf/gconf-internals.c:2503
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2520
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2530
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
 
-#: gconf/gconf-internals.c:2547
+#: gconf/gconf-internals.c:2543
 #, fuzzy, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Kunne ikkje laga katalog"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, fuzzy, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Kunne ikkje lasta %1."
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:596
-#, fuzzy, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "Kan ikkje laga mellombels fil."
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, fuzzy, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Feil ved lesing av filinfo."
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, fuzzy, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Feil ved lesing av filinfo."
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -753,531 +895,525 @@ msgstr ""
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, fuzzy, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Kunne ikkje henta lokal adresse!"
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1781
+#: gconf/gconf.c:1597
 #, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1797
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
 "Please file an OAF bug report."
 msgstr ""
 
-#: gconf/gconf.c:2108
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:2145
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2167
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:2169
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2190
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:2204
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2457
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2518
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2553
+#: gconf/gconf.c:2319
 #, fuzzy, c-format
 msgid "Expected int, got %s"
 msgstr "Forventar %1"
 
-#: gconf/gconf.c:2588
+#: gconf/gconf.c:2354
 #, fuzzy, c-format
 msgid "Expected string, got %s"
 msgstr "Erstatt denne teksten?"
 
-#: gconf/gconf.c:2625
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2658
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 #, fuzzy
 msgid "Shutdown request received"
 msgstr "Skru av maskina og starta p� nytt?"
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:297
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:306
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:306
-#, fuzzy
-msgid "/path"
-msgstr "Empath"
-
-#: gconf/gconfd.c:320
+#: gconf/gconfd.c:258
 #, fuzzy, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Feil ved lasting av biletefil."
 
-#: gconf/gconfd.c:332
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:349
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:375
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgid "Received signal %d, shutting down."
 msgstr ""
 
-#: gconf/gconfd.c:391
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-
-#: gconf/gconfd.c:408
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr ""
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:509
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:536
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:556
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:576
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:580
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:585
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:623
+#: gconf/gconfd.c:476
 #, fuzzy
 msgid "Exiting"
 msgstr "Avsluttar ..."
 
-#: gconf/gconfd.c:648
-msgid "GConf server is not in use, shutting down."
-msgstr ""
-
-#: gconf/gconfd.c:1007
+#: gconf/gconfd.c:818
 #, fuzzy, c-format
 msgid "Returning exception: %s"
 msgstr "Val for oppkopling p� nytt"
 
-#: gconf/gconfd.c:1107
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1142
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1211
+#: gconf/gconfd.c:966
 #, fuzzy, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 "Kunne ikkje opna fil for skriving:\n"
 "%s"
 
-#: gconf/gconfd.c:1225
+#: gconf/gconfd.c:980
 #, fuzzy, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 "Kunne ikkje skriva til fil:\n"
 "%s"
 
-#: gconf/gconfd.c:1234
+#: gconf/gconfd.c:989
 #, fuzzy, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Kunne ikkje lasta biletefil."
 
-#: gconf/gconfd.c:1248
+#: gconf/gconfd.c:1003
 #, fuzzy, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Kunne ikkje sletta fila %1"
 
-#: gconf/gconfd.c:1258
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1267
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1742
-#, c-format
-msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
-msgstr ""
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Kunne ikkje lasta biletefil."
 
-#: gconf/gconfd.c:1788
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Kunne ikkje lasta biletefil."
+
+#: gconf/gconfd.c:1140
 #, fuzzy, c-format
-msgid "Error reading saved state file: %s"
-msgstr ""
-"Feil ved lesing a fil:\n"
-"%1"
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr "Kunne ikkje lasta biletefil."
 
-#: gconf/gconfd.c:1841
+#: gconf/gconfd.c:1160
 #, fuzzy, c-format
-msgid "Unable to open saved state file '%s': %s"
-msgstr "Kan ikkje lagra til fila."
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "Kunne ikkje lasta biletefil."
 
-#: gconf/gconfd.c:1958
-#, c-format
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Kunne ikkje lasta biletefil."
+
+#: gconf/gconfd.c:1204
 msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to re-"
-"add the listener if gconfd exits or shuts down (%s)"
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
 msgstr ""
 
-#: gconf/gconfd.c:1963
-#, c-format
+#: gconf/gconfd.c:1225
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously re-"
-"add the listener if gconfd exits or shuts down (%s)"
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
 msgstr ""
 
-#: gconf/gconfd.c:1986 gconf/gconfd.c:2151
-#, fuzzy, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "Kunne ikkje akseptera innkommande klient"
+#: gconf/gconfd.c:1346
+#, c-format
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
 
-#: gconf/gconfd.c:2001
+#: gconf/gconfd.c:1377
 #, fuzzy, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "Kunne ikkje lasta biletefil."
+msgid "Unable to open saved state file '%s': %s"
+msgstr "Kan ikkje lagra til fila."
 
-#: gconf/gconfd.c:2014
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Failed to write client add to saved state file: %s"
+msgid ""
+"Failed to log addition of listener to gconfd logfile; won't be able to "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:2022
+#: gconf/gconfd.c:1481
 #, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr ""
-
-#: gconf/gconfd.c:2112
 msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
+"Failed to log removal of listener to gconfd logfile; might erroneously "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconftool.c:63
+#: gconf/gconftool.c:62
 #, fuzzy
 msgid "Help options"
 msgstr "Tekstval"
 
-#: gconf/gconftool.c:72
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr ""
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid ""
-"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
-"type."
+"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
+"--type."
 msgstr ""
 
-#: gconf/gconftool.c:100
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 #, fuzzy
 msgid "Print all key/value pairs in a directory."
 msgstr "Dette vil laga ein ny 'spool'-katalog."
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 #, fuzzy
 msgid "Print all subdirectories in a directory."
 msgstr "Skriv arbeidskatalogen"
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr ""
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr ""
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:173
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr ""
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:182 gconf/gconftool.c:191 gconf/gconftool.c:200
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr ""
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr ""
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 #, fuzzy
 msgid "Specify the owner of a schema"
 msgstr "Vel prosessnummeret det skal knytast til:"
 
-#: gconf/gconftool.c:227
+#: gconf/gconftool.c:226
 #, fuzzy
 msgid "OWNER"
 msgstr "ANNA"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr ""
 
-#: gconf/gconftool.c:236
+#: gconf/gconftool.c:235
 #, fuzzy
 msgid "FILENAME"
 msgstr "FIL OPNA"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 #, fuzzy
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "Spesifiser ein annan tenar enn standardtenaren (AOL)"
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 #, fuzzy
 msgid "SOURCE"
 msgstr "POENG"
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
 "config source or set to the empty string to use the default."
 msgstr ""
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:327
+#: gconf/gconftool.c:326
 #, fuzzy, c-format
 msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr "Bruk --help for � f� ei liste over tilgjengelege kommandolinjeval."
 
-#: gconf/gconftool.c:339
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:346
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:354
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:362
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:372
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:382
+#: gconf/gconftool.c:381
 msgid ""
-"--set_schema should not be used with --get, --set, --unset, --all-pairs, --"
-"all-dirs\n"
+"--set_schema should not be used with --get, --set, --unset, --all-pairs, "
+"--all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:388
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:394
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:403
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:412
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:421
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:431
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:441
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:451
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:458
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:463
 #, fuzzy, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Kunne ikkje lagra %1."
 
-#: gconf/gconftool.c:489
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr ""
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:504
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1285,36 +1421,36 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:526
+#: gconf/gconftool.c:525
 #, fuzzy, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "filene for systemoppsettet.\n"
 
-#: gconf/gconftool.c:686
+#: gconf/gconftool.c:685
 #, fuzzy, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Vis sidekantar"
 
-#: gconf/gconftool.c:729
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:763
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr ""
 
-#: gconf/gconftool.c:781
+#: gconf/gconftool.c:782
 #, fuzzy
 msgid "(no value set)"
 msgstr "(ingen verdi)"
 
-#: gconf/gconftool.c:836
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:850
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
@@ -1338,274 +1474,268 @@ msgstr " Type: %1 "
 msgid "Cdr Type: %s\n"
 msgstr " Type: %1 "
 
-#: gconf/gconftool.c:893
+#: gconf/gconftool.c:889
 #, fuzzy, c-format
-msgid "Default Value: %s\n"
-msgstr "Standardlydstyrkar"
+msgid "Owner: %s\n"
+msgstr "Eigar: %1"
 
-#: gconf/gconftool.c:893 gconf/gconftool.c:895 gconf/gconftool.c:896
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 #, fuzzy
 msgid "Unset"
 msgstr "Fjern merking"
 
-#: gconf/gconftool.c:895
-#, fuzzy, c-format
-msgid "Owner: %s\n"
-msgstr "Eigar: %1"
-
-#: gconf/gconftool.c:896
+#: gconf/gconftool.c:890
 #, fuzzy, c-format
 msgid "Short Desc: %s\n"
 msgstr "Breidd: %1"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:906
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:910
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:953 gconf/gconftool.c:965
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:977
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1025
+#: gconf/gconftool.c:1019
 #, fuzzy
 msgid "Cannot set schema as value\n"
 msgstr ""
 "Kan ikkje lagra fila\n"
 "'"
 
-#: gconf/gconftool.c:1035
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1049
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1064
+#: gconf/gconftool.c:1058
 #, fuzzy, c-format
 msgid "Error: %s\n"
 msgstr "Feil: %1"
 
-#: gconf/gconftool.c:1077 gconf/gconftool.c:1210
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, fuzzy, c-format
 msgid "Error setting value: %s"
 msgstr ""
 "Feil ved skriving av fil:\n"
 "%s"
 
-#: gconf/gconftool.c:1095 gconf/gconftool.c:1224
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, fuzzy, c-format
 msgid "Error syncing: %s"
 msgstr "Feil ved synkronisering av database"
 
-#: gconf/gconftool.c:1113
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1155
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1175
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1195
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1239
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1253
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1264
+#: gconf/gconftool.c:1258
 #, fuzzy, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "koplar til tenar"
 
-#: gconf/gconftool.c:1287
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1321
+#: gconf/gconftool.c:1315
 #, fuzzy, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 "Feil ved skriving av fil:\n"
 "%s"
 
-#: gconf/gconftool.c:1363
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1372
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1383 gconf/gconftool.c:1413 gconf/gconftool.c:1442
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1401
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1426
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1455
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1502 gconf/gconftool.c:1523 gconf/gconftool.c:1544
-#: gconf/gconftool.c:1565
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1519
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1540
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1561
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1589
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1592 gconf/gconftool.c:1855
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1602
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1722
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1751
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1759
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1781
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1789
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1868
+#: gconf/gconftool.c:1862
 #, fuzzy
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Eit namn m� innehalda minst eitt teikn"
 
-#: gconf/gconftool.c:1897
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1919
+#: gconf/gconftool.c:1913
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Fil opna: %s"
 
-#: gconf/gconftool.c:1926
+#: gconf/gconftool.c:1920
 #, fuzzy, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "&Dokumentsti:"
 
-#: gconf/gconftool.c:1938
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1951
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1965
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1976 gconf/gconftool.c:2008
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, fuzzy, c-format
 msgid "Error syncing config data: %s"
 msgstr "Feil ved synkronisering av database"
 
-#: gconf/gconftool.c:1992
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2029
+#: gconf/gconftool.c:2023
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1614,28 +1744,28 @@ msgstr ""
 "\n"
 "%1:\n"
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2199
+#: gconf/gconftool.c:2193
 #, fuzzy
 msgid "Must specify some directories to break\n"
 msgstr "Base for heimekatalogar"
 
-#: gconf/gconftool.c:2218
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1643,18 +1773,58 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, fuzzy, c-format
-msgid "GConf Error: %s\n"
-msgstr "Feil: %1"
-
-#: wrappers/gtk/gconf-client.c:795
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "Initialiserer modem"
+
+#, fuzzy
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "Fann ikkje heimekatalogen til brukaren"
+
+#, fuzzy
+#~ msgid "Failed to set mode on `%s': %s"
+#~ msgstr "Kunne ikkje fjerna temaet '%1'"
+
+#, fuzzy
+#~ msgid "No database available to save your configuration"
+#~ msgstr "Comment=Oppsett av databasemilj鷫t ODBC"
+
+#, fuzzy
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "Problemskildring"
+
+#, fuzzy
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Kan ikkje laga mellombels fil."
+
+#, fuzzy
+#~ msgid "/path"
+#~ msgstr "Empath"
+
+#, fuzzy
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr ""
+#~ "Feil ved lesing a fil:\n"
+#~ "%1"
+
+#, fuzzy
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "Kunne ikkje akseptera innkommande klient"
+
+#, fuzzy
+#~ msgid "Default Value: %s\n"
+#~ msgstr "Standardlydstyrkar"
+
+#, fuzzy
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "Feil: %1"
diff --git a/po/no.po b/po/no.po
index 4551c65b..422f2db5 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: 2001-05-22 16:50+0200\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2001-05-22 16:50+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -13,34 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "Laster ut BerkeleyDB (BDB) backend-modulen."
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "孿net BerkeleyDB kilde i rot %s"
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "Initialiserer BDB-backend modul"
-
-#: backends/dir-utils.c:108
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "Kunne ikke finne %s-rotkatalogen i adressen `%s'"
-
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "Kunne ikke opprette katalogen `%s': %s"
-
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "Kunne ikke lese fra eller skrive til %s-rotkatalogen i adressen `%s'"
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Laster ut XML-backend modulen."
@@ -50,6 +22,11 @@ msgstr "Laster ut XML-backend modulen."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Kunne ikke finne XML-rotkatalogen i adressen `%s'"
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "Kunne ikke opprette katalogen `%s': %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -64,7 +41,7 @@ msgstr "Katalog/fil rettigheter for XML kildekode ved rot %s er: %o/%o"
 msgid "Initializing XML backend module"
 msgstr "Initialiserer XML-backend modulen"
 
-#: backends/xml-backend.c:748
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Kunne ikke gi opp l廛 p� XML-katalog `%s': %s"
@@ -73,7 +50,7 @@ msgstr "Kunne ikke gi opp l廛 p� XML-katalog `%s': %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "Usynkronisert sletting av kataloger under nedstenging av XML-backenden"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -82,7 +59,7 @@ msgstr ""
 "Kunne ikke fjerne katalog `%s' fra XML-backend bufferen, fordi den ikke er "
 "synkronisert til disk"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -101,79 +78,74 @@ msgstr "Kunne ikke kj鷨e stat p� `%s': %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML-filnavn `%s' er en katalog"
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Kunne ikke slette `%s': %s"
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Kunne ikke skrive fil `%s': %s"
 
-#: backends/xml-dir.c:359
-#, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr "Kunne ikke sette modus p� `%s': %s"
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Kunne ikke endre navn `%s' til `%s': %s"
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Kunne ikke gjenopprette `%s' fra `%s': %s"
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Kunne ikke slette gammel fil `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Kunne ikke kj鷨e stat p� `%s': %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Duplisert oppf鷨ing `%s' i `%s', ignorerer"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Oppf鷨ing uten navn i XML-fil `%s', ignorerer"
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Toppniv�-node i XML-fil `%s' er ikke en <oppf鷨ing>, ignorerer"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Kunne ikke opprette fil `%s': %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2443
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Kunne ikke lukke filen `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:149
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorerer XML-node med navn `%s': %s"
 
-#: backends/xml-entry.c:200
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:327
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignorerer schema-navn `%s', ugyldig: %s"
@@ -181,81 +153,85 @@ msgstr "Ignorerer schema-navn `%s', ugyldig: %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:373
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "Ignorerer XML-node `%s', bortsett fra mulig schema navn:: %s"
 
-#: backends/xml-entry.c:724
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr "fant <local_schema> uten lokaleinnstilling"
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Kunne ikke lese standardverdi for schema: %s"
 
-#: backends/xml-entry.c:938
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Ingen \"type\" attributt for <%s> node"
 
-#: backends/xml-entry.c:952
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "En node har ukjent \"type\" attributt `%s', ignorerer"
 
-#: backends/xml-entry.c:967
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "Ingen \"verdi\" attributt for node"
 
-#: backends/xml-entry.c:1015 backends/xml-entry.c:1091
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Forsto ikke XML-node <%s> inne i en XML listenode"
 
-#: backends/xml-entry.c:1049
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Ugyldig type (liste, par, eller ukjent) i en listenode"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Ugyldig XML-node: %s"
 
-#: backends/xml-entry.c:1080
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Listen inneholder en feilskrevet node (%s, skulle v熳t %s)"
 
-#: backends/xml-entry.c:1132
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorerer ugyldig car fra XML-par: %s"
 
-#: backends/xml-entry.c:1141 backends/xml-entry.c:1164
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "tolker XML-fil: lister og par kan ikke plasseres inne i et par"
 
-#: backends/xml-entry.c:1154
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorerer ugyldig cdr fra XML-par: %s"
 
-#: backends/xml-entry.c:1173
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Forsto ikke XML-node <%s> inne i en XML-parnode"
 
-#: backends/xml-entry.c:1191
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Fant ikke car og cdr for XML-parnode"
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Manglende cdr fra verdipar i XML-fil"
 
-#: backends/xml-entry.c:1204
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "Manglende car fra verdipar i XML-fil"
 
-#: backends/xml-entry.c:1209
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Mangler b嶟e car og cdr verdier fra par i XML-fil"
 
@@ -288,29 +264,29 @@ msgstr "Kunne ikke finne backend modul for `%s'"
 msgid "Failed to shut down backend"
 msgstr "Kunne ikke stenge ned motoren"
 
-#: gconf/gconf-database.c:231
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Mottok ugyldig verdi i sett-foresp鷨sel"
 
-#: gconf/gconf-database.c:239
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Kunne ikke forst� CORBA-verdien mottatt i sett-foresp鷨sel etter n鷦kel `%s'"
 
-#: gconf/gconf-database.c:517
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "Mottok foresp鷨sel om � slippe alle mellomlagrede data"
 
-#: gconf/gconf-database.c:534
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Mottok foresp鷨sel om � utf鷨e synkron synkronisering"
 
-#: gconf/gconf-database.c:601
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Fatal feil: kunne ikke hente objektreferanse for ConfigDatabase"
 
-#: gconf/gconf-database.c:760
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Kunne ikke synkronisere en eller flere kilder: %s"
@@ -319,7 +295,7 @@ msgstr "Kunne ikke synkronisere en eller flere kilder: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -330,12 +306,12 @@ msgstr ""
 "lytteren ved gjenstart av gconfd, noe som vil resultere i up嶚itelige "
 "notifikasjon av konfigurasjonsendringer."
 
-#: gconf/gconf-database.c:873
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Lytter-ID %lu eksisterer ikke"
 
-#: gconf/gconf-database.c:882
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -345,47 +321,47 @@ msgstr ""
 "harml鷭t, kan resultere i at notifikasjon gjenintreffer p� uforklarlig vis): "
 "%s"
 
-#: gconf/gconf-database.c:997 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Feil under henting av verdi for `%s': %s"
 
-#: gconf/gconf-database.c:1044
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Feil under setting av verdi for `%s': %s"
 
-#: gconf/gconf-database.c:1087
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Feil under nullstilling av `%s': %s"
 
-#: gconf/gconf-database.c:1111
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Feil under henting av standardverdi for `%s': %s"
 
-#: gconf/gconf-database.c:1151
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Feil ved sjekking av eksisterende `%s': %s"
 
-#: gconf/gconf-database.c:1175
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Feil under fjerning av katalog `%s': %s"
 
-#: gconf/gconf-database.c:1202
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Fikk ikke alle oppf鷨ingene i `%s': %s"
 
-#: gconf/gconf-database.c:1228
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Feil under listing av kataloger i `%s': %s"
 
-#: gconf/gconf-database.c:1249
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Feil under setting av schema for `%s': %s"
@@ -450,29 +426,238 @@ msgstr "Operasjon ikke tillatt uten konfigurasjonstjener"
 msgid "Failed to get a lock"
 msgstr "Fikk ingen l廛"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "Ingen database tilgjengelig for lagring av din konfigurasjon"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+"Feil p� linje %d tegn %d: %s\n"
+"(Tekst i n熳heten var '%s')\n"
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+"Teksten sluttet midt i en entitet eller entitetens navn oversteg gyldig "
+"lengde ('&' b鷨 v熳e begynnelsen p� en entitet slik som '&quot;')"
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+"Ukjent entitet '%s' ('&' m� v熳e begynnelsen p� entitetene &amp; &quot; &lt; "
+"&gt; &apos;)"
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr "Merket tekst sluttet midt i en tegnreferanse, like etter '&#'"
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+"Tegnreferansen inneholdt ikke-tall '%s' ('&#' skal v熳e begynnelsen p� en "
+"referanse til et unicode tegn, slik som '&#2342;')"
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+"Tekst sluttet i midten av en tegnreferanse ('&#' skal v熳e begynnelsen p� en "
+"tegnreferanse slik som '&#2342;')"
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+"Kunne ikke tolke tegnreferansen '%s' ('&#' m� v熳e begynnelsen p� en "
+"tegnreferanse slik som '&#2343;')"
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+"Tegnkoden %#lx er ikke tillatt i XML-dokumenter eller den er ikke et gyldig "
+"Unicode tegn"
+
+#: gconf/gconf-glib.c:1013
+#, fuzzy
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+"Dokumentet sluttet rett etter en '&', '&' skal v熳e begynnelsen p� en "
+"entitet eller tegnreferanse."
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+"'<' eller '>' tegnene er ikke tillatt her; kun tillatt rundt tags, for "
+"eksempel <bold> eller <paragraph>. Andre steder m� disse tegnene kodes som "
+"entitetene &lt; og &gt;"
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr "Tegn '%s' er ikke gyldig ved starten av et attributtnavn"
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr "Dokumentet sluttet rett etter et attributtnavn"
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr "Attributtnavn m� v熳e direkte etterfulgt av et '='-tegn"
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+"'='-tegnet etter attributten m� v熳e direkte etterfulgt av et '\"'-tegn"
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+"Tegnet '%c' funnet inne i en attributtverdi; kanskje din attributtverdi "
+"mangler avsluttende hermetegn '\"'"
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+"Tom for tekst f鷨 et hermetegn ('\"') ble funnet ved slutten av en "
+"attributtverdi"
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr "Teksten slutter rett etter en attributtverdi, f鷨 elementet ble lukket"
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr "Manglende '<' ved starten av elementet"
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr "Dokumentet sluttet rett etter '<'-tegnet"
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr "Ingen avsluttende '>' funnet for en <? eller <!"
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr "Tegnet '%s' er ikke gyldig ved starten av et elementnavn"
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr "Dokumentet sluttet rett etter elementnavnet, ingen '>' sett"
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr "Elementer m� lukkes med '>' eller '/>, ikke med '%s'"
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+"Element sluttet rett etter '/', ingen '>' sett; tomme elementer b鷨 slutte "
+"med '/>'"
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr "Tag for lukking ble ikke funnet ved slutten av elementet"
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr "Lukk-taggen slutter rett etter '<'-tegnet"
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr "Lukk-taggen m� begynne med '</', '/'-tegnet mangler"
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr "Lukk-taggen slutter rett etter '/'-tegnet"
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+"Dokumentet sluttet rett etter elementnavnet i lukk-taggen, ingen '>' sett"
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr "Dokumentet sluttet rett etter navnet p� lukk-taggen, ingen '>' sett"
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr "Lukk-taggen '%s' er ikke lik 幠nings-taggen '%s'"
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+"Ugyldig UTF-8-tegn ved byte %d i kodet tekst. Noe av teksten f鷨 det "
+"ugyldige tegnet var '%s'"
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr "Den kodete teksten inneholdt kun tomrom."
+
+#: gconf/gconf-glib.c:10666
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Kunne ikke 幠ne fil '%s': %s"
+
+#: gconf/gconf-glib.c:10683
+#, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Feil under lesing av fil '%s': %s"
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Ingen '/' i n鷦kel `%s'"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Kunne ikke fortolke CORBA verdi for listeelement"
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Ugyldig type for listeelement i %s"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "Mottatt liste fra gconfd med ugyldig listetype"
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:445
 msgid "Failed to convert object to IOR"
 msgstr "Kunne ikke konvertere objekt til IOR"
 
@@ -481,97 +666,92 @@ msgstr "Kunne ikke konvertere objekt til IOR"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Kunne ikke 幠ne stifilen `%s': %s\n"
 
-#: gconf/gconf-internals.c:858
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Legger til kilde `%s'\n"
 
-#: gconf/gconf-internals.c:870
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Lesefeil p� fil `%s': %s\n"
 
-#: gconf/gconf-internals.c:1293
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Forventet liste, mottok %s"
 
-#: gconf/gconf-internals.c:1303
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Forventet liste av %s, mottok liste av %s"
 
-#: gconf/gconf-internals.c:1442
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Forventet par, mottok %s"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Forventet (%s,%s) par, mottok et par hvor en eller begge verdiene mangler"
 
-#: gconf/gconf-internals.c:1472
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Forventet par av type (%s,%s) mottok type (%s,%s)"
 
-#: gconf/gconf-internals.c:1588
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Streng i sitattegn begynner ikke med et sitattegn"
 
-#: gconf/gconf-internals.c:1650
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Streng i anf鷨selstegn slutter ikke med et sitattegn"
 
-#: gconf/gconf-internals.c:2130 gconf/gconf.c:3002
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA feil: %s"
 
-#: gconf/gconf-internals.c:2146
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "OAF problembeskrivelse: '%s'"
-
-#: gconf/gconf-internals.c:2152
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "fors鷦 p� � fjerne ikke listet OAF objekt katalog"
 
-#: gconf/gconf-internals.c:2157
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "fors鷦 p� � legge til allerede listet OAF katalog"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF fortolkningsfeil: %s"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Ukjent OAF feil"
 
-#: gconf/gconf-internals.c:2252
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Ingen ior-fil i `%s'"
 
-#: gconf/gconf-internals.c:2283
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd tar l廛 `%s' fra noen andre prosesser"
 
-#: gconf/gconf-internals.c:2294
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Et annet program holder l廛en `%s'"
 
-#: gconf/gconf-internals.c:2314
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "kunne ikke kontakte ORB for � pinge eksisterende gconfd"
 
-#: gconf/gconf-internals.c:2322
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -580,42 +760,42 @@ msgstr ""
 "Fjerner utg廞t l廛 `%s' fordi IOR ikke kunne koverteres til objektreferanse, "
 "IOR `%s'"
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr "Fjerner utg廞t l廛 `%s' pga feil under pinging av tjener: %s"
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf konfigurasjonsdaemon (gconfd) holder l廛en `%s'"
 
-#: gconf/gconf-internals.c:2360
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "kunne ikke opprette katalogen `%s': %s"
 
-#: gconf/gconf-internals.c:2395
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "kunne ikke opprette l廛 `%s': %s"
 
-#: gconf/gconf-internals.c:2431
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kunne ikke skrive til fil `%s': %s"
 
-#: gconf/gconf-internals.c:2474
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "Kan ikke 幠ne l廛-fil `%s'; antar at den ikke er v緳: %s"
 
-#: gconf/gconf-internals.c:2491
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Korrupt l廛-fil `%s', fjerner den likevel"
 
-#: gconf/gconf-internals.c:2501
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -624,27 +804,27 @@ msgstr ""
 "Opprettet ikke l廛-fil `%s' (skapers pid %u, v緳 pid %u; antar at noen tok "
 "v緳 l廛"
 
-#: gconf/gconf-internals.c:2518
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Kunne ikke slippe l廛-katalogen `%s': %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Kunne ikke lese kilde `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 "Schema `%s' spesifisert for  `%s' lagrer en verdi som ikke er for schema"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Navnet '/' kan kun v熳e en katalog, ikke en n鷦kel"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -653,22 +833,17 @@ msgstr ""
 "Verdi for `%s' satt i en skrivebeskyttet kilde i begynnelsen av din "
 "konfigurasjonssti."
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "Kunne ikke lagre verdi i n鷦kel '%s'"
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Feil under s鷦 etter metainfo: %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Feil under henting av metainfo: %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr "N鷦kel `%s' listet som schema for n鷦kel `%s' lagrer type `%s'"
@@ -738,21 +913,21 @@ msgstr "Forsto ikke `%s' (ekstra \"unescaped\" ')' funnet inne i par)"
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Tjener kunne ikke finne adressen `%s'"
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "Kan ikke legge til meldinger til en lokal konfigurasjonskilde"
 
-#: gconf/gconf.c:1781
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Feil under innlegging av klient i tjenerlisten, CORBA-feil: %s"
 
-#: gconf/gconf.c:1797
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -762,73 +937,73 @@ msgstr ""
 "fra oaf_activate_from_id() og satte ikke et unntak som forklarte problemet. "
 "Vennligst fyll ut en feilrapport for OAF."
 
-#: gconf/gconf.c:2108
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Kunne ikke initialisere GConf, avslutter\n"
 
-#: gconf/gconf.c:2145
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "M� begynne med en skr廛trek (/)"
 
-#: gconf/gconf.c:2167
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan ikke ha to skr廛treker (/) p� rad"
 
-#: gconf/gconf.c:2169
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan ikke ha punktum (.) rett etter en skr廛trek (/)"
 
-#: gconf/gconf.c:2190
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' er et ugyldig tegn i n鷦kel/katalog navn"
 
-#: gconf/gconf.c:2204
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "N鷦kel/katalog kan ikke slutte med en skr廛trek (/)"
 
-#: gconf/gconf.c:2457
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Feil under nedstenging av konfigurasjonstjeneren: %s"
 
-#: gconf/gconf.c:2518
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Forventet flyttall, mottok %s"
 
-#: gconf/gconf.c:2553
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Forventet heltall, mottok %s"
 
-#: gconf/gconf.c:2588
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Forventet streng, mottok %s"
 
-#: gconf/gconf.c:2625
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Forventet boolsk verdi, mottok %s"
 
-#: gconf/gconf.c:2658
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Forventet schema, mottok %s"
 
-#: gconf/gconfd.c:246
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Anmodning om nedstenging mottatt"
 
-#: gconf/gconfd.c:278
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 "gconfd kompilert med debugging; fors鷦er � laste gconf.sh fra kildekatalogen"
 
-#: gconf/gconfd.c:292
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -836,10 +1011,7 @@ msgstr ""
 "Ingen konfigurasjonsfiler funnet, fors鷦er � bruke standard "
 "konfigurasjonskilde `%s'"
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:300
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -847,12 +1019,12 @@ msgstr ""
 "Ingen konfigurasjonskilder i kildestien, konfigurasjonen vil ikke bli "
 "lagret; edit"
 
-#: gconf/gconfd.c:313
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Feil under lasting av noen konfigurasjonskilder: %s"
 
-#: gconf/gconfd.c:325
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -860,7 +1032,7 @@ msgstr ""
 "Kunne ikke sl� opp noen adresser for konfigurasjonskilde, kan ikke laste "
 "eller lagre konfigurasjonsdata"
 
-#: gconf/gconfd.c:342
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -868,33 +1040,28 @@ msgstr ""
 "Ingen skrivbare konfigurasjonskilder funnet, kan ikke lagre deler av "
 "konfigurasjonsendringene"
 
-#: gconf/gconfd.c:368
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-"Mottok signal %d, dumper minne. Vennligst send inn en feilrapport for GConf."
-
-#: gconf/gconfd.c:384
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"Mottok signal %d, kj鷨er usikker nedstenging. Vennligst send inn en "
-"feilrapport for GConf."
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down."
+msgstr "Mottok signal %d, stenger ned p� riktig m廞e"
 
-#: gconf/gconfd.c:401
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Mottok signal %d, stenger ned p� riktig m廞e"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:502
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "starter (versjon %s), pid %u bruker '%s'"
 
-#: gconf/gconfd.c:529
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr "GConf er bygget med feils鷦ingsfunksjoner aktivert"
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -902,11 +1069,11 @@ msgstr ""
 "Kunne ikke initialisere Object Activation Framework: vennligst send en "
 "feilrapport til OAF utviklerene"
 
-#: gconf/gconfd.c:549
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Kunne ikke hente objektreferanse for ConfigServer"
 
-#: gconf/gconfd.c:569
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -914,28 +1081,24 @@ msgstr ""
 "OAF vet ikke om v緳 IID; indikerer feil i installasjon; kan ikke\n"
 "registrere; avslutter\n"
 
-#: gconf/gconfd.c:573
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "En annen gconfd er allerede registrert hos OAF; avslutter\n"
 
-#: gconf/gconfd.c:578
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Ukjent feil ved registrering av gconfd hos OAF; avslutter\n"
 
-#: gconf/gconfd.c:616
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Avslutter"
 
-#: gconf/gconfd.c:641
-msgid "GConf server is not in use, shutting down."
-msgstr "GConf-tjeneren er ikke i bruk, stenger ned."
-
-#: gconf/gconfd.c:1000
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Returnerer unntak: %s"
 
-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -944,39 +1107,39 @@ msgstr ""
 "Klarte ikke � 幠ne gconfd loggfil; vil ikke kunne gjenopprette lyttere etter "
 "nedkj鷨ing av gconfd (%s)"
 
-#: gconf/gconfd.c:1135
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 "Klarte ikke � lukke gconfd loggfil; data ble kanskje ikke lagret riktig (%s)"
 
-#: gconf/gconfd.c:1204
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Kunne ikke 幠ne lagret tilstandsfil '%s' for skriving: %s"
 
-#: gconf/gconfd.c:1218
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Kunne ikke skrive lagret tilstandsfil '%s' fd: %d: %s"
 
-#: gconf/gconfd.c:1227
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Kunne ikke lukke ny lagret tilstandsfil '%s': %s"
 
-#: gconf/gconfd.c:1241
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Kunne ikke flytte gammel lagret tilstandsfil '%s': %s"
 
-#: gconf/gconfd.c:1251
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Kunne ikke flytte ny lagret tilstandsfil p� plass: %s"
 
-#: gconf/gconfd.c:1260
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -984,7 +1147,44 @@ msgstr ""
 "Kunne ikke gjenopprette opprinnelig lagret tilstandsfil som har blitt "
 "flyttet til '%s': %s"
 
-#: gconf/gconfd.c:1735
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Kunne ikke 幠ne lagret tilstandsfil: %s"
+
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Kunne ikke 幠ne lagret tilstandsfil: %s"
+
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr "Feil under skriving av tillegg av klient i lagret tilstandsfil: %s"
+
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "Feil under skriving av tillegg av klient i lagret tilstandsfil: %s"
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Kunne ikke 幠ne lagret tilstandsfil: %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -992,17 +1192,12 @@ msgstr ""
 "Kunne ikke gjenopprette en lytter p� adresse '%s', kunne ikke gj鷨e "
 "databaseoppslag"
 
-#: gconf/gconfd.c:1781
-#, c-format
-msgid "Error reading saved state file: %s"
-msgstr "Feil under lesing av lagret tilstandsfil: %s"
-
-#: gconf/gconfd.c:1834
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Kunne ikke 幠ne lagret tilstandsfil '%s': %s"
 
-#: gconf/gconfd.c:1951
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to "
@@ -1011,7 +1206,7 @@ msgstr ""
 "Klarte ikke � logge tillegg av lytter til gconfd loggfilen; vil ikke kunne "
 "legge til lytteren hvis gconfd avslutter eller stenger ned (%s)"
 
-#: gconf/gconfd.c:1956
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously "
@@ -1020,45 +1215,19 @@ msgstr ""
 "Klarte ikke � logge fjerning av lytter i gconfd-loggfilen; kan medf鷨e at "
 "lytter legges inn igjen hvis gconfd avsluttes eller maskinen stenges av (%s)."
 
-#: gconf/gconfd.c:1979 gconf/gconfd.c:2144
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "Kunne ikke hente IOR for klient: %s"
-
-#: gconf/gconfd.c:1994
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "Kunne ikke 幠ne lagret tilstandsfil: %s"
-
-#: gconf/gconfd.c:2007
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr "Feil under skriving av tillegg av klient i lagret tilstandsfil: %s"
-
-#: gconf/gconfd.c:2015
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr "Kunne ikke synkronisere tillegg av klient til lagret tilstandsfil: %s"
-
-#: gconf/gconfd.c:2105
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr ""
-"En klient fjernet seg selv fra GConf-tjeneren uten at den var lagt til."
-
-#: gconf/gconftool.c:63
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Alternativer for hjelp"
 
-#: gconf/gconftool.c:72
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Sett en n鷦kel til en verdi ok synkroniser. Bruk med --type."
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Skriv ut verdien for en n鷦kel til standard ut."
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -1066,36 +1235,36 @@ msgstr ""
 "Sett et schema og synkroniser. Bruk med --short-desc, --long-desc, --owner, "
 "og --type."
 
-#: gconf/gconftool.c:100
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "Nullstill n鷦lene fra kommandolinjen"
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Skriv ut alle n鷦kel/verdi par i en  katalog."
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Skriv ut alle underkataloger i en katalog."
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Skriv ut alle underkataloger og oppf鷨inger under en katalog, rekursivt."
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Returner 0 hvis katalogen eksisterer, 2 hvis ikke."
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Steng ned gconfd. IKKE BRUK DETTE VALGET UTEN GOD GRUNN."
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Returner 0 hvis gconfd kj鷨er, 2 hvis ikke."
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1103,7 +1272,7 @@ msgstr ""
 "Start konfigurasjonstjeneren (gconfd). (Skjer normalt automatisk n緳 det er "
 "n鷣vendig.)"
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1111,11 +1280,11 @@ msgstr ""
 "Spesifiser typen verdi som settes, eller typen for verdien et schema "
 "beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:173
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|liste|par"
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1123,11 +1292,11 @@ msgstr ""
 "Spesifiser type listeverdi som settes, eller typen for verdien et schema "
 "beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:182 gconf/gconftool.c:191 gconf/gconftool.c:200
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1135,7 +1304,7 @@ msgstr ""
 "Spesifiser car-type verdi som settes, eller typen for verdien et schema "
 "beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1143,45 +1312,45 @@ msgstr ""
 "Spesifiser type verdi for cdr-par som settes, eller typen for verdien et "
 "schema beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "Spesifiser en kort beskrivelse p� en halv linje som skal brukes i et schema."
 
-#: gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "BESKRIVELSE"
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "Spesifiser en beskrivelse p� flere linjer som skal brukes i et schema."
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "Spesifiser eieren av et schema"
 
-#: gconf/gconftool.c:227
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "EIER"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "Spesifiser en schema fil som skal installeres"
 
-#: gconf/gconftool.c:236
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "FILNAVN"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Spesifiser en konfigurasjonskilde som skal brukes i stedet for standard sti"
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "KILDE"
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1189,7 +1358,7 @@ msgstr ""
 "Aksepter konfigurasjonsdatabasen direkte, g緳 utenom tjeneren. Det kreves at "
 "gconfd ikke kj鷨er."
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1200,7 +1369,7 @@ msgstr ""
 "standardverdien for konfigurasjonskilde eller v熳e tom for at "
 "standardverdien skal brukes."
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1208,7 +1377,7 @@ msgstr ""
 "Utf鷨 en torturtest av en applikasjon ved � sette og t鷰me en rekke verdier "
 "av forskjellige typer for n鷦ler fra kommandolinjen."
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1216,7 +1385,7 @@ msgstr ""
 "Utf鷨 en torturtest av en applikasjon ved � sette og t鷰me en rekke n鷦ler "
 "inne i katalogene fra kommandolinjen."
 
-#: gconf/gconftool.c:330
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1226,23 +1395,23 @@ msgstr ""
 "Kj鷨 '%s --help' for � se en full liste over tilgjengelige "
 "kommandolinjeflagg.\n"
 
-#: gconf/gconftool.c:342
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Kan ikke hente og sette/nullstille samtidig\n"
 
-#: gconf/gconftool.c:349
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Kan ikke sette og hente/nullstille samtidig\n"
 
-#: gconf/gconftool.c:357
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "Kan ikke bruke --all-pairs sammen med --get eller --set\n"
 
-#: gconf/gconftool.c:365
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Kan ikke bruke --all-dirs sammen med --get eller --set\n"
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1250,7 +1419,7 @@ msgstr ""
 "--recursive-list b鷨 ikke brukes sammen med --get, --set, --unset, "
 "--all-pairs, eller --all-dirs\n"
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1258,58 +1427,58 @@ msgstr ""
 "--set-schema b鷨 ikke brukes sammen med --get, --set, --unset, --all-pairs, "
 "eller --all-dirs\n"
 
-#: gconf/gconftool.c:391
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Verditypen er kun relevant n緳 en verdi settes\n"
 
-#: gconf/gconftool.c:397
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "M� spesifisere en type n緳 en verdi settes\n"
 
-#: gconf/gconftool.c:406
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping flagget m� brukes alene.\n"
 
-#: gconf/gconftool.c:415
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists flagget m� brukes alene.\n"
 
-#: gconf/gconftool.c:424
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file m� brukes alene.\n"
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule m� brukes alene.\n"
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key m� brukes alene.\n"
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory m� brukes alene.\n"
 
-#: gconf/gconftool.c:461
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "Du m� spesifisere en konfigurasjonskilde med --config-source n緳 du bruker "
 "--direct\n"
 
-#: gconf/gconftool.c:467
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Kunne ikke initialisere GConf: %s\n"
 
-#: gconf/gconftool.c:492
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE milj黲ariabelen m� v熳e satt\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:507
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1321,250 +1490,244 @@ msgstr ""
 "applikasjoner kj鷨er\n"
 "(selv om ting virker i teorien selv n緳 applikasjoner kj鷨er).\n"
 
-#: gconf/gconftool.c:529
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Kunne ikke aksessere konfigurasjonskilden(e): %s\n"
 
-#: gconf/gconftool.c:689
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Feil ved nedstenging: %s\n"
 
-#: gconf/gconftool.c:732
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "M� spesifisere en eller flere kataloger som skal vises rekursivt.\n"
 
-#: gconf/gconftool.c:766
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "Feil under listing av par i `%s': %s"
 
-#: gconf/gconftool.c:784
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(ingen verdi satt)"
 
-#: gconf/gconftool.c:839
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Feil under splitting av konfigurasjonstjeneren (gconfd): %s\n"
 
-#: gconf/gconftool.c:853
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "M� spesifisere en eller flere n鷦ler som skal hentes\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Type: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listetype: %s\n"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car-type: %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr-type: %s\n"
 
-#: gconf/gconftool.c:896
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr "Standardverdi: %s\n"
+msgid "Owner: %s\n"
+msgstr "Eier: %s\n"
 
-#: gconf/gconftool.c:896 gconf/gconftool.c:898 gconf/gconftool.c:899
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Nullstill"
 
-#: gconf/gconftool.c:898
-#, c-format
-msgid "Owner: %s\n"
-msgstr "Eier: %s\n"
-
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kort beskrivelse: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Lang beskrivelse: %s\n"
 
-#: gconf/gconftool.c:909
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Ingen verdi satt for `%s'\n"
 
-#: gconf/gconftool.c:913
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Kunne ikke hente verdi for `%s': %s\n"
 
-#: gconf/gconftool.c:956 gconf/gconftool.c:968
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Forst緳 ikke type `%s'\n"
 
-#: gconf/gconftool.c:980
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "M� spesifisere vekselvis n鷦ler/verdier som argumenter\n"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Ingen verdi satt for n鷦kel: `%s'\n"
 
-#: gconf/gconftool.c:1028
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Kan ikke sette schema som verdi\n"
 
-#: gconf/gconftool.c:1038
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "N緳 en liste settes m� du spesifisere en primitiv liste-type\n"
 
-#: gconf/gconftool.c:1052
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "N緳 et par settes m� du spesifisere en primitiv car-type og cdr-type\n"
 
-#: gconf/gconftool.c:1067
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Feil: %s\n"
 
-#: gconf/gconftool.c:1080 gconf/gconftool.c:1213
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Feil under setting av verdi: %s"
 
-#: gconf/gconftool.c:1098 gconf/gconftool.c:1227
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Feil under synkronisering: %s"
 
-#: gconf/gconftool.c:1116
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "M� spesifisere n鷦kel (schema navn) som eneste argument\n"
 
-#: gconf/gconftool.c:1158
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Listetyp m� v熳e en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1178
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Parets car-type m� v熳e en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1198
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Parets cdr-type m� v熳e en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1242
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Det m� spesifiseres en eller flere kataloger � hente n鷦kel/verdi par fra.\n"
 
-#: gconf/gconftool.c:1256
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Det m� spesifiseres en eller flere n鷦ler som skal nullstilles.\n"
 
-#: gconf/gconftool.c:1267
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Feil under nullstilling av `%s': %s\n"
 
-#: gconf/gconftool.c:1290
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Det m� spesifiseres en eller flere kataloger som det skal hentes "
 "underkataloger fra.\n"
 
-#: gconf/gconftool.c:1324
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Feil ved vising av kataloger: %s\n"
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende type for schema (%s)\n"
 
-#: gconf/gconftool.c:1375
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende list_type for schema (%s)\n"
 
-#: gconf/gconftool.c:1386 gconf/gconftool.c:1416 gconf/gconftool.c:1445
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "ADVARSEL: Kunne ikke fortolke standardverdi `%s' for schema (%s)\n"
 
-#: gconf/gconftool.c:1404
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende car_type for schema (%s)\n"
 
-#: gconf/gconftool.c:1429
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "ADVARSEL: Du kan ikke sette en standardverdi for et schema\n"
 
-#: gconf/gconftool.c:1458
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "ADVARSEL: gconftool, intern feil, ukjent GConfValueType\n"
 
-#: gconf/gconftool.c:1505 gconf/gconftool.c:1526 gconf/gconftool.c:1547
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ADVARSEL: kunne ikke forst� typenavnet `%s'\n"
 
-#: gconf/gconftool.c:1522
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: list_type kan kun v熳e int, float, string eller bool og ikke `%s'\n"
 
-#: gconf/gconftool.c:1543
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: car_type kan kun v熳e int, float, string eller bool og ikke `%s'\n"
 
-#: gconf/gconftool.c:1564
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: cdr_type kan kun v熳e int, float, string eller bool og ikke `%s'\n"
 
-#: gconf/gconftool.c:1592
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "ADVARSEL: tom <applyto> node"
 
-#: gconf/gconftool.c:1595 gconf/gconftool.c:1858
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ADVARSEL: node <%s> ikke forst廞t under <schema>\n"
 
-#: gconf/gconftool.c:1605
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "ADVARSEL: ingen n鷦kel spesifisert for schema\n"
 
-#: gconf/gconftool.c:1638
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "ADVARSEL: <locale> node har ingen `navn=\"locale\"' attributt, ignorerer\n"
 
-#: gconf/gconftool.c:1644
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1572,51 +1735,51 @@ msgstr ""
 "ADVARSEL: flere <locale> noder for locale `%s', ignorerer alle etter den "
 "f鷨ste\n"
 
-#: gconf/gconftool.c:1725
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "ADVARSEL: Ugyldig node <%s> i en <locale> node\n"
 
-#: gconf/gconftool.c:1754
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "ADVARSEL: kunne ikke installere schema `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:1762
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Installert schema `%s' for locale `%s'\n"
 
-#: gconf/gconftool.c:1784
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "ADVARSEL: kunne ikke assosiere schema `%s' med n鷦kel `%s': %s\n"
 
-#: gconf/gconftool.c:1792
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Lagt ved schema `%s' til n鷦kel `%s'\n"
 
-#: gconf/gconftool.c:1871
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Du m� ha minst en <locale> oppf鷨ing i et <schema>\n"
 
-#: gconf/gconftool.c:1900
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "ADVARSEL: node <%s> ikke forst廞t under <schemaliste>\n"
 
-#: gconf/gconftool.c:1922
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Kunne ikke 幠ne `%s': %s\n"
 
-#: gconf/gconftool.c:1929
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument `%s' er tomt?\n"
 
-#: gconf/gconftool.c:1941
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1625,26 +1788,26 @@ msgstr ""
 "Dokumentet `%s' har feil type rot-node (<%s>, skulle v熳t "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1954
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokumentet `%s' har ingen topp-niv� <gconfschemafile> node\n"
 
-#: gconf/gconftool.c:1968
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ADVARSEL: node <%s> under <gconfschemafile> ikke forst廞t\n"
 
-#: gconf/gconftool.c:1979 gconf/gconftool.c:2011
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Feil under synkronisering av konfigurasjonsdata: %s"
 
-#: gconf/gconftool.c:1995
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Spesifiser schema filer som skal installeres\n"
 
-#: gconf/gconftool.c:2032
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1653,16 +1816,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2052
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Kunne ikke nullstille brytningsn鷦kel %s: %s\n"
 
-#: gconf/gconftool.c:2178
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "M� spesifisere n鷦ler som skal brytes\n"
 
-#: gconf/gconftool.c:2184
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1671,11 +1834,11 @@ msgstr ""
 "Pr黲er � knekke din applikasjon ved � sette ugyldige verdier for n鷦kel:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2202
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "M� spesifisere kataloger som skal brytes\n"
 
-#: gconf/gconftool.c:2221
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1686,188 +1849,75 @@ msgstr ""
 "katalogen:\n"
 "  %s\n"
 
-#: gconf/gconf-client.c:296 gconf/gconf-client.c:313
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "GConf Feil: %s\n"
-
-#: gconf/gconf-client.c:796
+#: 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"
 
-#: gconf/gconf-client.c:998
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Forventet`%s', mottok `%s' for n鷦kel %s"
 
-#~ msgid "found <local_schema> with no locale setting"
-#~ msgstr "fant <local_schema> uten lokaleinnstilling"
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "Laster ut BerkeleyDB (BDB) backend-modulen."
 
-#~ msgid "GConf was built with debugging features enabled"
-#~ msgstr "GConf er bygget med feils鷦ingsfunksjoner aktivert"
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "孿net BerkeleyDB kilde i rot %s"
 
-#~ msgid ""
-#~ "Error on line %d char %d: %s\n"
-#~ "(Some surrounding text was '%s')\n"
-#~ msgstr ""
-#~ "Feil p� linje %d tegn %d: %s\n"
-#~ "(Tekst i n熳heten var '%s')\n"
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "Initialiserer BDB-backend modul"
 
-#~ msgid ""
-#~ "Text ended in the middle of an entity, or entity name too long to be valid "
-#~ "('&' should begin an entity such as '&quot;')"
-#~ msgstr ""
-#~ "Teksten sluttet midt i en entitet eller entitetens navn oversteg gyldig "
-#~ "lengde ('&' b鷨 v熳e begynnelsen p� en entitet slik som '&quot;')"
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "Kunne ikke finne %s-rotkatalogen i adressen `%s'"
 
 #~ msgid ""
-#~ "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+#~ "Can't read from or write to the %s root directory in the address `%s'"
 #~ msgstr ""
-#~ "Ukjent entitet '%s' ('&' m� v熳e begynnelsen p� entitetene &amp; &quot; &lt; "
-#~ "&gt; &apos;)"
+#~ "Kunne ikke lese fra eller skrive til %s-rotkatalogen i adressen `%s'"
 
-#~ msgid ""
-#~ "Markup text ended in the middle of a character reference, just after '&#'"
-#~ msgstr "Merket tekst sluttet midt i en tegnreferanse, like etter '&#'"
+#~ msgid "Failed to set mode on `%s': %s"
+#~ msgstr "Kunne ikke sette modus p� `%s': %s"
 
-#~ msgid ""
-#~ "Character reference contained non-digit '%s' ('&#' should begin a reference "
-#~ "to a unicode character, such as '&#2342;')"
-#~ msgstr ""
-#~ "Tegnreferansen inneholdt ikke-tall '%s' ('&#' skal v熳e begynnelsen p� en "
-#~ "referanse til et unicode tegn, slik som '&#2342;')"
-
-#~ msgid ""
-#~ "Text ended in the middle of an character reference ('&#' should begin a "
-#~ "character reference such as '&#2342;')"
-#~ msgstr ""
-#~ "Tekst sluttet i midten av en tegnreferanse ('&#' skal v熳e begynnelsen p� en "
-#~ "tegnreferanse slik som '&#2342;')"
+#~ msgid "No database available to save your configuration"
+#~ msgstr "Ingen database tilgjengelig for lagring av din konfigurasjon"
 
-#~ msgid ""
-#~ "Couldn't parse character reference '%s' ('&#' must begin a character "
-#~ "reference such as '&#2343;')"
-#~ msgstr ""
-#~ "Kunne ikke tolke tegnreferansen '%s' ('&#' m� v熳e begynnelsen p� en "
-#~ "tegnreferanse slik som '&#2343;')"
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "OAF problembeskrivelse: '%s'"
 
-#~ msgid ""
-#~ "Character code %#lx is not allowed in XML documents or is not a valid "
-#~ "Unicode character"
-#~ msgstr ""
-#~ "Tegnkoden %#lx er ikke tillatt i XML-dokumenter eller den er ikke et gyldig "
-#~ "Unicode tegn"
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Kunne ikke lagre verdi i n鷦kel '%s'"
 
-#~ msgid ""
-#~ "Document ended just after an '&', '&' should begin an entity or character "
-#~ "reference."
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
 #~ msgstr ""
-#~ "Dokumentet sluttet rett etter en '&', '&' skal v熳e begynnelsen p� en "
-#~ "entitet eller tegnreferanse."
+#~ "Mottok signal %d, dumper minne. Vennligst send inn en feilrapport for GConf."
 
 #~ msgid ""
-#~ "'<' or '>' character not allowed here; only allowed around tags, for example "
-#~ "<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
-#~ "&lt; and &gt;"
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 #~ msgstr ""
-#~ "'<' eller '>' tegnene er ikke tillatt her; kun tillatt rundt tags, for "
-#~ "eksempel <bold> eller <paragraph>. Andre steder m� disse tegnene kodes som "
-#~ "entitetene &lt; og &gt;"
+#~ "Mottok signal %d, kj鷨er usikker nedstenging. Vennligst send inn en "
+#~ "feilrapport for GConf."
 
-#~ msgid "Character '%s' is not valid at the start of an attribute name"
-#~ msgstr "Tegn '%s' er ikke gyldig ved starten av et attributtnavn"
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "GConf-tjeneren er ikke i bruk, stenger ned."
 
-#~ msgid "Document ended just after attribute name"
-#~ msgstr "Dokumentet sluttet rett etter et attributtnavn"
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "Feil under lesing av lagret tilstandsfil: %s"
 
-#~ msgid "Attribute name must be immediately followed by an '=' character"
-#~ msgstr "Attributtnavn m� v熳e direkte etterfulgt av et '='-tegn"
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "Kunne ikke hente IOR for klient: %s"
 
-#~ msgid ""
-#~ "'=' character after attribute must be immediately followed by an '\"' "
-#~ "character"
+#~ msgid "Failed to flush client add to saved state file: %s"
 #~ msgstr ""
-#~ "'='-tegnet etter attributten m� v熳e direkte etterfulgt av et '\"'-tegn"
+#~ "Kunne ikke synkronisere tillegg av klient til lagret tilstandsfil: %s"
 
 #~ msgid ""
-#~ "Character '%c' found inside an attribute value; perhaps your attribute value "
-#~ "is missing the closing quotation mark '\"'"
+#~ "Some client removed itself from the GConf server when it hadn't been added."
 #~ msgstr ""
-#~ "Tegnet '%c' funnet inne i en attributtverdi; kanskje din attributtverdi "
-#~ "mangler avsluttende hermetegn '\"'"
-
-#~ msgid ""
-#~ "Ran out of text before a quote mark ('\"') was seen at the end of an "
-#~ "attribute value"
-#~ msgstr ""
-#~ "Tom for tekst f鷨 et hermetegn ('\"') ble funnet ved slutten av en "
-#~ "attributtverdi"
-
-#~ msgid ""
-#~ "Text ends immediately after an attribute value, before the element was closed"
-#~ msgstr ""
-#~ "Teksten slutter rett etter en attributtverdi, f鷨 elementet ble lukket"
-
-#~ msgid "Missing '<' at start of element"
-#~ msgstr "Manglende '<' ved starten av elementet"
-
-#~ msgid "Document ended just after '<' character"
-#~ msgstr "Dokumentet sluttet rett etter '<'-tegnet"
-
-#~ msgid "No closing '>' found for a <? or <!"
-#~ msgstr "Ingen avsluttende '>' funnet for en <? eller <!"
-
-#~ msgid "Character '%s' is not valid at the start of an element name"
-#~ msgstr "Tegnet '%s' er ikke gyldig ved starten av et elementnavn"
-
-#~ msgid "Document ended just after element name, no '>' seen"
-#~ msgstr "Dokumentet sluttet rett etter elementnavnet, ingen '>' sett"
-
-#~ msgid "Elements should be closed with '>' or '/>', not with '%s'"
-#~ msgstr "Elementer m� lukkes med '>' eller '/>, ikke med '%s'"
-
-#~ msgid ""
-#~ "Element ended just after '/', no '>' seen; empty elements should end with "
-#~ "'/>'"
-#~ msgstr ""
-#~ "Element sluttet rett etter '/', ingen '>' sett; tomme elementer b鷨 slutte "
-#~ "med '/>'"
-
-#~ msgid "Close tag not found at end of element"
-#~ msgstr "Tag for lukking ble ikke funnet ved slutten av elementet"
-
-#~ msgid "Close tag ends just after '<' character"
-#~ msgstr "Lukk-taggen slutter rett etter '<'-tegnet"
-
-#~ msgid "Close tag should begin with '</', '/' character is missing"
-#~ msgstr "Lukk-taggen m� begynne med '</', '/'-tegnet mangler"
-
-#~ msgid "Close tag ends just after '/' character"
-#~ msgstr "Lukk-taggen slutter rett etter '/'-tegnet"
-
-#~ msgid "Document ended just after element name in close tag, no '>' seen"
-#~ msgstr ""
-#~ "Dokumentet sluttet rett etter elementnavnet i lukk-taggen, ingen '>' sett"
-
-#~ msgid "Document ended just after close tag name, no '>' seen"
-#~ msgstr "Dokumentet sluttet rett etter navnet p� lukk-taggen, ingen '>' sett"
-
-#~ msgid "Close tag '%s' does not match opening tag '%s'"
-#~ msgstr "Lukk-taggen '%s' er ikke lik 幠nings-taggen '%s'"
-
-#~ msgid ""
-#~ "Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
-#~ "bad character was '%s'"
-#~ msgstr ""
-#~ "Ugyldig UTF-8-tegn ved byte %d i kodet tekst. Noe av teksten f鷨 det "
-#~ "ugyldige tegnet var '%s'"
-
-#~ msgid "The marked-up text contained nothing but whitespace."
-#~ msgstr "Den kodete teksten inneholdt kun tomrom."
+#~ "En klient fjernet seg selv fra GConf-tjeneren uten at den var lagt til."
 
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Kunne ikke 幠ne fil '%s': %s"
+#~ msgid "Default Value: %s\n"
+#~ msgstr "Standardverdi: %s\n"
 
-#~ msgid "Error reading file '%s': %s"
-#~ msgstr "Feil under lesing av fil '%s': %s"
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "GConf Feil: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8a033e20..cc6660eb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 0.12\n"
-"POT-Creation-Date: 2001-01-29 09:57-0200\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2001-01-29 09:56-02:00\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -14,34 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "Descarregando m鏚ulo BerkeleyDB (BDB)."
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "Aberta fonte BerkeleyDB como root %s"
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "Iniciando m鏚ulo BDB"
-
-#: backends/dir-utils.c:88
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "N緌 foi poss癉el encontrar o diret鏎io raiz %s no endere蔞 `%s'"
-
-#: backends/dir-utils.c:104 backends/xml-backend.c:301 backends/xml-dir.c:1035
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "N緌 foi poss癉el criar diret鏎io `%s': %s"
-
-#: backends/dir-utils.c:192
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "N緌 � poss癉el ler ou escrever no diret鏎io raiz %s no endere蔞 `%s'"
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Descarregando m鏚ulo XML"
@@ -51,6 +23,11 @@ msgstr "Descarregando m鏚ulo XML"
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "N緌 foi poss癉el encontrar o diret鏎io raiz XML no endere蔞 `%s'"
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "N緌 foi poss癉el criar diret鏎io `%s': %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -75,7 +52,7 @@ msgstr "Falha ao liberar bloqueio no diret鏎io XML `%s': %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "Remo踥es de diret鏎io n緌 sincronizadas ao desligar o m鏚ulo XML"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -84,7 +61,7 @@ msgstr ""
 "N緌 � poss癉el remover diret鏎io `%s' do cache do m鏚ulo XML, pois ele n緌 "
 "foi sincronizado com o disco corretamente"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -129,33 +106,33 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "Falha ao excluir arquivo antigo `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:790
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Falha ao obter status `%s': %s"
 
-#: backends/xml-dir.c:934
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Entrada duplicada `%s' em `%s', ignorando"
 
-#: backends/xml-dir.c:956
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Entrada sem nome no arquivo XML `%s', ignorando"
 
-#: backends/xml-dir.c:963
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 "N� de n癉el principal no arquivo XML `%s' n緌 � uma <entrada>, ignorando"
 
-#: backends/xml-dir.c:1051
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Falha ao criar arquivo `%s': %s"
 
-#: backends/xml-dir.c:1059 gconf/gconf-internals.c:2442
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Falha ao fechar arquivo `%s': %s"
@@ -166,7 +143,7 @@ msgstr "Falha ao fechar arquivo `%s': %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorando n� XML com nome `%s': %s"
 
-#: backends/xml-entry.c:199
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -184,78 +161,82 @@ msgstr "Ignorando nome de schema `%s', inv嫮ido: %s"
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "Ignorando n� XML `%s', exceto por poss癉el nome de schema: %s"
 
-#: backends/xml-entry.c:723
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Falha ao ler valor padr緌 para schema: %s"
 
-#: backends/xml-entry.c:937
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Sem atributo \"type\" para n� <%s>"
 
-#: backends/xml-entry.c:951
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Um n� tem atributo \"type\" desconhecido `%s', ignorando"
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "Sem atributo \"value\" para n�"
 
-#: backends/xml-entry.c:1014 backends/xml-entry.c:1090
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "N緌 foi poss癉el entender n� XML <%s> dentro de um n� de lista XML"
 
-#: backends/xml-entry.c:1048
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Tipo inv嫮ido (lista, par ou desconhecido) em um n� de lista"
 
-#: backends/xml-entry.c:1071
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "N� XML defeituoso: %s"
 
-#: backends/xml-entry.c:1079
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Lista cont幦 um n� com tipo inv嫮ido (%s, deveria ser %s)"
 
-#: backends/xml-entry.c:1131
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorando car defeituoso do par XML: %s"
 
-#: backends/xml-entry.c:1140 backends/xml-entry.c:1163
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "analisando arquivo XML: listas e pares n緌 podem ser colocados dentro de um "
 "par"
 
-#: backends/xml-entry.c:1153
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorando cdr defeituoso do par XML: %s"
 
-#: backends/xml-entry.c:1172
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "N緌 foi poss癉el entender n� XML <%s> dentro de um n� de par XML"
 
-#: backends/xml-entry.c:1190
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "N緌 foi poss癉el achar car e cdr para o n� de par XML"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Faltando cdr do par de valores em arquivo XML"
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "Faltando car do par de valores em arquivo XML"
 
-#: backends/xml-entry.c:1208
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Faltando car e cdr do par de valores em arquivo XML"
 
@@ -288,30 +269,30 @@ msgstr "N緌 foi poss癉el localizar m鏚ulo para `%s'"
 msgid "Failed to shut down backend"
 msgstr "Falha ao desligar m鏚ulo"
 
-#: gconf/gconf-database.c:233
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Valor inv嫮ido recebido na requisi誽o de atribui誽o"
 
-#: gconf/gconf-database.c:241
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "N緌 foi poss癉el interpretar o valor CORBA recebido na requisi誽o de "
 "atribui誽o para chave `%s'"
 
-#: gconf/gconf-database.c:521
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "Recebida requisi誽o para descartar todos os dados do cache"
 
-#: gconf/gconf-database.c:538
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Recebida requisi誽o para sincronizar sincronamente"
 
-#: gconf/gconf-database.c:605
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Erro fatal: falha ao obter refer瘽cia de objeto para ConfigDatabase"
 
-#: gconf/gconf-database.c:764
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Falha ao sincronizar uma ou mais fontes: %s"
@@ -320,7 +301,7 @@ msgstr "Falha ao sincronizar uma ou mais fontes: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -331,12 +312,12 @@ msgstr ""
 "este listener ao reiniciar o gconfd, resultando em uma notifica誽o n緌 "
 "confi嫛el de modifica踥es de configura誽o."
 
-#: gconf/gconf-database.c:871
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "ID de listener %lu n緌 existe"
 
-#: gconf/gconf-database.c:880
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -346,47 +327,47 @@ msgstr ""
 "inofensivo, pode resultar em uma notifica誽o reaparecendo de forma "
 "estranha): %s"
 
-#: gconf/gconf-database.c:992 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Erro ao obter valor para `%s': %s"
 
-#: gconf/gconf-database.c:1039
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Erro ao atribuir valor para `%s': %s"
 
-#: gconf/gconf-database.c:1082
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Erro ao limpar `%s': %s"
 
-#: gconf/gconf-database.c:1106
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Erro ao obter valor padr緌 para `%s': %s"
 
-#: gconf/gconf-database.c:1145
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Erro ao verificar exist瘽cia de `%s': %s"
 
-#: gconf/gconf-database.c:1169
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Erro ao remover diret鏎io `%s': %s"
 
-#: gconf/gconf-database.c:1195
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Falha ao obter todas as entradas em `%s': %s"
 
-#: gconf/gconf-database.c:1221
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Erro ao listar diret鏎ios em `%s': %s"
 
-#: gconf/gconf-database.c:1242
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Erro ao atribuir schema para `%s': %s"
@@ -451,9 +432,188 @@ msgstr "Opera誽o n緌 permitida sem servidor de configura誽o"
 msgid "Failed to get a lock"
 msgstr "Falha ao obter um bloqueio"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "Sem banco de dados dispon癉el para salvar sua configura誽o"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Falha ao fechar arquivo `%s': %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Erro ao remover diret鏎io `%s': %s"
 
 #: gconf/gconf-internals.c:85
 #, c-format
@@ -477,102 +637,97 @@ msgstr "Lista recebida de gconfd com um tipo de lista inv嫮ido"
 msgid "Failed to convert object to IOR"
 msgstr "Falha ao converter objeto para IOR"
 
-#: gconf/gconf-internals.c:809
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "N緌 foi poss癉el abrir arquivo de caminhos `%s': %s\n"
 
-#: gconf/gconf-internals.c:856
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Incluindo fonte `%s'\n"
 
-#: gconf/gconf-internals.c:868
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Erro de leitura no arquivo `%s': %s\n"
 
-#: gconf/gconf-internals.c:1292
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Lista esperada, recebi %s"
 
-#: gconf/gconf-internals.c:1302
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Lista de %s esperada, recebi lista de %s"
 
-#: gconf/gconf-internals.c:1441
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Par esperado, recebi %s"
 
-#: gconf/gconf-internals.c:1455
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Par (%s,%s) esperado, recebi um par com um ou ambos os valores faltando"
 
-#: gconf/gconf-internals.c:1471
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Par do tipo (%s,%s) esperado, recebi tipo (%s,%s)"
 
-#: gconf/gconf-internals.c:1587
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Cadeia entre aspas n緌 come蓷 com aspas"
 
-#: gconf/gconf-internals.c:1649
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Cadeia entre aspas n緌 termina com aspas"
 
-#: gconf/gconf-internals.c:2129 gconf/gconf.c:2945
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Erro CORBA: %s"
 
-#: gconf/gconf-internals.c:2145
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "Descri誽o de problema OAF: '%s'"
-
-#: gconf/gconf-internals.c:2151
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "tentativa de remover lista de objetos OAF n緌 listada"
 
-#: gconf/gconf-internals.c:2156
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "tentativa de incluir lista OAF j� listada"
 
-#: gconf/gconf-internals.c:2163
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Erro de an嫮ise OAF: %s"
 
-#: gconf/gconf-internals.c:2168
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Erro OAF desconhecido"
 
-#: gconf/gconf-internals.c:2251
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Arquivo ior n緌 encontrado em `%s'"
 
-#: gconf/gconf-internals.c:2282
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd tomando bloqueio `%s' de algum outro processo"
 
-#: gconf/gconf-internals.c:2293
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Outro programa tem bloqueio `%s'"
 
-#: gconf/gconf-internals.c:2313
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "n緌 foi poss癉el contactar ORB para enviar ping ao gconfd existente"
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -581,43 +736,43 @@ msgstr ""
 "Removendo bloqueio antigo `%s' porque IOR n緌 p瀺e ser convertido para "
 "refer瘽cia � objeto, IOR `%s'"
 
-#: gconf/gconf-internals.c:2333
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "Removendo bloqueio antigo `%s' devido a erro ao enviar ping ao servidor: %s"
 
-#: gconf/gconf-internals.c:2345
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "Daemon de configura誽o GConf (gconfd) possui bloqueio `%s'"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "n緌 foi poss癉el criar diret鏎io `%s': %s"
 
-#: gconf/gconf-internals.c:2394
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "N緌 � poss癉el criar bloqueio `%s': %s"
 
-#: gconf/gconf-internals.c:2430
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "N緌 � poss癉el escrever no arquivo `%s': %s"
 
-#: gconf/gconf-internals.c:2473
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "N緌 � poss癉el arquivo de bloqueio `%s'; supondo que ele n緌 � seu: %s"
 
-#: gconf/gconf-internals.c:2490
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Arquivo de bloqueio `%s' corrompido, removendo mesmo assim"
 
-#: gconf/gconf-internals.c:2500
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -626,26 +781,26 @@ msgstr ""
 "N緌 foi criado arquivo de bloqueio `%s' (criador com pid %u, nosso pid %u; "
 "supondo que algu幦 tomou nosso bloqueio"
 
-#: gconf/gconf-internals.c:2517
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Falha ao liberar diret鏎io de bloqueios `%s': %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Falha ao carregar fonte `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Schema `%s' especificado para `%s' armazena um valor de n緌-schema"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "O nome '/' pode ser apenas um diret鏎io, n緌 uma chave"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -654,22 +809,17 @@ msgstr ""
 "Valor para `%s' atribu獮o em fonte somente leitura no in獳io do seu caminho "
 "de configura誽o."
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "N緌 � poss癉el armazenar um valor na chave '%s'"
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Erro ao localizar metainfo: %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Erro ao obter metainfo: %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -740,22 +890,22 @@ msgstr "N緌 foi poss癉el entender `%s' (')' extra encontrado em um par)"
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Servidor n緌 conseguiu resolver o endere蔞 `%s'"
 
-#: gconf/gconf.c:568
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 "N緌 � poss癉el incluir notifica踥es para uma fonde de configura踥es local"
 
-#: gconf/gconf.c:1724
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Falha ao incluir cliente na lista do servidor, erro CORBA: %s"
 
-#: gconf/gconf.c:1740
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -765,66 +915,66 @@ msgstr ""
 "oaf_activate_from_id() e n緌 levantou uma exce誽o explicando o problema. Por "
 "favor, registre um relat鏎io de erros sobre o OAF."
 
-#: gconf/gconf.c:2051
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Falha ao iniciar GConf, terminando\n"
 
-#: gconf/gconf.c:2088
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Deve come蓷r com uma barra (/)"
 
-#: gconf/gconf.c:2110
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "N緌 pode ter duas barras (/) em seq�瘽cia"
 
-#: gconf/gconf.c:2112
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "N緌 pode ter um ponto (.) logo ap鏀 uma barra (/)"
 
-#: gconf/gconf.c:2133
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' � um caracter inv嫮ido em nomes de chave/diret鏎io"
 
-#: gconf/gconf.c:2147
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Chave/diret鏎io n緌 pode terminar com uma barra (/)"
 
-#: gconf/gconf.c:2400
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Falha ao desligar servidor de configura誽o: %s"
 
-#: gconf/gconf.c:2461
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Flutuante esperado, recebi %s"
 
-#: gconf/gconf.c:2496
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Inteiro esperado, recebi %s"
 
-#: gconf/gconf.c:2531
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "String esperado, recebi %s"
 
-#: gconf/gconf.c:2568
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Booleano esperado, recebi %s"
 
-#: gconf/gconf.c:2601
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Schema esperado, recebi %s"
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Requisi誽o de desligamento recebida"
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -832,7 +982,7 @@ msgstr ""
 "gconfd foi compilado com op誽o de depura誽o; tentando carregar gconf.path do "
 "diret鏎io de fontes"
 
-#: gconf/gconfd.c:293
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -840,10 +990,7 @@ msgstr ""
 "N緌 foram encontrados arquivos de configura誽o, tentando usar a fonte de "
 "configura誽o padr緌 `%s'"
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:301
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -851,12 +998,12 @@ msgstr ""
 "Nenhuma fonte de configura誽o no caminho de fontes, configura誽o n緌 ser� "
 "salva; edite "
 
-#: gconf/gconfd.c:314
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Erro ao carregar algumas fontes de configura誽o: %s"
 
-#: gconf/gconfd.c:326
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -864,7 +1011,7 @@ msgstr ""
 "Nenhum endere蔞 fonte de configura誽o foi resolvido com sucesso, n緌 � "
 "poss癉el ler ou armazenar dados de configura誽o"
 
-#: gconf/gconfd.c:343
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -872,37 +1019,28 @@ msgstr ""
 "Nenhuma fonte de configura誽o com permiss緌 de escrita foi resolvido com "
 "sucesso, pode n緌 ser poss癉el salvar algumas modifica踥es de configura誽o"
 
-#: gconf/gconfd.c:369
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-"Recebido sinal %d, gerando um core. Por favor, reporte um erro do GConf."
-
-#: gconf/gconfd.c:385
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"Recebido sinal %d, desligando anormalmente. Por favor, reporte um erro do "
-"GConf."
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down."
+msgstr "Recebido sinal %d, desligando corretamente"
 
-#: gconf/gconfd.c:402
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Recebido sinal %d, desligando corretamente"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:451
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "iniciando (vers緌 %s), pid %u usu嫫io '%s'"
 
-#: gconf/gconfd.c:455
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr "GConf foi compilado com recursos de depura誽o ativados"
 
-#: gconf/gconfd.c:478
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -910,11 +1048,11 @@ msgstr ""
 "Falha ao iniciar Object Activation Framework: por favor, envie relat鏎io de "
 "erros para os respos嫛eis pelo OAF"
 
-#: gconf/gconfd.c:498
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Falha ao obter refer瘽cia de objeto para ConfigServer"
 
-#: gconf/gconfd.c:518
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -922,28 +1060,24 @@ msgstr ""
 "OAF n緌 conhece nosso IID; indica uma instala誽o defeituosa; n緌 � poss癉el "
 "registrar; terminando\n"
 
-#: gconf/gconfd.c:522
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Outro gconfd j� registrado com o OAF; terminando\n"
 
-#: gconf/gconfd.c:527
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Erro desconhecido registrado gconfd com o OAF; terminando\n"
 
-#: gconf/gconfd.c:565
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Terminando"
 
-#: gconf/gconfd.c:589
-msgid "GConf server is not in use, shutting down."
-msgstr "Servidor GConf n緌 est� sendo usado, desligando."
-
-#: gconf/gconfd.c:924
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Levantando exce誽o: %s"
 
-#: gconf/gconfd.c:1012
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -952,7 +1086,7 @@ msgstr ""
 "Falha ao abrir arquivo de registro do gconfd; n緌 ser� poss癉el restaurar "
 "listeners ap鏀 uma parada do gconfd (%s)"
 
-#: gconf/gconfd.c:1035
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -960,39 +1094,76 @@ msgstr ""
 "Falha ao fechar arquivo de registro do gconfd; dados podem n緌 ter sido "
 "salvos corretamente (%s)"
 
-#: gconf/gconfd.c:1098
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "N緌 foi poss癉el abrir arquivo de estado '%s' para escrita: %s"
 
-#: gconf/gconfd.c:1112
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "N緌 foi poss癉el escrever arquivo de estado '%s' fd: %d: %s"
 
-#: gconf/gconfd.c:1121
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Falha ao fechar novo arquivo de estado '%s': %s"
 
-#: gconf/gconfd.c:1135
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "N緌 foi poss癉el mover arquivo de estado antigo '%s': %s"
 
-#: gconf/gconfd.c:1145
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Falha ao mover novo arquivo de estado: %s"
 
-#: gconf/gconfd.c:1154
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 "Falha ao restaurar arquivo de estado original que foi movido para '%s': %s"
 
-#: gconf/gconfd.c:1627
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Falha ao abrir arquivo de estado: %s"
+
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Falha ao abrir arquivo de estado: %s"
+
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr "Falha ao escrever inclus緌 de cliente no arquivo de estado: %s"
+
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "Falha ao escrever inclus緌 de cliente no arquivo de estado: %s"
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Falha ao abrir arquivo de estado: %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1000,17 +1171,12 @@ msgstr ""
 "N緌 � poss癉el restaurar um listener no endere蔞 '%s', n緌 foi poss癉el "
 "resolver o banco de dados"
 
-#: gconf/gconfd.c:1673
-#, c-format
-msgid "Error reading saved state file: %s"
-msgstr "Erro ao lerr arquivo de estado: %s"
-
-#: gconf/gconfd.c:1726
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "N緌 � poss癉el abrir arquivo de estado '%s': %s"
 
-#: gconf/gconfd.c:1843
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to "
@@ -1019,7 +1185,7 @@ msgstr ""
 "Falha ao registrar inclus緌 de listener ao arquivo de registro do gconfd; "
 "n緌 ser� poss癉el re-incluir o listener se o gconfd for desligado (%s)"
 
-#: gconf/gconfd.c:1848
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously "
@@ -1029,31 +1195,6 @@ msgstr ""
 "pode ocorrer uma re-inclus緌 errada do listener se o gconfd for desligado "
 "(%s)"
 
-#: gconf/gconfd.c:1871 gconf/gconfd.c:2032
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "Falha ao ler IOR para cliente: %s"
-
-#: gconf/gconfd.c:1886
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "Falha ao abrir arquivo de estado: %s"
-
-#: gconf/gconfd.c:1899
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr "Falha ao escrever inclus緌 de cliente no arquivo de estado: %s"
-
-#: gconf/gconfd.c:1907
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr "Falha ao descarregar inclus緌 de cliente no arquivo de estado: %s"
-
-#: gconf/gconfd.c:1993
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr "Algum cliente se excluiu do servidor GConf sem ter sido inclu獮o."
-
 #: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Op踥es de ajuda"
@@ -1360,220 +1501,214 @@ msgstr "Falha ao criar o servidor de configura誽o (gconfd): %s\n"
 msgid "Must specify a key or keys to get\n"
 msgstr "Devem ser especificada uma chave ou chaves para ler\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tipo: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Tipo de lista: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Tipo do car: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Tipo do cdr: %s\n"
 
-#: gconf/gconftool.c:894
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr "Valor padr緌: %s\n"
+msgid "Owner: %s\n"
+msgstr "Dono: %s\n"
 
-#: gconf/gconftool.c:894 gconf/gconftool.c:896 gconf/gconftool.c:897
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Limpar"
 
-#: gconf/gconftool.c:896
-#, c-format
-msgid "Owner: %s\n"
-msgstr "Dono: %s\n"
-
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Descr. Curta: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Descr. Longa: %s\n"
 
-#: gconf/gconftool.c:907
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Sem valor atribuido para `%s'\n"
 
-#: gconf/gconftool.c:911
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Falha ao ler valor para `%s': %s\n"
 
-#: gconf/gconftool.c:954 gconf/gconftool.c:966
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "N緌 � poss癉el entender tipo `%s'\n"
 
-#: gconf/gconftool.c:978
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Devem ser especificados chaves/valores alternados como argumentos\n"
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Sem valor a atribuir para chave: `%s'\n"
 
-#: gconf/gconftool.c:1026
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "N緌 � poss癉el atribuir um schema como valor\n"
 
-#: gconf/gconftool.c:1036
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 "Ao atribuir a uma lista voc� deve especificar um tipo de lista primitivo\n"
 
-#: gconf/gconftool.c:1050
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Ao atribuir a uma par voc� deve especificar um tipo de car e de cdr "
 "primitivos\n"
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erro: %s\n"
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1211
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Erro ao atribuir valor: %s"
 
-#: gconf/gconftool.c:1096 gconf/gconftool.c:1225
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Erro ao sincronizar: %s"
 
-#: gconf/gconftool.c:1114
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Deve ser especificada chave (nome do schema) como �nico argumento\n"
 
-#: gconf/gconftool.c:1156
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Tipo de lista deve ser um tipo primitivo: string, int, float or bool\n"
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Tipo de car de par deve ser um tipo primitivo: string, int, float or bool\n"
 
-#: gconf/gconftool.c:1196
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Tipo de cdr de par deve ser um tipo primitivo: string, int, float or bool\n"
 
-#: gconf/gconftool.c:1240
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Devem ser especificados um ou mais diret鏎ios de onde obter pares "
 "chave/valor.\n"
 
-#: gconf/gconftool.c:1254
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Devem ser especificadas uma ou mais chaves para limpar.\n"
 
-#: gconf/gconftool.c:1265
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Erro ao limpar `%s': %s\n"
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Devem ser especificados um ou mais diret鏎ios de onde obter subdiret鏎ios.\n"
 
-#: gconf/gconftool.c:1322
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Erro ao listar diret鏎ios: %s\n"
 
-#: gconf/gconftool.c:1364
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "ALERTA: tipo inv嫮ido ou faltante para schema (%s)\n"
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "ALERTA: tipo de lista inv嫮ido ou faltante para schema (%s)\n"
 
-#: gconf/gconftool.c:1384 gconf/gconftool.c:1414 gconf/gconftool.c:1443
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "ALERTA: Falha ao analisar valor padr緌 `%s' para schema (%s)\n"
 
-#: gconf/gconftool.c:1402
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "ALERTA: tipo de car ou de cdr inv嫮ido ou faltante para schema (%s)\n"
 
-#: gconf/gconftool.c:1427
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "ALERTA: Voc� n緌 pode atribuir uma valor padr緌 a um schema\n"
 
-#: gconf/gconftool.c:1456
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "ALERTA: Erro interno do gconftool, GConfValueType desconhecido\n"
 
-#: gconf/gconftool.c:1504 gconf/gconftool.c:1525 gconf/gconftool.c:1546
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ALERTA: falha ao analisar nome do tipo `%s'\n"
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ALERTA: tipo de lista s� pode ser int, float, string ou bool e n緌 `%s'\n"
 
-#: gconf/gconftool.c:1542
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ALERTA: tipo de car s� pode ser int, float, string ou bool e n緌 `%s'\n"
 
-#: gconf/gconftool.c:1563
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ALERTA: tipo de cdr s� pode ser int, float, string ou bool e n緌 `%s'\n"
 
-#: gconf/gconftool.c:1590
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "ALERTA: n� <applyto> vazio"
 
-#: gconf/gconftool.c:1593 gconf/gconftool.c:1856
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ALERTA: n� <%s> n緌 entendido sob <schema>\n"
 
-#: gconf/gconftool.c:1603
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "ALERTA: sem chave especificada para schema\n"
 
-#: gconf/gconftool.c:1636
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr "ALERTA: n� <locale> n緌 possui atributo `name=\"locale\"', ignorando\n"
 
-#: gconf/gconftool.c:1642
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1581,51 +1716,51 @@ msgstr ""
 "ALERTA: m�ltiplos n鏀 <locale> para o locale `%s', ignorando todos ap鏀 o "
 "primeiro\n"
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "ALERTA: N� inv嫮ido <%s> em um n� <locale>\n"
 
-#: gconf/gconftool.c:1752
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "ALERTA: falha ao instalar schema `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:1760
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Instalado schema `%s' para locale `%s'\n"
 
-#: gconf/gconftool.c:1782
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "ALERTA: falha ao associar schema `%s' com chave `%s': %s\n"
 
-#: gconf/gconftool.c:1790
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Anexado schema `%s' � chave `%s'\n"
 
-#: gconf/gconftool.c:1869
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Voc� deve ter pelo menos um item <locale> em um <schema>\n"
 
-#: gconf/gconftool.c:1898
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "ALERTA: n� <%s> n緌 entendido abaixo de <schemalist>\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Falha ao abrir `%s': %s\n"
 
-#: gconf/gconftool.c:1927
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Documento `%s' est� vazio?\n"
 
-#: gconf/gconftool.c:1939
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1634,26 +1769,26 @@ msgstr ""
 "Documento `%s' possui o tipo errado de n� raiz (<%s>, deveria ser "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1952
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Documento `%s' n緌 possui n� <gconfschemafile> de n癉el principal\n"
 
-#: gconf/gconftool.c:1966
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ALERTA: n� <%s> abaixo de <gconfschemafile> n緌 entendido\n"
 
-#: gconf/gconftool.c:1977 gconf/gconftool.c:2009
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Erro ao sincronizar dados de configura誽o: %s"
 
-#: gconf/gconftool.c:1993
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Devem ser especificados alguns arquivos de schema a instalar\n"
 
-#: gconf/gconftool.c:2030
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1662,16 +1797,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2050
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Falha ao limpar chave de quebra %s: %s\n"
 
-#: gconf/gconftool.c:2176
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "Devem ser especificadas algumas chaves para serem quebradas\n"
 
-#: gconf/gconftool.c:2182
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1680,11 +1815,11 @@ msgstr ""
 "Tentando quebrar o seu aplicativo atribu璯do valores inv嫮idos para chave:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2200
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "Devem ser especificados alguns diret鏎ios para serem quebrados\n"
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1695,17 +1830,70 @@ msgstr ""
 "no diret鏎io:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "Erro do GConf: %s\n"
-
-#: wrappers/gtk/gconf-client.c:795
+#: 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:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Esperado `%s' recebi `%s' para chave %s"
+
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "Descarregando m鏚ulo BerkeleyDB (BDB)."
+
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "Aberta fonte BerkeleyDB como root %s"
+
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "Iniciando m鏚ulo BDB"
+
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "N緌 foi poss癉el encontrar o diret鏎io raiz %s no endere蔞 `%s'"
+
+#~ msgid ""
+#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ msgstr ""
+#~ "N緌 � poss癉el ler ou escrever no diret鏎io raiz %s no endere蔞 `%s'"
+
+#~ msgid "No database available to save your configuration"
+#~ msgstr "Sem banco de dados dispon癉el para salvar sua configura誽o"
+
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "Descri誽o de problema OAF: '%s'"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "N緌 � poss癉el armazenar um valor na chave '%s'"
+
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgstr ""
+#~ "Recebido sinal %d, gerando um core. Por favor, reporte um erro do GConf."
+
+#~ msgid ""
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ msgstr ""
+#~ "Recebido sinal %d, desligando anormalmente. Por favor, reporte um erro do "
+#~ "GConf."
+
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "Servidor GConf n緌 est� sendo usado, desligando."
+
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "Erro ao lerr arquivo de estado: %s"
+
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "Falha ao ler IOR para cliente: %s"
+
+#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgstr "Falha ao descarregar inclus緌 de cliente no arquivo de estado: %s"
+
+#~ msgid ""
+#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ msgstr "Algum cliente se excluiu do servidor GConf sem ter sido inclu獮o."
+
+#~ msgid "Default Value: %s\n"
+#~ msgstr "Valor padr緌: %s\n"
+
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "Erro do GConf: %s\n"
diff --git a/po/ro.po b/po/ro.po
index a7291e03..6e42c556 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2001-05-21 19:08+0200\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2001-02-24 13:06+0100\n"
 "Last-Translator: Robert Claudiu Gheorghe <rgheorghe@writeme.com>\n"
 "Language-Team: Rom滱� <ro@li.org>\n"
@@ -13,34 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "Descarc modulul BerkeleyDB (BDB)"
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "Am deschis sursa BerkeleyDB la r緂綷ina %s"
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "Ini�ializez modulul BDB"
-
-#: backends/dir-utils.c:108
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "Nu am g綼it directorul r緂綷in� %s la adresa `%s'"
-
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "Nu am putut crea directorul `%s': %s"
-
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "Nu pot citi sau scrie in directorul r緂綷in� %s la adresa `%s'"
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Descarc modulul XML."
@@ -50,6 +22,11 @@ msgstr "Descarc modulul XML."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nu pot g綼i directorul r緂綷in� pentru XML la adresa `%s'"
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "Nu am putut crea directorul `%s': %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -65,7 +42,7 @@ msgstr ""
 msgid "Initializing XML backend module"
 msgstr "Ini�ializez modulul XML"
 
-#: backends/xml-backend.c:748
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "姷cercarea de a ridica blocarea directorului XML `%s': %s a e滾at"
@@ -75,7 +52,7 @@ msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 "泱ergere de directoare invalide(nesincronizate) la oprirea modulului XML"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -84,11 +61,11 @@ msgstr ""
 "Nu am putut elimina directorul `%s' din memoria tampon a modulului XML , "
 "deoarece nu a fost actualizat cu succes pe disc"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
-"%u items remain in the cache after cleaning already-synced items older than %"
-"u seconds"
+"%u items remain in the cache after cleaning already-synced items older than "
+"%u seconds"
 msgstr ""
 "%u obiecte au r緆as 螽 memoria tampon dup� eliminarea obiectelor deja "
 "actualizate mai vechi de %u secunde"
@@ -103,81 +80,76 @@ msgstr ""
 msgid "XML filename `%s' is a directory"
 msgstr "Fi槐erul XML `%s' este un director"
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "泱ergere e滾ata pentru `%s': %s"
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Nu am reu槐t s� scriu 螽 fi槐erul `%s': %s"
 
-#: backends/xml-dir.c:359
-#, fuzzy, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr "泱ergere e滾ata pentru `%s': %s"
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Nu am reu槐t s� redenumesc `%s' 螽 `%s': %s"
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Nu am reu槐t s� refac `%s' din `%s': %s"
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Nu am reu槐t s� 演erg vechiul fi槐erul `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Intrare duplicat `%s' 螽 `%s', o ignor"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Intrare f綖� nume 螽 fi槐erul `%s', o ignor"
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 "Nodul de pe nivelul superior 螽 fi槐erul XML `%s' nu este un '<entry>', il "
 "ignor"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Nu am reu槐t s� creez fi槐erul `%s': %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2443
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Nu am reu槐t s� inchid fi槐erul `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:149
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignor nodul XML cu numele `%s': %s"
 
-#: backends/xml-entry.c:200
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:327
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignor schema cu numele `%s', invalid�: %s"
@@ -185,83 +157,87 @@ msgstr "Ignor schema cu numele `%s', invalid�: %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:373
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "Ignor nodul XML `%s', cu exceptia schemei cu numele: %s"
 
-#: backends/xml-entry.c:724
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Nu am reu槐t s� citesc valoarea implicit� pentru schema: %s"
 
-#: backends/xml-entry.c:938
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Nu exist� atributul de \"tip\" pentru nodul <%s>"
 
-#: backends/xml-entry.c:952
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Un nod are atributul de \"tip\" necunoscut `%s', il ignor"
 
-#: backends/xml-entry.c:967
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "Nu exist� atributul \"valoare\" pentru nodul"
 
-#: backends/xml-entry.c:1015 backends/xml-entry.c:1091
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Nu am 螽�eles nodul XML <%s> 螽 interiorul unei liste de noduri XML"
 
-#: backends/xml-entry.c:1049
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Tip invalid (list�, pereche, sau necunoscut) 螽tr-o list� de noduri"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Nod XML gresit: %s"
 
-#: backends/xml-entry.c:1080
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Lista con�ine un nod scris incorect (%s, trebuia s� fie %s)"
 
-#: backends/xml-entry.c:1132
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1141 backends/xml-entry.c:1164
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "procesez fi槐erul XML: listele 槐 perechile pot s� nu fie plasate 螽 "
 "interiorul unei perechi"
 
-#: backends/xml-entry.c:1154
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1173
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Nu am 螽teles nodul XML <%s> 螽 interiorul unui nod pereche "
 
-#: backends/xml-entry.c:1191
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1204
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1209
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -294,33 +270,33 @@ msgstr "Nu am putut localiza modulul pentru `%s'"
 msgid "Failed to shut down backend"
 msgstr "Oprire modul(e) esuat�"
 
-#: gconf/gconf-database.c:231
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Informa�ie(valoare) invalid� recep�ionat� la 'set request'"
 
-#: gconf/gconf-database.c:239
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Informa�ie(valoare) CORBA primit� neinteligibil� la 'set request' pentru "
 "cheia `%s'"
 
-#: gconf/gconf-database.c:517
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr ""
 "Am primit solicitarea de a abandona toate informa�iile din memoria tampon"
 
-#: gconf/gconf-database.c:534
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Am primit solicitarea de actualizare(sync) sincron�"
 
-#: gconf/gconf-database.c:601
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "Eroare fatala: am e滾at 螽 ob�inerea unei referin�e c綟re un obiect "
 "ConfigDatabase"
 
-#: gconf/gconf-database.c:760
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Nu am reu槐t s� actualizez una sau mai multe surse: %s"
@@ -329,7 +305,7 @@ msgstr "Nu am reu槐t s� actualizez una sau mai multe surse: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -340,12 +316,12 @@ msgstr ""
 "refac acest proces la repornirea lui gconfd, fapt care va conduce la "
 "notific綖i gresite ale schimb綖ilor de configura�ie."
 
-#: gconf/gconf-database.c:873
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "ID-ul de proces 'listener' %lu nu exista"
 
-#: gconf/gconf-database.c:882
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -355,47 +331,47 @@ msgstr ""
 "(aproape sigur f綖� consecin�e , poate conduce la reapari�ia unor "
 "notific綖i: %s"
 
-#: gconf/gconf-database.c:997 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Eroare la ob�inerea valorii pentru `%s': %s"
 
-#: gconf/gconf-database.c:1044
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Eroare la stabilirea valorii pentru `%s': %s"
 
-#: gconf/gconf-database.c:1087
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Eroare la resetarea `%s': %s"
 
-#: gconf/gconf-database.c:1111
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Eroare la ob�inerea valorii implicite pentru `%s': %s"
 
-#: gconf/gconf-database.c:1151
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Eroare la verificarea existen�ei lui `%s': %s"
 
-#: gconf/gconf-database.c:1175
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Eroare la eliminarea directorului `%s': %s"
 
-#: gconf/gconf-database.c:1202
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Nu am reu槐t sa ob�in toate intr綖ile(elementele) din `%s': %s"
 
-#: gconf/gconf-database.c:1228
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Eroare la listarea directorelor 螽 `%s': %s"
 
-#: gconf/gconf-database.c:1249
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Eroare la stabilirea schemei pentru `%s': %s"
@@ -461,30 +437,209 @@ msgstr "Opera�ia nu este permis� far� un server de configura�ii"
 msgid "Failed to get a lock"
 msgstr "Nu am reu槐t s� blochez"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "Nu este disponibil� nici o baz� de date pentru a v� salva configuratia"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Nu am reu槐t s� inchid fi槐erul `%s': %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Eroare la eliminarea directorului `%s': %s"
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Nici un '/' 螽 cheia `%s'"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 "Nu am putut s� interpretez valoarea CORBA pentru elementul de tip list�"
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Tip incorect pentru elementul list� 螽 %s"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "Am primit o lista de la gconfd cu un tip de lista incorect"
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:445
 msgid "Failed to convert object to IOR"
 msgstr "Nu am reusit s� convertesc obiectul in IOR"
 
@@ -493,141 +648,136 @@ msgstr "Nu am reusit s� convertesc obiectul in IOR"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Nu am putut s� deschid fi槐erul `%s': %s\n"
 
-#: gconf/gconf-internals.c:858
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Adaug sursa `%s'\n"
 
-#: gconf/gconf-internals.c:870
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Eroare de citire la fi槐erul `%s': %s\n"
 
-#: gconf/gconf-internals.c:1293
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "A演eptam o list�, am primit %s"
 
-#: gconf/gconf-internals.c:1303
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "A演emptam o list� de %s, am primit o list� de %s"
 
-#: gconf/gconf-internals.c:1442
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "A演eptam o pereche, am primit %s"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "A演eptam o pereche (%s,%s), am primit o pereche cu una sau am滱doua valorile "
 "lipsa"
 
-#: gconf/gconf-internals.c:1472
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "A演eptam o pereche de tipul (%s, %s), am primit tipul (%s, %s)"
 
-#: gconf/gconf-internals.c:1588
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "波rul de caractere se termin� dar nu 螽cepe cu ghilimele"
 
-#: gconf/gconf-internals.c:1650
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "波rul de caractere 螽cepe dar nu se 槐 termin� cu ghilimele"
 
-#: gconf/gconf-internals.c:2130 gconf/gconf.c:3002
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Eroare CORBA: %s"
 
-#: gconf/gconf-internals.c:2146
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "Descriere problem� OAF: '%s'"
-
-#: gconf/gconf-internals.c:2152
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "螽cercare de a elimina directoarele de obiecte OAF nelistate"
 
-#: gconf/gconf-internals.c:2157
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "螽cercare de a adauga directoarele OAF deja listate"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Eroare de prelucrare(parcurgere): %s"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Eroare OAF necunoscut�"
 
-#: gconf/gconf-internals.c:2252
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Nu exist� nici un fi槐er ior in `%s'"
 
-#: gconf/gconf-internals.c:2283
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd a preluat blocarea `%s' de la un alt proces"
 
-#: gconf/gconf-internals.c:2294
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Un alt program de�ine blocarea `%s'"
 
-#: gconf/gconf-internals.c:2314
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "nu am putut contacta ORB pentru a ping-ui gconfd-ul existent"
 
-#: gconf/gconf-internals.c:2322
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2360
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "nu a putut crea directorul `%s': %s"
 
-#: gconf/gconf-internals.c:2395
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Nu pot bloca `%s': %s"
 
-#: gconf/gconf-internals.c:2431
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Nu pot scrie 螽 fi槐er `%s': %s"
 
-#: gconf/gconf-internals.c:2474
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "Nu pot deschide fi槐erul de blocaj `%s'; presupun c� nu este al nostru: %s"
 
-#: gconf/gconf-internals.c:2491
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Fi槐er de blocaj corupt `%s', il elimin oricum"
 
-#: gconf/gconf-internals.c:2501
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -636,49 +786,44 @@ msgstr ""
 "Nu am create fi槐erul de blocare `%s' (pid creator %u, pid-ul nostru %u; "
 "consider ca altcinevaa preluat blocajul nostru"
 
-#: gconf/gconf-internals.c:2518
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Nu am reu槐t s� eliberez directorul de blocaj `%s': %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Nu am reu槐t s� 螽carc sursa  `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 "Schema  `%s' specificat� pentru  `%s' con�ine o valoare de tip non-schem�"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Numele '/' poate fi numai un director, nu o cheie"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "Nu am reu槐t s� stochez o valoare la cheia '%s'"
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -749,517 +894,510 @@ msgstr "Nu am 螽�eles `%s' (螽 interiorul listei am g綼it un ')' unescaped)"
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Serverul nu a putut rezolva adresa `%s'"
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1781
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr "A e滾at ad綦garea de client la lista serverului, eroare CORBA: %s"
 
-#: gconf/gconf.c:1797
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
 "Please file an OAF bug report."
 msgstr ""
 
-#: gconf/gconf.c:2108
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Ini�ializarea GConf a e滾at, ies\n"
 
-#: gconf/gconf.c:2145
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Trebuie s� inceap� cu un slash (/)"
 
-#: gconf/gconf.c:2167
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Nu pot avea dou� shash-uri (/) pe un r滱d"
 
-#: gconf/gconf.c:2169
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Nu pot avea punct (.) imediat dup� un slash (/)"
 
-#: gconf/gconf.c:2190
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:2204
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2457
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2518
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2553
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2588
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2625
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2658
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:246
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:278
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:292
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:300
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:300
-msgid "/path"
-msgstr ""
-
-#: gconf/gconfd.c:313
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:325
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:342
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:368
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-
-#: gconf/gconfd.c:384
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgid "Received signal %d, shutting down."
 msgstr ""
 
-#: gconf/gconfd.c:401
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr ""
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:502
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:529
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:549
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:569
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:573
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:578
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:616
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr ""
 
-#: gconf/gconfd.c:641
-msgid "GConf server is not in use, shutting down."
-msgstr ""
-
-#: gconf/gconfd.c:1000
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1135
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1204
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1218
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1227
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1241
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1251
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1260
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1735
-#, c-format
-msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Nu am 螽�eles `%s' (lista trebuie s� 螽ceap� cu un '[')"
+
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
 msgstr ""
 
-#: gconf/gconfd.c:1781
+#: gconf/gconfd.c:1140
 #, c-format
-msgid "Error reading saved state file: %s"
+msgid "Failed to unquote config source address from saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1834
+#: gconf/gconfd.c:1160
 #, c-format
-msgid "Unable to open saved state file '%s': %s"
+msgid "Failed to unquote listener location from saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1951
-#, c-format
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Nu am reu槐t s� creez fi槐erul `%s': %s"
+
+#: gconf/gconfd.c:1204
 msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to re-"
-"add the listener if gconfd exits or shuts down (%s)"
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
 msgstr ""
 
-#: gconf/gconfd.c:1956
-#, c-format
+#: gconf/gconfd.c:1225
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously re-"
-"add the listener if gconfd exits or shuts down (%s)"
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
 msgstr ""
 
-#: gconf/gconfd.c:1979 gconf/gconfd.c:2144
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Failed to get IOR for client: %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1994
+#: gconf/gconfd.c:1377
 #, c-format
-msgid "Failed to open saved state file: %s"
+msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:2007
+#: gconf/gconfd.c:1476
 #, c-format
-msgid "Failed to write client add to saved state file: %s"
+msgid ""
+"Failed to log addition of listener to gconfd logfile; won't be able to "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:2015
+#: gconf/gconfd.c:1481
 #, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr ""
-
-#: gconf/gconfd.c:2105
 msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
+"Failed to log removal of listener to gconfd logfile; might erroneously "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconftool.c:63
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr ""
 
-#: gconf/gconftool.c:72
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr ""
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid ""
-"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
-"type."
+"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
+"--type."
 msgstr ""
 
-#: gconf/gconftool.c:100
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr ""
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr ""
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:173
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr ""
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:182 gconf/gconftool.c:191 gconf/gconftool.c:200
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr ""
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr ""
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr ""
 
-#: gconf/gconftool.c:227
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr ""
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr ""
 
-#: gconf/gconftool.c:236
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr ""
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr ""
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
 "config source or set to the empty string to use the default."
 msgstr ""
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:330
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 
-#: gconf/gconftool.c:342
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:349
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:357
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:365
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:385
+#: gconf/gconftool.c:381
 msgid ""
-"--set_schema should not be used with --get, --set, --unset, --all-pairs, --"
-"all-dirs\n"
+"--set_schema should not be used with --get, --set, --unset, --all-pairs, "
+"--all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:391
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:397
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:406
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:415
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:424
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:434
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:444
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:454
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:461
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:467
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:492
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr ""
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:507
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1267,344 +1405,338 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:529
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:689
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:732
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:766
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr ""
 
-#: gconf/gconftool.c:784
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:839
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:853
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:896
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
+msgid "Owner: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:896 gconf/gconftool.c:898 gconf/gconftool.c:899
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:898
-#, c-format
-msgid "Owner: %s\n"
-msgstr ""
-
-#: gconf/gconftool.c:899
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:909
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:913
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:956 gconf/gconftool.c:968
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:980
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1028
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1038
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1052
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1067
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1080 gconf/gconftool.c:1213
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1098 gconf/gconftool.c:1227
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1116
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1158
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1178
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1198
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1242
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1256
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1267
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1290
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1324
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1375
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1386 gconf/gconftool.c:1416 gconf/gconftool.c:1445
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1404
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1429
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1458
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1505 gconf/gconftool.c:1526 gconf/gconftool.c:1547
-#: gconf/gconftool.c:1568
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1522
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1543
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1564
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1592
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1595 gconf/gconftool.c:1858
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1605
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1638
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1644
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1725
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1754
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1762
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1784
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1792
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1871
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1900
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1922
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1929
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr ""
 
-#: gconf/gconftool.c:1941
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1954
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1968
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1979 gconf/gconftool.c:2011
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1995
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2032
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2052
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2178
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2184
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2202
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2221
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1612,17 +1744,42 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: gconf/gconf-client.c:296 gconf/gconf-client.c:313
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr ""
-
-#: gconf/gconf-client.c:796
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-client.c:998
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
+
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "Descarc modulul BerkeleyDB (BDB)"
+
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "Am deschis sursa BerkeleyDB la r緂綷ina %s"
+
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "Ini�ializez modulul BDB"
+
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "Nu am g綼it directorul r緂綷in� %s la adresa `%s'"
+
+#~ msgid ""
+#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ msgstr "Nu pot citi sau scrie in directorul r緂綷in� %s la adresa `%s'"
+
+#, fuzzy
+#~ msgid "Failed to set mode on `%s': %s"
+#~ msgstr "泱ergere e滾ata pentru `%s': %s"
+
+#~ msgid "No database available to save your configuration"
+#~ msgstr ""
+#~ "Nu este disponibil� nici o baz� de date pentru a v� salva configuratia"
+
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "Descriere problem� OAF: '%s'"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Nu am reu槐t s� stochez o valoare la cheia '%s'"
diff --git a/po/ru.po b/po/ru.po
index 64ed66b8..8c9b0779 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf\n"
-"POT-Creation-Date: 2001-02-15 14:49+0300\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2001-02-15 14:53+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -12,34 +12,6 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "戁й殑佹 蚥眢籤恘ж 迍齣曶 BerkeleyDB (BDB)."
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr ""
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "橁卍匢旻睋蟹� 蚥眢籤恘ж 迍齣曶 BDB"
-
-#: backends/dir-utils.c:108
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "醚 桫賻珃� 恔彸� 冾眛纔珅 佹埡昑� %s 俵 謐疻袀 '%s'"
-
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "醚 桫賻珃� 衃矬轂� 佹埡昑� '%s': %s"
-
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "醚豜硰珋恘 倷癹尕轂� 巟 妀� 睋倅蚆婥 � 冾眛纔珅 佹埡昑� %s 俵 謐疻袀 '%s'"
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "戁й殑佹 蚥眢籤恘ж 迍齣曶 XML."
@@ -49,6 +21,11 @@ msgstr "戁й殑佹 蚥眢籤恘ж 迍齣曶 XML."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "醚 桫賻珃� 恔彸� 冾眛纔珅 佹埡昑� XML 俵 謐疻袀 '%s'"
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "醚 桫賻珃� 衃矬轂� 佹埡昑� '%s': %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -73,14 +50,14 @@ msgstr "醚 桫賻珃� 睋蟯玹奿瓬轂� XML 佹埡昑� \"%s\": %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -97,63 +74,58 @@ msgstr "醚豜硰珋恘 趿俵旽尕� stat 騷� \"%s\": %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML そ帎 \"%s\" 朒曶籥衭 佹埡昑ж�"
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "醚 桫賻珃� 桫賻尕� \"%s\": %s"
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "醚 桫賻珃� 睋倅蚆婥 そ帎 \"%s\": %s"
 
-#: backends/xml-dir.c:359
-#, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr "醚 桫賻珃� 梌埡恘訰婥 疻窔� 恔 \"%s\": %s"
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "醚 桫賻珃� 陓疻奼曬瓬轂� \"%s\" � \"%s\": %s"
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "醚 桫賻珃� 俵枎瘃婥 \"%s\" 巟 \"%s\": %s"
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "醚 桫賻珃� 桫賻尕� 衲轄椋 そ帎 \"%s\": %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "醚 桫賻珃� 趿俵旽尕� stat 騷� \"%s\": %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "蟴赻玾恔� 睋倅衯 \"%s\" � \"%s\", 囟恘疶眙籥衭"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "�蹈孖� 藍� 奼曬� � XML-そ帎� \"%s\", 囟恘疶眙籥衭"
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "爝攫 覂疿恓ж 梑瓬恮 � XML-そ帎� \"%s\" 恓 <entry>, 囟恘疶眙籥衭"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "醚 桫賻珃� 衃矬轂� そ帎 \"%s\": %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2442
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "醚 桫賻珃� 睋刳椆� そ帎 '%s': %s"
@@ -164,7 +136,7 @@ msgstr "醚 桫賻珃� 睋刳椆� そ帎 '%s': %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "橶恘疶眐袬恌� XML-殑攽 � 恔稊蹉吇� \"%s\": %s"
 
-#: backends/xml-entry.c:199
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -182,76 +154,80 @@ msgstr "橶恘疶眙籥衭 奼� schema \"%s\", 恓鰍俷衲奼�: %s"
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "橶恘疶眐袬恌� XML-殑攽 \"%s\", 孖佮濯蹊 豜硰珋挃� 奼曬� schema: %s"
 
-#: backends/xml-entry.c:723
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "醚 桫賻珃� 倷癹籣婥 硩醣曬吇 俵 梠玶瓾恌� 騷� schema: %s"
 
-#: backends/xml-entry.c:937
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "醚� 轂婞梒梊� \"type\" 騷� 殑攽 <%s>"
 
-#: backends/xml-entry.c:951
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "爝攫 奼齬� 恓巟覂衲挃� 轂婞匟梊 \"type\" \"%s\", 囟恘疶眙籥衭"
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "醚� 轂婞匟梊� \"value\" 騷� 殑攽"
 
-#: backends/xml-entry.c:1014 backends/xml-entry.c:1090
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "醚 桫賻珃� 俵恮婥 XML 殑攫 <%s> 谻梊疶 XML 殑攽 衄孖佹"
 
-#: backends/xml-entry.c:1048
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "醚鰍俷衲奼椋 埩� (衄孖玹, 釓畛 妀� 恓巟覂衲挃�) � 殑旼 衄孖佹"
 
-#: backends/xml-entry.c:1071
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "醚倷避妀媓椋 殑攫 XML: %s"
 
-#: backends/xml-entry.c:1079
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "鯗孖玹 衃霰眚尕 倢珂珅 殑攫 (%s, 鰍枒恘 蹙婥 %s)"
 
-#: backends/xml-entry.c:1131
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1140 backends/xml-entry.c:1163
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "蹉賻巟 XML-そ帎�: 衄孖侂 � 釓砣 恓 迍м� 蹙婥 俵芶暙挃 谻梊疶 釓砣"
 
-#: backends/xml-entry.c:1153
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1172
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "醚 蹙� 俵恮� XML 殑攫 <%s> 谻梊疶 XML 殑攽 釓砣"
 
-#: backends/xml-entry.c:1190
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1208
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -284,29 +260,29 @@ msgstr "醚 桫賻珃� 恔彸� 蚥眢籤挃� 迍齣杻 騷� '%s'"
 msgid "Failed to shut down backend"
 msgstr "醚 桫賻珃� 珆佮濯尕� 蚥眢籤"
 
-#: gconf/gconf-database.c:233
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr ""
 
-#: gconf/gconf-database.c:241
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:521
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "蟴枎畷� 睋倷珃 恔 蚋眐� 赽囌 呿袶眐袬恄棼 鐘恄棼"
 
-#: gconf/gconf-database.c:538
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:605
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "碻埡杻恔� 畈匟佹: 醚 桫賻珃� 俵枎瘃婥 衶椗劼 恔 狟萲刱 騷� ConfigDatabase"
 
-#: gconf/gconf-database.c:764
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "醚 桫賻珃� 蚕恛眐恌硭眐袬婥 狦妅 妀� 蟠旼� 孖婘痸夼瓬: %s"
@@ -315,7 +291,7 @@ msgstr "醚 桫賻珃� 蚕恛眐恌硭眐袬婥 狦妅 妀� 蟠旼� 孖婘痸夼瓬: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -323,59 +299,59 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:871
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr ""
 
-#: gconf/gconf-database.c:880
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:992 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "曛匟佹 俵枎畷恌� 硩醣曬奷 騷� \"%s\": %s"
 
-#: gconf/gconf-database.c:1039
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "曛匟佹 俵枎畷恌� 硩醣曬奷 騷� \"%s\": %s"
 
-#: gconf/gconf-database.c:1082
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1106
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "曛匟佹 俵枎畷恌� 硩醣曬奷 俵 梠玶瓾恌� 騷� \"%s\": %s"
 
-#: gconf/gconf-database.c:1145
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "曛匟佹 倷瓬籤侂 袀暙衲豜袬恌� 騷� \"%s\": %s"
 
-#: gconf/gconf-database.c:1169
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "曛匟佹 桫賻曬奷 佹埡昑Щ \"%s\": %s"
 
-#: gconf/gconf-database.c:1195
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "醚 桫賻珃� 俵枎瘃婥 赽� 睋倅蚕 � \"%s\": %s"
 
-#: gconf/gconf-database.c:1221
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "曛匟佹 陓疻瘃蚝曬奷 佹埡昑ж� � \"%s\": %s"
 
-#: gconf/gconf-database.c:1242
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "曛匟佹 梌埡恘訬� 蚧攪� 騷� \"%s\": %s"
@@ -442,9 +418,188 @@ msgstr "靻弝婟吇 恓 鰍俷衲奼� 藍� 蚥眢籤� 冾恇囟梑謄圪"
 msgid "Failed to get a lock"
 msgstr "醚 桫賻珃� 衃矬轂� lock"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "煻睋 鐘恄棼 騷� 衃�畛恓恌� 袬袹� 冾恇囟梑謄圪 恓 鰍衲桸恔"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "醚 桫賻珃� 睋刳椆� そ帎 '%s': %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "曛匟佹 桫賻曬奷 佹埡昑Щ \"%s\": %s"
 
 #: gconf/gconf-internals.c:85
 #, c-format
@@ -468,102 +623,97 @@ msgstr "擸 gconfd 俵枎畷� 衄孖玹 � 倢珂奼 埩俵� 衄孖佹"
 msgid "Failed to convert object to IOR"
 msgstr "醚 桫賻珃� 倷欐觴邁瓬轂� 狟萲刱 � IOR"
 
-#: gconf/gconf-internals.c:809
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "醚 桫賻珃� 珆刳椆� そ帎 俷埩 '%s': %s\n"
 
-#: gconf/gconf-internals.c:856
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "餀臏訞曬吇 孖婘痸夼� '%s'\n"
 
-#: gconf/gconf-internals.c:868
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "曛匟佹 痽曬奷 そ帎� '%s': %s\n"
 
-#: gconf/gconf-internals.c:1292
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "攃厊賻衭 衄孖玹, 俵枎畷� %s"
 
-#: gconf/gconf-internals.c:1302
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "攃厊賻衭 衄孖玹 %s, 俵枎畷� 衄孖玹 %s"
 
-#: gconf/gconf-internals.c:1441
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "攃厊賻輾� 釓畛, 俵枎畷� %s"
 
-#: gconf/gconf-internals.c:1455
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "攃厊賻輾� 釓畛 (%s,%s), 俵枎畷恔 釓畛 � 恓覂眛棎� 狦恌� 妀� 狟珈虭 硩醣曬奷虭"
 
-#: gconf/gconf-internals.c:1471
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "攃厊賻輾� 釓畛 埩釓 (%s,%s) 俵枎畷恔 埩釓 (%s,%s)"
 
-#: gconf/gconf-internals.c:1587
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "鯥眐佹 � 佹趿痾賺 恓 恔瘃恔籥衭 � 佹趿痾�"
 
-#: gconf/gconf-internals.c:1649
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "鯥眐佹 � 佹趿痾賺 恓 睋佹拸屺豁娸� 佹趿痾珅"
 
-#: gconf/gconf-internals.c:2129 gconf/gconf.c:2945
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "曛匟佹 CORBA: %s"
 
-#: gconf/gconf-internals.c:2145
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "懩孖蹉吇 倷狟旼阽 OAF: \"%s\""
-
-#: gconf/gconf-internals.c:2151
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "俵倧堍� 桫賻尕� 恓 梖邁蹉挃� � 衄孖侜 佹埡昑� 狟萲刱瓬 OAF"
 
-#: gconf/gconf-internals.c:2156
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "俵倧堍� 鰍臏訰婥 欶� 梖邁蹉挃� � 衄孖侜 佹埡昑� OAF"
 
-#: gconf/gconf-internals.c:2163
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "曛匟佹 蹉賻巟� OAF: %s"
 
-#: gconf/gconf-internals.c:2168
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "醚巟覂衲恔� 畈匟佹 OAF"
 
-#: gconf/gconf-internals.c:2251
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "醚� ior-そ帎� � '%s'"
 
-#: gconf/gconf-internals.c:2282
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd 睋蟯玹奿瓬賻 '%s' 珆 恓冾婘砣� 黨梀圮 倷狪籣衃�"
 
-#: gconf/gconf-internals.c:2293
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "馜梀蹊 倷珌畛迋� 睋蟯玹奿瓬賻� '%s'"
 
-#: gconf/gconf-internals.c:2313
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "恓豜硰珋恘 俵騰抸瘃婥衭 � ORB, 痽狟� 倷瓬籤尕� 袀暙衲赹濫圴 gconfd"
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -572,91 +722,86 @@ msgstr ""
 "囃賻曬吇 梌埡疻軘龔� lock \"%s\", 埡� 佹� IOR 恓 迍秸� 蹙婥 倷欐觴邁瓬蹉 � "
 "衶椗劼 恔 狟萲刱, IOR \"%s\""
 
-#: gconf/gconf-internals.c:2333
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "囃賻曬吇 梌埡疻軘龔� lock \"%s\", � 衿栚� � 恓桫醣挃� ping 蚥眢籤�: %s "
 
-#: gconf/gconf-internals.c:2345
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "靻迍� 冾恇囟梑謄圪 GConf (gconfd) 睋蟯玹奿瓬賻 '%s'"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "恓 桫賻珃� 衃矬轂� 佹埡昑� '%s': %s"
 
-#: gconf/gconf-internals.c:2394
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "醚豜硰珋恘 衃矬轂� 蟯玹奿瓬劼 '%s': %s"
 
-#: gconf/gconf-internals.c:2430
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "醚豜硰珋恘 睋倅蚆婥 � そ帎 '%s': %s"
 
-#: gconf/gconf-internals.c:2473
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "醚豜硰珋恘 珆刳椆� そ帎 蟯玹奿瓬侂 \"%s\"; 豜硰珋恘 玴 恓 恔�: %s"
 
-#: gconf/gconf-internals.c:2490
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "蟴貥纖霰恄椋 lock-そ帎 \"%s\", 桫賻捇娸�"
 
-#: gconf/gconf-internals.c:2500
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
 
-#: gconf/gconf-internals.c:2517
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "醚 桫賻珃� 珃豜蟠馨婥 睋蟯玹奿瓬蹉挃� 佹埡昑� \"%s\": %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "醚 桫賻珃� 睋刳椆� 孖婘痸夼 \"%s\": %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "鯫攪� \"%s\" 梖邁蹉恔� 騷� \"%s\" �畛恌� 硩醣曬吇 恓 朒曶濫齬衭 蚧攪珅"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "樿� \"/\" 迍秸� 蹙婥 婘杻冾 佹埡昑ж�, � 恓 佮濯攪"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "醚 桫賻珃� 衃�畛恌婥 硩醣曬吇 俵 佮濯� \"%s\""
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "曛匟佹 俵孖佹 芶埡妅に眝謄圪: %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "曛匟佹 俵枎畷恌� 芶埡妅に眝謄圪: %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -728,21 +873,21 @@ msgstr "醚 俵恮婘 \"%s\" (旻褁旄 \")\" 恔岉曬� 谻梊疶 釓砣)"
 msgid "`%s': %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "鬌眢籤 恓 蚐珌 畛衄畇恔婥 謐疻� '%s'"
 
-#: gconf/gconf.c:568
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "醚豜硰珋恘 鰍臏訰婥 睋芶瓾恌� � 昑佹杻恘邯 孖婘痸夼� 冾恇囟梑謄圪"
 
-#: gconf/gconf.c:1724
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr "鬋珅 鰍臏訞曬奷 佮吇拏� � 衄孖劼 蚥眢籤瓬, 畈匟佹 CORBA: %s"
 
-#: gconf/gconf.c:1740
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -752,66 +897,66 @@ msgstr ""
 "oaf_activate_from_id() � 恓 梌埡恘訰� 孖佮濯曬奷 狟葌蚔挴暙ж 倷狟旼邯. "
 "蟴祫枎弝埡, 珆倷避寑� 衃狟暙恌� 狟 畈匟侜 OAF."
 
-#: gconf/gconf.c:2051
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "醚 桫賻珃� 妅卍匢旻硭眐袬婥 GConf, 趿�狦\n"
 
-#: gconf/gconf.c:2088
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "餀枒恘 恔瘃恔婥衭 � '/'"
 
-#: gconf/gconf.c:2110
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "醚 鰍枒恘 蹙婥 儷� '/' � 衲眐侜"
 
-#: gconf/gconf.c:2112
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "醚鰍枒恘 蹙婥 婘痾� 俵蚝� '/'"
 
-#: gconf/gconf.c:2133
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' 恓鰍俷衲奼椋 蚕邰玶 � 恔稊蹉圪 佮濯�/佹埡昑Щ"
 
-#: gconf/gconf.c:2147
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "輲濯/佹埡昑� 恓 迍秸� 睋佹拸屺轂寔� 恔 '/'"
 
-#: gconf/gconf.c:2400
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "鬋珅 趿佮濯曬奷 冾恇囟梑謄奻恄珌� 蚥眢籤�: %s"
 
-#: gconf/gconf.c:2461
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "攃厊賻珃� � 倢避.婘痾珅, 俵枎畷恘 %s"
 
-#: gconf/gconf.c:2496
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "攃厊賻珃� 藷昑�, 俵枎畷恘 %s"
 
-#: gconf/gconf.c:2531
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "攃厊賻輾� 衲眐佹, 俵枎畷恘 %s"
 
-#: gconf/gconf.c:2568
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "攃厊賻珃� 謬旼豜, 俵枎畷恘 %s"
 
-#: gconf/gconf.c:2601
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "攃厊賻珃� schema, 俵枎畷恘 %s"
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "蟴枎畷� 睋倷珃 恔 趿佮濯曬吇"
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -819,7 +964,7 @@ msgstr ""
 "gconfd 蚎玵倅旻眐袬� � 珆攽騰珅; 俵倷狟梛埧 睋й殑尕� gconf.path 巟 "
 "孖�狦恘ж 佹埡昑Щ"
 
-#: gconf/gconfd.c:293
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -827,10 +972,7 @@ msgstr ""
 "碻帎� 恔衲眐攣 恓 恔岉曬�, 俵倧埡攪衭 孖俵杻硨袬婥 孖婘痸夼 恔衲眐攣 俵 "
 "梠玶瓾恌� \"%s\""
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:301
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -838,12 +980,12 @@ msgstr ""
 "醚� 孖婘痸夼瓬 冾恇囟梑謄圪 � 俷埩 孖婘痸夼瓬, 冾恇囟梑謄奷 恓 蹙攽 "
 "衃�畛恓恔; 珆疻鐘刱奿瓬轂� "
 
-#: gconf/gconfd.c:314
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "曛匟佹 睋й殑侂 恓冾婘砣� 孖婘痸夼瓬 恔衲眐攣: %s"
 
-#: gconf/gconfd.c:326
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -851,7 +993,7 @@ msgstr ""
 "慁疻� 冾恇囟梑謄圪 恓 蹙� 梌陓褁� 畛衄畇恔�, 恓豜硰珋恘 睋й殑尕� 妀� "
 "衃�畛恌婥 冾恇囟梑謄奻恄棸 鐘恄棸"
 
-#: gconf/gconfd.c:343
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -859,37 +1001,28 @@ msgstr ""
 "醚 蹙昑 梌陓褁� 畛衄畇恔恘 睋倅袃袬攪棼 孖婘痸夼瓬 冾恇囟梑謄圪, 豜硰珋恘 "
 "恓冾婘砣� 巟芶恓恌� 冾恇囟梑謄圪 恓 桫輾娸� 衃�畛恌婥"
 
-#: gconf/gconfd.c:369
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-"蟴枎畷� 蚕ё賻 %d, 挭眐 蚋眐袹恘. 蟴祫枎弝埡 衃狟楦埧 狟 畈匟侜 � GConf."
-
-#: gconf/gconfd.c:385
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"蟴枎畷� 蚕ё賻 %d, 恓恘眝賻媓狣 趿佮濯曬吇. 蟴祫枎弝埡 衃狟楦埧 狟 畈匟侜 � "
-"GConf."
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down."
+msgstr "蟴枎畷� 蚕ё賻 %d, 瘃衲狣 趿佮濯曬吇."
 
-#: gconf/gconfd.c:402
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "蟴枎畷� 蚕ё賻 %d, 瘃衲狣 趿佮濯曬吇."
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:451
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "睋俷蚎 (覂眑奷 %s), pid %u 俵杻硨袬埧杻 \"%s\""
 
-#: gconf/gconfd.c:455
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr "GConf 蹙� 衃觴蹉 � 訬抸畷恄珅 俵闡籤笵珅 珆攽騰�"
 
-#: gconf/gconfd.c:478
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -897,76 +1030,72 @@ msgstr ""
 "醚 桫賻珃� 妅卍匢旻硭眐袬婥 Object Activation Framework: 俵祫枎弝埡, "
 "珆倷避寑� 衃狟暙恌� 狟 畈匟侜 畛祴謝珆瘃佹� OAF"
 
-#: gconf/gconfd.c:498
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "醚 桫賻珃� 俵枎瘃婥 衶椗劼 恔 狟萲刱 騷� ConfigServer"
 
-#: gconf/gconfd.c:518
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:522
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "馜梀珅 gconfd 欶� 睋疻б衲疶眐袬� � OAF; 趿�狦\n"
 
-#: gconf/gconfd.c:527
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "醚巟覂衲恔� 畈匟佹 倷� 疻б衲畛蟹� gconfd c OAF; 趿�狦\n"
 
-#: gconf/gconfd.c:565
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "�避籤袹恌�"
 
-#: gconf/gconfd.c:589
-msgid "GConf server is not in use, shutting down."
-msgstr "鬌眢籤 GConf 恓 孖俵杻祰籥衭, 趿佮濯曬吇."
-
-#: gconf/gconfd.c:924
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "龢稊畛� 孖佮濯曬奷: %s"
 
-#: gconf/gconfd.c:1012
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1035
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1098
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "醚 桫賻珃� 珆刳椆� 衃�畛恓恄椋 そ帎 衃衲珇恌� \"%s\" 騷� 睋倅蚕: %s"
 
-#: gconf/gconfd.c:1112
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "醚 桫賻珃� 睋倅蚆婥 � そ帎 衃�畛恓恄珌� 衃衲珇恌� \"%s\" fd: %d: %s"
 
-#: gconf/gconfd.c:1121
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "醚 桫賻珃� 睋刳椆� 恘趿� そ帎 衃�畛恓恄珌� 衃衲珇恌� \"%s\": %s"
 
-#: gconf/gconfd.c:1135
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1145
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "醚 桫賻珃� 陓疻芶衲尕� 恘趿� 衃�畛恓恄椋 そ帎 衃衲珇恌� �: %s"
 
-#: gconf/gconfd.c:1154
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -974,61 +1103,68 @@ msgstr ""
 "醚 桫賻珃� 豜衶埡恘訰婥 孖�狦挃� 衃�畛恓恄椋 そ帎 衃衲珇恌�, 冾婘砣� 蹙� "
 "陓疻芶暙� � \"%s\": %s"
 
-#: gconf/gconfd.c:1627
-#, c-format
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "醚 桫賻珃� 珆刳椆� 衃�畛恓恄椋 そ帎 衃衲珇恌�: %s"
+
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "醚 桫賻珃� 珆刳椆� 衃�畛恓恄椋 そ帎 衃衲珇恌�: %s"
+
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr "醚 桫賻珃� 珆刳椆� 衃�畛恓恄椋 そ帎 衃衲珇恌�: %s"
+
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "醚 桫賻珃� 珆刳椆� 衃�畛恓恄椋 そ帎 衃衲珇恌�: %s"
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "醚 桫賻珃� 珆刳椆� 衃�畛恓恄椋 そ帎 衃衲珇恌�: %s"
+
+#: gconf/gconfd.c:1204
 msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
 msgstr ""
 
-#: gconf/gconfd.c:1673
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Error reading saved state file: %s"
-msgstr "曛匟佹 倷� 痽曬圪 衃�畛恓恄珌� そ帎� 衃衲珇恌�: %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
 
-#: gconf/gconfd.c:1726
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "醚 桫賻珃� 珆刳椆� 衃�畛恓恄椋 そ帎 衃衲珇恌� \"%s\": %s"
 
-#: gconf/gconfd.c:1843
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to "
 "re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1848
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously "
 "re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1871 gconf/gconfd.c:2032
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "醚 桫賻珃� 俵枎瘃婥 IOR 騷� 佮吇拏�: %s"
-
-#: gconf/gconfd.c:1886
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "醚 桫賻珃� 珆刳椆� 衃�畛恓恄椋 そ帎 衃衲珇恌�: %s"
-
-#: gconf/gconfd.c:1899
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr ""
-
-#: gconf/gconfd.c:1907
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr ""
-
-#: gconf/gconfd.c:1993
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr ""
-
 #: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "蟥畛芶婞� 衄畛訬�"
@@ -1315,291 +1451,285 @@ msgstr ""
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "蠖�: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "蠖� 衄孖佹: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "蠖� Car: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "蠖� Cdr: %s\n"
 
-#: gconf/gconftool.c:894
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr "�恔畷恌� 俵 梠玶瓾恌�: %s\n"
+msgid "Owner: %s\n"
+msgstr "齂謐攫鷗: %s\n"
 
-#: gconf/gconftool.c:894 gconf/gconftool.c:896 gconf/gconftool.c:897
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:896
-#, c-format
-msgid "Owner: %s\n"
-msgstr "齂謐攫鷗: %s\n"
-
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "遻轂冾� 玿孖蹉吇: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "蟴旽狣 玿孖蹉吇: %s\n"
 
-#: gconf/gconftool.c:907
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "醚 梌埡恘訞曬� 硩醣曬吇 騷� '%s'\n"
 
-#: gconf/gconftool.c:911
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "醚 桫賻珃� 俵枎瘃婥 硩醣曬吇 騷� '%s': %s\n"
 
-#: gconf/gconftool.c:954 gconf/gconftool.c:966
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "醚俵恮婠椋 埩� '%s'\n"
 
-#: gconf/gconftool.c:978
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "鍜笥� 梖邁轂� 賻埧眛轂屺挃� 佮濯�/硩醣曬奷 � 佹畷衲覂 轄м芶拏瓬\n"
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "醚 梌埡恘訞曬� 硩醣曬吇 騷� 佮濯�: '%s'\n"
 
-#: gconf/gconftool.c:1026
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "醚豜硰珋恘 梌埡恘訰婥 schema 佹� 硩醣曬吇\n"
 
-#: gconf/gconftool.c:1036
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1050
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "曛匟佹: %s\n"
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1211
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "曛匟佹 梌埡恘訬� 硩醣曬奷: %s"
 
-#: gconf/gconftool.c:1096 gconf/gconftool.c:1225
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "曛匟佹 蚕恛眐恌睋蟹�: %s"
 
-#: gconf/gconftool.c:1114
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1156
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1196
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1240
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1254
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1265
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "譣鷓桲娸� 梖邁轂� 狦妅 妀� 蟠旼� 佹埡昑ж� 騷� 俵枎畷恌� 巟 恌� "
 "俵騰轂賻珌瓬.\n"
 
-#: gconf/gconftool.c:1322
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "曛匟佹 陓疻瘃蚝曬奷 佹埡昑ж�: %s\n"
 
-#: gconf/gconftool.c:1364
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "貗槼臝蠈欋槴毇: 恓俵饑狦栳圴 妀� 畈匟癹挃� 埩� 騷� 蚧攪� (%s)\n"
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "貗槼臝蠈欋槴毇: 恓俵饑狦栳圴 妀� 畈匟癹挃� 埩� 衄孖佹 騷� 蚧攪� (%s)\n"
 
-#: gconf/gconftool.c:1384 gconf/gconftool.c:1414 gconf/gconftool.c:1443
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "貗槼臝蠈欋槴毇: 恓 桫賻珃� 畛硨觴轂� 孖�狦恘� 硩醣曬吇 '%s' 騷� 蚧攪� (%s)\n"
 
-#: gconf/gconftool.c:1402
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "貗槼臝蠈欋槴毇: 恓俵饑狦栳圴 妀� 畈匟癹挃� 埩� CAR 妀� CDR 騷� 蚧攪� (%s)\n"
 
-#: gconf/gconftool.c:1427
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 "貗槼臝蠈欋槴毇: 戁 恓 迍秸埧 梌埡恘訰婥 硩醣曬吇 俵 梠玶瓾恌� 騷� 蚧攪揊n"
 
-#: gconf/gconftool.c:1456
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 "貗槼臝蠈欋槴毇: 谻梊疻恄旄 畈匟佹 gconftool, 恓巟覂衲挃� GConfValueType\n"
 
-#: gconf/gconftool.c:1504 gconf/gconftool.c:1525 gconf/gconftool.c:1546
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1542
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1563
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1590
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "纕澼搿毇: 俷衲珅 殑攫 <applyto>"
 
-#: gconf/gconftool.c:1593 gconf/gconftool.c:1856
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "纕澼搿毇: 殑攫 <%s> 恓 俵恮� 俵� <schema>\n"
 
-#: gconf/gconftool.c:1603
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1636
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1642
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "纕澼搿毇: 醚倷避妀媓椋 殑攫 <%s> � 殑旼 <locale>\n"
 
-#: gconf/gconftool.c:1752
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1760
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "灃埡恘訞曬� 蚧攪� \"%s\" 騷� locale \"%s\"\n"
 
-#: gconf/gconftool.c:1782
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1790
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "襓孖狣馨恓恔 蚧攪� \"%s\" � 佮濯� \"%s\"\n"
 
-#: gconf/gconftool.c:1869
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "� 袬� 鰍枒恔 蹙婥 �珆� 蹙 狦恔 睋倅衯 <locale> � <schema>\n"
 
-#: gconf/gconftool.c:1898
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "醚 桫賻珃� 珆刳椆� `%s': %s\n"
 
-#: gconf/gconftool.c:1927
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "餀劼芶拏 `%s' 俷衲?\n"
 
-#: gconf/gconftool.c:1939
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1952
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "餀劼芶拏 `%s' 恓 奼齬� 覂疿恓ж 梑瓬恮 殑攽 <gconfschemafile>\n"
 
-#: gconf/gconftool.c:1966
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "貗槼臝蠈欋槴毇: 殑攫 <%s> 恌秸 <gconfschemafile> 恓 蹙� 俵恮偅n"
 
-#: gconf/gconftool.c:1977 gconf/gconftool.c:2009
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "曛匟佹 蚕恛眐恌睋蟹� 冾恇囟梑謄奻恄棼 鐘恄棼: %s"
 
-#: gconf/gconftool.c:1993
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "醚狟�狦奼� 梖邁轂� 恓蚎玶媌� そ帎瓬 蚧攪� 騷� 梌埡恘訬尐n"
 
-#: gconf/gconftool.c:2030
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1608,16 +1738,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2050
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2176
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "醚狟�狦奼� 梖邁轂� 恓冾婘砣� 佮濯� 騷� 倷籤椕蹉奷\n"
 
-#: gconf/gconftool.c:2182
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1626,11 +1756,11 @@ msgstr ""
 "蟴倧堍� 倷籤袬婥 袬袹 倷妀珋曬吇 梌埡恘訬珅 倢珂圮 硩醣曬圴 騷� 佮濯�:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2200
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "醚狟�狦奼� 梖邁轂� 恓冾婘砣� 佹埡昑б 騷� 倷籤椕蹉奷\n"
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1641,17 +1771,63 @@ msgstr ""
 "佹埡昑Э:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "曛匟佹 GConf: %s\n"
-
-#: wrappers/gtk/gconf-client.c:795
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "襓鼴桸疻秺曬吇 GConf: 曛匟佹 陓疻瘃蚝曬奷 釓� � \"%s\": %s"
 
-#: wrappers/gtk/gconf-client.c:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "攃厊賻珃� \"%s\" 俵枎畷恘 \"%s\" 騷� 佮濯� %s"
+
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "戁й殑佹 蚥眢籤恘ж 迍齣曶 BerkeleyDB (BDB)."
+
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "橁卍匢旻睋蟹� 蚥眢籤恘ж 迍齣曶 BDB"
+
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "醚 桫賻珃� 恔彸� 冾眛纔珅 佹埡昑� %s 俵 謐疻袀 '%s'"
+
+#~ msgid ""
+#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ msgstr ""
+#~ "醚豜硰珋恘 倷癹尕轂� 巟 妀� 睋倅蚆婥 � 冾眛纔珅 佹埡昑� %s 俵 謐疻袀 '%s'"
+
+#~ msgid "Failed to set mode on `%s': %s"
+#~ msgstr "醚 桫賻珃� 梌埡恘訰婥 疻窔� 恔 \"%s\": %s"
+
+#~ msgid "No database available to save your configuration"
+#~ msgstr "煻睋 鐘恄棼 騷� 衃�畛恓恌� 袬袹� 冾恇囟梑謄圪 恓 鰍衲桸恔"
+
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "懩孖蹉吇 倷狟旼阽 OAF: \"%s\""
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "醚 桫賻珃� 衃�畛恌婥 硩醣曬吇 俵 佮濯� \"%s\""
+
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgstr ""
+#~ "蟴枎畷� 蚕ё賻 %d, 挭眐 蚋眐袹恘. 蟴祫枎弝埡 衃狟楦埧 狟 畈匟侜 � GConf."
+
+#~ msgid ""
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ msgstr ""
+#~ "蟴枎畷� 蚕ё賻 %d, 恓恘眝賻媓狣 趿佮濯曬吇. 蟴祫枎弝埡 衃狟楦埧 狟 畈匟侜 � "
+#~ "GConf."
+
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "鬌眢籤 GConf 恓 孖俵杻祰籥衭, 趿佮濯曬吇."
+
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "曛匟佹 倷� 痽曬圪 衃�畛恓恄珌� そ帎� 衃衲珇恌�: %s"
+
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "醚 桫賻珃� 俵枎瘃婥 IOR 騷� 佮吇拏�: %s"
+
+#~ msgid "Default Value: %s\n"
+#~ msgstr "�恔畷恌� 俵 梠玶瓾恌�: %s\n"
+
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "曛匟佹 GConf: %s\n"
diff --git a/po/sk.po b/po/sk.po
index 8f53d43e..95f540e5 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 1.1\n"
-"POT-Creation-Date: 2001-07-17 15:12+0200\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2001-07-17 15:13CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -14,36 +14,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.3\n"
 
-#: backends/bdb-backend.c:215
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "Uvo蛞ujem modul pre BerkeleyDB (BDB)."
-
-#: backends/bdb-backend.c:238
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "Otvoren� zdroj BerkeleyDB z %s"
-
-#: backends/bdb-backend.c:578
-msgid "Initializing BDB backend module"
-msgstr "Inicializujem BDB modul"
-
-#: backends/dir-utils.c:108
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "Nie je mo駐� n奫s� kore犦v� prie鋱nok pre %s na adrese `%s'"
-
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "Nie je mo駐� vytvori� prie鋱nok '%s': %s"
-
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr ""
-"Nie je mo駐� pre鴈ta� alebo zap疄a� do kore犦v嶭o prie鋱nku pre %s na adrese "
-"'%s'"
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Uvo蛞ujem modul pre XML."
@@ -53,12 +23,17 @@ msgstr "Uvo蛞ujem modul pre XML."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nie je mo駐� n奫s� kore犦v� prie鋱nok pre XML na adrese `%s'"
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "Nie je mo駐� vytvori� prie鋱nok '%s': %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
-"Nie je mo駐� pre鴈ta� alebo zapisova� do kore犦v嶭o prie鋱nku XML na adrese `"
-"%s'"
+"Nie je mo駐� pre鴈ta� alebo zapisova� do kore犦v嶭o prie鋱nku XML na adrese "
+"`%s'"
 
 #: backends/xml-backend.c:396
 #, c-format
@@ -69,7 +44,7 @@ msgstr "Pr嫛a k prie鋱nku/s�boru pre zdroj XML v koreni %s s�: %o/%o"
 msgid "Initializing XML backend module"
 msgstr "Inicializujem XML modul"
 
-#: backends/xml-backend.c:748
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Zlyhalo uvo登enie z嫥ku na prie鋱nku XML `%s': %s"
@@ -78,7 +53,7 @@ msgstr "Zlyhalo uvo登enie z嫥ku na prie鋱nku XML `%s': %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "Nesynchronizovan� mazania z prie鋱nku pri vyp璯an� modulu XML"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -87,11 +62,11 @@ msgstr ""
 "Nepodarilo s odstr嫕i� prie鋱nok `%s' z ke鈹 modulu XML, preto頡 nebol "
 "�spe雉e zap疄an� na disk"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
-"%u items remain in the cache after cleaning already-synced items older than %"
-"u seconds"
+"%u items remain in the cache after cleaning already-synced items older than "
+"%u seconds"
 msgstr ""
 "%u polo養ek zostalo v ke隘 po vy鋱sten� u� synchronizovan�ch polo養ek "
 "star寤ch ako %u sek�nd"
@@ -106,79 +81,74 @@ msgstr "Ned� sa zisti� stav `%s': %s"
 msgid "XML filename `%s' is a directory"
 msgstr "Meno s�boru XML `%s' je prie鋱nok"
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Nepodarilo sa odstr嫕i�  `%s': %s"
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Nepodarilo sa zap疄a� do s�boru `%s': %s"
 
-#: backends/xml-dir.c:359
-#, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr "Nepodarilo sa nastavi� m鏚 na `%s': %s"
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Nepodarilo sa premenova� s�bor `%s' na `%s': %s"
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Nepodarilo sa obnovi� `%s' zo s�boru `%s': %s"
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Nepodarilo sa odstr嫕i� star� s�bor `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Nepodarilo sa zisti� stav `%s': %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Duplikovan� polo餒a `%s' v `%s', ignorujem"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Polo餒a bez mena v s�bore XML `%s', ignorujem"
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Uzol na najvy凳ej �rovni v s�bore XML `%s' nie je <entry>, ignorujem"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Nepodarilo sa vytvori� s�bor `%s': %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2443
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Nepodarilo sa zavrie� s�bor `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:150
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorujem uzol XML s menom `%s': %s"
 
-#: backends/xml-entry.c:201
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:328
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignorujem meno sch幦y `%s', nie je platn�: %s"
@@ -186,81 +156,85 @@ msgstr "Ignorujem meno sch幦y `%s', nie je platn�: %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:374
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "Ignorujem uzol XML `%s', okrem mo駐嶭o mena sch幦y: %s"
 
-#: backends/xml-entry.c:725
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Nepodarilo sa pre鴈ta� 靖andardn� hodnotu pre sch幦u: %s"
 
-#: backends/xml-entry.c:939
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "V uzle  <%s> ch�ba atrib�t \"type\""
 
-#: backends/xml-entry.c:953
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Uzol m� nezn嫥y atrib�t \"type\" `%s', ignorujem"
 
-#: backends/xml-entry.c:968
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "V uzle ch�ba atrib�t \"value\""
 
-#: backends/xml-entry.c:1016 backends/xml-entry.c:1092
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Nerozpoznan� uzol XML <%s> v XML zozname"
 
-#: backends/xml-entry.c:1050
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Neplatn� typ (zoznam, p嫫 alebo nezn嫥y) v uzle zoznamu"
 
-#: backends/xml-entry.c:1073
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Neplatn� uzol XML: %s"
 
-#: backends/xml-entry.c:1081
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Zoznam obsahuje nespr嫛ne typovan� uzol (%s, m� by� %s)"
 
-#: backends/xml-entry.c:1133
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorujem neplatn� car z p嫫u XML: %s"
 
-#: backends/xml-entry.c:1142 backends/xml-entry.c:1165
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "spracovanie s�boru XML: zoznamy a p嫫y mo駐o nie s� umiestnen� v p嫫e"
 
-#: backends/xml-entry.c:1155
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorujem neplatn� cdr z p嫫u XML: %s"
 
-#: backends/xml-entry.c:1174
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Nerozpoznan� uzol XML <%s> v XML uzle p嫫u"
 
-#: backends/xml-entry.c:1192
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Nen奫den� car a cdr v p嫫e uzla XML"
 
-#: backends/xml-entry.c:1198
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Ch�baj�ce cdr z p嫫u hodn矌 v s�bore XML"
 
-#: backends/xml-entry.c:1205
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "Ch�baj�ce car z p嫫u hodn矌 v s�bore XML"
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Ch�baj�ce obidve hodnoty car aj cdr z p嫫u v s�bore XML"
 
@@ -293,28 +267,28 @@ msgstr "Nie je mo駐� n奫s� modul pre `%s'"
 msgid "Failed to shut down backend"
 msgstr "Nepodarilo sa ukon鋱� modul"
 
-#: gconf/gconf-database.c:231
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Zachyten� neplatn� hodnota v po養adavke"
 
-#: gconf/gconf-database.c:239
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr "Nezmyseln� CORBA hodnota vr嫢en� pri po養adavke na k詠� `%s'"
 
-#: gconf/gconf-database.c:517
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "Prijat� po養adavka pre zahodenie v鈹tk�ch d嫢 v ke隘"
 
-#: gconf/gconf-database.c:534
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Prijat� po養adavka na synchroniz塶iu"
 
-#: gconf/gconf-database.c:601
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Kritick� chyba: nepodarilo sa z疄ka� referenciu na ConfigDatabase"
 
-#: gconf/gconf-database.c:760
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Nepodarilo sa synchronizova� jeden alebo viac zdrojov: %s"
@@ -323,7 +297,7 @@ msgstr "Nepodarilo sa synchronizova� jeden alebo viac zdrojov: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -334,12 +308,12 @@ msgstr ""
 "Tohto listenera nebude mo駐� obnovi� pri re靖arte gconfd. V�sledkom bude "
 "nespo琦hliv� upozor犦vanie na zmeny konfigur塶ie."
 
-#: gconf/gconf-database.c:873
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Listener ID %lu neexistuje"
 
-#: gconf/gconf-database.c:882
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -348,47 +322,47 @@ msgstr ""
 "Nepodarilo sa zaznamena� odstr嫕enie listenera do s�boru so z嫙namom (asi "
 "ne隕odn�, ale m藶e sa objavi� divn� opakovanie upozornen�): %s"
 
-#: gconf/gconf-database.c:997 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Chyba pri z疄kavan� hodnoty pre `%s': %s"
 
-#: gconf/gconf-database.c:1044
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Chyba pri nastavovan� hodnoty pre `%s': %s"
 
-#: gconf/gconf-database.c:1087
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Chyba pri mazan� hodnoty pre `%s': %s"
 
-#: gconf/gconf-database.c:1111
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Chyba pri z疄kavan� 靖andardnej hodnoty pre `%s': %s"
 
-#: gconf/gconf-database.c:1151
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Chyba pri kontrole existencie `%s': %s"
 
-#: gconf/gconf-database.c:1175
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Chyba pri odstra犦van� prie鋱nku `%s': %s"
 
-#: gconf/gconf-database.c:1202
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Nepodarilo sa z疄ka� v鈹tky polo餒y v `%s': %s"
 
-#: gconf/gconf-database.c:1228
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Chyba pri v�pise prie鋱nkov v `%s': %s"
 
-#: gconf/gconf-database.c:1249
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Chyba pri nastavovan� sch幦y pre `%s': %s"
@@ -453,29 +427,208 @@ msgstr "Oper塶ia nie je povolen� bez konfigura鋝嶭o serveru"
 msgid "Failed to get a lock"
 msgstr "Nepodarilo sa z疄ka� z嫥ok"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "Pre ulo頡nie va鈹j konfigur塶ie nie je k dispoz獳ii datab嫙a"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Nepodarilo sa zavrie� s�bor `%s': %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Chyba pri odstra犦van� prie鋱nku `%s': %s"
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "V k詠鋱 `%s' ch�ba '/'"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Nie je mo駐� interpretova� CORBA hodnotu pre prvok zoznamu"
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Nespr嫛ny typ pre element zoznamu v %s"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "Prijat� zoznam od gconfd s neplatn�m typom zoznamu"
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:445
 msgid "Failed to convert object to IOR"
 msgstr "Nepodarilo sa previes� objekt na IOR"
 
@@ -484,96 +637,92 @@ msgstr "Nepodarilo sa previes� objekt na IOR"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Nie je mo駐� otvori� s�bor `%s': %s\n"
 
-#: gconf/gconf-internals.c:858
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Prid嫛am zdroj `%s'\n"
 
-#: gconf/gconf-internals.c:870
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Chyba pri 鴈tan� s�boru `%s': %s\n"
 
-#: gconf/gconf-internals.c:1293
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "O醀k嫛an� zoznam, prijat� %s"
 
-#: gconf/gconf-internals.c:1303
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "O醀k嫛an� zoznam %s, prijat� zoznam %s"
 
-#: gconf/gconf-internals.c:1442
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "O醀k嫛an� p嫫, prijat� %s"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
-msgstr "O醀k嫛an� (%s,%s) p嫫, prijat� p嫫 s jednou alebo obomi ch�baj�cimi hodnotami"
+msgstr ""
+"O醀k嫛an� (%s,%s) p嫫, prijat� p嫫 s jednou alebo obomi ch�baj�cimi hodnotami"
 
-#: gconf/gconf-internals.c:1472
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "O醀k嫛an� p嫫 typu (%s,%s), na鴈tan� typ (%s,%s)"
 
-#: gconf/gconf-internals.c:1588
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Text v �vodzovk塶h neza鴈na �vodzovkami"
 
-#: gconf/gconf-internals.c:1650
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Text v �vodzovk塶h nekon鴈 �vodzovkami"
 
-#: gconf/gconf-internals.c:2130 gconf/gconf.c:3002
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Chyba CORBA: %s"
 
-#: gconf/gconf-internals.c:2146
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "Popis probl幦u OAF: '%s'"
-
-#: gconf/gconf-internals.c:2152
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "Pokus o odstr嫕enie neexistuj�ceho prie鋱nku objektov OAF"
 
-#: gconf/gconf-internals.c:2157
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "Pokus o pridanie u� pridan嶭o prie鋱nku objektov OAF"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Chyba spracovania OAF: %s"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Nezn嫥a chyba OAF"
 
-#: gconf/gconf-internals.c:2252
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Nie je IOR s�bor v `%s'"
 
-#: gconf/gconf-internals.c:2283
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "Gconfd preber� z嫥ok `%s' od in嶭o procesu"
 
-#: gconf/gconf-internals.c:2294
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "In� program dr橙 z嫥ok `%s'"
 
-#: gconf/gconf-internals.c:2314
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "Nie je mo駐� spoji� sa s ORBom pre ping na existuj�ci gconfd"
 
-#: gconf/gconf-internals.c:2322
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -582,42 +731,43 @@ msgstr ""
 "Odstra璷jem zabudnut� z嫥ok `%s', preto頡 IOR nie je mo駐� previes� na "
 "objektov� referenciu, IOR `%s'"
 
-#: gconf/gconf-internals.c:2334
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr "Odstra璷jem zabudnut� z嫥ok `%s' kv犨i chyba pri pingu na server: %s"
 
-#: gconf/gconf-internals.c:2346
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "Konfigura鋝� d幦on GConf (gconfd) dr橙 z嫥ok `%s'"
 
-#: gconf/gconf-internals.c:2360
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "Nie je mo駐� vytvori� prie鋱nok `%s': %s"
 
-#: gconf/gconf-internals.c:2395
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Nie je mo駐� vytvori� z嫥ok `%s': %s"
 
-#: gconf/gconf-internals.c:2431
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Nie je mo駐� zapisova� do s�boru `%s': %s"
 
-#: gconf/gconf-internals.c:2474
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
-msgstr "Nie je mo駐� otvori� s�bor so z嫥kom `%s', predpoklad嫥, 頡 n嫥 nepatr�: %s"
+msgstr ""
+"Nie je mo駐� otvori� s�bor so z嫥kom `%s', predpoklad嫥, 頡 n嫥 nepatr�: %s"
 
-#: gconf/gconf-internals.c:2491
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Po隕oden� s�bor so z嫥kom `%s', aj tak ho odstra璷jem"
 
-#: gconf/gconf-internals.c:2501
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -626,26 +776,26 @@ msgstr ""
 "Nie je mo駐� vytvori� s�bor so z嫥kom `%s' (vytvoril pid %u, na鈹 pid %u; "
 "asi n嫥 niekto zobral n廜 z嫥ok)"
 
-#: gconf/gconf-internals.c:2518
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Nepodarilo sa uvo登i� prie鋱nok pre z嫥ky `%s': %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Nepodarilo sa na鴈ta� zdroj `%s': %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Sch幦e `%s' uveden� pre `%s' udr養ava hodnotu, ktor� nie je sch幦a"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Meno '/' m藶e by� iba pre prie鋱nok, nie pre k詠�"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -654,27 +804,22 @@ msgstr ""
 "Hodnota pre `%s' nastaven� v zdroji ur鋀nom iba pre 鴈tanie pred va雊u "
 "konfigura鋝ou cestou."
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "Nepodarilo sa ulo養� hodnotu k詠醀 '%s'"
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Chyba pri h琦dan� meta-inform塶i�: %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Chyba pri z疄kavan� meta-inform塶i�: %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
-"K詠� `%s', ktor� je uveden� ako sch幦a pre k詠� `%s', je v skuto鋝osti typu `"
-"%s'"
+"K詠� `%s', ktor� je uveden� ako sch幦a pre k詠� `%s', je v skuto鋝osti typu "
+"`%s'"
 
 #: gconf/gconf-value.c:82
 #, c-format
@@ -741,21 +886,21 @@ msgstr "Nerozpoznan� `%s' (extra ')' n奫den� v r嫥ci p嫫u)"
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Server nemohol zisti� adresu `%s'"
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "Nie je mo駐� prid嫛a� upozornenia k lok嫮nemu konfigura鋝幦u zdroju"
 
-#: gconf/gconf.c:1781
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Pridanie klienta do zoznamu serveru zlyhalo, chyba CORBA: %s"
 
-#: gconf/gconf.c:1797
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -765,66 +910,66 @@ msgstr ""
 "volan� oaf_activate_from_id() a nenastavil v�nimku s vysvetlen璥 probl幦u. "
 "Pros璥, vypl瓅e spr嫛u o chybe pre OAF."
 
-#: gconf/gconf.c:2108
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Nepodarilo sa inicializova� GConf, kon鴈m\n"
 
-#: gconf/gconf.c:2145
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Mus� za鴈na� znamienkom lomeno (/)"
 
-#: gconf/gconf.c:2167
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Dve znamienka lomeno (/) nesm� by� hne� za sebou"
 
-#: gconf/gconf.c:2169
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Bodka (.) nesmie by� hne� za znamienkom lomeno (/)"
 
-#: gconf/gconf.c:2190
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' nie je platn� znak v men塶h k詠鋌v/prie鋱nkov"
 
-#: gconf/gconf.c:2204
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "K詠�/prie鋱nok nesmie kon鋱� znamienkom lomeno (/)"
 
-#: gconf/gconf.c:2457
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Zlyhalo vypnutie konfigura鋝嶭o serveru: %s"
 
-#: gconf/gconf.c:2518
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "O醀k嫛an� float, prijat� %s"
 
-#: gconf/gconf.c:2553
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "O醀k嫛an� int, prijat� %s"
 
-#: gconf/gconf.c:2588
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "O醀k嫛an� string, prijat� %s"
 
-#: gconf/gconf.c:2625
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "O醀k嫛an� bool, prijat� %s"
 
-#: gconf/gconf.c:2658
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "O醀k嫛an� sch幦a, prijat� %s"
 
-#: gconf/gconfd.c:246
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Prijat� po養adavka na ukon鋀nie"
 
-#: gconf/gconfd.c:278
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -832,17 +977,15 @@ msgstr ""
 "gconfd bol prelo頡n� s ladiacimi inform塶iami, pok�鈴m sa na鴈ta� gconf.path "
 "zo zdrojov嶭o prie鋱nku"
 
-#: gconf/gconfd.c:292
+#: gconf/gconfd.c:235
 #, c-format
-msgid "No configuration files found, trying to use the default config source `%s'"
+msgid ""
+"No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 "Nen奫den� 養adne konfigura鋝� s�bory, pok�sim sa pou養� 靖andardn� "
 "konfigura鋝� zdroj `%s'"
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:300
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -850,16 +993,12 @@ msgstr ""
 "Nen奫den� 養adne konfigura鋝� s�bory v zdrojovej ceste, konfigur塶ia nebude "
 "ulo頡n� ani upraven�"
 
-#: gconf/gconfd.c:300
-msgid "/path"
-msgstr "/cesta"
-
-#: gconf/gconfd.c:313
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Chyba pri nahr嫛an� niektor�ch konfigura鋝�ch zdrojov: %s"
 
-#: gconf/gconfd.c:325
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -867,7 +1006,7 @@ msgstr ""
 "Neboli �spe雉e n奫den� 養adne konfigura鋝� zdroje, nebude mo駐� uklada� ani "
 "na鴈ta� konfigura鋝� d嫢a"
 
-#: gconf/gconfd.c:342
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -875,41 +1014,39 @@ msgstr ""
 "Neboli �spe雉e n奫den� 養adne konfigura鋝� zdroje, do ktor�ch je mo駐� "
 "z嫚is, niektor� zmeny konfigur塶ie asi nebude mo駐� ulo養�"
 
-#: gconf/gconfd.c:368
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr "Zachyten� sign嫮 %d, zapisujem s�bor core. Pros璥, ozn嫥te chybu GConfu."
-
-#: gconf/gconfd.c:384
-#, c-format
-msgid "Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"Zachyten� sign嫮 %d, kon鴈m abnorm嫮ne. Pros璥, vypl瓅e spr嫛u o chybe v "
-"GConf."
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down."
+msgstr "Zachyten� sign嫮 %d, vyp璯am"
 
-#: gconf/gconfd.c:401
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Zachyten� sign嫮 %d, vyp璯am"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:502
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "starting (version %s), pid %u user '%s'"
 
-#: gconf/gconfd.c:529
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr ""
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
-msgstr "Nepodarilo sa inicializova� OAF: pros璥, po雍ite spr嫛u o chybe spr嫛com OAFu"
+msgstr ""
+"Nepodarilo sa inicializova� OAF: pros璥, po雍ite spr嫛u o chybe spr嫛com OAFu"
 
-#: gconf/gconfd.c:549
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Nepodarilo sa z疄ka� referenciu na objekt pre ConfigServer"
 
-#: gconf/gconfd.c:569
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -917,28 +1054,24 @@ msgstr ""
 "OAF nevie o na雊m IID; to vyzer� ako nespr嫛na in靖al塶ia; nem藶e sa "
 "zaregistrova�; kon鴈m\n"
 
-#: gconf/gconfd.c:573
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "U OAF u� je zaregistrovan� in� gconfd, kon鴈m\n"
 
-#: gconf/gconfd.c:578
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Nezn嫥a chyba pri registr塶ii gconfd u OAF; kon鴈m\n"
 
-#: gconf/gconfd.c:616
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Kon鴈m"
 
-#: gconf/gconfd.c:641
-msgid "GConf server is not in use, shutting down."
-msgstr "GConf server sa nepou橙va, kon鴈m."
-
-#: gconf/gconfd.c:1000
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Vraciam v�nimku: %s"
 
-#: gconf/gconfd.c:1100
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -947,154 +1080,165 @@ msgstr ""
 "Nepodarilo sa otvori� s�bor so z嫙namom pre gconfd; nebude mo駐� obnovi� "
 "listenerom po vypnut� gconfd (%s)"
 
-#: gconf/gconfd.c:1135
+#: gconf/gconfd.c:908
 #, c-format
-msgid "Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 "Nepodarilo sa zavrie� s�bor so z嫙namom pre gconfd, d嫢a mo駐o nie s� "
 "spr嫛ne ulo頡n� (%s)"
 
-#: gconf/gconfd.c:1204
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Nepodarilo sa otvori� s�bor s ulo頡n�m stavom '%s' pre z嫚is: %s"
 
-#: gconf/gconfd.c:1218
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Nie je mo駐� sa zapisova� do s�boru s ulo頡n�m stavom '%s' fd: %d: %s"
 
-#: gconf/gconfd.c:1227
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Nepodarilo sa zavrie� s�bor s ulo頡n�m stavom '%s': %s"
 
-#: gconf/gconfd.c:1241
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Nie je mo駐� odsun�� nabok star� s�bor s ulo頡n�m stavom '%s': %s"
 
-#: gconf/gconfd.c:1251
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Nepodarilo sa presun�� nov� s�bor s ulo頡n�m stavom na miesto: %s"
 
-#: gconf/gconfd.c:1260
+#: gconf/gconfd.c:1022
 #, c-format
-msgid "Failed to restore original saved state file that had been moved to '%s': %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 "Nepodarilo sa obnovi� p矏odn� s�bor s ulo頡n�m stavom, ktor� bol presunut� "
 "do '%s': %s"
 
-#: gconf/gconfd.c:1735
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Nepodarilo sa otvori� s�bor s ulo頡n�m stavom: %s"
+
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Nepodarilo sa otvori� s�bor s ulo頡n�m stavom: %s"
+
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr "Nepodarilo sa zap疄a� d嫢a od klienta do s�boru s ulo頡n�m stavom: %s"
+
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "Nepodarilo sa zap疄a� d嫢a od klienta do s�boru s ulo頡n�m stavom: %s"
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Nepodarilo sa otvori� s�bor s ulo頡n�m stavom: %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Unable to restore a listener on address '%s', couldn't resolve the database"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 "Nepodarilo sa obnovi� listenera na adrese '%s', nie je mo駐� zisti� adresu "
 "datab嫙e"
 
-#: gconf/gconfd.c:1781
-#, c-format
-msgid "Error reading saved state file: %s"
-msgstr "Chyba pri 鴈tan� s�boru s ulo頡n�m stavom: %s"
-
-#: gconf/gconfd.c:1834
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Nepodarilo sa otvori� s�bor s ulo頡n�m stavom '%s': %s"
 
-#: gconf/gconfd.c:1951
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to re-"
-"add the listener if gconfd exits or shuts down (%s)"
+"Failed to log addition of listener to gconfd logfile; won't be able to "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 "Nepodarilo sa zaznamena� pridanie listeneru do s�boru so z嫙namom pre "
 "gconfd, nebude mo駐� znovu-prida� listenera aj bude gconfd ukon鋀n� (%s)"
 
-#: gconf/gconfd.c:1956
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously re-"
-"add the listener if gconfd exits or shuts down (%s)"
+"Failed to log removal of listener to gconfd logfile; might erroneously "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 "Nepodarilo sa zaznamena� odstr嫕enie listeneru do s�boru so z嫙namom pre "
 "gconfd, je mo駐�, 頡 bude listener nespr嫛ne znovu-pridan� pri ukon鋀n� "
 "gconfd (%s)"
 
-#: gconf/gconfd.c:1979 gconf/gconfd.c:2144
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "Nepodarilo sa z疄ka� IOR klienta: %s"
-
-#: gconf/gconfd.c:1994
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "Nepodarilo sa otvori� s�bor s ulo頡n�m stavom: %s"
-
-#: gconf/gconfd.c:2007
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr "Nepodarilo sa zap疄a� d嫢a od klienta do s�boru s ulo頡n�m stavom: %s"
-
-#: gconf/gconfd.c:2015
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr "Nepodarilo sa prida� d嫢a od klienta do s�boru s ulo頡n�m stavom: %s"
-
-#: gconf/gconfd.c:2105
-msgid "Some client removed itself from the GConf server when it hadn't been added."
-msgstr "Niektor� klient sa odstr嫕il z GConf serveru ke� tam nebol pridan�."
-
-#: gconf/gconftool.c:64
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Mo駐osti pomocn璭a"
 
-#: gconf/gconftool.c:73
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Nastavi� k詠� na hodnotu a synchronizova�. Pou養� s --type."
 
-#: gconf/gconftool.c:82
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Vyp疄a� hodnotu k詠醀 na 靖andardn� v�stup."
 
-#: gconf/gconftool.c:91
+#: gconf/gconftool.c:89
 msgid ""
-"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
-"type."
+"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
+"--type."
 msgstr ""
-"Nastavi� sch幦u a synchronizova�. Pou養� s --short-desc, --long-desc, --"
-"owner, a --type."
+"Nastavi� sch幦u a synchronizova�. Pou養� s --short-desc, --long-desc, "
+"--owner, a --type."
 
-#: gconf/gconftool.c:101
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "Vymaza� k詠鋀 z pr璭azov嶭o riadku"
 
-#: gconf/gconftool.c:110
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Vyp疄a� v鈹tky p嫫y k詠�/hodnota v prie鋱nku."
 
-#: gconf/gconftool.c:119
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Vyp疄a� v鈹tky podprie鋱nky v prie鋱nku."
 
-#: gconf/gconftool.c:128
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "Vyp疄a� v鈹tky podprie鋱nky a polo餒y v prie鋱nku, rekurz癉ne."
 
-#: gconf/gconftool.c:137
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Vr嫢i� 0, ak prie鋱nok existuje, 2 ak neexistuje."
 
-#: gconf/gconftool.c:146
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Ukon鋱� gconfd. POU晒VAJTE IBA V PR炔ADE, 圃 M糞E ROZUMN� D偍OD."
 
-#: gconf/gconftool.c:155
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Vr嫢i� 0, ak gconfd be橙, inak vr嫢i� 2."
 
-#: gconf/gconftool.c:164
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1102,7 +1246,7 @@ msgstr ""
 "Spusti� konfigura鋝� server (gconfd). (Norm嫮ne sp�劂an�, a� ke� je "
 "potrebn�.)"
 
-#: gconf/gconftool.c:173
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1110,11 +1254,11 @@ msgstr ""
 "Typ nastavovanej hodnoty alebo typ hodnoty popisovanej sch幦ou. Jednozna鋝� "
 "skratky s� akceptovan�."
 
-#: gconf/gconftool.c:174
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:182
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1122,11 +1266,11 @@ msgstr ""
 "Typ nastavovan嶭o zoznamu hodn矌 alebo typ hodnoty popisovanej sch幦ou. "
 "Jednozna鋝� skratky s� akceptovan�."
 
-#: gconf/gconftool.c:183 gconf/gconftool.c:192 gconf/gconftool.c:201
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:191
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1134,7 +1278,7 @@ msgstr ""
 "Typ nastavovan嶭o car p嫫u hodn矌 alebo typ hodnoty popisovanej sch幦ou. "
 "Jednozna鋝� skratky s� akceptovan�."
 
-#: gconf/gconftool.c:200
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1142,43 +1286,43 @@ msgstr ""
 "Typ nastavovan嶭o cdr p嫫u hodn矌 alebo typ hodnoty popisovanej sch幦ou. "
 "Jednozna鋝� skratky s� akceptovan�."
 
-#: gconf/gconftool.c:209
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Kr嫢ky, polriadkov� popis pre ulo頡nie do sch幦y."
 
-#: gconf/gconftool.c:210 gconf/gconftool.c:219
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "POPIS"
 
-#: gconf/gconftool.c:218
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "Nieko痘oriadkov� popis pre ulo頡nie do sch幦y."
 
-#: gconf/gconftool.c:227
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "Vlastn璭 sch幦y"
 
-#: gconf/gconftool.c:228
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "VLASTN沰"
 
-#: gconf/gconftool.c:236
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "In靖alovan� s�bor sch幦y"
 
-#: gconf/gconftool.c:237
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "MENOS湡ORU"
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "Konfigura鋝� zdroj pou養t� namiesto 靖andardnej cesty"
 
-#: gconf/gconftool.c:246
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "ZDROJ"
 
-#: gconf/gconftool.c:254
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1186,7 +1330,7 @@ msgstr ""
 "Pristupova� do konfigura鋝ej datab嫙e priamo, ob疄� server. Vy靠duje, aby "
 "gconfd nebe靠l."
 
-#: gconf/gconftool.c:263
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1196,7 +1340,7 @@ msgstr ""
 "ne靖andardn� zdroj d嫢 by mala by� nastaven� premenn� prostredia "
 "GCONF_CONFIG_SOURCE, alebo by mala by� pr嫙dna pre 靖andardn� zdroj."
 
-#: gconf/gconftool.c:272
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1204,7 +1348,7 @@ msgstr ""
 "Testova� aplik塶iu nastavovan璥 a vymaz嫛an璥 obsahu skupiny hodn矌 pre "
 "r礣ne typy k詠鋌v z pr璭azov嶭o riadku."
 
-#: gconf/gconftool.c:281
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1212,7 +1356,7 @@ msgstr ""
 "Testova� aplik塶iu nastavovan璥 a vymaz嫛an璥 obsahu skupiny hodn矌 v "
 "prie鋱nku z pr璭azov嶭o riadku."
 
-#: gconf/gconftool.c:331
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1221,89 +1365,90 @@ msgstr ""
 "Chyba vo vo琨e %s: %s.\n"
 "Spus裨e '%s --help' pre �pln� zoznam mo駐ost� pr璭azov嶭o riadku.\n"
 
-#: gconf/gconftool.c:343
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Nie je mo駐� naraz z疄ka� hodnotu a nastavi�/vymaza� hodnotu\n"
 
-#: gconf/gconftool.c:350
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Nie je mo駐� naraz nastavi� hodnotu a z疄ka� hodnotu/vymaza� hodnotu\n"
 
-#: gconf/gconftool.c:358
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "Neviem pou養� --all-pairs spolu s --get alebo --set\n"
 
-#: gconf/gconftool.c:366
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Neviem pou養� --all-dirs spolu s --get alebo --set\n"
 
-#: gconf/gconftool.c:376
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
 msgstr ""
-"--recursive-list nesmie by� pou養t� spolu s --get, --set, --unset, --all-"
-"pairs, alebo --all-dirs\n"
+"--recursive-list nesmie by� pou養t� spolu s --get, --set, --unset, "
+"--all-pairs, alebo --all-dirs\n"
 
-#: gconf/gconftool.c:386
+#: gconf/gconftool.c:381
 msgid ""
-"--set_schema should not be used with --get, --set, --unset, --all-pairs, --"
-"all-dirs\n"
+"--set_schema should not be used with --get, --set, --unset, --all-pairs, "
+"--all-dirs\n"
 msgstr ""
 "--set_schema nesmie by� pou養t� spolu s --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
 
-#: gconf/gconftool.c:392
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Typ hodnoty je d犨e養t� iba pri nastavovan� hodnoty\n"
 
-#: gconf/gconftool.c:398
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "Pri nastavovan� hodnoty mus癃e zada� typ\n"
 
-#: gconf/gconftool.c:407
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "Vo琨a ping mus� by� pou養t� iba samostatne.\n"
 
-#: gconf/gconftool.c:416
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists mus� by� pou養t� iba samostatne.\n"
 
-#: gconf/gconftool.c:425
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file mus� by� pou養t� iba samostatne.\n"
 
-#: gconf/gconftool.c:435
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule mus� by� pou養t� iba samostatne.\n"
 
-#: gconf/gconftool.c:445
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key mus� by� pou養t� iba samostatne.\n"
 
-#: gconf/gconftool.c:455
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory mus� by� pou養t� iba samostatne.\n"
 
-#: gconf/gconftool.c:462
-msgid "You must specify a config source with --config-source when using --direct\n"
+#: gconf/gconftool.c:457
+msgid ""
+"You must specify a config source with --config-source when using --direct\n"
 msgstr ""
-"Ke� pou橙vate --direct, mus癃e zada� konfigura鋝� zdroj pomocou --config-"
-"source\n"
+"Ke� pou橙vate --direct, mus癃e zada� konfigura鋝� zdroj pomocou "
+"--config-source\n"
 
-#: gconf/gconftool.c:468
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Nepodarilo sa inicializova� GConf: %s\n"
 
-#: gconf/gconftool.c:493
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Mus癃e nastavi� premenn� prostredia 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:508
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1315,298 +1460,300 @@ msgstr ""
 "養adna aplik塶ia\n"
 "(aj ke� by v鈹tko malo fungova� aj tak).\n"
 
-#: gconf/gconftool.c:530
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Nepodaril sa pr疄tup ku konfigura鋝幦u zdroju: %s\n"
 
-#: gconf/gconftool.c:690
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Chyba pri ukon鋌van�: %s\n"
 
-#: gconf/gconftool.c:733
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
-msgstr "Mus癃e zada� jeden alebo viac prie鋱nkov, ktor� chcete rekurz癉ne vyp疄a�.\n"
+msgstr ""
+"Mus癃e zada� jeden alebo viac prie鋱nkov, ktor� chcete rekurz癉ne vyp疄a�.\n"
 
-#: gconf/gconftool.c:767
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "Nepodarilo sa vyp疄a� zoznam p嫫ov v `%s': %s"
 
-#: gconf/gconftool.c:785
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(hodnota nenastaven�)"
 
-#: gconf/gconftool.c:840
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Nepodarilo sa spusti� konfigura鋝� server (gconfd): %s\n"
 
-#: gconf/gconftool.c:854
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "Mus癃e zada�, ktor� k詠� alebo k詠鋀 chcete z疄ka蓋n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Typ zoznamu: %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Typ car: %s\n"
 
-#: gconf/gconftool.c:892
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Typ cdr: %s\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr "孤andardn� hodnota: %s\n"
+msgid "Owner: %s\n"
+msgstr "Vlastn璭: %s\n"
 
-#: gconf/gconftool.c:897 gconf/gconftool.c:899 gconf/gconftool.c:900
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Nenaplnen�"
 
-#: gconf/gconftool.c:899
-#, c-format
-msgid "Owner: %s\n"
-msgstr "Vlastn璭: %s\n"
-
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kr嫢ky popis: %s\n"
 
-#: gconf/gconftool.c:901
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Dlh� popis: %s\n"
 
-#: gconf/gconftool.c:910
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Pre `%s' nie je nastaven� hodnota\n"
 
-#: gconf/gconftool.c:914
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Nepodarilo sa z疄ka� hodnotu pre `%s': %s\n"
 
-#: gconf/gconftool.c:957 gconf/gconftool.c:969
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Nerozpoznan� typ `%s'\n"
 
-#: gconf/gconftool.c:981
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Mus癃e zada� striedavo k詠鋀 a hodnoty ako argumenty\n"
 
-#: gconf/gconftool.c:1001
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Pre k詠� nie je nastaven� hodnota: `%s'\n"
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Nie je mo駐� nastavi� sch幦u ako hodnotu\n"
 
-#: gconf/gconftool.c:1039
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Pri nastavovan� zoznamu mus癃e zada� primit癉ny typ zoznamu.\n"
 
-#: gconf/gconftool.c:1053
-msgid "When setting a pair you must specify a primitive car-type and cdr-type\n"
+#: gconf/gconftool.c:1043
+msgid ""
+"When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "Pri nastavovan� p嫫u mus癃e zada� primit癉ny typ car alebo typ cdr.\n"
 
-#: gconf/gconftool.c:1068
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Chyba: %s\n"
 
-#: gconf/gconftool.c:1081 gconf/gconftool.c:1214
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Chyba pri nastavovan� hodnoty: %s"
 
-#: gconf/gconftool.c:1099 gconf/gconftool.c:1228
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Chyba pri synchroniz塶ii: %s"
 
-#: gconf/gconftool.c:1117
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Mus癃e zada� k詠� (meno sch幦y) ako jedin� argument\n"
 
-#: gconf/gconftool.c:1159
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Typ zoznamu mus� by� primit癉ny typ: string, int, float alebo bool\n"
 
-#: gconf/gconftool.c:1179
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr "Typ car p嫫u mus� by� primit癉ny typ: string, int, float alebo bool\n"
 
-#: gconf/gconftool.c:1199
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr "Typ cdr p嫫u mus� by� primit癉ny typ: string, int, float alebo bool\n"
 
-#: gconf/gconftool.c:1243
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
-"Mus癃e zada� jeden alebo viac prie鋱nkov, z ktor�ch chcete p嫫y k詠�/"
-"hodnota.\n"
+"Mus癃e zada� jeden alebo viac prie鋱nkov, z ktor�ch chcete p嫫y "
+"k詠�/hodnota.\n"
 
-#: gconf/gconftool.c:1257
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Mus癃e uvies� jeden alebo viac k詠鋌v, ktor� chcete vymaza�.\n"
 
-#: gconf/gconftool.c:1268
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Chyba mazania `%s': %s\n"
 
-#: gconf/gconftool.c:1291
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
-msgstr "Mus癃e zada� jeden alebo viac prie鋱nkov, z ktor�ch chcete podprie鋱nky.\n"
+msgstr ""
+"Mus癃e zada� jeden alebo viac prie鋱nkov, z ktor�ch chcete podprie鋱nky.\n"
 
-#: gconf/gconftool.c:1325
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Chyba pri vypisovan� prie鋱nkov: %s\n"
 
-#: gconf/gconftool.c:1367
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "VAROVANIE: neplatn� alebo ch�baj�ci typ pre sch幦u (%s)\n"
 
-#: gconf/gconftool.c:1376
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "VAROVANIE: neplatn� alebo ch�baj�ci list_type pre sch幦u (%s)\n"
 
-#: gconf/gconftool.c:1387 gconf/gconftool.c:1417 gconf/gconftool.c:1446
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
-msgstr "VAROVANIE: Neporadilo sa spracova� 靖andardn� hodnotu `%s' pre sch幦u (%s)\n"
+msgstr ""
+"VAROVANIE: Neporadilo sa spracova� 靖andardn� hodnotu `%s' pre sch幦u (%s)\n"
 
-#: gconf/gconftool.c:1405
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
-msgstr "VAROVANIE: neplatn� alebo ch�baj�ci car_type alebo cdr_type pre sch幦u (%s)\n"
+msgstr ""
+"VAROVANIE: neplatn� alebo ch�baj�ci car_type alebo cdr_type pre sch幦u (%s)\n"
 
-#: gconf/gconftool.c:1430
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "VAROVANIE: Nem藶ete nastavi� 靖andardn� hodnotu pre sch幦u\n"
 
-#: gconf/gconftool.c:1459
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "VAROVANIE: intern� chyba gconftool, nezn嫥y GConfValueType\n"
 
-#: gconf/gconftool.c:1506 gconf/gconftool.c:1527 gconf/gconftool.c:1548
-#: gconf/gconftool.c:1569
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "VAROVANIE: nepodarilo sa spracova� meno typu `%s'\n"
 
-#: gconf/gconftool.c:1523
+#: gconf/gconftool.c:1514
 #, c-format
-msgid "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
+msgid ""
+"WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"VAROVANIE: list_type m藶e by� iba int, float, string alebo bool, ale nie `%"
-"s'\n"
+"VAROVANIE: list_type m藶e by� iba int, float, string alebo bool, ale nie "
+"`%s'\n"
 
-#: gconf/gconftool.c:1544
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"VAROVANIE: car_type m藶e by� iba int, float, string alebo bool, ale nie `%"
-"s'\n"
+"VAROVANIE: car_type m藶e by� iba int, float, string alebo bool, ale nie "
+"`%s'\n"
 
-#: gconf/gconftool.c:1565
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"VAROVANIE: cdr_type m藶e by� iba int, float, string alebo bool, ale nie `%"
-"s'\n"
+"VAROVANIE: cdr_type m藶e by� iba int, float, string alebo bool, ale nie "
+"`%s'\n"
 
-#: gconf/gconftool.c:1593
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "VAROVANIE: pr嫙dny uzol <applyto>"
 
-#: gconf/gconftool.c:1596 gconf/gconftool.c:1859
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "VAROVANIE: uzol <%s> nie je rozpoznan� pod <schema>\n"
 
-#: gconf/gconftool.c:1606
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "VAROVANIE: neuveden� 養adny k詠� pre sch幦u\n"
 
-#: gconf/gconftool.c:1639
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
-msgstr "VAROVANIE: uzol <locale> neobsahuje atrib�t `name=\"locale\"', ignorujem\n"
+msgstr ""
+"VAROVANIE: uzol <locale> neobsahuje atrib�t `name=\"locale\"', ignorujem\n"
 
-#: gconf/gconftool.c:1645
+#: gconf/gconftool.c:1635
 #, c-format
-msgid "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
+msgid ""
+"WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 "VAROVANIE: viacn嫳obn� uzol <locale> pre locale `%s', ignorujem v鈹tky okrem "
 "prv嶭o\n"
 
-#: gconf/gconftool.c:1726
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "VAROVANIE: Neplatn� uzol <%s> v uzle <locale>\n"
 
-#: gconf/gconftool.c:1755
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "VAROVANIE: Nepodarilo sa nain靖alova� sch幦u `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:1763
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Nain靖alovan� sch幦a `%s' pre locale `%s'\n"
 
-#: gconf/gconftool.c:1785
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "VAROVANIE: Nepodarilo sa asociova� sch幦u `%s' s k詠鋌m `%s': %s\n"
 
-#: gconf/gconftool.c:1793
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Sch幦a `%s' pripojen� ku k詠鋎 `%s'\n"
 
-#: gconf/gconftool.c:1872
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Mus癃e ma� aspo� jednu polo餒u <locale> v <schema>\n"
 
-#: gconf/gconftool.c:1901
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "VAROVANIE: uzol <%s> nie je rozpoznan� pod <schemalist>\n"
 
-#: gconf/gconftool.c:1923
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Nepodarilo sa otvori� `%s': %s\n"
 
-#: gconf/gconftool.c:1930
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument `%s' je pr嫙dny?\n"
 
-#: gconf/gconftool.c:1942
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1615,26 +1762,26 @@ msgstr ""
 "Dokument `%s' m� nespr嫛ny typ kore犦v嶭o uzlu ( <%s>, m� by� "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1955
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokument `%s' nie je <gconfschemafile> uzol na najvy凳ej �rovni\n"
 
-#: gconf/gconftool.c:1969
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "VAROVANIE: uzol <%s> pod <gconfschemafile> nerozpoznan�\n"
 
-#: gconf/gconftool.c:1980 gconf/gconftool.c:2012
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Chyba pri synchroniz塶ii konfigura鋝�ch d嫢: %s"
 
-#: gconf/gconftool.c:1996
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Mus癃e zada� nejak� s�bory so sch幦ou, ktor� sa maj� nain靖alova蓋n"
 
-#: gconf/gconftool.c:2033
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1643,16 +1790,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2053
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Nepodarilo sa zru隘� hodnotu prelamovacieho k詠醀 %s: %s\n"
 
-#: gconf/gconftool.c:2179
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "Mus癃e zada� k詠鋀, ktor� maj� by� po隕oden嬞n"
 
-#: gconf/gconftool.c:2185
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1661,11 +1808,11 @@ msgstr ""
 "Pok�鈴m sa o poru鈹nie aplik塶ie nastaven璥 nespr嫛nych hodn矌 pre k詠�:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2203
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "Mus癃e zada� prie鋱nky, ktor� maj� by� po隕oden嬞n"
 
-#: gconf/gconftool.c:2222
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1676,18 +1823,78 @@ msgstr ""
 "prie鋱nku:\n"
 "  %s\n"
 
-#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "Chyba GConf: %s\n"
-
-#: gconf/gconf-client.c:798
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Varovanie GConf: zlyhanie v zozname p嫫ov v `%s': %s"
 
-#: gconf/gconf-client.c:1000
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "O醀k嫛an� `%s' prijat� `%s' pre k詠� %s"
 
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "Uvo蛞ujem modul pre BerkeleyDB (BDB)."
+
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "Otvoren� zdroj BerkeleyDB z %s"
+
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "Inicializujem BDB modul"
+
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "Nie je mo駐� n奫s� kore犦v� prie鋱nok pre %s na adrese `%s'"
+
+#~ msgid ""
+#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ msgstr ""
+#~ "Nie je mo駐� pre鴈ta� alebo zap疄a� do kore犦v嶭o prie鋱nku pre %s na adrese "
+#~ "'%s'"
+
+#~ msgid "Failed to set mode on `%s': %s"
+#~ msgstr "Nepodarilo sa nastavi� m鏚 na `%s': %s"
+
+#~ msgid "No database available to save your configuration"
+#~ msgstr "Pre ulo頡nie va鈹j konfigur塶ie nie je k dispoz獳ii datab嫙a"
+
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "Popis probl幦u OAF: '%s'"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Nepodarilo sa ulo養� hodnotu k詠醀 '%s'"
+
+#~ msgid "/path"
+#~ msgstr "/cesta"
+
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgstr ""
+#~ "Zachyten� sign嫮 %d, zapisujem s�bor core. Pros璥, ozn嫥te chybu GConfu."
+
+#~ msgid ""
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ msgstr ""
+#~ "Zachyten� sign嫮 %d, kon鴈m abnorm嫮ne. Pros璥, vypl瓅e spr嫛u o chybe v "
+#~ "GConf."
+
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "GConf server sa nepou橙va, kon鴈m."
+
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "Chyba pri 鴈tan� s�boru s ulo頡n�m stavom: %s"
+
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "Nepodarilo sa z疄ka� IOR klienta: %s"
+
+#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgstr ""
+#~ "Nepodarilo sa prida� d嫢a od klienta do s�boru s ulo頡n�m stavom: %s"
+
+#~ msgid ""
+#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ msgstr "Niektor� klient sa odstr嫕il z GConf serveru ke� tam nebol pridan�."
+
+#~ msgid "Default Value: %s\n"
+#~ msgstr "孤andardn� hodnota: %s\n"
+
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "Chyba GConf: %s\n"
diff --git a/po/sl.po b/po/sl.po
index 2ae4af95..2835e3fc 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2001-07-27 16:24+0200\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2001-02-12 20:02+0100\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,34 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:215
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "Spro寡am ozadni modul BerkeleyDB (BDB)."
-
-#: backends/bdb-backend.c:238
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "Odpru sem vir BerkeleyDB v korenu %s"
-
-#: backends/bdb-backend.c:578
-msgid "Initializing BDB backend module"
-msgstr "Incialliziram ozadni BerkeleyDB modul"
-
-#: backends/dir-utils.c:108
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "Nisem mogel najti korenskega imenika %s na naslovu `%s'"
-
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "Nisem mogel ustvariti imenika '%s': %s"
-
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "Ne morem brati iz ali pisati v korenski imenik %s na naslovu `%s'"
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Spro寡am ozadni modul XML."
@@ -50,6 +22,11 @@ msgstr "Spro寡am ozadni modul XML."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nisem mogel najti korenskega imenika XML na naslovu `%s'"
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "Nisem mogel ustvariti imenika '%s': %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -64,7 +41,7 @@ msgstr "Dovoljenja imenika/datoteke za vir XML na korenu %s so: %o/%o"
 msgid "Initializing XML backend module"
 msgstr "Inicializiram ozadni XML modul"
 
-#: backends/xml-backend.c:748
+#: backends/xml-backend.c:745
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Nisem uspel sprostiti klju醀vnice v imeniku XML `%s': %s"
@@ -73,7 +50,7 @@ msgstr "Nisem uspel sprostiti klju醀vnice v imeniku XML `%s': %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "Neskladna brisanja imenikov ob zapiranju modula XML"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -82,11 +59,11 @@ msgstr ""
 "Ne morem odstraniti imenika `%s' iz predpomnilnika modula XML, ker ni bil "
 "uspe雉o usklajen na disk"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
-"%u items remain in the cache after cleaning already-synced items older than %"
-"u seconds"
+"%u items remain in the cache after cleaning already-synced items older than "
+"%u seconds"
 msgstr ""
 "V predpomnilniku je po 鋱寡enju 頡 usklajenih predmetov starej隘h od %2$u "
 "sekund ostalo 鈹 %1$u predmetov"
@@ -101,79 +78,74 @@ msgstr "Nisem mogel izvesti ukaza stat na `%s':  %s"
 msgid "XML filename `%s' is a directory"
 msgstr "Datoteka XML `%s' je imenik"
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Nisem uspel zbrisati `%s': %s"
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Nisem uspel zapisati datoteke `%s' %s"
 
-#: backends/xml-dir.c:359
-#, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr "Nisem uspel nastaviti na鋱na `%s': %s"
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Nisem uspel preimenovati `%s' v `%s': %s"
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Nisem uspel restavrirati `%s' iz `%s': %s"
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Nisem uspel zbrisati stare datoteke `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Nisem uspel izvesti ukaza stat nad `%s': %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Podvojitev vnosa  `%s' v  `%s', prezrto"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Vnos brez imena v datoteki XML  `%s', prezrto"
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Vrhnje vozli寡e v datoteki XML  `%s' ni <entry>, prezrto"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Nisem uspel ustvariti datoteke `%s': %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2460
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Nisem uspel zapreti datoteke  `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:150
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignoriram vozli寡e XML z imenom  `%s': %s"
 
-#: backends/xml-entry.c:201
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:328
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignoriram ime sheme `%s', neveljavno: %s"
@@ -181,82 +153,86 @@ msgstr "Ignoriram ime sheme `%s', neveljavno: %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:374
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "Ignoriram vozli寡e XML `%s', razen za mo駐o ime sheme: %s"
 
-#: backends/xml-entry.c:725
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Nisem uspel prebrati privzete vrednosti za shemo: %s"
 
-#: backends/xml-entry.c:939
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Za vozli寡e <%s> ni atributa \"type\""
 
-#: backends/xml-entry.c:953
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Vozli寡e ima neznan \"type\" atribut `%s', prezrto"
 
-#: backends/xml-entry.c:968
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "Za vozli寡e ni atributa \"value\""
 
-#: backends/xml-entry.c:1016 backends/xml-entry.c:1092
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Nisem razumel vozli寡a XML <%s> znotraj XML seznamskega vozli寡a"
 
-#: backends/xml-entry.c:1050
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Neveljaven tip (list, pair ali neznan) v seznamskem vozli寡u"
 
-#: backends/xml-entry.c:1073
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Slabo vozli寡e XML: %s"
 
-#: backends/xml-entry.c:1081
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Seznam vsebuje slabo-tipizirano vozli寡e (%s, moralo bi biti %s)"
 
-#: backends/xml-entry.c:1133
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Preziram slab \"car\" iz para XML: %s"
 
-#: backends/xml-entry.c:1142 backends/xml-entry.c:1165
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "raz鋩jenjujem datoteko XML: seznami in pari ne smejo biti znotraj parov"
 
-#: backends/xml-entry.c:1155
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Preziram slab cdr iz para XML: %s"
 
-#: backends/xml-entry.c:1174
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Nisem razumel vozli寡a XML <%s> znotraj parnega vozli寡a"
 
-#: backends/xml-entry.c:1192
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Nisem na鈹l \"car\" in \"cdr\" za parno vozli寡e XML"
 
-#: backends/xml-entry.c:1198
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Manjka \"cdr\" v paru vrednosti v datoteki XML"
 
-#: backends/xml-entry.c:1205
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "Manjka \"car\" v paru vrednosti v datoteki XML"
 
-#: backends/xml-entry.c:1210
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Manjkata obe \"car\" in \"cdr\" vrednosti v paru v datoteki XML"
 
@@ -289,30 +265,30 @@ msgstr "Nisem uspel najti ozadnega modula za `%s'"
 msgid "Failed to shut down backend"
 msgstr "Nisem uspel ustaviti ozadnega modula"
 
-#: gconf/gconf-database.c:232
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Prejel sem neveljavno vrednost v zahtevku \"set\""
 
-#: gconf/gconf-database.c:240
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
-"Nisem mogel najti smisla vredosti CORBA prejete v zahtevku \"set\" za klju� `"
-"%s'"
+"Nisem mogel najti smisla vredosti CORBA prejete v zahtevku \"set\" za klju� "
+"`%s'"
 
-#: gconf/gconf-database.c:518
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "Prejel zahtevek za opustitev vseh predpomnjenih podatkov"
 
-#: gconf/gconf-database.c:535
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Prejel zahtevek za usklajeno (sinhrono) uskladitev"
 
-#: gconf/gconf-database.c:770
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Usodna napaka: nisem uspel dobiti sklica predmeta za ConfigDatabase"
 
-#: gconf/gconf-database.c:929
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Nisem uspel uskladiti enega ali ve� virov: %s"
@@ -321,7 +297,7 @@ msgstr "Nisem uspel uskladiti enega ali ve� virov: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:1015
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -332,12 +308,12 @@ msgstr ""
 "gconfd-ja poslu鈴lca ne bom mogel obnoviti, kar bo povzro鋱lo nezanesljivo "
 "obve寡anje o spremembah nastavitev."
 
-#: gconf/gconf-database.c:1042
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Poslu鈴lec z ID %lu ne obstaja"
 
-#: gconf/gconf-database.c:1051
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -346,47 +322,47 @@ msgstr ""
 "V dnevnik nisem uspel zapisati odstranitve poslu鈴lca (verjetno ni "
 "隕odljivo, lahko pa povzro鋱 ponavljanje obvestil): %s"
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Napaka ob branju vrednosti za `%s': %s"
 
-#: gconf/gconf-database.c:1216
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Napaka ob nastavljanju vrednosti za `%s': %s"
 
-#: gconf/gconf-database.c:1259
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Napaka ob odnastavljanju `%s': %s"
 
-#: gconf/gconf-database.c:1283
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Napaka ob branju privzete vrednosti za `%s': %s"
 
-#: gconf/gconf-database.c:1323
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Napaka ob preverjanju obstoja `%s': %s"
 
-#: gconf/gconf-database.c:1347
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Napaka ob odstranjevanju imenika `%s': %s"
 
-#: gconf/gconf-database.c:1374
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Nisem uspel prebrati vseh vnosov v %s': %s"
 
-#: gconf/gconf-database.c:1400
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Napaka ob izpisu seznama imenikov v %s': %s"
 
-#: gconf/gconf-database.c:1421
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Napaka ob nastavljanju sheme za %s': %s"
@@ -451,29 +427,208 @@ msgstr "Operacija ni dovoljena brez nastavitvenega stre駐ika"
 msgid "Failed to get a lock"
 msgstr "Nisem uspel zakleniti"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "Zbirka podatkov za shranitev va隘h nastavitev ni na voljo"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Nisem uspel zapreti datoteke  `%s': %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Napaka ob odstranjevanju imenika `%s': %s"
+
+#: gconf/gconf-internals.c:85
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Ni znaka '/' v klju鋎 `%s'"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:249
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Nisem mogel interpretirati vrednosti CORBA za element seznama"
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:251
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Nepravilna vrsta elementa seznama v %s"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:264
 msgid "Received list from gconfd with a bad list type"
 msgstr "Sprejel seznam od gconfd s slabim tipom seznama"
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:445
 msgid "Failed to convert object to IOR"
 msgstr "Nisem uspel preoblikovati predmeta v IOR"
 
@@ -482,98 +637,93 @@ msgstr "Nisem uspel preoblikovati predmeta v IOR"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Nisem mogel odpreti datoteke poti `%s': %s\n"
 
-#: gconf/gconf-internals.c:858
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Dodajam vir `%s'\n"
 
-#: gconf/gconf-internals.c:870
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Napaka ob branju datoteke `%s': %s\n"
 
-#: gconf/gconf-internals.c:1293
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Pri醀koval seznam, dobil %s"
 
-#: gconf/gconf-internals.c:1303
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Pri醀koval seznam z %s, dobil seznam z %s"
 
-#: gconf/gconf-internals.c:1442
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Pri醀koval par, dobil %s"
 
-#: gconf/gconf-internals.c:1456
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Pri醀koval par (%s,%s), dobil par z manjkajo鋌 eno ali mankajo鋱ma obema "
 "vrednostima"
 
-#: gconf/gconf-internals.c:1472
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Pri醀koval par vrste (%s,%s), dobil vrsto (%s,%s)"
 
-#: gconf/gconf-internals.c:1588
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Citiran niz se ne za鋝e z narekovajem"
 
-#: gconf/gconf-internals.c:1650
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Citiran niz se ne kon醀 z narekovajem"
 
-#: gconf/gconf-internals.c:2130 gconf/gconf.c:3091
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Napaka CORBA: %s"
 
-#: gconf/gconf-internals.c:2146
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "Opis problema OAF: '%s'"
-
-#: gconf/gconf-internals.c:2152
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "poskus odstranitve imenika OAF, ki ni v seznamu"
 
-#: gconf/gconf-internals.c:2157
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "poskus dodajanja imenika OAF, ki je 頡 v seznamu"
 
-#: gconf/gconf-internals.c:2164
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Napaka ob raz鋩jenjevanju OAF: %s"
 
-#: gconf/gconf-internals.c:2169
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Neznana napaka OAF"
 
-#: gconf/gconf-internals.c:2256
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Ni datoteke ior v `%s'"
 
-#: gconf/gconf-internals.c:2287
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd prevzema klju醀vnico `%s' od nekega drugega procesa"
 
-#: gconf/gconf-internals.c:2298
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Drug program ima klju醀vnico nad `%s'"
 
-#: gconf/gconf-internals.c:2317
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "nisem uspel dostopati do ORB-a za ping obstoje鋀ga gconfd-ja"
 
-#: gconf/gconf-internals.c:2325
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -582,73 +732,73 @@ msgstr ""
 "Odstranjujem klju醀vnico `%s', ker IOR ni mogel biti preoblikovan v sklic "
 "predmeta , IOR `%s'"
 
-#: gconf/gconf-internals.c:2337
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "Odstranjujem klju醀vnico `%s', ker se je zgodila napaka ob pinganju "
 "stre駐ika: %s"
 
-#: gconf/gconf-internals.c:2349
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "Nastavitveni daemon GConf (gconfd) ima klju醀vnico  `%s'"
 
-#: gconf/gconf-internals.c:2363
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "nisem mogel ustvariti imenika `%s': %s"
 
-#: gconf/gconf-internals.c:2412
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Ne morem ustvariti klju醀vnice `%s': %s"
 
-#: gconf/gconf-internals.c:2448
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Ne morem pisati v datoteko `%s': %s"
 
-#: gconf/gconf-internals.c:2498
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "Ne morem odpreti klju醀vni鋝e datoteke `%s'; predvidevam, da ni na鈴: %s"
 
-#: gconf/gconf-internals.c:2515
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Po隕odovana klju醀vni鋝a datoteka `%s', vseeno odstranjujem"
 
-#: gconf/gconf-internals.c:2525
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
-"Nisem uspel ustvariti klju醀vni鋝e datoteke `%s' (pid lastnika %u, na� pid %"
-"u, predvidam, da je nekdo vzel na雊 klju醀vnico)"
+"Nisem uspel ustvariti klju醀vni鋝e datoteke `%s' (pid lastnika %u, na� pid "
+"%u, predvidam, da je nekdo vzel na雊 klju醀vnico)"
 
-#: gconf/gconf-internals.c:2542
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Nisem uspel sprostiti klju醀vni鋝ega imenika `%s': %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Nisem uspel nalo養ti vira `%s': %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Shema `%s' navedena za `%s' vsebuje ne-shematsko vrednost"
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Ime '/' je lahko le imenik, ne klju�"
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -657,38 +807,17 @@ msgstr ""
 "Vrednost za  `%s' nastavljena v le-berljivem viru v ospredju va鈹 "
 "nastavitvene poti. "
 
-#: gconf/gconf-sources.c:608
-#, c-format
-msgid ""
-"Unable to store a value at key '%s', as the configuration server has no "
-"writeable databases. There are two common causes of this problem: 1) your "
-"configuration path file doesn't contain any databases or wasn't found or 2) "
-"OAF mistakenly created two gconfd processes. If you have two gconfd "
-"processes (or had two at the time the second was launched), then it's an OAF "
-"bug, not a GConf issue. Logging out, killing oafd and gconfd, and logging "
-"back in may help. As always, check the user.* syslog for details on problems "
-"gconfd encountered."
-msgstr ""
-"Nisem mogel shraniti vrednosti pri klju鋎 '%s', saj stre駐ik nastavitev "
-"nima nobene pisljive zbirke podatkov. Ta problem ima dva pogosta vzroka: "
-"1) va鈴 pot nastavitev ne vsebuje nobene zbirke podatkov ali ni bila najdena "
-"ali 2) OAF je pomotoma ustvaril dva procesa gconfd. �e imate dva procesa "
-"gconfd (ali ste imeli dva, ko se je pognal drugi), potem je hro寡 v OAF-u in"
-" ne v GConf. �e se odjavite, ubijete oafd in gconfd in ponovno prijavite, "
-"lahko problem izgine. Kot vedno, preverite user.* sistemski dnevnik za "
-"podrobnosti o problemu na katerega je naletel gconfd."
-
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Napaka ob iskanju metapodatkov: %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Napaka ob branju metapodatkov: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -759,96 +888,90 @@ msgstr "Nisem razumel `%s' (dodaten neube頡n ')' najden znotraj para)"
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Stre駐ik ni mogel razvozlati naslova `%s'"
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "Krajevnemu viru nastavitev ne  morem dodati obve寡anj"
 
-#: gconf/gconf.c:1870
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Dodajanje odjemalca v seznam stre駐ika ni uspelo, napaka CORBA: %s"
 
-#: gconf/gconf.c:1887
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
-"This is a bug in the OAF package; something went wrong in OAF, and no error "
-"was reported. This is not a bug in the GConf package. Do not report a GConf "
-"bug unless you have information indicating what went wrong with OAF that was "
-"caused by GConf."
-msgstr ""
-"Napaka ob vzpostavljanju povezave z nastavitvenim stre駐ikom: "
-"OAF je vrnil nil iz oaf_activate_from_id() in ni nastavil izjeme, ki bi "
-"razlo養la problem. To je hro寡 v paketu OAF; v OAF je 雍o nekaj narobe, "
-"a ni bila sporo鋀na nobena napak. To ni hro寡 v paketu GConf. Ne oddajte "
-"poro鋱la o hro寡u v GConf v kolikor nimate podatkov, da je GConf povzro鋱l "
-"napako v OAF."
-
-#: gconf/gconf.c:2197
+"Please file an OAF bug report."
+msgstr ""
+"Napaka ob povezovanju s stre駐ikom nastavitev: OAF je vrnil nil (ni�) iz "
+"oaf_activate_from_id() in ni nastavil izjeme (exception), ki razlaga "
+"problem. Prosimo po雍jite poro鋱lu o hro寡u v OAF."
+
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Nisem uspel inicializirati GConf, kon鋎jem\n"
 
-#: gconf/gconf.c:2234
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Mora se za鋀ti s po鈹vnico (/)"
 
-#: gconf/gconf.c:2256
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Ne more imeti dveh po鈹vnic (/) zapored"
 
-#: gconf/gconf.c:2258
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Ne more imeti pike (.) takoj za po鈹vnico (/)"
 
-#: gconf/gconf.c:2279
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "znak '%c' je neveljaven v imenu klju鋀v/imenikov"
 
-#: gconf/gconf.c:2293
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Klju�/imenik se ne sme kon醀ti s po鈹vnico (/)"
 
-#: gconf/gconf.c:2546
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Napaka ob ustavljanju stre駐ika nastavitev: %s"
 
-#: gconf/gconf.c:2607
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Pri醀koval 靖evilo s plavajo鋌 vejico, dobil %s"
 
-#: gconf/gconf.c:2642
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Pri醀koval celo 靖evilo, dobil %s"
 
-#: gconf/gconf.c:2677
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Pri醀koval niz, dobil %s"
 
-#: gconf/gconf.c:2714
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Pri醀koval booleanovo vrednost, dobil %s"
 
-#: gconf/gconf.c:2747
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Pri醀koval shemo, dobil %s"
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Prejet je bil zahtevek za ustavitev"
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -856,7 +979,7 @@ msgstr ""
 "gconfd preveden z razhro寡venjem; posku鈴m nalo養ti gconf.path iz imenika z "
 "izvorno kodo"
 
-#: gconf/gconfd.c:293
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -864,26 +987,19 @@ msgstr ""
 "Datoteke z nastavitvami niso bile najdene, posku鈴m uporabiti privzet vir "
 "nastavitev `%s'"
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:301
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 "Ni virov nastavitev v poti virov, nastavitve ne bodo shranjene; uredite "
 
-#: gconf/gconfd.c:301
-msgid "/path"
-msgstr "/pot"
-
-#: gconf/gconfd.c:314
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Napaka ob nalaganju nekaterih virov nastavitev: %s"
 
-#: gconf/gconfd.c:326
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -891,7 +1007,7 @@ msgstr ""
 "Noben naslov virov nastavitev ni bil uspte雉o razvozlan, ne morem nalagati "
 "ali shranjevati podatkov o nastavitvah"
 
-#: gconf/gconfd.c:343
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -899,33 +1015,28 @@ msgstr ""
 "Noben pisljiv naslov virov nastavitev ni bil uspte雉o razvozlan, ne morem "
 "shranjevati podatkov o nastavitvah"
 
-#: gconf/gconfd.c:369
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-"Prejel signal %d, izpisujem pomnilnik. Prosimo poro醀jte o hro寡u v GConf."
-
-#: gconf/gconfd.c:385
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"Prejel singal %d, neobi醀jno se ustavljam. Prosimo poro醀jte o hro寡u v "
-"GConf."
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down."
+msgstr "Prejel signal %d, ustavljam se po pravilih"
 
-#: gconf/gconfd.c:402
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Prejel signal %d, ustavljam se po pravilih"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:506
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "pri鋀njam (razli鋱ca %s), pid %u uporabnik '%s'"
 
-#: gconf/gconfd.c:533
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr "GConf je bil zgrajen z vklju鋀nimi mo駐ostmi razhro寡venja"
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -933,46 +1044,11 @@ msgstr ""
 "Nisem uspel inicializirati Okolja za aktivacijo predmetov (OAF): prosimo "
 "po雍jite poro鋱lo o napaki vzdr頡valcem OAF-a"
 
-#: gconf/gconfd.c:553
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Nisem uspel dobiti sklica predmeta za ConfigDatabase"
 
-#: gconf/gconfd.c:566
-msgid "Failed to create %s: %s"
-msgstr "Nisem uspel ustvariti %s: %s"
-
-#. Bad hack alert - register the current lockholder with oafd,
-#. * since oafd seems to have forgotten about us.
-#.
-#: gconf/gconfd.c:581
-msgid "Failed to get lock for daemon: %s"
-msgstr "Nisem uspel dobiti klju醀vnice za daemona: %s"
-
-#: gconf/gconfd.c:587
-msgid ""
-"Registering existing server with oafd, since OAF appears to have leaked it"
-msgstr ""
-"Registriram obstoje� stre駐ik pri oafd-ju, ker izgleda, da ga je OAF izgubil"
-
-#: gconf/gconfd.c:596
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register existing server."
-msgstr ""
-"OAF ne ve za na� IID; to ka頡 na po隕odovano namestitev; ne mroem "
-"registrirati obstoje鋀ga stre駐ika."
-
-#: gconf/gconfd.c:600
-msgid ""
-"Another gconfd already registered with OAF, so we can't register the "
-"existing server"
-msgstr "Drug gconfd je 頡 registrian pri OAF-u, zato obstoje鋀ga stre駐ika ne moremo registrirati"
-
-#: gconf/gconfd.c:605
-msgid "Unknown error registering existing gconfd with OAF; exiting"
-msgstr "Neznana napaka ob registriranju obstoje鋀ga gconfd-ja pri OAF-u; kon鋎jem"
-
-#: gconf/gconfd.c:632
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -980,32 +1056,24 @@ msgstr ""
 "OAF ne ve za na� IID; kar ka頡 na po隕odovano namestitev; ne mroem se "
 "registrirati; kon鋎jem\n"
 
-#: gconf/gconfd.c:636
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Drug gconfd je 頡 registrian pri OAF-u; kon鋎jem\n"
 
-#: gconf/gconfd.c:641
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Neznana napaka ob registriranju gconfd-ja pri OAF-u; kon鋎jem\n"
 
-#: gconf/gconfd.c:685
-msgid "Failed to release lockfile: %s"
-msgstr "Nisem uspel sprostiti klju醀vni鋝e datoteke: %s"
-
-#: gconf/gconfd.c:693
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Kon鋎jem"
 
-#: gconf/gconfd.c:718
-msgid "GConf server is not in use, shutting down."
-msgstr "Stre駐ik GConf ni v uporabi, kon鋎jem."
-
-#: gconf/gconfd.c:1077
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Vra醀m izjemo: %s"
 
-#: gconf/gconfd.c:1177
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1014,7 +1082,7 @@ msgstr ""
 "Nisem uspel odpreti dnevni隕e datoteke gconf; poslu鈴lci ne bodo bili "
 "obnovljeni po ustavitvi gconfd-ja (%s)"
 
-#: gconf/gconfd.c:1212
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1022,33 +1090,33 @@ msgstr ""
 "Nisem uspel zapreti dnevni隕e datoteke gconfd-ja; podatki morda niso "
 "pravilno shranjeni (%s)"
 
-#: gconf/gconfd.c:1281
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Za pisanje nisem uspel odpreti datoteke s shranjenim stanjem '%s': %s"
 
-#: gconf/gconfd.c:1295
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Nisem mogel zapisati datoteke shranjenega stanja '%s' fd: %d: %s"
 
-#: gconf/gconfd.c:1304
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Nisem uspel zapreti nove datoteke shranjenega stanja '%s': %s"
 
-#: gconf/gconfd.c:1318
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Nisem mogel odmakniti stare datoteke shranjenega stanja '%s': %s"
 
-#: gconf/gconfd.c:1328
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 "Nisem uspel premakniti nove datoteke shranjenega stanja na ustrezno mesto: %s"
 
-#: gconf/gconfd.c:1337
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1056,7 +1124,46 @@ msgstr ""
 "Nisem uspel obnoviti izvorne datoteke shranjenega stanja, ki je bila "
 "premaknjena v '%s': %s"
 
-#: gconf/gconfd.c:1812
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Nisem uspel odpreti datoteke s shranjenim stanjem: %s"
+
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Nisem uspel odpreti datoteke s shranjenim stanjem: %s"
+
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr ""
+"Nisem uspel zapisati dodajanja odjemalca v datoteko s shranjenim stanjem: %s"
+
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr ""
+"Nisem uspel zapisati dodajanja odjemalca v datoteko s shranjenim stanjem: %s"
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Nisem uspel odpreti datoteke s shranjenim stanjem: %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1064,110 +1171,78 @@ msgstr ""
 "Nisem mogel obnoviti poslu鈴lca na naslovu '%s', nisem mogel razvozlati "
 "zbirke podatkov"
 
-#: gconf/gconfd.c:1858
-#, c-format
-msgid "Error reading saved state file: %s"
-msgstr "Napaka ob branju datoteke s shranjenim stanjem: %s"
-
-#: gconf/gconfd.c:1911
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Ne morem odpreti datoteke s shranjenim stanjem '%s': %s"
 
-#: gconf/gconfd.c:2028
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to re-"
-"add the listener if gconfd exits or shuts down (%s)"
+"Failed to log addition of listener to gconfd logfile; won't be able to "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
-"V dnevnik nisem uspel zapisati dodajanja poslu鈴lca; ob novem zagonu gconfd-"
-"ja poslu鈴lca poslu鈴lca ne bo mo駐o dodati (%s)"
+"V dnevnik nisem uspel zapisati dodajanja poslu鈴lca; ob novem zagonu "
+"gconfd-ja poslu鈴lca poslu鈴lca ne bo mo駐o dodati (%s)"
 
-#: gconf/gconfd.c:2033
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously re-"
-"add the listener if gconfd exits or shuts down (%s)"
+"Failed to log removal of listener to gconfd logfile; might erroneously "
+"re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 "V dnevnik nisem uspel zapisati odstranitve poslu鈴lca; lahko se napa鋝o doda "
 "poslu鈴lca ob novem zagonu gconfd-ja: (%s)"
 
-#: gconf/gconfd.c:2056 gconf/gconfd.c:2221
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "Nisem uspel dobiti IOR za odjemalca: %s"
-
-#: gconf/gconfd.c:2071
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "Nisem uspel odpreti datoteke s shranjenim stanjem: %s"
-
-#: gconf/gconfd.c:2084
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr ""
-"Nisem uspel zapisati dodajanja odjemalca v datoteko s shranjenim stanjem: %s"
-
-#: gconf/gconfd.c:2092
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr ""
-"Nisem uspel zapisati dodajanja odjemalca v datoteko s shranjenim stanjem: %s"
-
-#: gconf/gconfd.c:2182
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr "Nek odjemalec se je odstranil z GConf stre駐ika, 鋀prav ni bil dodan."
-
-#: gconf/gconftool.c:68
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Mo駐osti pomo鋱"
 
-#: gconf/gconftool.c:77
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Nastavi klju� k vrednosti in uskladi. Uporabi z --type."
 
-#: gconf/gconftool.c:86
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Izpi隘 vrednost klju醀 na obi醀jni izhod."
 
-#: gconf/gconftool.c:95
+#: gconf/gconftool.c:89
 msgid ""
-"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
-"type."
+"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
+"--type."
 msgstr ""
 "Nastavi shemo in uskladi. Uporabi z --short-desc, --long-desc, --owner  in  "
 "--type."
 
-#: gconf/gconftool.c:105
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "Odnastavi klju鋀 v ukazni vrstici"
 
-#: gconf/gconftool.c:114
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Izpi隘 vse pare klju�/vrednost v imeniku."
 
-#: gconf/gconftool.c:123
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Izpi隘 vse podimenike v imeniku."
 
-#: gconf/gconftool.c:132
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "Izpi隘 vse podimenike in vnose v imeniku, rekurzivno."
 
-#: gconf/gconftool.c:141
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Vrni 0, 鋀 imenik obstaja in 2 鋀 ne."
 
-#: gconf/gconftool.c:150
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Ustavi gconfd. NE UPORABLJAJTE TE MO奘OSTI BREZ DOBREGA RAZLOGA."
 
-#: gconf/gconftool.c:159
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Vrni 0, 鋀 te鋀 gconfd in 2 鋀 ne."
 
-#: gconf/gconftool.c:168
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1175,7 +1250,7 @@ msgstr ""
 "Po頡ni stre駐ik nastavitev (gconfd). (Obi醀jno se samodejno zgodi, ko je "
 "potrebno)"
 
-#: gconf/gconftool.c:177
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1183,11 +1258,11 @@ msgstr ""
 "Navedi tip vrednosti, ki se nastavlja ali tip vrednosti, ki jo opisuje "
 "shema. Enozna鋝e okraj鈴ve so v redu."
 
-#: gconf/gconftool.c:178
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|niz|seznam|par"
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1195,11 +1270,11 @@ msgstr ""
 "Navedi vrsto seznama vrednosti, ki se nastavlja ali tip vrednosti, ki jo "
 "opisuje shema. Enozna鋝e okraj鈴ve so v redu."
 
-#: gconf/gconftool.c:187 gconf/gconftool.c:196 gconf/gconftool.c:205
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "int|bool|float|niz"
 
-#: gconf/gconftool.c:195
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1207,7 +1282,7 @@ msgstr ""
 "Navedi tip vrednosti para \"car\", ki se nastavlja ali tip vrednosti, ki jo "
 "opisuje shemaEnozna鋝e okraj鈴ve so v redu."
 
-#: gconf/gconftool.c:204
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1215,50 +1290,50 @@ msgstr ""
 "Navedi tip vrednosti para \"cdr\", ki se nastavlja ali tip vrednosti, ki jo "
 "opisuje shemaEnozna鋝e okraj鈴ve so v redu."
 
-#: gconf/gconftool.c:213
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Navedi kratek pol-vrstice dolg opis, ki naj gre v shemo."
 
-#: gconf/gconftool.c:214 gconf/gconftool.c:223
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "OPIS"
 
-#: gconf/gconftool.c:222
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "Navedi ve� vrstic dolg opis, ki naj gre v shemo."
 
-#: gconf/gconftool.c:231
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "Navedi lastnika sheme"
 
-#: gconf/gconftool.c:232
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "LASTNIK"
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "Navedi datoteko sheme, ki naj bo name寡ena"
 
-#: gconf/gconftool.c:241
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "DATOTEKA"
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "Navedi vir nastavitev, ki naj se uporabi namesti privzete poti"
 
-#: gconf/gconftool.c:250
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "VIR"
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 "Neposreden dostop do zbirke podatkov, mimo stre駐ika. Gconfd ne sme te鋱."
 
-#: gconf/gconftool.c:267
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1269,7 +1344,7 @@ msgstr ""
 "spremenljivka GCONF_CONFIG_SOURCE; za uporabo privzete vrednosti je lahko "
 "nastavljena na prazen niz."
 
-#: gconf/gconftool.c:276
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1277,7 +1352,7 @@ msgstr ""
 "Mu鋀ni隕o-preverjaj program z nastavljanjem in odnastavljanjem razli鋝ih "
 "tipov vrednosti za klju鋀 navedene v ukazni vrstici."
 
-#: gconf/gconftool.c:285
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1285,23 +1360,7 @@ msgstr ""
 "Mu鋀ni隕o-preverjaj program z nastavljanjem in odnastavljanjem razli鋝ih "
 "klju鋀v v imenikih navedenih v ukazni vrstici."
 
-#: gconf/gconftool.c:294
-msgid "Get the short doc string for a key"
-msgstr "Dobi kratek niz dokumentacije za klju�"
-
-#: gconf/gconftool.c:303
-msgid "Get the long doc string for a key"
-msgstr "Dobi dolg niz dokumentacije za klju�"
-
-#: gconf/gconftool.c:312
-msgid "Get the name of the schema applied to this key"
-msgstr "Dobi ime sheme, ki je uveljavljena na tem klju鋎"
-
-#: gconf/gconftool.c:321
-msgid "Specify the schema name followed by the key to apply the schema name to"
-msgstr "Navedite ime sheme, ki ji sledi ime klju醀 na katerem naj se shema uveljavi"
-
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1311,90 +1370,90 @@ msgstr ""
 " Po頡nite '%s --help', 鋀 頡lite videti popoln seznam mo駐osti ukazne "
 "vrstice.\n"
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Ne morem prebrati in nastaviti/odnastaviti hkrati\n"
 
-#: gconf/gconftool.c:394
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Ne morem nastaviti in prebrati/odnastaviti hkrati\n"
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "Ne morete uporabiti --all-pairs z --get ali s --set\n"
 
-#: gconf/gconftool.c:410
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Ne morete uporabiti --all-dirs z --get ali s --set\n"
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
 msgstr ""
-"--recursive-list bi morala biti uprorabljena le z --get, --set, --unset, --"
-"all-pairs, ali --all-dirs\n"
+"--recursive-list bi morala biti uprorabljena le z --get, --set, --unset, "
+"--all-pairs, ali --all-dirs\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:381
 msgid ""
-"--set_schema should not be used with --get, --set, --unset, --all-pairs, --"
-"all-dirs\n"
+"--set_schema should not be used with --get, --set, --unset, --all-pairs, "
+"--all-dirs\n"
 msgstr ""
-"--set_schema ne bi smela biti uporabljena z --get, --set, --unset, --all-"
-"pairs in --all-dirs\n"
+"--set_schema ne bi smela biti uporabljena z --get, --set, --unset, "
+"--all-pairs in --all-dirs\n"
 
-#: gconf/gconftool.c:436
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Vrsta vrednosti je pomembna le ob nastavljanju le te\n"
 
-#: gconf/gconftool.c:442
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "Ob nastavljanju vrednosti morate navesti vrsto\n"
 
-#: gconf/gconftool.c:452
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "Mo駐osti ping ni mogo鋀 uporabljati hkrati z drugimi.\n"
 
-#: gconf/gconftool.c:462
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "Mo駐osti --dir-exits ni mogo鋀 uporabljati hkrati z drugimi.\n"
 
-#: gconf/gconftool.c:472
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 "Mo駐ostiu --install-schema-file ni mogo鋀 uporabljati hkrati z drguimi.\n"
 
-#: gconf/gconftool.c:483
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 "Mo駐osti --makefile-install-rule ni mogo鋀 uporabljati hkrati z drguimi.\n"
 
-#: gconf/gconftool.c:494
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "Mo駐osti --break-key ni mogo鋀 uporabljati hkrati z drguimi.\n"
 
-#: gconf/gconftool.c:505
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "Mo駐osti --break-directory ni mogo鋀 uporabljati hkrati z drguimi.\n"
 
-#: gconf/gconftool.c:512
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr "Ob uporabi --direct morate navesti vir nastavitev z --config-source\n"
 
-#: gconf/gconftool.c:518
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Nisem uspel inicializirati GConf-a: %s\n"
 
-#: gconf/gconftool.c:543
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Nastaviti morate okoljsko spremenljivko 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:558
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1406,256 +1465,209 @@ msgstr ""
 "programi ne te鋀jo)\n"
 "(dasiravno bi moralo teoreti鋝o delovati tudi med tekom programov).\n"
 
-#: gconf/gconftool.c:580
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Nisem uspel dostopati do vira(ov) nastavitev: %s\n"
 
-#: gconf/gconftool.c:781
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Napaka ob ustavljanju: %s\n"
 
-#: gconf/gconftool.c:824
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Naveden mora biti en ali ve� imenikov za rekurziven izpis.\n"
 
-#: gconf/gconftool.c:858
-msgid "Failure listing entries in `%s': %s\n"
+#: gconf/gconftool.c:764
+#, fuzzy, c-format
+msgid "Failure listing pairs in `%s': %s"
 msgstr "Napaka ob izpisu vnosov v `%s': %s\n"
 
-#: gconf/gconftool.c:876
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(vrednost ni nastavljena)"
 
-#: gconf/gconftool.c:931
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Nisem uspel pognati stre駐ika nastavitev (gconfd): %s\n"
 
-#: gconf/gconftool.c:945
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "Navedeni morajo biti klju� ali klju鋱, ki naj se dobijo\n"
 
-#: gconf/gconftool.c:980
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Vrsta: %s\n"
 
-#: gconf/gconftool.c:981
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Vrsta seznama: %s\n"
 
-#: gconf/gconftool.c:982
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Vrsta \"car\"-a: %s\n"
 
-#: gconf/gconftool.c:983
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Vrsta \"cdr\"-a: %s\n"
 
-#: gconf/gconftool.c:988
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr "Privzeta vrednost: %s\n"
+msgid "Owner: %s\n"
+msgstr "Lastnik: %s\n"
 
-#: gconf/gconftool.c:988 gconf/gconftool.c:990 gconf/gconftool.c:991
-#: gconf/gconftool.c:992
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Odnastavi"
 
-#: gconf/gconftool.c:990
-#, c-format
-msgid "Owner: %s\n"
-msgstr "Lastnik: %s\n"
-
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kratek opis: %s\n"
 
-#: gconf/gconftool.c:992
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Dolg opis: %s\n"
 
-#: gconf/gconftool.c:1001 gconf/gconftool.c:1295
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Za `%s' vrednost ni nastavljena\n"
 
-#: gconf/gconftool.c:1005 gconf/gconftool.c:1299
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Nisem uspel prebrati vrednosti za `%s':%s\n"
 
-#: gconf/gconftool.c:1048 gconf/gconftool.c:1060
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Ne razumem vrste `%s'\n"
 
-#: gconf/gconftool.c:1072
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Kot argumenti morajo biti navedeni pari klju�/vrednost\n"
 
-#: gconf/gconftool.c:1092
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Zak lju� `%s' vrednost ni nastavljena\n"
 
-#: gconf/gconftool.c:1120
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Ne morem nastaviti sheme kot vrednosti\n"
 
-#: gconf/gconftool.c:1130
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Kadar nastavljate seznam morate navesti osnovno vrsto seznama\n"
 
-#: gconf/gconftool.c:1144
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "Kadar nastavljate par morate navesti osnovni vrsti za car in cdr\n"
 
-#: gconf/gconftool.c:1159
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Napaka %s\n"
 
-#: gconf/gconftool.c:1172
-msgid "Error setting value: %s\n"
-msgstr "Napaka ob nastavljanju vrednosti: %s\n"
-
-#: gconf/gconftool.c:1190
-msgid "Error syncing: %s\n"
-msgstr "Napaka ob usklajevanju: %s\n"
-
-#: gconf/gconftool.c:1213
-msgid "Must specify a key or keys on the command line\n"
-msgstr "Klju� ali klju鋱 morajo biti navedeni v ukazni vrstici\n"
-
-#: gconf/gconftool.c:1233
-msgid "No schema known for `%s'\n"
-msgstr "Shema za `%s' ni znana\n"
-
-#: gconf/gconftool.c:1266
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
-msgid "No doc string stored in schema at '%s'\n"
-msgstr "Niz dokumentacije ni shranjen za shemo pri '%s'\n"
-
-#: gconf/gconftool.c:1271
-msgid "Error getting schema at '%s': %s\n"
-msgstr "Napaka ob dobivanju sheme pri '%s': %s\n"
-
-#: gconf/gconftool.c:1278
-msgid "No schema stored at '%s'\n"
-msgstr "Shema pri `%s' ni shranjena\n"
+msgid "Error setting value: %s"
+msgstr "Napaka ob nastavljanju vrednosti: %s"
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
-msgid "Value at '%s' is not a schema\n"
-msgstr "Vrednost pri '%s' ni shema\n"
-
-#: gconf/gconftool.c:1337
-msgid "Must specify a schema name followed by the key name to apply it to\n"
-msgstr "Navesti morate ime sheme, ki mu sledi ime klju醀 na katerem naj se shema uveljavi\n"
-
-#: gconf/gconftool.c:1344
-msgid "Error associating schema name '%s' with key name '%s': %s\n"
-msgstr "Napaka pri povezovanju sheme '%s' s klju鋀m  '%s': %s\n"
+msgid "Error syncing: %s"
+msgstr "Napaka ob usklajevanju: %s"
 
-#: gconf/gconftool.c:1364
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Navesti morate klju� (ime shema) kot edini argument\n"
 
-#: gconf/gconftool.c:1406
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Vrsta seznama mora biti osnovna vrsta: niz, int, float ali bool\n"
 
-#: gconf/gconftool.c:1426
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr "Vrsta car mora biti osnovna vrsta: niz, int, float ali bool\n"
 
-#: gconf/gconftool.c:1446
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr "Vrsta cdr mora biti osnovna vrsta: niz, int, float ali bool\n"
 
-#: gconf/gconftool.c:1461
-#, c-format
-msgid "Error setting value: %s"
-msgstr "Napaka ob nastavljanju vrednosti: %s"
-
-#: gconf/gconftool.c:1475
-#, c-format
-msgid "Error syncing: %s"
-msgstr "Napaka ob usklajevanju: %s"
-
-#: gconf/gconftool.c:1490
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
-"Navesti morate enega ali ve� imenikov iz katerih naj se preberejo pari klju�/"
-"vrednost.\n"
+"Navesti morate enega ali ve� imenikov iz katerih naj se preberejo pari "
+"klju�/vrednost.\n"
 
-#: gconf/gconftool.c:1504
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Navesti morate enega ali ve� klju鋌v za odnastavitev.\n"
 
-#: gconf/gconftool.c:1515
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Napaka ob odnastavljanju `%s': %s\n"
 
-#: gconf/gconftool.c:1538
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Navesti morate enega ali ve� imenikov iz katerih naj se preberejo "
 "podimeniki.\n"
 
-#: gconf/gconftool.c:1572
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Napaka ob izpisovanju imenikov: %s\n"
 
-#: gconf/gconftool.c:1614
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "OPOZORILO: neveljavna ali pogre鈴na vrsta za shemo (%s)\n"
 
-#: gconf/gconftool.c:1623
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 "OPOZORILO: neveljaven ali pogre鈴n list_type (vrsta seznama) za shemo (%s)\n"
 
-#: gconf/gconftool.c:1634 gconf/gconftool.c:1664 gconf/gconftool.c:1693
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "OPOZORILO: Nisem uspel raz鋩eniti privzete vrednosti `%s' za shemo (%s)\n"
 
-#: gconf/gconftool.c:1652
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "OPOZORILO: neveljaven ali pogre鈴n car_type ali cdr_type za shemo (%s)\n"
 
-#: gconf/gconftool.c:1677
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "OPOZORILO: Ne morete nastaviti privzete vrednosti za shemo\n"
 
-#: gconf/gconftool.c:1706
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "OPOZORILO: notranja napaka gconftool, neznan GConfValueType\n"
 
-#: gconf/gconftool.c:1753 gconf/gconftool.c:1774 gconf/gconftool.c:1795
-#: gconf/gconftool.c:1816
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "OPOZORILO: nisem uspel raz鋩eniti imena vrste '%s'\n"
 
-#: gconf/gconftool.c:1770
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1663,86 +1675,86 @@ msgstr ""
 "OPOZORILO: list_type (vrsta seznama) je lahko le int, float, niz ali bool in "
 "ne '%s'\n"
 
-#: gconf/gconftool.c:1791
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr "OPOZORILO: car_type je lahko le int, float, niz ali bool in ne '%s'\n"
 
-#: gconf/gconftool.c:1812
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr "OPOZORILO: cdr_type je lahko le int, float, niz ali bool in ne '%s'\n"
 
-#: gconf/gconftool.c:1840
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "OPOZORILO: prazno vozli寡e <applyto>"
 
-#: gconf/gconftool.c:1843 gconf/gconftool.c:2106
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "OPOZORILO: vozli寡e <%s> ni bilo razumljeno pod <schema>\n"
 
-#: gconf/gconftool.c:1853
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "OPOZORILO: klju� za shemo ni naveden\n"
 
-#: gconf/gconftool.c:1886
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "OPOZORILO: vozli寡e <locale> nima atributa `name=\"locale\"', prezrto\n"
 
-#: gconf/gconftool.c:1892
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr "OPOZORILO: ve� vozli寡 <locale> za locale `%s, prezrti vsi za prvim\n"
 
-#: gconf/gconftool.c:1973
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "OPOZORILO: Neveljavno vozli寡e <%s> v vozli寡u <locale>\n"
 
-#: gconf/gconftool.c:2002
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 "OPOZORILO: nisem uspel namestiti definicij locale `%2$s' sheme `%1$s': %3$s\n"
 
-#: gconf/gconftool.c:2010
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Namestil shemo `%s' za definicije locale  `%s'\n"
 
-#: gconf/gconftool.c:2032
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "OPOZORILO: nisem uspel povezati sheme `%s' s klju鋀m  `%s': %s\n"
 
-#: gconf/gconftool.c:2040
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Pripel shemo `%s' h klju鋎  `%s'\n"
 
-#: gconf/gconftool.c:2119
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "V <schema> morate imeti vsaj en vnos <locale>\n"
 
-#: gconf/gconftool.c:2148
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "OPOZORILO: vozli寡e <%s> ni razumljeno pod <schemalist>\n"
 
-#: gconf/gconftool.c:2170
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Nisem uspel odpreti `%s': %s\n"
 
-#: gconf/gconftool.c:2177
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument  `%s' je prazen?\n"
 
-#: gconf/gconftool.c:2189
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1751,26 +1763,26 @@ msgstr ""
 "Dokument `%s' ima napa鋝o vrsto korenskega vozli寡a (<%s>, moral bi biti "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:2202
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokument `%s' nima vrhnjega vozli寡a <gconfschemafile>\n"
 
-#: gconf/gconftool.c:2216
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "OPOZORILO: vozli寡e <%s> pod <gconfschemafile> ni razumljeno\n"
 
-#: gconf/gconftool.c:2227 gconf/gconftool.c:2259
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Napaka ob usklajevanju podatkov nastavitev: %s"
 
-#: gconf/gconftool.c:2243
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Navedene morajo biti datoteke shem, ki naj se namestijo\n"
 
-#: gconf/gconftool.c:2280
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1779,16 +1791,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2300
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Nisem uspel odnastaviti problemati鋝ega klju醀 %s: %s\n"
 
-#: gconf/gconftool.c:2426
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "Navesti morate klju鋀, ki naj postanejo problemati鋝i\n"
 
-#: gconf/gconftool.c:2432
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1797,11 +1809,11 @@ msgstr ""
 "Posku鈴m zlomiti va� program z nastavljanjem slabih vrednosti za klju�:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2450
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "Navesti morate imenike, ki naj postanejo problemati鋝i\n"
 
-#: gconf/gconftool.c:2469
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1812,32 +1824,188 @@ msgstr ""
 "imeniku:\n"
 "  %s\n"
 
-#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "Napaka gconf %s\n"
-
-#: gconf/gconf-client.c:798
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Opozorilo GConf: napaka ob izpisovanju praov v `%s': %s"
 
-#: gconf/gconf-client.c:1000
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Za klju� %s pri醀koval `%s' dobil `%s'"
 
-#~ msgid "Unable to store a value at key '%s'"
-#~ msgstr "Ne morem shraniti vrednosti pri klju鋎  `%s'"
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "Spro寡am ozadni modul BerkeleyDB (BDB)."
+
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "Odpru sem vir BerkeleyDB v korenu %s"
+
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "Incialliziram ozadni BerkeleyDB modul"
+
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "Nisem mogel najti korenskega imenika %s na naslovu `%s'"
+
+#~ msgid ""
+#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ msgstr "Ne morem brati iz ali pisati v korenski imenik %s na naslovu `%s'"
+
+#~ msgid "Failed to set mode on `%s': %s"
+#~ msgstr "Nisem uspel nastaviti na鋱na `%s': %s"
+
+#~ msgid "No database available to save your configuration"
+#~ msgstr "Zbirka podatkov za shranitev va隘h nastavitev ni na voljo"
+
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "Opis problema OAF: '%s'"
+
+#~ msgid ""
+#~ "Unable to store a value at key '%s', as the configuration server has no "
+#~ "writeable databases. There are two common causes of this problem: 1) your "
+#~ "configuration path file doesn't contain any databases or wasn't found or 2) "
+#~ "OAF mistakenly created two gconfd processes. If you have two gconfd "
+#~ "processes (or had two at the time the second was launched), then it's an OAF "
+#~ "bug, not a GConf issue. Logging out, killing oafd and gconfd, and logging "
+#~ "back in may help. As always, check the user.* syslog for details on problems "
+#~ "gconfd encountered."
+#~ msgstr ""
+#~ "Nisem mogel shraniti vrednosti pri klju鋎 '%s', saj stre駐ik nastavitev nima "
+#~ "nobene pisljive zbirke podatkov. Ta problem ima dva pogosta vzroka: 1) va鈴 "
+#~ "pot nastavitev ne vsebuje nobene zbirke podatkov ali ni bila najdena ali 2) "
+#~ "OAF je pomotoma ustvaril dva procesa gconfd. �e imate dva procesa gconfd "
+#~ "(ali ste imeli dva, ko se je pognal drugi), potem je hro寡 v OAF-u in ne v "
+#~ "GConf. �e se odjavite, ubijete oafd in gconfd in ponovno prijavite, lahko "
+#~ "problem izgine. Kot vedno, preverite user.* sistemski dnevnik za podrobnosti "
+#~ "o problemu na katerega je naletel gconfd."
 
 #~ 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."
+#~ "oaf_activate_from_id() and did not set an exception explaining the problem. "
+#~ "This is a bug in the OAF package; something went wrong in OAF, and no error "
+#~ "was reported. This is not a bug in the GConf package. Do not report a GConf "
+#~ "bug unless you have information indicating what went wrong with OAF that was "
+#~ "caused by GConf."
+#~ msgstr ""
+#~ "Napaka ob vzpostavljanju povezave z nastavitvenim stre駐ikom: OAF je vrnil "
+#~ "nil iz oaf_activate_from_id() in ni nastavil izjeme, ki bi razlo養la "
+#~ "problem. To je hro寡 v paketu OAF; v OAF je 雍o nekaj narobe, a ni bila "
+#~ "sporo鋀na nobena napak. To ni hro寡 v paketu GConf. Ne oddajte poro鋱la o "
+#~ "hro寡u v GConf v kolikor nimate podatkov, da je GConf povzro鋱l napako v OAF."
+
+#~ msgid "/path"
+#~ msgstr "/pot"
+
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgstr ""
+#~ "Prejel signal %d, izpisujem pomnilnik. Prosimo poro醀jte o hro寡u v GConf."
+
+#~ msgid ""
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 #~ msgstr ""
-#~ "Napaka ob povezovanju s stre駐ikom nastavitev: OAF je vrnil nil (ni�) iz "
-#~ "oaf_activate_from_id() in ni nastavil izjeme (exception), ki razlaga "
-#~ "problem. Prosimo po雍jite poro鋱lu o hro寡u v OAF."
+#~ "Prejel singal %d, neobi醀jno se ustavljam. Prosimo poro醀jte o hro寡u v "
+#~ "GConf."
+
+#~ msgid "Failed to create %s: %s"
+#~ msgstr "Nisem uspel ustvariti %s: %s"
 
-#~ msgid "GConf was built with debugging features enabled"
-#~ msgstr "GConf je bil zgrajen z vklju鋀nimi mo駐ostmi razhro寡venja"
+#~ msgid "Failed to get lock for daemon: %s"
+#~ msgstr "Nisem uspel dobiti klju醀vnice za daemona: %s"
+
+#~ msgid ""
+#~ "Registering existing server with oafd, since OAF appears to have leaked it"
+#~ msgstr ""
+#~ "Registriram obstoje� stre駐ik pri oafd-ju, ker izgleda, da ga je OAF izgubil"
+
+#~ msgid ""
+#~ "OAF doesn't know about our IID; indicates broken installation; can't "
+#~ "register existing server."
+#~ msgstr ""
+#~ "OAF ne ve za na� IID; to ka頡 na po隕odovano namestitev; ne mroem "
+#~ "registrirati obstoje鋀ga stre駐ika."
+
+#~ msgid ""
+#~ "Another gconfd already registered with OAF, so we can't register the "
+#~ "existing server"
+#~ msgstr ""
+#~ "Drug gconfd je 頡 registrian pri OAF-u, zato obstoje鋀ga stre駐ika ne moremo "
+#~ "registrirati"
+
+#~ msgid "Unknown error registering existing gconfd with OAF; exiting"
+#~ msgstr ""
+#~ "Neznana napaka ob registriranju obstoje鋀ga gconfd-ja pri OAF-u; kon鋎jem"
+
+#~ msgid "Failed to release lockfile: %s"
+#~ msgstr "Nisem uspel sprostiti klju醀vni鋝e datoteke: %s"
+
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "Stre駐ik GConf ni v uporabi, kon鋎jem."
+
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "Napaka ob branju datoteke s shranjenim stanjem: %s"
+
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "Nisem uspel dobiti IOR za odjemalca: %s"
+
+#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgstr ""
+#~ "Nisem uspel zapisati dodajanja odjemalca v datoteko s shranjenim stanjem: %s"
+
+#~ msgid ""
+#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ msgstr ""
+#~ "Nek odjemalec se je odstranil z GConf stre駐ika, 鋀prav ni bil dodan."
+
+#~ msgid "Get the short doc string for a key"
+#~ msgstr "Dobi kratek niz dokumentacije za klju�"
+
+#~ msgid "Get the long doc string for a key"
+#~ msgstr "Dobi dolg niz dokumentacije za klju�"
+
+#~ msgid "Get the name of the schema applied to this key"
+#~ msgstr "Dobi ime sheme, ki je uveljavljena na tem klju鋎"
+
+#~ msgid ""
+#~ "Specify the schema name followed by the key to apply the schema name to"
+#~ msgstr ""
+#~ "Navedite ime sheme, ki ji sledi ime klju醀 na katerem naj se shema uveljavi"
+
+#~ msgid "Default Value: %s\n"
+#~ msgstr "Privzeta vrednost: %s\n"
+
+#~ msgid "Error setting value: %s\n"
+#~ msgstr "Napaka ob nastavljanju vrednosti: %s\n"
+
+#~ msgid "Error syncing: %s\n"
+#~ msgstr "Napaka ob usklajevanju: %s\n"
+
+#~ msgid "Must specify a key or keys on the command line\n"
+#~ msgstr "Klju� ali klju鋱 morajo biti navedeni v ukazni vrstici\n"
+
+#~ msgid "No schema known for `%s'\n"
+#~ msgstr "Shema za `%s' ni znana\n"
+
+#~ msgid "No doc string stored in schema at '%s'\n"
+#~ msgstr "Niz dokumentacije ni shranjen za shemo pri '%s'\n"
+
+#~ msgid "Error getting schema at '%s': %s\n"
+#~ msgstr "Napaka ob dobivanju sheme pri '%s': %s\n"
+
+#~ msgid "No schema stored at '%s'\n"
+#~ msgstr "Shema pri `%s' ni shranjena\n"
+
+#~ msgid "Value at '%s' is not a schema\n"
+#~ msgstr "Vrednost pri '%s' ni shema\n"
+
+#~ msgid "Must specify a schema name followed by the key name to apply it to\n"
+#~ msgstr ""
+#~ "Navesti morate ime sheme, ki mu sledi ime klju醀 na katerem naj se shema "
+#~ "uveljavi\n"
+
+#~ msgid "Error associating schema name '%s' with key name '%s': %s\n"
+#~ msgstr "Napaka pri povezovanju sheme '%s' s klju鋀m  '%s': %s\n"
+
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "Napaka gconf %s\n"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Ne morem shraniti vrednosti pri klju鋎  `%s'"
diff --git a/po/sv.po b/po/sv.po
index a9d478cf..fa3e0848 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf\n"
-"POT-Creation-Date: 2001-02-09 14:31+0100\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2000-12-14 13:19+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -15,34 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "Gl闣mer BerkeleyDB-backendmodulen (BDB)."
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "珽pnade BerkeleyDB-k鄟la vid rot %s"
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "Initierar BDB-backendmodulen"
-
-#: backends/dir-utils.c:108
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "Kunde inte hitta %s-rotkatalogen i adressen \"%s\""
-
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "Kunde inte skapa katalogen \"%s\": %s"
-
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "Kan inte l酲a eller skriva till %s-rotkatalogen i adressen \"%s\""
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Kopplar bort XML-backendmodulen."
@@ -52,6 +24,11 @@ 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:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "Kunde inte skapa katalogen \"%s\": %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -75,7 +52,7 @@ msgstr "Kunde inte ge upp l廛 p� XML-katalogen \"%s\": %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "Osynkroniserade katalogborttagningar vid avst鄚gning av XML-backenden"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -84,7 +61,7 @@ msgstr ""
 "Kunde inte ta bort katalogen \"%s\" fr幩 XML-backenden eftersom den inte har "
 "synkroniserats korrekt till disk"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -103,63 +80,58 @@ msgstr "Kunde inte ta status p� \"%s\": %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML-filnamnet \"%s\" 酺 en katalog"
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Misslyckades med att ta bort \"%s\": %s"
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Misslyckades med att skriva filen \"%s\": %s"
 
-#: backends/xml-dir.c:359
-#, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr "Misslyckades med att s酹ta l輍e p� \"%s\": %s"
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Misslyckades med att byta namn p� \"%s\" till \"%s\": %s"
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Misslyckades med att 廞erskapa \"%s\" fr幩 \"%s\": %s"
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Misslyckades med att ta bort den gamla filen \"%s\": %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Misslyckades med att ta status p� \"%s\": %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Dubbla \"%s\"-poster i \"%s\", ignorerar"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Post utan namn i XML-filen \"%s\", ignorerar"
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "琌ersta noden i XML-filen \"%s\" 酺 inte ett <entry>, ignorerar"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Misslyckades med att skapa filen \"%s\": %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2442
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Misslyckades med att st鄚ga filen \"%s\": %s"
@@ -170,7 +142,7 @@ msgstr "Misslyckades med att st鄚ga filen \"%s\": %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorerar XML-noden med namnet \"%s\": %s"
 
-#: backends/xml-entry.c:199
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -188,76 +160,80 @@ msgstr "Ignorerar schemanamnet \"%s\", ogiltigt: %s"
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr "Ignorerar XML-noden \"%s\", utom f顤 m鐱liga schemanamnet: %s"
 
-#: backends/xml-entry.c:723
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr "hittade <local_schema> utan n嶓on lokalinst鄟lning"
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Misslyckades med att l酲a standardv酺det f顤 schema: %s"
 
-#: backends/xml-entry.c:937
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Inget \"type\"-attribut f顤 noden <%s>"
 
-#: backends/xml-entry.c:951
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "En nod har ok鄚t \"type\"-attribut \"%s\", ignorerar"
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "Inget \"value\"-attribut f顤 nod"
 
-#: backends/xml-entry.c:1014 backends/xml-entry.c:1090
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "F顤stod inte XML-noden <%s> inuti en XML-listnod"
 
-#: backends/xml-entry.c:1048
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Ogiltig typ (lista, par eller ok鄚d) i en listnod"
 
-#: backends/xml-entry.c:1071
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Felaktig XML-nod: %s"
 
-#: backends/xml-entry.c:1079
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Listan inneh嶚ler en felaktigt skriven nod (%s, borde varit %s)"
 
-#: backends/xml-entry.c:1131
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorerar felaktig car i XML-par: %s"
 
-#: backends/xml-entry.c:1140 backends/xml-entry.c:1163
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "tolkar XML-fil: listor och par f緳 inte placeras inuti par"
 
-#: backends/xml-entry.c:1153
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorerar felaktig cdr i XML-par: %s"
 
-#: backends/xml-entry.c:1172
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "F顤stod inte XML-noden <%s> inuti en XML-parnod"
 
-#: backends/xml-entry.c:1190
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Hittade inte car och cdr f顤 XML-parnoden"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Cdr saknas i ett par med v酺den i XML-filen"
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "Car saknas i ett par med v酺den i XML-filen"
 
-#: backends/xml-entry.c:1208
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "B嶟e car- och cdr-v酺den saknas i ett par med v酺den i XML-filen"
 
@@ -290,31 +266,31 @@ msgstr "Kunde inte hitta backendmodulen f顤 \"%s\""
 msgid "Failed to shut down backend"
 msgstr "Fel vid avst鄚gning av backend"
 
-#: gconf/gconf-database.c:233
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Mottog ogiltigt v酺de i s酹tbeg酺an"
 
-#: gconf/gconf-database.c:241
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Kunde inte f� ut n嶓ot vettigt av CORBA-v酺det som mottogs i s酹tbeg酺an f顤 "
 "nyckeln \"%s\""
 
-#: gconf/gconf-database.c:521
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "Mottog beg酺an att sl鄡pa all cachad data"
 
-#: gconf/gconf-database.c:538
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "Mottog beg酺an att synkronisera synkront"
 
-#: gconf/gconf-database.c:605
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "Allvarligt fel: misslyckades med att f� objektreferens f顤 konfig-databasen"
 
-#: gconf/gconf-database.c:764
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Misslyckades med att synkronisera med en eller flera k鄟lor: %s"
@@ -323,7 +299,7 @@ msgstr "Misslyckades med att synkronisera med en eller flera k鄟lor: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -334,12 +310,12 @@ msgstr ""
 "kunna 廞erst鄟la den h酺 lyssnaren vid omstart av gconfd, vilket kommer att "
 "resultera i otillf顤litliga meddelanden om konfigurations鄚dringar."
 
-#: gconf/gconf-database.c:871
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Lyssnar-ID %lu finns inte"
 
-#: gconf/gconf-database.c:880
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -348,47 +324,47 @@ msgstr ""
 "Misslyckades med att logga borttagningen av lyssnare i loggfilen (troligtvis "
 "ofarligt, men kan resultera i att ett meddelande pl飆sligt 廞erkommer): %s"
 
-#: gconf/gconf-database.c:992 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fel vid h鄝tning av v酺de f顤 \"%s\": %s"
 
-#: gconf/gconf-database.c:1039
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Fel n酺 v酺de f顤 \"%s\" sattes: %s"
 
-#: gconf/gconf-database.c:1082
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Fel vid 廞erst鄟lning av \"%s\": %s"
 
-#: gconf/gconf-database.c:1106
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Fel vid h鄝tning av standardv酺de f顤 \"%s\": %s"
 
-#: gconf/gconf-database.c:1145
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Fel vid existenskontroll av \"%s\": %s"
 
-#: gconf/gconf-database.c:1169
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Fel vid borttagning av katalog \"%s\": %s"
 
-#: gconf/gconf-database.c:1195
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Misslyckades med att h鄝ta alla poster i \"%s\": %s"
 
-#: gconf/gconf-database.c:1221
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Fel vid listning av kataloger i \"%s\": %s"
 
-#: gconf/gconf-database.c:1242
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Fel n酺 schema f顤 \"%s\" sattes: %s"
@@ -453,9 +429,224 @@ msgstr "Operationen inte till廞en utan en konfigurationsserver"
 msgid "Failed to get a lock"
 msgstr "Misslyckades med att f� ett l廛"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "Ingen databas tillg鄚glig f顤 sparande av din konfiguration"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+"Fel p� rad %d, tecken %d: %s\n"
+"(En del omgivande text var \"%s\")\n"
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+"Texten slutade mitt i en entitet, eller s� 酺 entitetsnamnet f顤 l幩gt f顤 "
+"att vara giltigt (\"&\" m廛te finnas i b顤jan p� en enhet, exempelvis "
+"\"&quot;\")"
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+"Ok鄚d entitet \"%s\" (\"&\" m廛te finnas i b顤jan p� entitet, exempelvis "
+"&amp; &quot; &lt; &gt; &apos;)"
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+"M酺kestexten slutade i mitten av en teckenreferens, precis efter \"&#\""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+"Teckenreferensen inneh闤l tecknet \"%s\" som inte 酺 en siffra (\"&#\" m廛te "
+"inleda en referens till ett Unicode-tecken, exempelvis \"&#2342;\")"
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+"Texten slutade i mitten av en teckenreferens (\"&#\" m廛te inleda en "
+"teckenreferens, exempelvis \"&#2342;\")"
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+"Kunde inte tolka teckenreferensen \"%s\" (\"&#\" m廛te inleda en "
+"teckenreferens, exempelvis \"&#2342;\")"
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+"Teckenkoden %#lx 酺 inte till廞en i XML eller 酺 inte ett giltigt "
+"Unicode-tecken"
+
+#: gconf/gconf-glib.c:1013
+#, fuzzy
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+"Dokumentet slutade direkt efter ett \"&\", \"&\" ska inleda en entitets- "
+"eller teckenreferens."
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+"Tecknen \"<\" eller \">\" 酺 inte till廞na h酺; de 酺 endast till廞na runt "
+"taggar, exempelvis <bold> eller <paragraph>. P� andra st鄟len b顤 du koda "
+"dessa tecken som entiteterna &lt; och &gt;"
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr "Tecknet \"%s\" 酺 inte giltigt som inledning p� ett attributnamn"
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr "Dokumentet slutade direkt ett attributnamn"
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr "Attributnamn m廛te omedelbart 廞f闤jas av ett \"=\"-tecken"
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+"\"=\"-tecknet efter ett attribut m廛te omedelbart 廞f闤jas av ett \"-tecken"
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+"Tecknet \"%c\" hittades inuti ett attributv酺de. Ditt attributv酺de kanske "
+"saknar det avslutande citationstecknet \""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+"Fick slut p� text innan ett citationstecken (\") hittades i slutet av ett "
+"attributv酺de"
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+"Texten slutar omedelbart efter ett attributv酺de, innan elementet var st鄚gt"
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr "Ett \"<\" saknas i b顤jan p� element"
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr "Dokumentet slutar omedelbart efter ett \"<\"-tecken"
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr "Inget avslutande \">\" hittades till ett <? eller <!"
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr "Tecknet \"%s\" 酺 inte giltigt som inledning p� ett elementnamn"
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr "Dokumentet slutade direkt efter elementnamn, inget \">\" hittades"
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr "Element m廛te avslutas med \">\" eller \"/>\", inte med \"%s\""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+"Elementet slutade direkt efter ett \"/\"; inget \">\" hittades. Tomma "
+"element b顤 avslutas med \"/>\""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr "Avslutande tagg hittades inte i slutet av element"
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr "Avslutande tagg direkt efter \"<\"-tecken"
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr "Avslutande tagg ska inledas med \"</\", \"/\"-tecknet saknas"
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr "Avslutande tagg slutar direkt efter \"/\"-tecknet"
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+"Dokumentet slutade direkt efter elementnamnet i avslutningstagg, ingen \">\" "
+"hittades"
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+"Dokumentet slutade direkt efter namnet p� avslutningstagg, ingen \">\" "
+"hittades"
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr "Avslutningstaggen \"%s\" passar inte med 鞿pningstaggen \"%s\""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+"Ogiltigt UTF-8-tecken vid byte %d i den m酺kta texten. Texten n酺mast innan "
+"det felaktiga tecknet var \"%s\""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr "Den m酺kta texten inneh闤l inget annat 鄚 blanksteg."
+
+#: gconf/gconf-glib.c:10666
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Misslyckades med att 鞿pna filen \"%s\": %s"
+
+#: gconf/gconf-glib.c:10683
+#, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Fel vid l酲ning av filen \"%s\": %s"
 
 #: gconf/gconf-internals.c:85
 #, c-format
@@ -479,102 +670,97 @@ msgstr "Mottog lista fr幩 gconfd med en felaktig listtyp"
 msgid "Failed to convert object to IOR"
 msgstr "Misslyckades med att konvertera objekt till IOR"
 
-#: gconf/gconf-internals.c:809
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Kunde inte 鞿pna s闥v輍sfilen \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:856
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "L輍ger till k鄟lan \"%s\"\n"
 
-#: gconf/gconf-internals.c:868
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Fel vid l酲ning av fil \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:1292
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "F顤v鄚tade lista, fick %s"
 
-#: gconf/gconf-internals.c:1302
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "F顤v鄚tade lista med %s, fick lista med %s"
 
-#: gconf/gconf-internals.c:1441
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "F顤v鄚tade par, fick %s"
 
-#: gconf/gconf-internals.c:1455
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "F顤v鄚tade ett (%s,%s)-par, fick ett par d酺 ett eller b嶟a v酺dena saknades"
 
-#: gconf/gconf-internals.c:1471
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "F顤v鄚tade par av typen (%s,%s), men fick typen (%s,%s)"
 
-#: gconf/gconf-internals.c:1587
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Citerad str鄚g b顤jar inte med ett citationstecken"
 
-#: gconf/gconf-internals.c:1649
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Citerad str鄚g slutar inte med ett citationstecken"
 
-#: gconf/gconf-internals.c:2129 gconf/gconf.c:2945
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-fel: %s"
 
-#: gconf/gconf-internals.c:2145
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "OAF-problembeskrivning: \"%s\""
-
-#: gconf/gconf-internals.c:2151
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "f顤s闥er att ta bort icke-listad OAF-objektkatalog"
 
-#: gconf/gconf-internals.c:2156
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "f顤s闥er att l輍ga till en redan listad OAF-katalog"
 
-#: gconf/gconf-internals.c:2163
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF-tolkningsfel: %s"
 
-#: gconf/gconf-internals.c:2168
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Ok鄚t OAF-fel"
 
-#: gconf/gconf-internals.c:2251
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Ingen ior-fil i \"%s\""
 
-#: gconf/gconf-internals.c:2282
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd tar l廛et \"%s\" fr幩 en annan process"
 
-#: gconf/gconf-internals.c:2293
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Ett annat program har l廛et \"%s\""
 
-#: gconf/gconf-internals.c:2313
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "kunde inte kontakta ORB f顤 att pinga existerande gconfd"
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -583,43 +769,43 @@ msgstr ""
 "Tar bort det gamla l廛et \"%s\" p� grund av att IOR inte kunde konverteras "
 "till objektreferensen, IOR \"%s\""
 
-#: gconf/gconf-internals.c:2333
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "Tar bort det gamla l廛et \"%s\" p� grund av fel vid pingande av server: %s"
 
-#: gconf/gconf-internals.c:2345
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf-konfigurationsdemonen (gconfd) har l廛et \"%s\""
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "kunde inte skapa katalog \"%s\": %s"
 
-#: gconf/gconf-internals.c:2394
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "kunde inte skapa l廛et \"%s\": %s"
 
-#: gconf/gconf-internals.c:2430
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kan inte skriva till filen \"%s\": %s"
 
-#: gconf/gconf-internals.c:2473
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "Kan inte 鞿pna l廛fil \"%s\"; antar att den inte 酺 v緳: %s"
 
-#: gconf/gconf-internals.c:2490
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Korrupt l廛fil \"%s\", tar bort den 鄚d�"
 
-#: gconf/gconf-internals.c:2500
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -628,26 +814,26 @@ msgstr ""
 "Skapade inte l廛filen \"%s\" (skapare pid %u, v緳t pid %u; antar att n嶓on "
 "tog v緳t l廛"
 
-#: gconf/gconf-internals.c:2517
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Misslyckades med att sl鄡pa l廛et p� katalogen \"%s\": %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Misslyckades med att l酲a k鄟lkoden \"%s\": %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Schemat \"%s\" som 酺 angivet f顤 \"%s\" lagrar ett icke-schema-v酺de"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Namnet \"/\" kan bara vara en katalog, inte en nyckel"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -656,22 +842,17 @@ msgstr ""
 "V酺det f顤 \"%s\" 酺 satt i en skrivskyddad k鄟la i b顤jan p� din "
 "konfigurationss闥v輍."
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "Kan inte lagra ett v酺de vid nyckeln \"%s\""
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Fel vid s闥ning av metainformation: %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Fel vid h鄝tning av metainformation: %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -743,21 +924,21 @@ msgstr "F顤stod inte \"%s\" (ett extra \")\" utan escape hittades inuti par)"
 msgid "`%s': %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Servern kunde inte l飉a adressen \"%s\""
 
-#: gconf/gconf.c:568
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "Kan inte l輍ga till notifikationer till lokal konfigurationsk鄟la"
 
-#: gconf/gconf.c:1724
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr "Till輍g av klient till serverns lista misslyckades, CORBA-fel: %s"
 
-#: gconf/gconf.c:1740
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -767,66 +948,66 @@ msgstr ""
 "oaf_activate_from_id() och satte inte ett undantag som f顤klarade problemet. "
 "Var v鄚lig och skicka en OAF-buggrapport."
 
-#: gconf/gconf.c:2051
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "Misslyckades med att initiera GConf, avslutar\n"
 
-#: gconf/gconf.c:2088
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "M廛te b顤ja med ett snedstreck (/)"
 
-#: gconf/gconf.c:2110
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan inte ha tv� snedstreck (/) i rad"
 
-#: gconf/gconf.c:2112
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan inte ha en punkt (.) precis efter ett snedstreck (/)"
 
-#: gconf/gconf.c:2133
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "\"%c\" 酺 ett ogiligt tecken i nyckel/katalognamnen"
 
-#: gconf/gconf.c:2147
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Nyckel/katalog kan inte avslutas med ett snedstreck (/)"
 
-#: gconf/gconf.c:2400
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Misslyckades med att st鄚ga ner konfigurationsservern: %s"
 
-#: gconf/gconf.c:2461
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "F顤v鄚tade flyttal, fick %s"
 
-#: gconf/gconf.c:2496
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "F顤v鄚tade heltal, fick %s"
 
-#: gconf/gconf.c:2531
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "F顤v鄚tade str鄚g, fick %s"
 
-#: gconf/gconf.c:2568
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "F顤v鄚tade boolean, fick %s"
 
-#: gconf/gconf.c:2601
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "F顤v鄚tade schema, fick %s"
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Avst鄚gningsbeg酺an mottagen"
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -834,7 +1015,7 @@ msgstr ""
 "gconfd kompilerades med avbuggning; f顤s闥 att ladda gconf.path fr幩 "
 "k鄟lkatalogen"
 
-#: gconf/gconfd.c:293
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -842,10 +1023,7 @@ msgstr ""
 "Kunde inte hitta n嶓ra konfigurationsfiler, f顤s闥er anv鄚da standard "
 "konfigurationsk鄟lan \"%s\""
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:301
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -853,12 +1031,12 @@ msgstr ""
 "Inga konfigurationsk鄟lor i k鄟ls闥v輍en, konfigurationen kommer ej sparas; "
 "redigera "
 
-#: gconf/gconfd.c:314
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Fel vid laddning av vissa konfigurationsk鄟lor: %s"
 
-#: gconf/gconfd.c:326
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -866,7 +1044,7 @@ msgstr ""
 "Inga konfigurationsk鄟lor kunde l飉as, kan inte ladda eller spara "
 "konfigurationsdata"
 
-#: gconf/gconfd.c:343
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -874,36 +1052,28 @@ msgstr ""
 "Inga skrivbara konfigurationsk鄟lor l飉tes lyckat, kommer kanske inte att "
 "kunna spara vissa konfigurations鄚dringar"
 
-#: gconf/gconfd.c:369
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-"Mottog signal %d, l鄝nar en core-fil. Rapportera v鄚ligen en bugg i GConf."
-
-#: gconf/gconfd.c:385
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
 #, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"Mottog signal %d, st鄚ger ner onormalt. Rapportera v鄚ligen en bugg i GConf."
+msgid "Received signal %d, shutting down."
+msgstr "Mottog signal %d, st鄚ger ner."
 
-#: gconf/gconfd.c:402
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Mottog signal %d, st鄚ger ner snyggt"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:451
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "startar (version %s), pid %u anv鄚dare \"%s\""
 
-#: gconf/gconfd.c:455
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr "GConf byggdes med fels闥ningsalternativ p廛lagna"
 
-#: gconf/gconfd.c:478
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
@@ -911,11 +1081,11 @@ msgstr ""
 "Misslyckades med att initiera Object Activation Framework: var god och "
 "skicka en buggrapport till OAF:s underh嶚lare"
 
-#: gconf/gconfd.c:498
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Misslyckades med att f� objektreferensen f顤 konfigurationsservern"
 
-#: gconf/gconfd.c:518
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -923,28 +1093,24 @@ msgstr ""
 "OAF vet inget om v緳 IID; verkar som en trasig installation; kan inte "
 "registrera; avslutar\n"
 
-#: gconf/gconfd.c:522
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "En annan gconfd 酺 redan registrerad hos OAF; avslutar\n"
 
-#: gconf/gconfd.c:527
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "Ok鄚t fel vid registrering av gconfd hos OAF; avslutar\n"
 
-#: gconf/gconfd.c:565
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Avslutar"
 
-#: gconf/gconfd.c:589
-msgid "GConf server is not in use, shutting down."
-msgstr "GConf-servern anv鄚ds inte, st鄚ger ner."
-
-#: gconf/gconfd.c:924
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Returnerar undantag: %s"
 
-#: gconf/gconfd.c:1012
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -953,7 +1119,7 @@ msgstr ""
 "Misslyckades med att 鞿pna gconfd-loggfilen; kommer inte att kunna "
 "廞erst鄟la lyssnare efter avslutning av gconfd (%s)"
 
-#: gconf/gconfd.c:1035
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -961,32 +1127,32 @@ msgstr ""
 "Misslyckades med att st鄚ga gconfd-loggfilen; data kanske inte har sparats "
 "korrekt (%s)"
 
-#: gconf/gconfd.c:1098
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Kunde inte 鞿pna tillst幩dsfilen \"%s\" f顤 skrivning: %s"
 
-#: gconf/gconfd.c:1112
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Kunde inte skriva fildeskriptorn f顤 tillst幩dsfilen \"%s\": %d: %s"
 
-#: gconf/gconfd.c:1121
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Misslyckades med att st鄚ga den nya tillst幩dsfilen \"%s\": %s"
 
-#: gconf/gconfd.c:1135
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Kunde inte flytta undan den gamla tillst幩dsfilen \"%s\": %s"
 
-#: gconf/gconfd.c:1145
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Misslyckades med att flytta den nya tillst幩dsfilen p� plats: %s"
 
-#: gconf/gconfd.c:1154
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -994,24 +1160,61 @@ msgstr ""
 "Misslyckades med att 廞erskapa den ursprungliga tillst幩dsfilen som hade "
 "flyttats till \"%s\": %s"
 
-#: gconf/gconfd.c:1627
+#: gconf/gconfd.c:1110
+#, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "F顤stod inte rad i tillst幩dsfilen: \"%s\""
+
+#: gconf/gconfd.c:1125
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Misslyckades med att tolka anslutnings-ID i tillst幩dsfilen"
+
+#: gconf/gconfd.c:1140
 #, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr ""
+"Misslyckades med att avcitera k鄟ladressen f顤 konfigurationen ifr幩 "
+"tillst幩dsfilen: %s"
+
+#: gconf/gconfd.c:1160
+#, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "Misslyckades med att avcitera lyssnarplatsen fr幩 tillst幩dsfilen: %s"
+
+#: gconf/gconfd.c:1180
+#, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Misslyckades med att avcitera IOR fr幩 tillst幩dsfilen: %s"
+
+#: gconf/gconfd.c:1204
 msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
 msgstr ""
-"Kunde inte 廞erst鄟la lyssnaren p� adress \"%s\", kunde inte tolka databasen"
+"Tillst幩dsfilen har hittat att samma lyssnare har lagts till tv� g幩ger; "
+"ignorerar den andra instansen"
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+"Tillst幩dsfilen hade en borttagning av en lyssnare som inte hade lagts till; "
+"ignorerar borttagningen."
 
-#: gconf/gconfd.c:1673
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Error reading saved state file: %s"
-msgstr "Fel vid l酲ning av tillst幩dsfilen: %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
+"Kunde inte 廞erst鄟la lyssnaren p� adress \"%s\", kunde inte tolka databasen"
 
-#: gconf/gconfd.c:1726
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Misslyckades med att 鞿pna tillst幩dsfilen \"%s\": %s"
 
-#: gconf/gconfd.c:1843
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to "
@@ -1021,7 +1224,7 @@ msgstr ""
 "kommer inte att kunna l輍ga in lyssnaren igen om gconfd avslutar eller "
 "st鄚gs av (%s)"
 
-#: gconf/gconfd.c:1848
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously "
@@ -1031,32 +1234,6 @@ msgstr ""
 "kan komma att felaktigt l輍ga in lyssnaren igen om gconfd avslutar eller "
 "st鄚gs ner (%s)"
 
-#: gconf/gconfd.c:1871 gconf/gconfd.c:2032
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "Misslyckades med att f� IOR f顤 klienten: %s"
-
-#: gconf/gconfd.c:1886
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "Misslyckades med att 鞿pna tillst幩dsfilen: %s"
-
-#: gconf/gconfd.c:1899
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr "Misslyckades med att skriva klienttill輍g till tillst幩dsfilen: %s"
-
-#: gconf/gconfd.c:1907
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr "Misslyckades med att t闣ma klienttill輍g till tillst幩dsfilen: %s"
-
-#: gconf/gconfd.c:1993
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr ""
-"N嶓on klient tog bort sig sj鄟v fr幩 GConf-servern n酺 den inte var tillagd."
-
 #: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Alternativ f顤 hj鄟p"
@@ -1364,180 +1541,174 @@ msgstr "Misslyckades med att starta konfigurationsservern (gconfd): %s\n"
 msgid "Must specify a key or keys to get\n"
 msgstr "M廛te ange en nyckel eller flera att f嫹n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listtyp: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car-typ: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr-typ: %s\n"
 
-#: gconf/gconftool.c:894
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr "Standardv酺de: %s\n"
+msgid "Owner: %s\n"
+msgstr "朧are: %s\n"
 
-#: gconf/gconftool.c:894 gconf/gconftool.c:896 gconf/gconftool.c:897
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Nollst鄟l"
 
-#: gconf/gconftool.c:896
-#, c-format
-msgid "Owner: %s\n"
-msgstr "朧are: %s\n"
-
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kort beskrivning: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "L幩g beskrivning: %s\n"
 
-#: gconf/gconftool.c:907
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Inget v酺de satt f顤 \"%s\"\n"
 
-#: gconf/gconftool.c:911
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Misslyckades med att f� v酺det f顤 \"%s\": %s\n"
 
-#: gconf/gconftool.c:954 gconf/gconftool.c:966
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "F顤st緳 inte typen \"%s\"\n"
 
-#: gconf/gconftool.c:978
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Du m廛te ange alternativa nycklar/v酺den som argument\n"
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Inget v酺de satt f顤 nyckel: \"%s\"\n"
 
-#: gconf/gconftool.c:1026
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Kan inte s酹ta schema som v酺de\n"
 
-#: gconf/gconftool.c:1036
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "N酺 du anger en lista m廛te du ange en primitiv listtyp\n"
 
-#: gconf/gconftool.c:1050
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "N酺 du anger ett par m廛te du ange en primitiv car-typ och cdr-typ\n"
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fel: %s\n"
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1211
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Fel n酺 v酺de sattes: %s"
 
-#: gconf/gconftool.c:1096 gconf/gconftool.c:1225
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Fel vid synkronisering: %s"
 
-#: gconf/gconftool.c:1114
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "M廛te ange nyckel (schemanamn) som det enda argumentet\n"
 
-#: gconf/gconftool.c:1156
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Listtypen m廛te vara en primitiv typ: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Car-partypen m廛te vara en primitiv typ: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1196
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Cdr-partypen m廛te vara en primitiv typ: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1240
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr "M廛te ange en eller flera kataloger att f� nyckel/v酺de par fr幩.\n"
 
-#: gconf/gconftool.c:1254
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "M廛te ange en eller flera nycklar att nollst鄟la.\n"
 
-#: gconf/gconftool.c:1265
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Fel vid nollst鄟lning av \"%s\": %s\n"
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr "M廛te ange en eller flera kataloger att f� underkataloger fr幩.\n"
 
-#: gconf/gconftool.c:1322
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Fel vid listning av kataloger: %s\n"
 
-#: gconf/gconftool.c:1364
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "VARNING: ogiltig eller saknad typ f顤 schema (%s)\n"
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "VARNING: ogiltig eller saknad list_type f顤 schema (%s)\n"
 
-#: gconf/gconftool.c:1384 gconf/gconftool.c:1414 gconf/gconftool.c:1443
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "VARNING: Misslyckades med att tolka standardv酺de \"%s\" f顤 schema (%s)\n"
 
-#: gconf/gconftool.c:1402
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "VARNING: ogiltig eller saknad car_type eller cdr_type f顤 schema (%s)\n"
 
-#: gconf/gconftool.c:1427
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "VARNING: Du kan inte s酹ta ett standardv酺de f顤 ett schema\n"
 
-#: gconf/gconftool.c:1456
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "VARNING: internt fel i gconftool, ok鄚d GConfValueType\n"
 
-#: gconf/gconftool.c:1504 gconf/gconftool.c:1525 gconf/gconftool.c:1546
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "VARNING: misslyckades med att tolka typnamnet \"%s\"\n"
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1545,39 +1716,39 @@ msgstr ""
 "VARNING: list_type kan bara vara int, float, string eller bool och inte "
 "\"%s\"\n"
 
-#: gconf/gconftool.c:1542
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "VARNING: car_type kan bara vara int, float, string eller bool och inte "
 "\"%s\"\n"
 
-#: gconf/gconftool.c:1563
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "VARNING: cdr_type kan bara vara int, float, string eller bool och inte "
 "\"%s\"\n"
 
-#: gconf/gconftool.c:1590
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "VARNING: tom <applyto>-nod"
 
-#: gconf/gconftool.c:1593 gconf/gconftool.c:1856
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "VARNING: noden <%s> kan inte f顤st廛 under <schema>\n"
 
-#: gconf/gconftool.c:1603
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "VARNING: ingen nyckel angiven f顤 schema\n"
 
-#: gconf/gconftool.c:1636
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "VARNING: <locale>-noden har inget `name=\"locale\"'-attribut, ignorerar\n"
 
-#: gconf/gconftool.c:1642
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1585,53 +1756,53 @@ msgstr ""
 "VARNING: flera <locale>-noder f顤 platsen \"%s\", ignorerar allt f顤eg嶒nde "
 "f顤st\n"
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "VARNING: Ogiltig nod <%s> i en <locale>-nod\n"
 
-#: gconf/gconftool.c:1752
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 "VARNING: misslyckades med att installera schemat \"%s\" lokal \"%s\": %s\n"
 
-#: gconf/gconftool.c:1760
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Installerade schemat \"%s\" f顤 lokalen \"%s\"\n"
 
-#: gconf/gconftool.c:1782
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 "VARNING: misslyckades med att associera schemat `%s' med nyckeln `%s': %s\n"
 
-#: gconf/gconftool.c:1790
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Kopplade ihop schemat \"%s\" med nyckeln \"%s\"\n"
 
-#: gconf/gconftool.c:1869
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Du m廛te ha minst en <locale>-post i ett <schema>\n"
 
-#: gconf/gconftool.c:1898
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "VARNING: noden <%s> kan inte f顤st廛 under <schemalist>\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Misslyckades med att 鞿pna \"%s\": %s\n"
 
-#: gconf/gconftool.c:1927
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument \"%s\" tomt?\n"
 
-#: gconf/gconftool.c:1939
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1640,26 +1811,26 @@ msgstr ""
 "Dokumentet \"%s\" har fel typ av rotnod (<%s>, borde vara "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1952
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokumentet \"%s\" har ingen toppniv� <gconfschemafil> nod\n"
 
-#: gconf/gconftool.c:1966
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "VARNING: nod <%s> nedan <gconfschemafile> kan inte f顤st廛\n"
 
-#: gconf/gconftool.c:1977 gconf/gconftool.c:2009
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Fel vid synkronisering av konfigurationsdata: %s"
 
-#: gconf/gconftool.c:1993
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "M廛te ange n嶓on schemafil att installera\n"
 
-#: gconf/gconftool.c:2030
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1668,16 +1839,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2050
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Misslyckades med att nollst鄟la kn踄knyckeln %s: %s\n"
 
-#: gconf/gconftool.c:2176
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "M廛te ange n嶓ra nycklar att kn踄ka\n"
 
-#: gconf/gconftool.c:2182
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1687,11 +1858,11 @@ msgstr ""
 "nyckeln:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2200
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "M廛te ange n嶓ra kataloger att kn踄ka\n"
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1702,228 +1873,81 @@ msgstr ""
 "nyckeln i katalogen:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "GConf-fel: %s\n"
-
-#: wrappers/gtk/gconf-client.c:795
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf-varning: misslyckades med att lista par i \"%s\": %s"
 
-#: wrappers/gtk/gconf-client.c:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "F顤v鄚tade \"%s\", fick \"%s\" f顤 nyckeln \"%s\""
 
-#~ msgid "found <local_schema> with no locale setting"
-#~ msgstr "hittade <local_schema> utan n嶓on lokalinst鄟lning"
-
-#~ msgid ""
-#~ "Error on line %d char %d: %s\n"
-#~ "(Some surrounding text was '%s')\n"
-#~ msgstr ""
-#~ "Fel p� rad %d, tecken %d: %s\n"
-#~ "(En del omgivande text var \"%s\")\n"
-
-#~ msgid ""
-#~ "Text ended in the middle of an entity, or entity name too long to be valid "
-#~ "('&' should begin an entity such as '&quot;')"
-#~ msgstr ""
-#~ "Texten slutade mitt i en entitet, eller s� 酺 entitetsnamnet f顤 l幩gt f顤 "
-#~ "att vara giltigt (\"&\" m廛te finnas i b顤jan p� en enhet, exempelvis "
-#~ "\"&quot;\")"
-
-#~ msgid ""
-#~ "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
-#~ msgstr ""
-#~ "Ok鄚d entitet \"%s\" (\"&\" m廛te finnas i b顤jan p� entitet, exempelvis "
-#~ "&amp; &quot; &lt; &gt; &apos;)"
-
-#~ msgid ""
-#~ "Markup text ended in the middle of a character reference, just after '&#'"
-#~ msgstr ""
-#~ "M酺kestexten slutade i mitten av en teckenreferens, precis efter \"&#\""
-
-#~ msgid ""
-#~ "Character reference contained non-digit '%s' ('&#' should begin a reference "
-#~ "to a unicode character, such as '&#2342;')"
-#~ msgstr ""
-#~ "Teckenreferensen inneh闤l tecknet \"%s\" som inte 酺 en siffra (\"&#\" m廛te "
-#~ "inleda en referens till ett Unicode-tecken, exempelvis \"&#2342;\")"
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "Gl闣mer BerkeleyDB-backendmodulen (BDB)."
 
-#~ msgid ""
-#~ "Text ended in the middle of an character reference ('&#' should begin a "
-#~ "character reference such as '&#2342;')"
-#~ msgstr ""
-#~ "Texten slutade i mitten av en teckenreferens (\"&#\" m廛te inleda en "
-#~ "teckenreferens, exempelvis \"&#2342;\")"
-
-#~ msgid ""
-#~ "Couldn't parse character reference '%s' ('&#' must begin a character "
-#~ "reference such as '&#2343;')"
-#~ msgstr ""
-#~ "Kunde inte tolka teckenreferensen \"%s\" (\"&#\" m廛te inleda en "
-#~ "teckenreferens, exempelvis \"&#2342;\")"
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "珽pnade BerkeleyDB-k鄟la vid rot %s"
 
-#~ msgid ""
-#~ "Character code %#lx is not allowed in XML documents or is not a valid "
-#~ "Unicode character"
-#~ msgstr ""
-#~ "Teckenkoden %#lx 酺 inte till廞en i XML eller 酺 inte ett giltigt "
-#~ "Unicode-tecken"
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "Initierar BDB-backendmodulen"
 
-#~ msgid ""
-#~ "Document ended just after an '&', '&' should begin an entity or character "
-#~ "reference."
-#~ msgstr ""
-#~ "Dokumentet slutade direkt efter ett \"&\", \"&\" ska inleda en entitets- "
-#~ "eller teckenreferens."
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "Kunde inte hitta %s-rotkatalogen i adressen \"%s\""
 
 #~ msgid ""
-#~ "'<' or '>' character not allowed here; only allowed around tags, for example "
-#~ "<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
-#~ "&lt; and &gt;"
-#~ msgstr ""
-#~ "Tecknen \"<\" eller \">\" 酺 inte till廞na h酺; de 酺 endast till廞na runt "
-#~ "taggar, exempelvis <bold> eller <paragraph>. P� andra st鄟len b顤 du koda "
-#~ "dessa tecken som entiteterna &lt; och &gt;"
-
-#~ msgid "Character '%s' is not valid at the start of an attribute name"
-#~ msgstr "Tecknet \"%s\" 酺 inte giltigt som inledning p� ett attributnamn"
+#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ msgstr "Kan inte l酲a eller skriva till %s-rotkatalogen i adressen \"%s\""
 
-#~ msgid "Document ended just after attribute name"
-#~ msgstr "Dokumentet slutade direkt ett attributnamn"
+#~ msgid "Failed to set mode on `%s': %s"
+#~ msgstr "Misslyckades med att s酹ta l輍e p� \"%s\": %s"
 
-#~ msgid "Attribute name must be immediately followed by an '=' character"
-#~ msgstr "Attributnamn m廛te omedelbart 廞f闤jas av ett \"=\"-tecken"
+#~ msgid "No database available to save your configuration"
+#~ msgstr "Ingen databas tillg鄚glig f顤 sparande av din konfiguration"
 
-#~ msgid ""
-#~ "'=' character after attribute must be immediately followed by an '\"' "
-#~ "character"
-#~ msgstr ""
-#~ "\"=\"-tecknet efter ett attribut m廛te omedelbart 廞f闤jas av ett \"-tecken"
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "OAF-problembeskrivning: \"%s\""
 
-#~ msgid ""
-#~ "Character '%c' found inside an attribute value; perhaps your attribute value "
-#~ "is missing the closing quotation mark '\"'"
-#~ msgstr ""
-#~ "Tecknet \"%c\" hittades inuti ett attributv酺de. Ditt attributv酺de kanske "
-#~ "saknar det avslutande citationstecknet \""
-
-#~ msgid ""
-#~ "Ran out of text before a quote mark ('\"') was seen at the end of an "
-#~ "attribute value"
-#~ msgstr ""
-#~ "Fick slut p� text innan ett citationstecken (\") hittades i slutet av ett "
-#~ "attributv酺de"
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Kan inte lagra ett v酺de vid nyckeln \"%s\""
 
-#~ msgid ""
-#~ "Text ends immediately after an attribute value, before the element was closed"
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
 #~ msgstr ""
-#~ "Texten slutar omedelbart efter ett attributv酺de, innan elementet var st鄚gt"
-
-#~ msgid "Missing '<' at start of element"
-#~ msgstr "Ett \"<\" saknas i b顤jan p� element"
-
-#~ msgid "Document ended just after '<' character"
-#~ msgstr "Dokumentet slutar omedelbart efter ett \"<\"-tecken"
-
-#~ msgid "No closing '>' found for a <? or <!"
-#~ msgstr "Inget avslutande \">\" hittades till ett <? eller <!"
-
-#~ msgid "Character '%s' is not valid at the start of an element name"
-#~ msgstr "Tecknet \"%s\" 酺 inte giltigt som inledning p� ett elementnamn"
-
-#~ msgid "Document ended just after element name, no '>' seen"
-#~ msgstr "Dokumentet slutade direkt efter elementnamn, inget \">\" hittades"
-
-#~ msgid "Elements should be closed with '>' or '/>', not with '%s'"
-#~ msgstr "Element m廛te avslutas med \">\" eller \"/>\", inte med \"%s\""
+#~ "Mottog signal %d, l鄝nar en core-fil. Rapportera v鄚ligen en bugg i GConf."
 
 #~ msgid ""
-#~ "Element ended just after '/', no '>' seen; empty elements should end with "
-#~ "'/>'"
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 #~ msgstr ""
-#~ "Elementet slutade direkt efter ett \"/\"; inget \">\" hittades. Tomma "
-#~ "element b顤 avslutas med \"/>\""
+#~ "Mottog signal %d, st鄚ger ner onormalt. Rapportera v鄚ligen en bugg i GConf."
 
-#~ msgid "Close tag not found at end of element"
-#~ msgstr "Avslutande tagg hittades inte i slutet av element"
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "GConf-servern anv鄚ds inte, st鄚ger ner."
 
-#~ msgid "Close tag ends just after '<' character"
-#~ msgstr "Avslutande tagg direkt efter \"<\"-tecken"
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "Fel vid l酲ning av tillst幩dsfilen: %s"
 
-#~ msgid "Close tag should begin with '</', '/' character is missing"
-#~ msgstr "Avslutande tagg ska inledas med \"</\", \"/\"-tecknet saknas"
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "Misslyckades med att f� IOR f顤 klienten: %s"
 
-#~ msgid "Close tag ends just after '/' character"
-#~ msgstr "Avslutande tagg slutar direkt efter \"/\"-tecknet"
+#~ msgid "Failed to open saved state file: %s"
+#~ msgstr "Misslyckades med att 鞿pna tillst幩dsfilen: %s"
 
-#~ msgid "Document ended just after element name in close tag, no '>' seen"
-#~ msgstr ""
-#~ "Dokumentet slutade direkt efter elementnamnet i avslutningstagg, ingen \">\" "
-#~ "hittades"
-
-#~ msgid "Document ended just after close tag name, no '>' seen"
-#~ msgstr ""
-#~ "Dokumentet slutade direkt efter namnet p� avslutningstagg, ingen \">\" "
-#~ "hittades"
+#~ msgid "Failed to write client add to saved state file: %s"
+#~ msgstr "Misslyckades med att skriva klienttill輍g till tillst幩dsfilen: %s"
 
-#~ msgid "Close tag '%s' does not match opening tag '%s'"
-#~ msgstr "Avslutningstaggen \"%s\" passar inte med 鞿pningstaggen \"%s\""
+#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgstr "Misslyckades med att t闣ma klienttill輍g till tillst幩dsfilen: %s"
 
 #~ msgid ""
-#~ "Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
-#~ "bad character was '%s'"
-#~ msgstr ""
-#~ "Ogiltigt UTF-8-tecken vid byte %d i den m酺kta texten. Texten n酺mast innan "
-#~ "det felaktiga tecknet var \"%s\""
-
-#~ msgid "The marked-up text contained nothing but whitespace."
-#~ msgstr "Den m酺kta texten inneh闤l inget annat 鄚 blanksteg."
-
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Misslyckades med att 鞿pna filen \"%s\": %s"
-
-#~ msgid "Error reading file '%s': %s"
-#~ msgstr "Fel vid l酲ning av filen \"%s\": %s"
-
-#~ msgid "Received signal %d, shutting down."
-#~ msgstr "Mottog signal %d, st鄚ger ner."
-
-#~ msgid "Didn't understand line in saved state file: '%s'"
-#~ msgstr "F顤stod inte rad i tillst幩dsfilen: \"%s\""
-
-#~ msgid "Failed to parse connection ID in saved state file"
-#~ msgstr "Misslyckades med att tolka anslutnings-ID i tillst幩dsfilen"
-
-#~ msgid "Failed to unquote config source address from saved state file: %s"
+#~ "Some client removed itself from the GConf server when it hadn't been added."
 #~ msgstr ""
-#~ "Misslyckades med att avcitera k鄟ladressen f顤 konfigurationen ifr幩 "
-#~ "tillst幩dsfilen: %s"
-
-#~ msgid "Failed to unquote listener location from saved state file: %s"
-#~ msgstr ""
-#~ "Misslyckades med att avcitera lyssnarplatsen fr幩 tillst幩dsfilen: %s"
-
-#~ msgid "Failed to unquote IOR from saved state file: %s"
-#~ msgstr "Misslyckades med att avcitera IOR fr幩 tillst幩dsfilen: %s"
+#~ "N嶓on klient tog bort sig sj鄟v fr幩 GConf-servern n酺 den inte var tillagd."
 
-#~ msgid ""
-#~ "Saved state file records the same listener added twice; ignoring the second "
-#~ "instance"
-#~ msgstr ""
-#~ "Tillst幩dsfilen har hittat att samma lyssnare har lagts till tv� g幩ger; "
-#~ "ignorerar den andra instansen"
+#~ msgid "Default Value: %s\n"
+#~ msgstr "Standardv酺de: %s\n"
 
-#~ msgid ""
-#~ "Saved state file had a removal of a listener that wasn't added; ignoring the "
-#~ "removal."
-#~ msgstr ""
-#~ "Tillst幩dsfilen hade en borttagning av en lyssnare som inte hade lagts till; "
-#~ "ignorerar borttagningen."
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "GConf-fel: %s\n"
 
 #~ msgid ""
 #~ "Saved state file records the same client added twice; ignoring the second "
diff --git a/po/tr.po b/po/tr.po
index 5253ffb5..2efb51da 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.1\n"
-"POT-Creation-Date: 2001-03-17 16:31+0100\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 2001-03-16 21:50+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -13,34 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "BerkeleyDB (BDB) mod�l� kald�r�l�yor."
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr "BerkeleyDB kayna蹥 k闥 %s'de a踦ld�"
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "BDB mod�l� ba�lat�l�yor"
-
-#: backends/dir-utils.c:108
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "`%s' k闥 dizini `%s' adresinde bulunamad�"
-
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "`%s' dizini olu�turulamad�: %s"
-
-#: backends/dir-utils.c:212
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "%s dizini (%s adresindeki) okunamaz/yaz�lamaz"
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "XML mod�l� kald�r�l�yor."
@@ -50,6 +22,11 @@ msgstr "XML mod�l� kald�r�l�yor."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "`%s' adresinde XML k闥 dizini bulunamad�."
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "`%s' dizini olu�turulamad�: %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -73,7 +50,7 @@ msgstr "`%s' XML dizininde kilitleme yap�lamad�: %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "XML mod�l� kapat�l�rken baz� dizinler silinmeden kald�"
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -82,7 +59,7 @@ msgstr ""
 "Diskle e�zamanl� olmad�蹥ndan, XML mod�l�n�n arabelle簨ndeki `%s' dizini "
 "silinemiyor"
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -100,79 +77,74 @@ msgstr "`%s' durumlanamad�: %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML dosyaismi olarak verilen `%s' bir dizindir"
 
-#: backends/xml-dir.c:298 backends/xml-dir.c:305
+#: backends/xml-dir.c:293 backends/xml-dir.c:300
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "`%s' silinemedi: %s"
 
-#: backends/xml-dir.c:346
+#: backends/xml-dir.c:341
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "`%s' dosyas� yaz�lamad�: %s"
 
-#: backends/xml-dir.c:359
-#, c-format
-msgid "Failed to set mode on `%s': %s"
-msgstr "`%s'de kip belirlenemedi: %s"
-
-#: backends/xml-dir.c:373 backends/xml-dir.c:383
+#: backends/xml-dir.c:357 backends/xml-dir.c:367
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "`%s' `%s' olarak de簨�tirilemedi: %s"
 
-#: backends/xml-dir.c:389
+#: backends/xml-dir.c:373
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "`%s' `%s'den eski haline getirilemedi: %s"
 
-#: backends/xml-dir.c:401
+#: backends/xml-dir.c:385
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Eski dosya `%s' silinemedi: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "`%s' durumlanamad�: %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "`%s' girdisi `%s' i蓾nde tekrarland�, yoksay�l�yor"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "`%s' XML dosyas�nda isimsiz girdi var, yoksay�l�yor"
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "`%s' XML dosyas�ndaki ilk d�蹞m bir <entry> de簨l, yoksay�l�yor"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "`%s' dosyas� olu�turulamad�: %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2442
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "`%s' dosyas� kapat�lamad�: %s"
 
 #. There was an error
-#: backends/xml-entry.c:149
+#: backends/xml-entry.c:148
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "`%s' adl� XML d�蹞m� yoksay�l�yor: %s"
 
-#: backends/xml-entry.c:200
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:327
+#: backends/xml-entry.c:326
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "`%s' �ema ismi yoksay�l�yor, ge蔒rsiz: %s"
@@ -180,85 +152,89 @@ msgstr "`%s' �ema ismi yoksay�l�yor, ge蔒rsiz: %s"
 #. FIXME for nodes with no value stored, but containing a schema name,
 #. * we improperly log an error here
 #.
-#: backends/xml-entry.c:373
+#: backends/xml-entry.c:372
 #, c-format
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 "Bir �ema isminden ba�ka bir �ey i蔒rmeyen `%s' XML d�蹞m� yoksay�l�yor: %s"
 
-#: backends/xml-entry.c:724
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "溳ma i蓾n verilen 霵tan�ml� de簟r okunamad�: %s"
 
-#: backends/xml-entry.c:938
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "<%s> d�蹞m� i蓾n \"type\" de簟ri belirtilmemi�"
 
-#: backends/xml-entry.c:952
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Bilinmeyen `%s' \"type\" de簟rine sahip d�蹞m yoksay�ld�"
 
-#: backends/xml-entry.c:967
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "D�蹞mde \"value\" i蓾n bir �ey verilmemi�"
 
-#: backends/xml-entry.c:1015 backends/xml-entry.c:1091
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Bir XML liste d�蹞m� i蓾ndeki <%s> XML d�蹞m� anla��lamad�"
 
-#: backends/xml-entry.c:1049
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 "Bir liste d�蹞m� i蓾ndeki t�r (liste, de簟r 蓾fti ya da  her neyse) ge蔒rsiz"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "K飆� bi蓾mlendirilmi� XML d�蹞m�: %s"
 
-#: backends/xml-entry.c:1080
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Liste yanl�� t�rde d�蹞m i蔒riyor ( %s, %s olmal�yd�)"
 
-#: backends/xml-entry.c:1132
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "XML 蓾ftindeki hatal� `car' yoksay�l�yor: %s"
 
-#: backends/xml-entry.c:1141 backends/xml-entry.c:1164
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "XML dosyas� okunurken hata: listeler ve 蓾ftler bir ba�ka 蓾ftin i蓾ne "
 "yerle�tirilemez"
 
-#: backends/xml-entry.c:1154
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "XML 蓾ftinde hatal� `cdr' yoksay�ld�: %s"
 
-#: backends/xml-entry.c:1173
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Bir XML 蓾ftindeki <%s> XML d�蹞m� anla��lamad�"
 
-#: backends/xml-entry.c:1191
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "XML 蓾fti d�蹞m� i蓾n `car' ve `cdr' bulunamad�"
 
-#: backends/xml-entry.c:1197
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "XML dosyas�ndaki de簟r 蓾ftlerinden `cdr' eksik"
 
-#: backends/xml-entry.c:1204
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "XML dosyas�ndaki de簟r 蓾ftlerinden `car' eksik"
 
-#: backends/xml-entry.c:1209
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "XML dosyas�ndaki de簟r 蓾ftlerinde `car' ve `cdr'  ikisi de eksik"
 
@@ -291,28 +267,28 @@ msgstr "`%s' i蓾n mod�l bulunamad�"
 msgid "Failed to shut down backend"
 msgstr "Mod�l kapat�lamad�"
 
-#: gconf/gconf-database.c:231
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "Ayar iste簨nden ge蔒rsiz de簟r al�nd�"
 
-#: gconf/gconf-database.c:239
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr "`%s' anahtar�n�n ayar� i蓾n al�nan CORBA de簟rine anlam verilemedi"
 
-#: gconf/gconf-database.c:517
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "T�m arabelleklenmi� verinin silinmesi istendi"
 
-#: gconf/gconf-database.c:534
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr "E�zamanlaman�n e�zamanlanmas� istendi"
 
-#: gconf/gconf-database.c:601
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "珸�mc�l hata: ConfigDatabase i蓾n ba�vuru nesnesi al�namad�"
 
-#: gconf/gconf-database.c:760
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Bir ya da daha fazla kayna蹥n e�zamanlamas�nda hata: %s"
@@ -321,7 +297,7 @@ msgstr "Bir ya da daha fazla kayna蹥n e�zamanlamas�nda hata: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -332,12 +308,12 @@ msgstr ""
 "g�venilir olmayan bildirimlerinin sonucu olarak bu dinleyici gconfd tekrar "
 "ba�lat�l�rken etkinle�tirilemeyecek."
 
-#: gconf/gconf-database.c:873
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Dinleyici kimli簨 %lu yok"
 
-#: gconf/gconf-database.c:882
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -346,47 +322,47 @@ msgstr ""
 "Dinleyicinin kald�r�lmas� g�nl�k dosyas�na kaydedilemedi (genelde zarars�z, "
 "ara s�ra ortaya 踦kan bir sistem bildiriminin sonucu): %s"
 
-#: gconf/gconf-database.c:997 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "`%s' i蓾n de簟r al�n�rken hata: %s"
 
-#: gconf/gconf-database.c:1044
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "`%s' i蓾n de簟r belirtilirken hata: %s"
 
-#: gconf/gconf-database.c:1087
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "`%s' kald�r�lamad�: %s"
 
-#: gconf/gconf-database.c:1111
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "`%s' i蓾n 霵tan�ml� de簟r al�n�rken hata: %s"
 
-#: gconf/gconf-database.c:1151
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "`%s' var m�/yok mu bak�l�rken hata: %s"
 
-#: gconf/gconf-database.c:1175
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "`%s' dizini silinirken hata: %s"
 
-#: gconf/gconf-database.c:1202
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "`%s' i蓾ndeki t�m girdiler al�namad�: %s"
 
-#: gconf/gconf-database.c:1228
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "`%s' i蓾ndeki dizinler listelenirken hata: %s"
 
-#: gconf/gconf-database.c:1249
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "`%s' i蓾n �ema belirtilirken hata: %s"
@@ -451,9 +427,188 @@ msgstr "Yap�land�rma sunucusu olmaks�z�n i�lem yap�lamaz"
 msgid "Failed to get a lock"
 msgstr "Kilit olu�turulamad�"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "Yap�land�rman�z�n kaydedilebilece簨 bir veritaban� yok"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "`%s' dosyas� kapat�lamad�: %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "`%s' dizini silinirken hata: %s"
 
 #: gconf/gconf-internals.c:85
 #, c-format
@@ -477,101 +632,96 @@ msgstr "gconfd'den hatal� bir liste t�r� al�nd�"
 msgid "Failed to convert object to IOR"
 msgstr "Nesne IOR'a d霵��t�r�lemedi"
 
-#: gconf/gconf-internals.c:809
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Dizin dosyas� `%s' a踦lamad�: %s\n"
 
-#: gconf/gconf-internals.c:856
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "`%s' kayna蹥n�n eklenmesi\n"
 
-#: gconf/gconf-internals.c:868
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "`%s' dosyas�nda okuma hatas�: %s\n"
 
-#: gconf/gconf-internals.c:1292
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Liste beklerken, %s al�nd�"
 
-#: gconf/gconf-internals.c:1302
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "%s listesi beklenirken, %s listesi al�nd�"
 
-#: gconf/gconf-internals.c:1441
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "パft beklenirken, %s al�nd�"
 
-#: gconf/gconf-internals.c:1455
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr "(%s,%s) 蓾fti beklenirken , bir ya da iki de簟ri eksik bir 蓾ft al�nd�"
 
-#: gconf/gconf-internals.c:1471
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "(%s,%s) 蓾fti beklenirken, (%s,%s) 蓾fti al�nd�"
 
-#: gconf/gconf-internals.c:1587
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "T�rnaklarla belirlenen bir dizge ? i�areti ile ba�lamaz"
 
-#: gconf/gconf-internals.c:1649
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "T�rnaklarla belirlenen bir dizge ? i�areti ile bitmez"
 
-#: gconf/gconf-internals.c:2129 gconf/gconf.c:2999
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA hatas�: %s"
 
-#: gconf/gconf-internals.c:2145
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "OAF sorun tan�m�: %s"
-
-#: gconf/gconf-internals.c:2151
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "listelenmemi� OAF nesne dizini silinmeye 蓷l���l�yor"
 
-#: gconf/gconf-internals.c:2156
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "zaten listede olan OAF dizini eklenmeye 蓷l���l�yor"
 
-#: gconf/gconf-internals.c:2163
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF ayr��t�rma hatas�: %s"
 
-#: gconf/gconf-internals.c:2168
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "Bilinmeyen OAF hatas�"
 
-#: gconf/gconf-internals.c:2251
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "`%s' i蓾nde IOR dosyas� yok"
 
-#: gconf/gconf-internals.c:2282
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd `%s' kilidini di簟r s�re蔮erden al�yor"
 
-#: gconf/gconf-internals.c:2293
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "`%s' kilidi ba�ka bir uygulamaya ait"
 
-#: gconf/gconf-internals.c:2313
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "var olan gconfd'yi do繢ulamak i蓾n ORB'ye ba簰an�lamad�"
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -579,42 +729,42 @@ msgid ""
 msgstr ""
 "IOR nesne ba�vurusuna d霵��t�r�lemedi簨nden kilit `%s' kald�r�l�yor, IOR `%s'"
 
-#: gconf/gconf-internals.c:2333
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr "Sunucuya eri�im sorunlar�ndan dolay� `%s' kilidi kald�r�l�yor: %s"
 
-#: gconf/gconf-internals.c:2345
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf ardalan uygulamas� ( gconfd ) `%s' kilidine sahip"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "`%s' dizini olu�turulamad�: %s"
 
-#: gconf/gconf-internals.c:2394
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "`%s' kilidi olu�turulamad�: %s"
 
-#: gconf/gconf-internals.c:2430
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "`%s' dosyas�na yaz�lamad�: %s"
 
-#: gconf/gconf-internals.c:2473
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "`%s' kilit dosyas� a踦lamad�; bizim ki olmayabilir: %s"
 
-#: gconf/gconf-internals.c:2490
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Bozuk kilit dosyas� `%s' siliniyor"
 
-#: gconf/gconf-internals.c:2500
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -623,26 +773,26 @@ msgstr ""
 "`%s' kilit dosyas� olu�turulamad� ( \"yarat�c�\" pid %u, bizim pid %u; "
 "birisi bizim kilidi ald� galiba"
 
-#: gconf/gconf-internals.c:2517
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "`%s' kilit dizini b�rak�lamad�: %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "`%s' kayna蹥 y�klenemedi: %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "`%s' �emas� (`%s' i蓾n belirtilen) �ema olmayan bir de簟r i蔒riyor"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "'/' ile sadece bir dizin belirtilebilir, bir anahtar de簨l."
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -651,22 +801,17 @@ msgstr ""
 "`%s'in de簟ri yap�land�rma dizinlerinden birindeki bir salt-okunur kaynak "
 "i蓾nde belirtiliyor"
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "`%s' anahtar�na bir de簟r kaydedilemez"
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Meta bilgilerinin bulunmas�nda hata: %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Meta bilgileri al�rken hata: %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -738,21 +883,21 @@ msgstr "`%s' anla��lamad� (蓾ft i蓾nde fazladan bir ')' var)"
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Sunucu `%s' adresini 踤z�mleyemedi"
 
-#: gconf/gconf.c:571
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "Yerel yap�land�rma kayna蹥na bildirimler eklenemedi"
 
-#: gconf/gconf.c:1778
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr "酨temci, sunucular listesine eklenemedi, CORBA hatas�: %s"
 
-#: gconf/gconf.c:1794
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
@@ -762,66 +907,66 @@ msgstr ""
 "i�levinden de簟r alamad� ve bu sorunu a踦klayacak bir ola簜nd���l�k da yok. "
 "L�tfen bir OAF hata raporu g霵derin."
 
-#: gconf/gconf.c:2105
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConf 踤kt�\n"
 
-#: gconf/gconf.c:2142
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "Bir '/' ile ba�lamal�"
 
-#: gconf/gconf.c:2164
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "Bir sat�rda iki '/' olamaz"
 
-#: gconf/gconf.c:2166
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Bir nokta '/'den sonra gelemez"
 
-#: gconf/gconf.c:2187
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' anahtar/dizin isimlerinde ge蔒rsizdir"
 
-#: gconf/gconf.c:2201
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Anahtar/Dizin bir '/' ile bitemez"
 
-#: gconf/gconf.c:2454
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Yap�land�rma sunucusu kapat�lamad�: %s"
 
-#: gconf/gconf.c:2515
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "\"ger蔒k say�\" beklenirken %s al�nd�"
 
-#: gconf/gconf.c:2550
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "\"tamsay�\" beklenirken %s al�nd�"
 
-#: gconf/gconf.c:2585
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Dizge beklenirken %s al�nd�"
 
-#: gconf/gconf.c:2622
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "\"mant�ksal\" beklenirken %s al�nd�"
 
-#: gconf/gconf.c:2655
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "溳ma beklenirken %s al�nd�"
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "Kapatma iste簨 al�nd�"
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -829,7 +974,7 @@ msgstr ""
 "gconfd hata ay�klama se蔒ne簨 ile derlenmi�; gconf.path kaynak dizininden "
 "y�klenmeye 蓷l���l�yor"
 
-#: gconf/gconfd.c:293
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -837,10 +982,7 @@ msgstr ""
 "Yap�land�rma dosyalar� bulunamad�, 霵tan�ml� yap�land�rma kayna蹥 `%s' "
 "deneniyor"
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:301
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -848,16 +990,12 @@ msgstr ""
 "Kaynak dizininde yap�land�rma kaynaklar� yok, yap�land�rma kaydedilmeyecek "
 "d�zeltin "
 
-#: gconf/gconfd.c:301
-msgid "/path"
-msgstr "/dizin"
-
-#: gconf/gconfd.c:314
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Baz� yap�land�rma kaynaklar� y�klenirken hata: %s"
 
-#: gconf/gconfd.c:326
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -865,7 +1003,7 @@ msgstr ""
 "⑷z�mlenebilen bir yap�land�rma kayna蹥 adresi yok, yap�land�rma bilgisi "
 "y�klenemez ve kaydedilemez"
 
-#: gconf/gconfd.c:343
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -873,44 +1011,38 @@ msgstr ""
 "⑷z�mlenebilen bir yaz�labilir ayarlama kayna蹥 adresi yok, baz� "
 "yap�land�rma de簨�ikliklerini kaydetmek m�mk�n olmayabilir"
 
-#: gconf/gconfd.c:369
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-"%d sinyali al�nd�, core kaydedildi (GConf 踤kt�). L�tfen bir hata raporu "
-"g霵derin."
-
-#: gconf/gconfd.c:385
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"%d sinyali al�nd�, ola簜nd��� kapanma (GConf 踤kt�). L�tfen bir hata raporu "
-"g霵derin"
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down."
+msgstr "%d sinyali al�nd�, GConf kapat�l�yor."
 
-#: gconf/gconfd.c:402
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "%d sinyali al�nd�, GConf kapat�l�yor."
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:498
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "ba�l�yor (s�r�m: %s), pid %u kullan�c� `%s'"
 
-#: gconf/gconfd.c:525
+#: gconf/gconfd.c:380
+msgid "GConf was built with debugging features enabled"
+msgstr "GConf hata ay�klama 驆ellikleri ile derlenmi�"
+
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
 msgstr "OAF ba�lat�lamad�; l�tfen OAF yazarlar�na bir hata raporu g霵derin"
 
-#: gconf/gconfd.c:545
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr "ConfigServer i蓾n nesne ba�vurusu al�namad�"
 
-#: gconf/gconfd.c:565
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
@@ -918,28 +1050,24 @@ msgstr ""
 "OAF, GConf IID'sini tan�m�yor; bu hatal� bir y�kleme gibi g顤�n�yor; sisteme "
 "kay�tl� giri� yap�lamad�; GConf kapan�yor\n"
 
-#: gconf/gconfd.c:569
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "Ba�ka bir gconfd OAF'ta zaten kay�tl�; GConf kapan�yor\n"
 
-#: gconf/gconfd.c:574
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "gconfd OAF'a kaydedilirken bilinmeyen hata; GConf kapan�yor\n"
 
-#: gconf/gconfd.c:612
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "Kapan�yor"
 
-#: gconf/gconfd.c:637
-msgid "GConf server is not in use, shutting down."
-msgstr "GConf sunucusu kullan�mda de簨l, kapan�yor."
-
-#: gconf/gconfd.c:996
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "D霵en ola簜nd���l�k: %s"
 
-#: gconf/gconfd.c:1096
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -948,45 +1076,82 @@ msgstr ""
 "gconfd g�nl�k dosyas� a踦lamad�; gconfd kapand�ktan sonra dinleyiciler "
 "etkinle�tirilemeyecek (%s)"
 
-#: gconf/gconfd.c:1131
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 "gconfd g�nl�k dosyas� kapat�lamad�; veri gere簨 gibi kaydedilemeyecek (%s)"
 
-#: gconf/gconfd.c:1200
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Durum kay�t dosyas� '%s' yazmak i蓾n a踦lamad�: %s"
 
-#: gconf/gconfd.c:1214
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "'%s' durum kay�t dosyas�na yaz�lamad�, fd: %d: %s"
 
-#: gconf/gconfd.c:1223
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Yeni durum kay�t dosyas� '%s' kapat�lamad�: %s"
 
-#: gconf/gconfd.c:1237
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Eski durum kay�t dosyas� '%s' uygun bir yere ta��namad�: %s"
 
-#: gconf/gconfd.c:1247
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Yeni durum kay�t dosyas� yerine ta��namad�: %s"
 
-#: gconf/gconfd.c:1256
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr "'%s' e ta��nm�� olan durum kay�t dosyas� 驆g�n haline getirilemedi: %s"
 
-#: gconf/gconfd.c:1731
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "Durum kay�t dosyas� a踦lamad�: %s"
+
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "Durum kay�t dosyas� a踦lamad�: %s"
+
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr "Durum kay�t dosyas�na istemci eklenmesi kaydedilemedi: %s"
+
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "Durum kay�t dosyas�na istemci eklenmesi kaydedilemedi: %s"
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "Durum kay�t dosyas� a踦lamad�: %s"
+
+#: gconf/gconfd.c:1204
+msgid ""
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
+msgstr ""
+
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -994,17 +1159,12 @@ msgstr ""
 "'%s' adresindeki bir dinleyici eski haline getirilemedi, veritaban� "
 "踤z�mlenemedi"
 
-#: gconf/gconfd.c:1777
-#, c-format
-msgid "Error reading saved state file: %s"
-msgstr "Durum kay�t dosyas� okunurken hata: %s"
-
-#: gconf/gconfd.c:1830
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Durum kay�t dosyas� '%s' a踦lamad�: %s"
 
-#: gconf/gconfd.c:1947
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to "
@@ -1013,7 +1173,7 @@ msgstr ""
 "gconfd g�nl�k dosyas�na dinleyici eklenmesi kaydedilemedi; gconfd "
 "kapand�蹥nda dinleyici tekrar eklenemeyecek (%s)"
 
-#: gconf/gconfd.c:1952
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously "
@@ -1022,46 +1182,20 @@ msgstr ""
 "gconfd g�nl�k dosyas�na dinleyici kald�r�lmas� kaydedilemedi; gconfd "
 "kapand�蹥nda dinleyici istenmedi簨 halde tekrar eklenebilir (%s)"
 
-#: gconf/gconfd.c:1975 gconf/gconfd.c:2140
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "酨temci i蓾n IOR al�namad�: %s"
-
-#: gconf/gconfd.c:1990
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "Durum kay�t dosyas� a踦lamad�: %s"
-
-#: gconf/gconfd.c:2003
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr "Durum kay�t dosyas�na istemci eklenmesi kaydedilemedi: %s"
-
-#: gconf/gconfd.c:2011
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr ""
-"Durum kay�t dosyas�ndan istemci eklenmesinin temizlenmesi ba�ar�s�z: %s"
-
-#: gconf/gconfd.c:2101
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr "GConf sunucusu eklemedi簨 s�rada tek bir istemci sunucudan silindi."
-
-#: gconf/gconftool.c:63
+#: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "Yard�m se蔒nekleri"
 
-#: gconf/gconftool.c:72
+#: gconf/gconftool.c:71
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 "Bir anahtara bir de簟r ve e�zamanlama belirtilir. --type ile kullan�l�r."
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:80
 msgid "Print the value of a key to standard output."
 msgstr "Bir anahtar�n de簟rini standart 踦kt�ya yazar."
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:89
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
 "--type."
@@ -1069,35 +1203,35 @@ msgstr ""
 "Bir �ema ve e�zamanlama belirtilir. --short-desk, --long-desc, --owner, ve "
 "--type ile kullan�l�r."
 
-#: gconf/gconftool.c:100
+#: gconf/gconftool.c:99
 msgid "Unset the keys on the command line"
 msgstr "komut sat�r�nda anahtarlar� kald�r�r"
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:108
 msgid "Print all key/value pairs in a directory."
 msgstr "Dizindeki t�m anahtar/de簟r 蓾ftlerini g飉terir."
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:117
 msgid "Print all subdirectories in a directory."
 msgstr "Dizindeki t�m alt dizinleri g飉terir."
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:126
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "Bir dizinin alt�ndaki t�m alt dizinleri ard���k olarak g飉terir."
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:135
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Dizin varsa 0, yoksa 2 de簟rini al�r."
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:144
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "gconfd kapat�l�r. 幎� B嵬 SEBEB嵣幊 OLMADIKォ BU SEキNE倎 KULLANMAYIN."
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:153
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "gconfd etkinse 0 de簨lse 2 de簟rini al�r."
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:162
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1105,7 +1239,7 @@ msgstr ""
 "Yap�land�rma sunucusunu (gconfd) ba�lat�r. (Normalde ihtiya� varsa otomatik "
 "olarak ba�lat�l�r)"
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:171
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1113,11 +1247,11 @@ msgstr ""
 "De簟r t�r� bir ayarlama ya da bir �ema a踦klamas� olarak belirtilir. "
 "K�saltmalar e�sizse kabul edilir."
 
-#: gconf/gconftool.c:173
+#: gconf/gconftool.c:172
 msgid "int|bool|float|string|list|pair"
 msgstr "tam|mant�k|ger蔒k|dizge|liste|蓾ft"
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:180
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1125,11 +1259,11 @@ msgstr ""
 "Liste t�r� bir ayarlama ya da bir �ema a踦klamas� olarak belirtilir. "
 "K�saltmalar e�sizse kabul edilir."
 
-#: gconf/gconftool.c:182 gconf/gconftool.c:191 gconf/gconftool.c:200
+#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
 msgid "int|bool|float|string"
 msgstr "tam|mant�k|ger蔒k|dizge"
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:189
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1137,7 +1271,7 @@ msgstr ""
 "car 蓾ftinin t�r� bir ayarlama ya da bir �ema a踦klamas� olarak belirtilir. "
 "K�saltmalar e�sizse kabul edilir."
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:198
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1145,43 +1279,43 @@ msgstr ""
 "cdr 蓾ftinin t�r� bir ayarlama ya da bir �ema a踦klamas� olarak belirtilir. "
 "K�saltmalar e�sizse kabul edilir."
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:207
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Bir �emaya giden yar�m sat�rl�k bir a踦klama belirtilir."
 
-#: gconf/gconftool.c:209 gconf/gconftool.c:218
+#: gconf/gconftool.c:208 gconf/gconftool.c:217
 msgid "DESCRIPTION"
 msgstr "AケKLAMA"
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:216
 msgid "Specify a several-line description to go in a schema."
 msgstr "Bir �emaya giden bir ka� sat�rl�k bir a踦klama belirtilir."
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:225
 msgid "Specify the owner of a schema"
 msgstr "溳ma sahibi belirtilir"
 
-#: gconf/gconftool.c:227
+#: gconf/gconftool.c:226
 msgid "OWNER"
 msgstr "SAH嫊�"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:234
 msgid "Specify a schema file to be installed"
 msgstr "Y�kl� olan bir �ema dosyas� belirtilir"
 
-#: gconf/gconftool.c:236
+#: gconf/gconftool.c:235
 msgid "FILENAME"
 msgstr "DOSYA嵞M�"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:243
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "琄tan�ml� dosya yolu d���nda bir yap�land�rma kayna蹥 belirtilir"
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:244
 msgid "SOURCE"
 msgstr "KAYNAK"
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:252
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1189,7 +1323,7 @@ msgstr ""
 "Sunucuyu a�arak yap�land�rma veritaban�na do繢udan eri�ir. gconfd etkin "
 "olmad�蹥nda gereklidir."
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:261
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1200,7 +1334,7 @@ msgstr ""
 "yap�land�rma kayna蹥na ya da 霵tan�ml� kullan�lmak �zere bir bo� dizgeye "
 "ayarlanm�� olmal�d�r."
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:270
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1209,7 +1343,7 @@ msgstr ""
 "uygulayarak ve kald�rarak bir uygulaman�n deneme yan�lma usul� testleri "
 "yap�l�r."
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:279
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1218,7 +1352,7 @@ msgstr ""
 "uygulayarak ve kald�rarak bir uygulaman�n deneme yan�lma usul� testleri "
 "yap�l�r."
 
-#: gconf/gconftool.c:327
+#: gconf/gconftool.c:326
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1228,23 +1362,23 @@ msgstr ""
 "Kullan�labilecek komut sat�r� se蔒neklerinin tam listesini almak i蓾n '%s "
 "--help' 蓷l��t�r�n.\n"
 
-#: gconf/gconftool.c:339
+#: gconf/gconftool.c:338
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Ayn� anda hem al�ns�n hem de belirtilsin/kald�r�ls�n olmaz.\n"
 
-#: gconf/gconftool.c:346
+#: gconf/gconftool.c:345
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Ayn� anda hem belirtilsin hem de al�ns�n/kald�r�ls�n olmaz.\n"
 
-#: gconf/gconftool.c:354
+#: gconf/gconftool.c:353
 msgid "Can't use --all-pairs with --get or --set\n"
 msgstr "--all-pairs se蔒ne簨 ile --get veya --set birlikte kullan�lamaz.\n"
 
-#: gconf/gconftool.c:362
+#: gconf/gconftool.c:361
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "--all-dirs se蔒ne簨 ile --get veya --set birlikte kullan�lamaz.\n"
 
-#: gconf/gconftool.c:372
+#: gconf/gconftool.c:371
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
 "or --all-dirs\n"
@@ -1252,7 +1386,7 @@ msgstr ""
 "--recursive-list se蔒ne簨 ile --get, --set, --unset, --all-pairs, ya da "
 "--all-dirs birlikte kullan�lamaz.\n"
 
-#: gconf/gconftool.c:382
+#: gconf/gconftool.c:381
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
@@ -1260,58 +1394,58 @@ msgstr ""
 "--set_schema se蔒ne簨 ile --get, --set, --unset, --all-pairs, --all-dirs "
 "birlikte kullan�lamaz.\n"
 
-#: gconf/gconftool.c:388
+#: gconf/gconftool.c:387
 msgid "Value type is only relevant when setting a value\n"
 msgstr "De簟r t�r� sadece bir de簟r belirtildi簨nde amaca uygundur\n"
 
-#: gconf/gconftool.c:394
+#: gconf/gconftool.c:393
 msgid "Must specify a type when setting a value\n"
 msgstr "Bir de簟r ile bir de t�r belirtilmelidir.\n"
 
-#: gconf/gconftool.c:403
+#: gconf/gconftool.c:402
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping se蔒ne簨 tek ba��na kullan�labilir.\n"
 
-#: gconf/gconftool.c:412
+#: gconf/gconftool.c:411
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists se蔒ne簨 tek ba��na kullan�labilir.\n"
 
-#: gconf/gconftool.c:421
+#: gconf/gconftool.c:420
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file se蔒ne簨 tek ba��na kullan�labilir.\n"
 
-#: gconf/gconftool.c:431
+#: gconf/gconftool.c:430
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule se蔒ne簨 tek ba��na kullan�labilir.\n"
 
-#: gconf/gconftool.c:441
+#: gconf/gconftool.c:440
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key se蔒ne簨 tek ba��na kullan�labilir.\n"
 
-#: gconf/gconftool.c:451
+#: gconf/gconftool.c:450
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory se蔒ne簨 tek ba��na kullan�labilir.\n"
 
-#: gconf/gconftool.c:458
+#: gconf/gconftool.c:457
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "--direct se蔒ne簨ni kullan�rken --config-source se蔒ne簨 ile bir "
 "yap�land�rma kayna蹥 belirtmelisiniz\n"
 
-#: gconf/gconftool.c:464
+#: gconf/gconftool.c:463
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf ba�lat�lamad�: %s\n"
 
-#: gconf/gconftool.c:489
+#: gconf/gconftool.c:488
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE 蔒vre de簨�keni ayarlanm�� olmal�\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:504
+#: gconf/gconftool.c:503
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1323,35 +1457,35 @@ msgstr ""
 "蓷l��mazken daha g�venlidir.\n"
 "(teorik olarak uygulamalar 蓷l���rken baz� ba�ka �eyler de 蓷l���r).\n"
 
-#: gconf/gconftool.c:526
+#: gconf/gconftool.c:525
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Yap�land�rma kayna蹥na/kaynaklar�na eri�ilemedi: %s\n"
 
-#: gconf/gconftool.c:686
+#: gconf/gconftool.c:685
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Kapanma hatas�: %s\n"
 
-#: gconf/gconftool.c:729
+#: gconf/gconftool.c:730
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Ard���k listeye bir ya da daha fazla dizin belirtilmelidir.\n"
 
-#: gconf/gconftool.c:763
+#: gconf/gconftool.c:764
 #, c-format
 msgid "Failure listing pairs in `%s': %s"
 msgstr "`%s' i蓾nde 蓾ftler listelenemedi: %s"
 
-#: gconf/gconftool.c:781
+#: gconf/gconftool.c:782
 msgid "(no value set)"
 msgstr "(belirtilmi� de簟r yok)"
 
-#: gconf/gconftool.c:836
+#: gconf/gconftool.c:837
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Yap�land�rma sunucusunun (gconfd) alt sunucular� a踦lamad�: %s\n"
 
-#: gconf/gconftool.c:850
+#: gconf/gconftool.c:851
 msgid "Must specify a key or keys to get\n"
 msgstr "Al�nacak anahtar ya da anahtarlar belirtilmelidir.\n"
 
@@ -1375,165 +1509,159 @@ msgstr "Car T�r�: %s\n"
 msgid "Cdr Type: %s\n"
 msgstr "Cdr T�r�: %s\n"
 
-#: gconf/gconftool.c:893
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr "琄tan�ml� De簟r: %s\n"
+msgid "Owner: %s\n"
+msgstr "Sahibi: %s\n"
 
-#: gconf/gconftool.c:893 gconf/gconftool.c:895 gconf/gconftool.c:896
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "Tan�ms�z"
 
-#: gconf/gconftool.c:895
-#, c-format
-msgid "Owner: %s\n"
-msgstr "Sahibi: %s\n"
-
-#: gconf/gconftool.c:896
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "畤et: %s\n"
 
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "A踦klama: %s\n"
 
-#: gconf/gconftool.c:906
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "%s i蓾n belirtilmi� bir de簟r yok\n"
 
-#: gconf/gconftool.c:910
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "`%s' i蓾n de簟r al�namad�: %s\n"
 
-#: gconf/gconftool.c:953 gconf/gconftool.c:965
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "`%s' t�r� anla��lamad�\n"
 
-#: gconf/gconftool.c:977
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Arg�man olarak de簨�ik anahtarlar/de簟rler belirtilmelidir\n"
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Anahtar i蓾n belirtilmi� bir de簟r yok: %s\n"
 
-#: gconf/gconftool.c:1025
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "Bir de簟r olarak �ema belirtilemez\n"
 
-#: gconf/gconftool.c:1035
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Bir listeyi ayarlarken bir temel liste t�r� belirtmelisiniz\n"
 
-#: gconf/gconftool.c:1049
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "Bir 蓾fti ayarlarken bir temel car t�r� ve cdr t�r� belirtmelisiniz\n"
 
-#: gconf/gconftool.c:1064
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "Hata: %s\n"
 
-#: gconf/gconftool.c:1077 gconf/gconftool.c:1210
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "De簟r belirlenirken hata: %s"
 
-#: gconf/gconftool.c:1095 gconf/gconftool.c:1224
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "E�zamanlamada hata: %s"
 
-#: gconf/gconftool.c:1113
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Tek arg�man olarak anahtar (�ema ismi) belirtilmelidir\n"
 
-#: gconf/gconftool.c:1155
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Liste t�r� bir temel t�r olmal�d�r: dizge, tamsay�, ger蔒k say� ya da "
 "mant�ksal\n"
 
-#: gconf/gconftool.c:1175
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Car 蓾fti t�r� bir temel t�r olmal�d�r: dizge, tamsay�, ger蔒k say� ya da "
 "mant�ksal\n"
 
-#: gconf/gconftool.c:1195
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Cdr 蓾fti t�r� bir temel t�r olmal�d�r: dizge, tamsay�, ger蔒k say� ya da "
 "mant�ksal\n"
 
-#: gconf/gconftool.c:1239
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "anahtar/de簟r 蓾ftinin al�naca蹥 bir ya da daha fazla dizin "
 "belirtilmelidir.\n"
 
-#: gconf/gconftool.c:1253
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Kald�r�lacak anahtarlar belirtilmelidir.\n"
 
-#: gconf/gconftool.c:1264
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "`%s' kald�r�l�rken hata: %s\n"
 
-#: gconf/gconftool.c:1287
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr "Alt dizinlerin al�naca蹥 dizin ya da dizinler belirtilmelidir.\n"
 
-#: gconf/gconftool.c:1321
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Dizinler listelenirken hata: %s\n"
 
-#: gconf/gconftool.c:1363
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "UYARI: �ema (%s) i蓾n type ge蔒rsiz ya da verilmemi�\n"
 
-#: gconf/gconftool.c:1372
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "UYARI: �ema (%s) i蓾n list_type ge蔒rsiz ya da verilmemi�\n"
 
-#: gconf/gconftool.c:1383 gconf/gconftool.c:1413 gconf/gconftool.c:1442
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "UYARI: 霵tan�ml� `%s' de簟ri �ema (%s) i蓾n ayr��t�r�lamad�\n"
 
-#: gconf/gconftool.c:1401
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "UYARI: �ema (%s) i蓾n car_type ya da cdr_type ge蔒rsiz ya da verilmemi�\n"
 
-#: gconf/gconftool.c:1426
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "UYARI: Bir 霵tan�ml� de簟r bir �ema i蓾n belirtilemez\n"
 
-#: gconf/gconftool.c:1455
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "UYARI: gconftoool hatas� GConfValueType bilinmiyor\n"
 
-#: gconf/gconftool.c:1502 gconf/gconftool.c:1523 gconf/gconftool.c:1544
-#: gconf/gconftool.c:1565
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "UYARI: T�r ismi `%s' ayr��t�r�lamad�\n"
 
-#: gconf/gconftool.c:1519
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1541,40 +1669,40 @@ msgstr ""
 "UYARI: list_type sadece tamsay�, ger蔒k say�, dizge ya da mant�ksal de簟r "
 "olabilir, %s de簨l\n"
 
-#: gconf/gconftool.c:1540
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "UYARI: car_type sadece tamsay�, ger蔒k say�, dizge ya da mant�ksal de簟r "
 "olabilir, %s de簨l\n"
 
-#: gconf/gconftool.c:1561
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "UYARI: cdr_type sadece tamsay�, ger蔒k say�, dizge ya da mant�ksal de簟r "
 "olabilir, %s de簨l\n"
 
-#: gconf/gconftool.c:1589
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "UYARI: bo� <applyto> d�蹞m�"
 
-#: gconf/gconftool.c:1592 gconf/gconftool.c:1855
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "UYARI: <%s> d�蹞m� <schema> alt�nda anla��lamad�\n"
 
-#: gconf/gconftool.c:1602
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "UYARI: �ema i蓾n belirtilmi� bir anahtar yok\n"
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "UYARI: <locale> d�蹞m� `name=\"konum\"' diye bir niteleyiciye sahip de簨l, "
 "yoksay�ld�\n"
 
-#: gconf/gconftool.c:1641
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1582,51 +1710,51 @@ msgstr ""
 "UYARI: `%s' konumu i蓾n 蔞k say�da <locale> d�蹞m�, ilkinden sonrakiler "
 "yoksay�ld�\n"
 
-#: gconf/gconftool.c:1722
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "UYARI: Bir <locale> d�蹞m�nde ge蔒rsiz <%s> d�蹞m� var\n"
 
-#: gconf/gconftool.c:1751
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "UYARI: `%s' �emas� `%s' konumu y�klenemedi: %s\n"
 
-#: gconf/gconftool.c:1759
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "`%s' konumu i蓾n `%s' �emas� y�klendi\n"
 
-#: gconf/gconftool.c:1781
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "UYARI: `%s' �emas� `%s' anahtar� ile ili�kilendirilemedi: %s\n"
 
-#: gconf/gconftool.c:1789
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "`%s' �emas� `%s' anahtar�na ili�tirildi\n"
 
-#: gconf/gconftool.c:1868
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Bir <schema> i蓾nde en az bir <locale> girdisi olmal�d�r\n"
 
-#: gconf/gconftool.c:1897
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "UYARI: <%s> d�蹞m� <schemalist> alt�nda anla��lamad�\n"
 
-#: gconf/gconftool.c:1919
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "`%s' a踦lamad�: %s\n"
 
-#: gconf/gconftool.c:1926
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Belge %s bo� mu?\n"
 
-#: gconf/gconftool.c:1938
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1634,26 +1762,26 @@ msgid ""
 msgstr ""
 "Belge %s k闥 d�蹞mde yanl�� t�r i蔒riyor (<%s>, <gconfschemafile> olmal�)\n"
 
-#: gconf/gconftool.c:1951
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Belge `%s' bir �st d�zey <gconfschemafile> d�蹞m� i蔒rmiyor\n"
 
-#: gconf/gconftool.c:1965
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "UYARI: <%s> d�蹞m� <gconfschemafile> alt�nda anla��lamad�\n"
 
-#: gconf/gconftool.c:1976 gconf/gconftool.c:2008
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Yap�land�rma verisini e�zamanlarken hata: %s"
 
-#: gconf/gconftool.c:1992
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "Y�klenecek �ema dosyalar� belirtilmeli\n"
 
-#: gconf/gconftool.c:2029
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1662,16 +1790,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "K�r�lma anahtar� %s kald�r�lamad�: %s\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "K�r�lacak anahtarlar belirtilmeli\n"
 
-#: gconf/gconftool.c:2181
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1680,11 +1808,11 @@ msgstr ""
 "Uygulaman�z anahtara hatal� de簟rler atayarak k�rmaya 蓷l���yor:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2199
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "K�r�lacak dizinler belirtilmeli\n"
 
-#: gconf/gconftool.c:2218
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1695,20 +1823,77 @@ msgstr ""
 "蓷l���yor:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "GConf Hatas�: %s\n"
-
-#: wrappers/gtk/gconf-client.c:795
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf uyar�s�: `%s' i蓾ndeki 蓾ftlerin listelenmesi ba�ar�s�z oldu: %s"
 
-#: wrappers/gtk/gconf-client.c:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "`%s' olmal�yd�, `%s' al�nd� (%s anahtar� i蓾n)"
 
-#~ msgid "GConf was built with debugging features enabled"
-#~ msgstr "GConf hata ay�klama 驆ellikleri ile derlenmi�"
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "BerkeleyDB (BDB) mod�l� kald�r�l�yor."
+
+#~ msgid "Opened BerkeleyDB source at root %s"
+#~ msgstr "BerkeleyDB kayna蹥 k闥 %s'de a踦ld�"
+
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "BDB mod�l� ba�lat�l�yor"
+
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "`%s' k闥 dizini `%s' adresinde bulunamad�"
+
+#~ msgid ""
+#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ msgstr "%s dizini (%s adresindeki) okunamaz/yaz�lamaz"
+
+#~ msgid "Failed to set mode on `%s': %s"
+#~ msgstr "`%s'de kip belirlenemedi: %s"
+
+#~ msgid "No database available to save your configuration"
+#~ msgstr "Yap�land�rman�z�n kaydedilebilece簨 bir veritaban� yok"
+
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "OAF sorun tan�m�: %s"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "`%s' anahtar�na bir de簟r kaydedilemez"
+
+#~ msgid "/path"
+#~ msgstr "/dizin"
+
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgstr ""
+#~ "%d sinyali al�nd�, core kaydedildi (GConf 踤kt�). L�tfen bir hata raporu "
+#~ "g霵derin."
+
+#~ msgid ""
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ msgstr ""
+#~ "%d sinyali al�nd�, ola簜nd��� kapanma (GConf 踤kt�). L�tfen bir hata raporu "
+#~ "g霵derin"
+
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "GConf sunucusu kullan�mda de簨l, kapan�yor."
+
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "Durum kay�t dosyas� okunurken hata: %s"
+
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "酨temci i蓾n IOR al�namad�: %s"
+
+#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgstr ""
+#~ "Durum kay�t dosyas�ndan istemci eklenmesinin temizlenmesi ba�ar�s�z: %s"
+
+#~ msgid ""
+#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ msgstr "GConf sunucusu eklemedi簨 s�rada tek bir istemci sunucudan silindi."
+
+#~ msgid "Default Value: %s\n"
+#~ msgstr "琄tan�ml� De簟r: %s\n"
+
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "GConf Hatas�: %s\n"
diff --git a/po/uk.po b/po/uk.po
index 3f40e868..c96967b8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2001-02-05 12:51+0200\n"
+"POT-Creation-Date: 2000-09-14 22:20-0400\n"
 "PO-Revision-Date: 1999-12-29 12:36+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,35 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: backends/bdb-backend.c:211
-msgid "Unloading BerkeleyDB (BDB) backend module."
-msgstr "鼵袬拏輿曬恮 蚥眢籤恘ж 迍齣曶 BerkeleyDB (BDB)."
-
-#: backends/bdb-backend.c:234
-#, c-format
-msgid "Opened BerkeleyDB source at root %s"
-msgstr ""
-
-#: backends/bdb-backend.c:574
-msgid "Initializing BDB backend module"
-msgstr "僇污汐怞睋疆� 蚥眢籤恘ж 迍齣曶 BDB"
-
-#: backends/dir-utils.c:88
-#, c-format
-msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "醚 袎賻珃� 蛈鰓購埩 冾疻恓訰� 佹埡昑� %s 睋 謐疻衃� \"%s\""
-
-#: backends/dir-utils.c:104 backends/xml-backend.c:301 backends/xml-dir.c:1035
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "醚迍筇屺� 衲豜疶埩 佹埡昑� \"%s\": %s"
-
-#: backends/dir-utils.c:192
-#, c-format
-msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr ""
-"醚迍筇屺� 筊尕轂� � 瘃 睋倅蚆埩 � 冾疻恓訰� 佹埡昑� %s 睋 謐疻衃� \"%s\""
-
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "鼵袬拏輿曬恮 蚥眢籤恘ж 迍齣曶 XML."
@@ -51,6 +22,11 @@ msgstr "鼵袬拏輿曬恮 蚥眢籤恘ж 迍齣曶 XML."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "醚 袎賻珃� 蛈鰓購埩 冾疻恓訰� 佹埡昑� XML 睋 謐疻衃� \"%s\""
 
+#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "醚迍筇屺� 衲豜疶埩 佹埡昑� \"%s\": %s"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -75,14 +51,14 @@ msgstr "醚 袎賻珃� 硩晟� 蟯玹欳蹉恮 � 佹埡昑м XML \"%s\": %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:229
+#: backends/xml-cache.c:228
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
 
-#: backends/xml-cache.c:256
+#: backends/xml-cache.c:253
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than "
@@ -125,32 +101,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "醚 袎賻珃� 衲籤埩 衲轄圴 そ帎 \"%s\": %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:790
+#: backends/xml-dir.c:788
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "醚 袎賻珃� 珆疶芩埩 訞輾埩豜衲� \"%s\": %s"
 
-#: backends/xml-dir.c:934
+#: backends/xml-dir.c:932
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "蟴赻玾曬恮 觕狦秸恄� \"%s\" � \"%s\", 倷浀倀玾瓬蹉�"
 
-#: backends/xml-dir.c:956
+#: backends/xml-dir.c:954
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "黰狦秸恄� 藍� 恔稊� � そ帎� XML \"%s\", 倷浀倀玾瓬蹉�"
 
-#: backends/xml-dir.c:963
+#: backends/xml-dir.c:961
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "孍硨� 覂疿挎珌� 狾谻� � そ帎� XML \"%s\" 恓 <entry>, 倷浀倀玾瓬蹉�"
 
-#: backends/xml-dir.c:1051
+#: backends/xml-dir.c:1049
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "醚 袎賻珃� 衲豜疶埩 そ帎 \"%s\": %s"
 
-#: backends/xml-dir.c:1059 gconf/gconf-internals.c:2442
+#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "醚 袎賻珃� 睋刳尕� そ帎 \"%s\": %s"
@@ -161,7 +137,7 @@ msgstr "醚 袎賻珃� 睋刳尕� そ帎 \"%s\": %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "襓浀倀玾瓬蹉� 赹硨� XML � 恔稊狨 \"%s\": %s"
 
-#: backends/xml-entry.c:199
+#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -179,79 +155,83 @@ msgstr "雁恘眙袬恄� 恔稊� 蚧攪� \"%s\", 俵虭昋�: %s"
 msgid "Ignoring XML node `%s', except for possible schema name: %s"
 msgstr ""
 
-#: backends/xml-entry.c:723
+#: backends/xml-entry.c:699
+msgid "found <local_schema> with no locale setting"
+msgstr ""
+
+#: backends/xml-entry.c:721
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "蟴虭昋� 珆疶芩恄� 埩俵豜ж 硩醣曬恮 蚧攪�: %s"
 
-#: backends/xml-entry.c:937
+#: backends/xml-entry.c:930
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "醚芩� 轂疶謬婭 \"type\" � 赹确� <%s>"
 
-#: backends/xml-entry.c:951
+#: backends/xml-entry.c:944
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "孍硨� 芩� 恓蛈鰍虭� 轂疶謬� \"type\" - \"%s\", 倷浀倀玾瓬蹉�"
 
-#: backends/xml-entry.c:966
+#: backends/xml-entry.c:959
 msgid "No \"value\" attribute for node"
 msgstr "醚芩� 轂疶謬婭 \"value\" � 赹确�"
 
-#: backends/xml-entry.c:1014 backends/xml-entry.c:1090
+#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "醚祴畇梠米圴 赹硨� XML <%s> � 赹确� 衄孖劼 XML"
 
-#: backends/xml-entry.c:1048
+#: backends/xml-entry.c:1041
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "醚蛈眛圴 埩� (衄孖玹, 釓畛 瘃 恓蛈鰍虭�) � 赹确� 衄孖劼"
 
-#: backends/xml-entry.c:1071
+#: backends/xml-entry.c:1064
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "醚蛈眛圴 赹硨� XML: %s"
 
-#: backends/xml-entry.c:1079
+#: backends/xml-entry.c:1072
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "鯗孖玹 穻衲尕� 俵Щ恘 跂鼴曬圴 赹硨� (%s 睋穻衲� %s)"
 
 # car - 陓砢圴 攫攪曬� 衄孖劼
 # cdr - 衄孖玹 藍� 陓砢珌� 攫攪曬埡
-#: backends/xml-entry.c:1131
+#: backends/xml-entry.c:1124
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "雁恘眙袬恄� 恓蛈眛珌� CAR � 釓疶 XML: %s"
 
-#: backends/xml-entry.c:1140 backends/xml-entry.c:1163
+#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "蹉賻臣 そ帎� XML: 衄孖侂 � 釓疶 恓 迍笝婥 謬埩 眐硰臼曬� 赽籤鼴妅� 釓疶"
 
-#: backends/xml-entry.c:1153
+#: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "雁恘眙袬恄� 恓蛈眛珌� CDR � 釓疶 XML: %s"
 
-#: backends/xml-entry.c:1172
+#: backends/xml-entry.c:1165
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "醚祴畇梠米圴 赹硨� XML <%s> � 赹确� 釓疶 XML"
 
-#: backends/xml-entry.c:1190
+#: backends/xml-entry.c:1183
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "醚 硠購霰恘 CAR � CDR 騷� 赹确� 釓疶 XML"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1189
 msgid "Missing cdr from pair of values in XML file"
 msgstr "鬫鼯梊峇 硩醣曬恮 CDR � 釓疶 � そ帎� XML"
 
-#: backends/xml-entry.c:1203
+#: backends/xml-entry.c:1196
 msgid "Missing car from pair of values in XML file"
 msgstr "鬫鼯梊峇 硩醣曬恮 CAR � 釓狾 � そ帎� XML"
 
-#: backends/xml-entry.c:1208
+#: backends/xml-entry.c:1201
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "鬫鼯尕峖 硩醣曬恮 CAR � CDR � 釓狾 � そ帎� XML"
 
@@ -284,28 +264,28 @@ msgstr "醚 袎賻珃� 硩購埩 蚥眢籤恌� 迍齣杻 騷� \"%s\""
 msgid "Failed to shut down backend"
 msgstr "醚 袎賻珃� 蛈騰抸瘃埩 蚥眢籤"
 
-#: gconf/gconf-database.c:233
+#: gconf/gconf-database.c:193
 msgid "Received invalid value in set request"
 msgstr "擸疶芩恘 恓蛈眛� 硩醣曬恮 � 睋倅啈"
 
-#: gconf/gconf-database.c:241
+#: gconf/gconf-database.c:201
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:521
+#: gconf/gconf-database.c:416
 msgid "Received request to drop all cached data"
 msgstr "擸疶芩恘 睋倅� 恔 蚎厊蹉恮 梌牟 侜裉袬恌� 鐘恌�"
 
-#: gconf/gconf-database.c:538
+#: gconf/gconf-database.c:430
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:605
+#: gconf/gconf-database.c:495
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 
-#: gconf/gconf-database.c:764
+#: gconf/gconf-database.c:617
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "醚 袎賻珃� 蚕恛眐峖祰袬埩 狦恓 瘃 礎杻袹 齡籤攫: %s"
@@ -314,7 +294,7 @@ msgstr "醚 袎賻珃� 蚕恛眐峖祰袬埩 狦恓 瘃 礎杻袹 齡籤攫: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:846
+#: gconf/gconf-database.c:699
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -322,59 +302,59 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:871
+#: gconf/gconf-database.c:724
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "鯦桱醣� � 汛曬埩あ佹婘眐� %lu 恓 而挍�"
 
-#: gconf/gconf-database.c:880
+#: gconf/gconf-database.c:733
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:992 gconf/gconf-sources.c:1281
+#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "蟴虭昋� 珆疶芩恄� 硩醣曬恮 \"%s\": %s"
 
-#: gconf/gconf-database.c:1039
+#: gconf/gconf-database.c:875
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "蟴虭昋� 赽埡恘訞曬恮 硩醣曬恮 騷� \"%s\": %s"
 
-#: gconf/gconf-database.c:1082
+#: gconf/gconf-database.c:910
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "蟴虭昋� 硩晟婧 硩醣曬恮 \"%s\": %s"
 
-#: gconf/gconf-database.c:1106
+#: gconf/gconf-database.c:931
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "蟴虭昋� 珆疶芩恄� 埩俵豜ж 硩醣曬恮 \"%s\": %s"
 
-#: gconf/gconf-database.c:1145
+#: gconf/gconf-database.c:969
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "蟴虭昋� 陓疻蛈迗侂 恔朒恘衲� \"%s\": %s"
 
-#: gconf/gconf-database.c:1169
+#: gconf/gconf-database.c:993
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "蟴虭昋� 訰鐘旼恄� 佹埡昑м \"%s\": %s"
 
-#: gconf/gconf-database.c:1195
+#: gconf/gconf-database.c:1019
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "醚袎賻珃� 珆疶芩埩 赽� 攫攪曬埩 � \"%s\": %s"
 
-#: gconf/gconf-database.c:1221
+#: gconf/gconf-database.c:1045
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "蟴虭昋� 珆疶芩恄� 衄孖劼 佹埡昑м � \"%s\": %s"
 
-#: gconf/gconf-database.c:1242
+#: gconf/gconf-database.c:1066
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "懰妀佹 珆疶芩恄� 蚧攪� 騷� \"%s\": %s"
@@ -439,9 +419,188 @@ msgstr "懩籤謄老 恓 鰍衲桸恔 藍� 冾恇早梑謄百恘ж 蚥眢籤�"
 msgid "Failed to get a lock"
 msgstr "醚 袎賻珃� 珆疶芩埩 蟯玹欳蹉恮"
 
-#: gconf/gconf-error.c:40
-msgid "No database available to save your configuration"
-msgstr "醚芩� 鰍衲桸恘� 臏硭 鐘恌� 騷� 睌籤纖曬恮 袬裉� 冾恇早梑謄戍"
+#: gconf/gconf-glib.c:629
+#, c-format
+msgid ""
+"Error on line %d char %d: %s\n"
+"(Some surrounding text was '%s')\n"
+msgstr ""
+
+#: gconf/gconf-glib.c:749
+msgid ""
+"Text ended in the middle of an entity, or entity name too long to be valid "
+"('&' should begin an entity such as '&quot;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:801
+#, c-format
+msgid ""
+"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
+msgstr ""
+
+#: gconf/gconf-glib.c:841
+msgid ""
+"Markup text ended in the middle of a character reference, just after '&#'"
+msgstr ""
+
+#: gconf/gconf-glib.c:867
+#, c-format
+msgid ""
+"Character reference contained non-digit '%s' ('&#' should begin a reference "
+"to a unicode character, such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:891
+msgid ""
+"Text ended in the middle of an character reference ('&#' should begin a "
+"character reference such as '&#2342;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:916
+#, c-format
+msgid ""
+"Couldn't parse character reference '%s' ('&#' must begin a character "
+"reference such as '&#2343;')"
+msgstr ""
+
+#: gconf/gconf-glib.c:938
+#, c-format
+msgid ""
+"Character code %#lx is not allowed in XML documents or is not a valid "
+"Unicode character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1013
+msgid ""
+"Documented ended just after an '&', '&' should begin an entity or character "
+"reference."
+msgstr ""
+
+#: gconf/gconf-glib.c:1027
+msgid ""
+"'<' or '>' character not allowed here; only allowed around tags, for example "
+"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
+"&lt; and &gt;"
+msgstr ""
+
+#: gconf/gconf-glib.c:1082
+#, c-format
+msgid "Character '%s' is not valid at the start of an attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1109
+msgid "Document ended just after attribute name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1120
+msgid "Attribute name must be immediately followed by an '=' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1135
+msgid ""
+"'=' character after attribute must be immediately followed by an '\"' "
+"character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1161
+#, c-format
+msgid ""
+"Character '%c' found inside an attribute value; perhaps your attribute value "
+"is missing the closing quotation mark '\"'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1181
+msgid ""
+"Ran out of text before a quote mark ('\"') was seen at the end of an "
+"attribute value"
+msgstr ""
+
+#: gconf/gconf-glib.c:1194
+msgid ""
+"Text ends immediately after an attribute value, before the element was closed"
+msgstr ""
+
+#: gconf/gconf-glib.c:1508
+msgid "Missing '<' at start of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1519
+msgid "Document ended just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1547
+msgid "No closing '>' found for a <? or <!"
+msgstr ""
+
+#: gconf/gconf-glib.c:1576
+#, c-format
+msgid "Character '%s' is not valid at the start of an element name"
+msgstr ""
+
+#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
+msgid "Document ended just after element name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1638
+#, c-format
+msgid "Elements should be closed with '>' or '/>', not with '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1655
+msgid ""
+"Element ended just after '/', no '>' seen; empty elements should end with "
+"'/>'"
+msgstr ""
+
+#: gconf/gconf-glib.c:1694
+msgid "Close tag not found at end of element"
+msgstr ""
+
+#: gconf/gconf-glib.c:1709
+msgid "Close tag ends just after '<' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1723
+msgid "Close tag should begin with '</', '/' character is missing"
+msgstr ""
+
+#: gconf/gconf-glib.c:1737
+msgid "Close tag ends just after '/' character"
+msgstr ""
+
+#: gconf/gconf-glib.c:1772
+msgid "Document ended just after element name in close tag, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1788
+msgid "Document ended just after close tag name, no '>' seen"
+msgstr ""
+
+#: gconf/gconf-glib.c:1807
+#, c-format
+msgid "Close tag '%s' does not match opening tag '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2145
+#, c-format
+msgid ""
+"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
+"bad character was '%s'"
+msgstr ""
+
+#: gconf/gconf-glib.c:2202
+msgid "The marked-up text contained nothing but whitespace."
+msgstr ""
+
+#: gconf/gconf-glib.c:10666
+#, fuzzy, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "醚 袎賻珃� 睋刳尕� そ帎 \"%s\": %s"
+
+#: gconf/gconf-glib.c:10683
+#, fuzzy, c-format
+msgid "Error reading file '%s': %s"
+msgstr "蟴虭昋� 訰鐘旼恄� 佹埡昑м \"%s\": %s"
 
 #: gconf/gconf-internals.c:85
 #, c-format
@@ -465,193 +624,183 @@ msgstr "鬫� gconfd 珆疶芩恘 衄孖玹 � 俵Щ恌� 埩俵� 衄孖劼"
 msgid "Failed to convert object to IOR"
 msgstr "醚 袎賻珃� 陓疻婟玾尕� 狟'卞� � IOR"
 
-#: gconf/gconf-internals.c:809
+#: gconf/gconf-internals.c:811
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "醚 袎賻珃� 蛈騰疶埩 そ帎 袽捑� \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:856
+#: gconf/gconf-internals.c:866
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "餀鐘袬恄� 齡籤攫� \"%s\"\n"
 
-#: gconf/gconf-internals.c:868
+#: gconf/gconf-internals.c:878
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "蟴虭昋� 筊尕欳蹉恮 � そ帎� \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:1292
+#: gconf/gconf-internals.c:1320
 #, c-format
 msgid "Expected list, got %s"
 msgstr "檹竹欳避衭 衄孖玹, 珆疶芩恘 %s"
 
-#: gconf/gconf-internals.c:1302
+#: gconf/gconf-internals.c:1330
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "檹夼欳避衭 衄孖玹 %s, 珆疶芩恘 衄孖玹 %s"
 
-#: gconf/gconf-internals.c:1441
+#: gconf/gconf-internals.c:1469
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "檹竹欳賻輾� 釓畛, 珆疶芩恘 %s"
 
-#: gconf/gconf-internals.c:1455
+#: gconf/gconf-internals.c:1483
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "檹竹欳賻輾� 釓畛 (%s,%s), 珆疶芩恘 釓眙 � 恓蛈眛奼� 狦恌� 謝� 狟玵� "
 "硩醣曬恮虭"
 
-#: gconf/gconf-internals.c:1471
+#: gconf/gconf-internals.c:1499
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "檹竹欳賻輾� 釓畛 埩俷 (%s,%s) 珆疶芩恘 埩俷 (%s,%s)"
 
-#: gconf/gconf-internals.c:1587
+#: gconf/gconf-internals.c:1615
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "藘鰍� � 攽倓賺 恓 俵瘃恔夭寔� � 攽倓�"
 
-#: gconf/gconf-internals.c:1649
+#: gconf/gconf-internals.c:1677
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "藘鰍� � 攽倓賺 恓 辿拸薑婥衭 攽倓狨"
 
-#: gconf/gconf-internals.c:2129 gconf/gconf.c:2945
+#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
 #, c-format
 msgid "CORBA error: %s"
 msgstr "蟴虭昋� CORBA: %s"
 
-#: gconf/gconf-internals.c:2145
-#, c-format
-msgid "OAF problem description: '%s'"
-msgstr "懩孖 倷狟旼虭 OAF: \"%s\""
-
-#: gconf/gconf-internals.c:2151
+#: gconf/gconf-internals.c:2177
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "衄眐臏 訰鐘旻埩 恓訬邁蹉圴 � 衄孖劼 佹埡昑� 狟'卞啈� OAF"
 
-#: gconf/gconf-internals.c:2156
+#: gconf/gconf-internals.c:2182
 msgid "attempt to add already-listed OAF directory"
 msgstr "衄眐臏 鰍鐘埩 趼� 訬邁蹉圴 � 衄孖劼 佹埡昑� OAF"
 
-#: gconf/gconf-internals.c:2163
+#: gconf/gconf-internals.c:2189
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "俵虭昋� 蹉賻臣� OAF: %s"
 
-#: gconf/gconf-internals.c:2168
+#: gconf/gconf-internals.c:2194
 msgid "Unknown OAF error"
 msgstr "醚蛈鰍芩 俵虭昋� OAF"
 
-#: gconf/gconf-internals.c:2251
+#: gconf/gconf-internals.c:2277
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "醚蛈眛圴 そ帎 ior � \"%s\""
 
-#: gconf/gconf-internals.c:2282
+#: gconf/gconf-internals.c:2308
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd 睋蟯玹欳避 \"%s\" 蛈� 霰捀圮 缶袶� 倷狪籣肉"
 
-#: gconf/gconf-internals.c:2293
+#: gconf/gconf-internals.c:2319
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "僇衖 倷珌畛芩 睋蟯玹欳賻� \"%s\""
 
-#: gconf/gconf-internals.c:2313
+#: gconf/gconf-internals.c:2339
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "恓 袎賻珃� �'勾恔埩衯 � ORB 騷� 硨恅欳蹉恮 gconfd"
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2347
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2333
+#: gconf/gconf-internals.c:2359
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2345
+#: gconf/gconf-internals.c:2371
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "靻迍� 冾恇早梑謄戍 GConf (gconfd) 睋蟯玹欳避 \"%s\""
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2385
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "恓 袎賻珃� 衲豜疶埩 佹埡昑� \"%s\": %s"
 
-#: gconf/gconf-internals.c:2394
+#: gconf/gconf-internals.c:2420
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "醚迍筇屺� 衲豜疶埩 蟯玹欳蹉恮 \"%s\": %s"
 
-#: gconf/gconf-internals.c:2430
+#: gconf/gconf-internals.c:2456
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "醚迍筇屺� 睋倅蚆埩 � そ帎 \"%s\": %s"
 
-#: gconf/gconf-internals.c:2473
+#: gconf/gconf-internals.c:2499
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2490
+#: gconf/gconf-internals.c:2516
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "�羽衃袬恌� そ帎 蟯玹欳蹉恮 \"%s\", 倷奼梌瓬� 訰鐘旼恄�"
 
-#: gconf/gconf-internals.c:2500
+#: gconf/gconf-internals.c:2526
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
 
-#: gconf/gconf-internals.c:2517
+#: gconf/gconf-internals.c:2543
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "醚 袎賻珃� 稊米媓尕� 睋蟯玹瓬蹉圴 佹埡昑� \"%s\": %s"
 
-#: gconf/gconf-sources.c:320
+#: gconf/gconf-sources.c:318
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "蟴虭昋� 睋袬拏輿曬恮 齡籤攫� \"%s\": %s"
 
-#: gconf/gconf-sources.c:506
+#: gconf/gconf-sources.c:490
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "鯫攪� \"%s\" 訬邁蹉� 騷� \"%s\" 睌籤灰薑 硩醣曬恮, 椿 恓 � 蚧攪狨"
 
-#: gconf/gconf-sources.c:555
+#: gconf/gconf-sources.c:539
 msgid "The '/' name can only be a directory, not a key"
 msgstr "轀稊� \"/\" 迍秸 謬埩 旻袹 佹埡昑ж�, � 恓 佮濯攪"
 
-#: gconf/gconf-sources.c:584
+#: gconf/gconf-sources.c:568
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:596
-#, c-format
-msgid "Unable to store a value at key '%s'"
-msgstr "醚 袎賻珃� 睌籤龔埩 硩醣曬恮 睋 佮濯攪 \"%s\""
-
-#: gconf/gconf-sources.c:1151
+#: gconf/gconf-sources.c:1063
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "蟴虭昋� 俵觛劼 芶拏薯恇玾芩疆�: %s"
 
-#: gconf/gconf-sources.c:1220
+#: gconf/gconf-sources.c:1128
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "蟴虭昋� 珆疶芩恄� 芶埡缶に眝謄戍: %s"
 
-#: gconf/gconf-sources.c:1244
+#: gconf/gconf-sources.c:1152
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -722,87 +871,87 @@ msgstr ""
 msgid "`%s': %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:288
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "鬌眢籤 恓 硰灰 眐硞臣恔埩 謐疻袀 \"%s\""
 
-#: gconf/gconf.c:568
+#: gconf/gconf.c:542
 msgid "Can't add notifications to a local configuration source"
 msgstr "醚迍筇屺� 鰍鐘袬埩 稊而堍� 鰍 昑佹杻恘ж 齡籤攫� 冾恇早梑謄戍"
 
-#: gconf/gconf.c:1724
-#, c-format
-msgid "Adding client to server's list failed, CORBA error: %s"
+#: gconf/gconf.c:1597
+#, fuzzy, c-format
+msgid "Pinging the server failed, CORBA error: %s"
 msgstr "醚 袎賻珃� 鰍鐘埩 佮忖拏衯侂� 衄孖玹 鰍 蚥眢籤恘ж, 俵虭昋� CORBA: %s"
 
-#: gconf/gconf.c:1740
+#: gconf/gconf.c:1613
 msgid ""
 "Error contacting configuration server: OAF returned nil from "
 "oaf_activate_from_id() and did not set an exception explaining the problem. "
 "Please file an OAF bug report."
 msgstr ""
 
-#: gconf/gconf.c:2051
+#: gconf/gconf.c:1880
 msgid "Failed to init GConf, exiting\n"
 msgstr "醚 袎賻珃� 缶污汐怞祰袬埩 GConf: %s, 訰�汛\n"
 
-#: gconf/gconf.c:2088
+#: gconf/gconf.c:1917
 msgid "Must begin with a slash (/)"
 msgstr "縸蚕婥 俵瘃恔埩衭 � \"/\""
 
-#: gconf/gconf.c:2110
+#: gconf/gconf.c:1939
 msgid "Can't have two slashes (/) in a row"
 msgstr "醚 迍秸 謬埩 儷� \"/\" � 眒騰�"
 
-#: gconf/gconf.c:2112
+#: gconf/gconf.c:1941
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "醚 迍秸 謬埩 刳蹈侂 虷蚝� \"/\""
 
-#: gconf/gconf.c:2133
+#: gconf/gconf.c:1962
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "\"%c\" - 恓蛈眛圴 蚕邰玶 � 恔稊� 佮濯肉/佹埡昑レ�"
 
-#: gconf/gconf.c:2147
+#: gconf/gconf.c:1976
 msgid "Key/directory may not end with a slash (/)"
 msgstr "輲濯/佹埡昑� 恓 迍秸 睋辿拸欳轂孖� 蚝蠱攪 (/)"
 
-#: gconf/gconf.c:2400
+#: gconf/gconf.c:2223
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "醚袎賻珃� 蛈騰抸瘃埩 蚥眢籤 冾恇灰梑謄戍: %s"
 
-#: gconf/gconf.c:2461
+#: gconf/gconf.c:2284
 #, c-format
 msgid "Expected float, got %s"
 msgstr "檹竹欳賻珃� 瘃蚝� � 倢避謊瘐� 婘痾狨, 珆疶芩恘 %s"
 
-#: gconf/gconf.c:2496
+#: gconf/gconf.c:2319
 #, c-format
 msgid "Expected int, got %s"
 msgstr "檹竹欳賻珃� 疆旼, 珆疶芩恘 %s"
 
-#: gconf/gconf.c:2531
+#: gconf/gconf.c:2354
 #, c-format
 msgid "Expected string, got %s"
 msgstr "檹竹欳避衭 眒鰍�, 珆疶芩恘 %s"
 
-#: gconf/gconf.c:2568
+#: gconf/gconf.c:2391
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "檹竹欳賻珃� 昑レ痸�, 珆疶芩恘 %s"
 
-#: gconf/gconf.c:2601
+#: gconf/gconf.c:2424
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "檹竹欳賻輾� 蚧攪�, 珆疶芩恘 %s"
 
-#: gconf/gconfd.c:247
+#: gconf/gconfd.c:185
 msgid "Shutdown request received"
 msgstr "擸疶芩恘 睋倅� 恔 睋覂砢曬恮 眐蟠埩"
 
-#: gconf/gconfd.c:279
+#: gconf/gconfd.c:217
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -810,27 +959,24 @@ msgstr ""
 "gconfd 蚎玵虷杻瓬蹉� � 恔攽ж齡曬恮�; 衄眐臏 睋袬拏輿曬恮 gconf.path � "
 "佹埡昑м 訰�汛恌� 埧剆啈�"
 
-#: gconf/gconfd.c:293
+#: gconf/gconfd.c:235
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
-#.
-#: gconf/gconfd.c:301
+#: gconf/gconfd.c:244
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:314
+#: gconf/gconfd.c:258
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "蟴虭昋� 睋袬拏輿曬恮 霰捀圮 齡籤攫 冾恇早梑謄戍: %s"
 
-#: gconf/gconfd.c:326
+#: gconf/gconfd.c:270
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -838,7 +984,7 @@ msgstr ""
 "慁疻袀 冾恇囟梑謄戍 恓 謬昑 梌虷褁� 眐硞臣恔恘, 恓迍筇屺� 睋袬拏輿尕� 瘃 "
 "睌籤龔埩 冾恇灰梑謄百峖 鐘峖"
 
-#: gconf/gconfd.c:343
+#: gconf/gconfd.c:287
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -846,111 +992,99 @@ msgstr ""
 "醚 謬昑 梌虷褁� 眐硞臣恔恘 齡籤攫 冾恇早梑謄戍, � 捀� 迍笥� 睋倅袀袬埩, "
 "迍筇屺� 霰捀� 硰缶� 冾恇早梑謄戍 恓 袎輾婥衭 睌籤龔埩"
 
-#: gconf/gconfd.c:369
-#, c-format
-msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr ""
-"擸疶芩恘 蚕倀賻 %d, 蚎厊蹉� 挭畛. 甀儸 攽蚎�, 俵蛈鰍邴� 倷� 藝 俵虭昋� � "
-"GConf."
-
-#: gconf/gconfd.c:385
-#, c-format
-msgid ""
-"Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr "擸疶芩恘 蚕倀賻 %d, 恓恘眝賻媓� 睋覂砢曬恮 眐蟠埩. 甀儸 攽蚎�, 俵蛈鰍邴� 倷� 藝 俵虭昋�."
+#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#, fuzzy, c-format
+msgid "Received signal %d, shutting down."
+msgstr "擸疶芩恘 蚕倀賻 %d, 恘眝賻媓� 睋覂砢曬恮 眐蟠埩."
 
-#: gconf/gconfd.c:402
+#: gconf/gconfd.c:329
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "擸疶芩恘 蚕倀賻 %d, 恘眝賻媓� 睋覂砢曬恮 眐蟠埩."
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:451
+#: gconf/gconfd.c:376
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "睋俷蚎 (覂眑老 %s), 倷狪籣 %u 冾疶衲欳醣� \"%s\""
 
-#: gconf/gconfd.c:455
+#: gconf/gconfd.c:380
 msgid "GConf was built with debugging features enabled"
 msgstr ""
 
-#: gconf/gconfd.c:478
+#: gconf/gconfd.c:403
 msgid ""
 "Failed to init Object Activation Framework: please mail bug report to OAF "
 "maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:498
+#: gconf/gconfd.c:423
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:518
+#: gconf/gconfd.c:443
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:522
+#: gconf/gconfd.c:447
 msgid "Another gconfd already registered with OAF; exiting\n"
 msgstr "僇袶� gconf 趼� 睋疻太婞瓬蹉� � OAF; 訰�汛\n"
 
-#: gconf/gconfd.c:527
+#: gconf/gconfd.c:452
 msgid "Unknown error registering gconfd with OAF; exiting\n"
 msgstr "醚蛈鰍芩 俵虭昋� 疻太婞謄戍 gconfd 恔 OAF; 訰�汛\n"
 
-#: gconf/gconfd.c:565
+#: gconf/gconfd.c:476
 msgid "Exiting"
 msgstr "�避籤袹恄�"
 
-#: gconf/gconfd.c:589
-msgid "GConf server is not in use, shutting down."
-msgstr "鬌眢籤 GConf 恓 訰冾疶衲瓬掑婥衭, 睋覂砢曬恮 眐蟠埩."
-
-#: gconf/gconfd.c:924
+#: gconf/gconfd.c:818
 #, c-format
 msgid "Returning exception: %s"
 msgstr "蟴覂眕蹉恮 訰佮濯曬恮: %s"
 
-#: gconf/gconfd.c:1012
+#: gconf/gconfd.c:885
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1035
+#: gconf/gconfd.c:908
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1098
+#: gconf/gconfd.c:966
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "醚 袎賻珃� 蛈騰疶埩 そ帎 睌籤纖曬珌� 衲蹉� \"%s\" 騷� 睋倅袀: %s"
 
-#: gconf/gconfd.c:1112
+#: gconf/gconfd.c:980
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "醚 袎賻珃� 睋倅蚆埩 そ帎 睌籤纖曬珌� 衲蹉� \"%s\", 霰蚎疶俶玾: %d: %s"
 
-#: gconf/gconfd.c:1121
+#: gconf/gconfd.c:989
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "醚 袎賻珃� 睋刳尕� 恘訰� そ帎 睌籤纖曬珌� 衲蹉� \"%s\": %s"
 
-#: gconf/gconfd.c:1135
+#: gconf/gconfd.c:1003
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "醚 袎賻珃� 蛈騰攽衲� 衲轄圴 そ帎 睌籤纖曬珌� 衲蹉� \"%s\": %s"
 
-#: gconf/gconfd.c:1145
+#: gconf/gconfd.c:1013
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "醚 袎賻珃� 陓疻恓衲� 恘訰� そ帎 睌籤纖曬珌� 衲蹉� 恔 穻蚚�: %s"
 
-#: gconf/gconfd.c:1154
+#: gconf/gconfd.c:1022
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -958,61 +1092,68 @@ msgstr ""
 "醚 袎賻珃� 蛈鰓瓬尕� 玾伬缶賻媓圴 そ帎 睌籤纖曬珌� 衲蹉�, 捀圴 謬昑 "
 "陓疻恓蚥恘 � \"%s\": %s"
 
-#: gconf/gconfd.c:1627
-#, c-format
+#: gconf/gconfd.c:1110
+#, fuzzy, c-format
+msgid "Didn't understand line in saved state file: '%s'"
+msgstr "醚 袎賻珃� 蛈騰疶埩 そ帎 睌籤纖曬珌� 衲蹉�: %s"
+
+#: gconf/gconfd.c:1125
+#, fuzzy
+msgid "Failed to parse connection ID in saved state file"
+msgstr "醚 袎賻珃� 蛈騰疶埩 そ帎 睌籤纖曬珌� 衲蹉�: %s"
+
+#: gconf/gconfd.c:1140
+#, fuzzy, c-format
+msgid "Failed to unquote config source address from saved state file: %s"
+msgstr "醚 袎賻珃� 睋倅蚆埩 佮忖拏� 鰍 そ帎� 睌籤纖曬珌� 衲蹉�: %s"
+
+#: gconf/gconfd.c:1160
+#, fuzzy, c-format
+msgid "Failed to unquote listener location from saved state file: %s"
+msgstr "醚 袎賻珃� 睋倅蚆埩 佮忖拏� 鰍 そ帎� 睌籤纖曬珌� 衲蹉�: %s"
+
+#: gconf/gconfd.c:1180
+#, fuzzy, c-format
+msgid "Failed to unquote IOR from saved state file: %s"
+msgstr "醚 袎賻珃� 蛈騰疶埩 そ帎 睌籤纖曬珌� 衲蹉�: %s"
+
+#: gconf/gconfd.c:1204
 msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+"Saved state file records the same listener added twice; ignoring the second "
+"instance"
 msgstr ""
 
-#: gconf/gconfd.c:1673
+#: gconf/gconfd.c:1225
+msgid ""
+"Saved state file had a removal of a listener that wasn't added; ignoring the "
+"removal."
+msgstr ""
+
+#: gconf/gconfd.c:1346
 #, c-format
-msgid "Error reading saved state file: %s"
-msgstr "蟴虭昋� 筊尕欳蹉恮 そ帎� 睌籤纖曬珌� 衲蹉�: %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
 
-#: gconf/gconfd.c:1726
+#: gconf/gconfd.c:1377
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "醚 袎賻珃� 蛈騰疶埩 そ帎 睌籤纖曬珌� 衲蹉� \"%s\": %s"
 
-#: gconf/gconfd.c:1843
+#: gconf/gconfd.c:1476
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to "
 "re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1848
+#: gconf/gconfd.c:1481
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously "
 "re-add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1871 gconf/gconfd.c:2032
-#, c-format
-msgid "Failed to get IOR for client: %s"
-msgstr "醚 袎賻珃� 珆疶芩埩 IOR 騷� 佮忖拏�: %s"
-
-#: gconf/gconfd.c:1886
-#, c-format
-msgid "Failed to open saved state file: %s"
-msgstr "醚 袎賻珃� 蛈騰疶埩 そ帎 睌籤纖曬珌� 衲蹉�: %s"
-
-#: gconf/gconfd.c:1899
-#, c-format
-msgid "Failed to write client add to saved state file: %s"
-msgstr "醚 袎賻珃� 睋倅蚆埩 佮忖拏� 鰍 そ帎� 睌籤纖曬珌� 衲蹉�: %s"
-
-#: gconf/gconfd.c:1907
-#, c-format
-msgid "Failed to flush client add to saved state file: %s"
-msgstr "醚 袎賻珃� 蚎妅梊� 佮忖拏� � そ帎 睌籤纖恘ж 衲蹉�: %s"
-
-#: gconf/gconfd.c:1993
-msgid ""
-"Some client removed itself from the GConf server when it hadn't been added."
-msgstr ""
-
 #: gconf/gconftool.c:62
 msgid "Help options"
 msgstr "蟥畛芶婞� 鰍蛈騰�"
@@ -1290,262 +1431,261 @@ msgstr "醚袎賻珃� 眐硥賻桫尕� 蚥眢籤 冾恇灰梑謄戍 (gconfd): %s\n"
 msgid "Must specify a key or keys to get\n"
 msgstr "蟴婞汕恘 訬邁轂� 佮濯 謝� 佮濯� 騷� 珆疶芩恄娖n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:885
 #, c-format
 msgid "Type: %s\n"
 msgstr "蠖�: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:886
 #, c-format
 msgid "List Type: %s\n"
 msgstr "蠖� 衄孖劼: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:887
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "蠖� CAR: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:888
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "蠖� CDR: %s\n"
 
-#: gconf/gconftool.c:894
+#: gconf/gconftool.c:889
 #, c-format
-msgid "Default Value: %s\n"
-msgstr "蠖俵覂 硩醣曬恮: %s\n"
+msgid "Owner: %s\n"
+msgstr "齂輾恌�: %s\n"
 
-#: gconf/gconftool.c:894 gconf/gconftool.c:896 gconf/gconftool.c:897
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
 msgid "Unset"
 msgstr "�恮埩 硩醣曬恮"
 
-#: gconf/gconftool.c:896
-#, c-format
-msgid "Owner: %s\n"
-msgstr "齂輾恌�: %s\n"
-
-#: gconf/gconftool.c:897
+#: gconf/gconftool.c:890
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "輴眐堍圴 玿孖: %s\n"
 
-#: gconf/gconftool.c:898
+#: gconf/gconftool.c:891
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "餀觙圴 玿孖: %s\n"
 
-#: gconf/gconftool.c:907
+#: gconf/gconftool.c:900
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "醚 赽埡恘訞曬� 硩醣曬恮 騷� \"%s\"\n"
 
-#: gconf/gconftool.c:911
+#: gconf/gconftool.c:904
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "醚 袎賻珃� 珆疶芩埩 硩醣曬恮 騷� \"%s\": %s\n"
 
-#: gconf/gconftool.c:954 gconf/gconftool.c:966
+#: gconf/gconftool.c:947 gconf/gconftool.c:959
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "醚祴畇梠米圴 埩� \"%s\"\n"
 
-#: gconf/gconftool.c:978
+#: gconf/gconftool.c:971
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "蟴婞汕恘 訬邁轂� 硰缶濘蹉� 佮濯� � 硩醣曬恮 で 轄倘芶拏尐n"
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:991
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "醚虭� 硩醣曬恮 騷� 赽埡恘訞曬恮 庌ж 佮濯�: \"%s\"\n"
 
-#: gconf/gconftool.c:1026
+#: gconf/gconftool.c:1019
 msgid "Cannot set schema as value\n"
 msgstr "醚迍筇屺� 赽埡恘訰埩 蚧攪� 捀 硩醣曬恮\n"
 
-#: gconf/gconftool.c:1036
+#: gconf/gconftool.c:1029
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "蟴婞汕恘 訬邁欳轂� 倷奼耒屺恌� 埩� 衄孖劼\n"
 
-#: gconf/gconftool.c:1050
+#: gconf/gconftool.c:1043
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "蟴婞汕恘 訬邁欳轂� 倷奼耒屺峖 埩倅 CAR 埡 CDR\n"
 
-#: gconf/gconftool.c:1065
+#: gconf/gconftool.c:1058
 #, c-format
 msgid "Error: %s\n"
 msgstr "蟴虭昋�: %s\n"
 
-#: gconf/gconftool.c:1078 gconf/gconftool.c:1211
+#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
 #, c-format
 msgid "Error setting value: %s"
 msgstr "蟴虭昋� 赽埡恘訞曬恮 硩醣曬恮: %s"
 
-#: gconf/gconftool.c:1096 gconf/gconftool.c:1225
+#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
 #, c-format
 msgid "Error syncing: %s"
 msgstr "蟴虭昋� 蚕恛眐峖睋疆�: %s"
 
-#: gconf/gconftool.c:1114
+#: gconf/gconftool.c:1107
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "蟴婞汕恘 訬邁轂� 佮濯 (恔稊� 蚧攪�) 捀 勾妅圴 轄倘芶拏\n"
 
-#: gconf/gconftool.c:1156
+#: gconf/gconftool.c:1149
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "鯗孖玹 芩� 芩埩 倷奼耒屺恌� 埩�: string, int, float 瘃 bool\n"
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1169
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr "蠖� CAR 釓疶 芩� 謬埩 倷奼耒屺恌�: string, int, float 瘃 bool\n"
 
-#: gconf/gconftool.c:1196
+#: gconf/gconftool.c:1189
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr "蠖� CDR 釓疶 芩� 謬埩 倷奼耒屺恌�: string, int, float 瘃 bool\n"
 
-#: gconf/gconftool.c:1240
+#: gconf/gconftool.c:1233
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
-msgstr "蟴婞汕恘 訬邁轂� 狦妅 瘃 礎杻袹 佹埡昑レ� 騷� 珆疶芩恄� � 恌� 釓� \"佮濯-硩醣曬恮\".\n"
+msgstr ""
+"蟴婞汕恘 訬邁轂� 狦妅 瘃 礎杻袹 佹埡昑レ� 騷� 珆疶芩恄� � 恌� 釓� "
+"\"佮濯-硩醣曬恮\".\n"
 
-#: gconf/gconftool.c:1254
+#: gconf/gconftool.c:1247
 msgid "Must specify one or more keys to unset.\n"
 msgstr "蟴婞汕恘 訬邁轂� 狦妅 謝� 礎杻袹 佮濯肉 騷� 硩晟婧 硩醣曬恮.\n"
 
-#: gconf/gconftool.c:1265
+#: gconf/gconftool.c:1258
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "蟴虭昋� 硩晟婧 硩醣曬恮 \"%s\": %s\n"
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1281
 msgid "Must specify one or more dirs to get subdirs from.\n"
-msgstr "蟴婞汕恘 訬邁轂� 狦妅 瘃 礎杻袹 佹埡昑レ� 騷� 珆疶芩恄� � 恌� 虷騰轂賻珌肉.\n"
+msgstr ""
+"蟴婞汕恘 訬邁轂� 狦妅 瘃 礎杻袹 佹埡昑レ� 騷� 珆疶芩恄� � 恌� 虷騰轂賻珌肉.\n"
 
-#: gconf/gconftool.c:1322
+#: gconf/gconftool.c:1315
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "蟴虭昋� 珆疶芩恄� 衄孖劼 佹埡昑レ�: %s\n"
 
-#: gconf/gconftool.c:1364
+#: gconf/gconftool.c:1357
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "蘙摞�: 恓蛈眛圴 瘃 蛈鼯梊峖� 埩� 騷� 蚧攪� (%s)\n"
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1366
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "蘙摞�: 恓蛈眛圴 瘃 蛈鼯梊峖� 埩� list_type 騷� 蚧攪� (%s)\n"
 
-#: gconf/gconftool.c:1384 gconf/gconftool.c:1414 gconf/gconftool.c:1443
+#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "蘙摞�: 醚 袎賻珃� 倷狫恔怞祰袬埩 埩俵覂 硩醣曬恮 \"%s\" 騷� 蚧攪� (%s)\n"
 
-#: gconf/gconftool.c:1402
+#: gconf/gconftool.c:1395
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "蘙摞�: 恓蛈眛圴 瘃 蛈鼯梊峖� 埩� car_type 瘃 cdr_type 騷� 蚧攪� (%s)\n"
 
-#: gconf/gconftool.c:1427
+#: gconf/gconftool.c:1420
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "蘙摞�: 恓 訬邁蹉� 埩俵豜ж 硩醣曬恮 佮濯 騷� 蚧攪尐n"
 
-#: gconf/gconftool.c:1456
+#: gconf/gconftool.c:1449
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "蘙摞�: 谻梊狾褁� 俵虭昋� gconftool, 恓蛈鰍虭� GConfValueType\n"
 
-#: gconf/gconftool.c:1504 gconf/gconftool.c:1525 gconf/gconftool.c:1546
-#: gconf/gconftool.c:1567
+#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
+#: gconf/gconftool.c:1560
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "蘙摞�: 恓 袎賻珃� 倷狫恔怞祰袬埩 恔稊� 埩俷 \"%s\"\n"
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1514
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "蘙摞�: list_type 迍秸 謬埩 旻袹 int, float, string 瘃 bool, � 恓 \"%s\"\n"
 
-#: gconf/gconftool.c:1542
+#: gconf/gconftool.c:1535
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
-msgstr "蘙摞�: car_type 迍秸 謬埩 旻袹 int, float, string 瘃 bool, � 恓 \"%s\"\n"
+msgstr ""
+"蘙摞�: car_type 迍秸 謬埩 旻袹 int, float, string 瘃 bool, � 恓 \"%s\"\n"
 
-#: gconf/gconftool.c:1563
+#: gconf/gconftool.c:1556
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
-msgstr "蘙摞�: cdr_type 迍秸 謬埩 旻袹 int, float, string 瘃 bool, � 恓 \"%s\"\n"
+msgstr ""
+"蘙摞�: cdr_type 迍秸 謬埩 旻袹 int, float, string 瘃 bool, � 恓 \"%s\"\n"
 
-#: gconf/gconftool.c:1590
+#: gconf/gconftool.c:1583
 msgid "WARNING: empty <applyto> node"
 msgstr "蘙摞�: 俵眐笥百 赹硨� <applyto>"
 
-#: gconf/gconftool.c:1593 gconf/gconftool.c:1856
+#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "蘙摞�: 赹硨� <%s> 恓祴畇梠米圴 虷蚝� <schema>\n"
 
-#: gconf/gconftool.c:1603
+#: gconf/gconftool.c:1596
 msgid "WARNING: no key specified for schema\n"
 msgstr "蘙摞�: 恓 訬邁蹉� 佮濯 騷� 蚧攪尐n"
 
-#: gconf/gconftool.c:1636
+#: gconf/gconftool.c:1629
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "蘙摞�: 赹硨� <locale> 恓 芩� 轂疶謬婭 \"name=\"locale\"\", 倷浀倀玾瓬蹉柦n"
 
-#: gconf/gconftool.c:1642
+#: gconf/gconftool.c:1635
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1716
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "蘙摞�: 醚蛈眛圴 赹硨� <%s> � 赹确� <locale>\n"
 
-#: gconf/gconftool.c:1752
+#: gconf/gconftool.c:1745
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1760
+#: gconf/gconftool.c:1753
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1782
+#: gconf/gconftool.c:1775
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "蘙摞�: 恓 袎賻珃� 稊'栚轂� 蚧攪� \"%s\" � 佮濯攪 \"%s\": %s\n"
 
-#: gconf/gconftool.c:1790
+#: gconf/gconftool.c:1783
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "餀枎畷恘 蚧攪� \"%s\" 鰍 佮濯� \"%s\"\n"
 
-#: gconf/gconftool.c:1869
+#: gconf/gconftool.c:1862
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "醚狟�汛恘 椿� 謬昑 �癹� � 狦恓 觕狦秸恄� <locale> � <schema>\n"
 
-#: gconf/gconftool.c:1898
+#: gconf/gconftool.c:1891
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "蘙摞�: 赹硨� <%s> 陓疻� <schemalist> - 恓祴畇梠米圴\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:1913
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "醚 袎賻珃� 蛈騰疶埩 \"%s\": %s\n"
 
-#: gconf/gconftool.c:1927
+#: gconf/gconftool.c:1920
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "餀劼芶拏 \"%s\" 俵眐笥百?\n"
 
-#: gconf/gconftool.c:1939
+#: gconf/gconftool.c:1932
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1554,26 +1694,26 @@ msgstr ""
 "餀劼芶拏 \"%s\" 芩� 恓蛈眛圴 埩� 冾狾恄珌� 赹确� (<%s>, 芩� 謬埩 "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1952
+#: gconf/gconftool.c:1945
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "餀劼芶拏 \"%s\" 恓芩� 赹确� 覂疿挎珌� 狾谻� <gconfschemafile>\n"
 
-#: gconf/gconftool.c:1966
+#: gconf/gconftool.c:1959
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "蘙摞�: 赹硨� <%s> 陓疻� <gconfschemafile> - 恓祴畇梠米圴\n"
 
-#: gconf/gconftool.c:1977 gconf/gconftool.c:2009
+#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "蟴虭昋� 蚕恛眐峖睋疆� 鐘恌� 冾恇灰梑謄戍: %s"
 
-#: gconf/gconftool.c:1993
+#: gconf/gconftool.c:1986
 msgid "Must specify some schema files to install\n"
 msgstr "蟴婞汕恘 訬邁轂� 霰辿杻佹 そ帎肉 蚧攪� 騷� 缶衲賻捙戍\n"
 
-#: gconf/gconftool.c:2030
+#: gconf/gconftool.c:2023
 #, c-format
 msgid ""
 "\n"
@@ -1582,16 +1722,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2050
+#: gconf/gconftool.c:2043
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2176
+#: gconf/gconftool.c:2169
 msgid "Must specify some keys to break\n"
 msgstr "蟴婞汕恘 訬邁轂� 霰捀� 佮濯� 騷� 陓疻疶袬恄娖n"
 
-#: gconf/gconftool.c:2182
+#: gconf/gconftool.c:2175
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1600,11 +1740,11 @@ msgstr ""
 "鯗眐臏 陓疻眢轂� 袬觛 倷珌畛邯 赽埡恘訞曬恮� 俵Щ恌� 硩醣曬� 騷� 佮濯�:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2200
+#: gconf/gconftool.c:2193
 msgid "Must specify some directories to break\n"
 msgstr "醚狟�汛恘 訬邁轂� 霰捀� 佹埡昑б 騷� 騷� 陓疻疶袬恄娖n"
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2212
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1615,17 +1755,64 @@ msgstr ""
 "佹埡昑琣:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
-#, c-format
-msgid "GConf Error: %s\n"
-msgstr "蟴虭昋� GConf: %s\n"
-
-#: wrappers/gtk/gconf-client.c:795
+#: wrappers/gtk/gconf-client.c:812
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "蟴陓疻齡曬恮 GConf: 恓 袎賻珃� 珆疶芩埩 衄孖玹 釓� � \"%s\": %s"
 
-#: wrappers/gtk/gconf-client.c:997
+#: wrappers/gtk/gconf-client.c:985
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "檹竹欳賻珃� \"%s\", 珆疶芩恘 \"%s\" 騷� 佮濯� %s"
+
+#~ msgid "Unloading BerkeleyDB (BDB) backend module."
+#~ msgstr "鼵袬拏輿曬恮 蚥眢籤恘ж 迍齣曶 BerkeleyDB (BDB)."
+
+#~ msgid "Initializing BDB backend module"
+#~ msgstr "僇污汐怞睋疆� 蚥眢籤恘ж 迍齣曶 BDB"
+
+#~ msgid "Couldn't find the %s root directory in the address `%s'"
+#~ msgstr "醚 袎賻珃� 蛈鰓購埩 冾疻恓訰� 佹埡昑� %s 睋 謐疻衃� \"%s\""
+
+#~ msgid ""
+#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ msgstr ""
+#~ "醚迍筇屺� 筊尕轂� � 瘃 睋倅蚆埩 � 冾疻恓訰� 佹埡昑� %s 睋 謐疻衃� \"%s\""
+
+#~ msgid "No database available to save your configuration"
+#~ msgstr "醚芩� 鰍衲桸恘� 臏硭 鐘恌� 騷� 睌籤纖曬恮 袬裉� 冾恇早梑謄戍"
+
+#~ msgid "OAF problem description: '%s'"
+#~ msgstr "懩孖 倷狟旼虭 OAF: \"%s\""
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "醚 袎賻珃� 睌籤龔埩 硩醣曬恮 睋 佮濯攪 \"%s\""
+
+#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgstr ""
+#~ "擸疶芩恘 蚕倀賻 %d, 蚎厊蹉� 挭畛. 甀儸 攽蚎�, 俵蛈鰍邴� 倷� 藝 俵虭昋� � "
+#~ "GConf."
+
+#~ msgid ""
+#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ msgstr ""
+#~ "擸疶芩恘 蚕倀賻 %d, 恓恘眝賻媓� 睋覂砢曬恮 眐蟠埩. 甀儸 攽蚎�, 俵蛈鰍邴� 倷� "
+#~ "藝 俵虭昋�."
+
+#~ msgid "GConf server is not in use, shutting down."
+#~ msgstr "鬌眢籤 GConf 恓 訰冾疶衲瓬掑婥衭, 睋覂砢曬恮 眐蟠埩."
+
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "蟴虭昋� 筊尕欳蹉恮 そ帎� 睌籤纖曬珌� 衲蹉�: %s"
+
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "醚 袎賻珃� 珆疶芩埩 IOR 騷� 佮忖拏�: %s"
+
+#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgstr "醚 袎賻珃� 蚎妅梊� 佮忖拏� � そ帎 睌籤纖恘ж 衲蹉�: %s"
+
+#~ msgid "Default Value: %s\n"
+#~ msgstr "蠖俵覂 硩醣曬恮: %s\n"
+
+#~ msgid "GConf Error: %s\n"
+#~ msgstr "蟴虭昋� GConf: %s\n"