srcdir != builddir fixageGCONF_1_1_2

2001-09-27  Havoc Pennington  <hp@redhat.com>

	* backends/Makefile.am (INCLUDES): srcdir != builddir fixage

	* configure.in: increment version for release
	(ORBIT_IDL): look for orbit-idl-2 using pkg-config

30 files changed, 12439 insertions, 11673 deletions

diff --git a/ChangeLog b/ChangeLog
index 407a5daf..e14928f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2001-09-27  Havoc Pennington  <hp@redhat.com>
 
-	* configure.in (ORBIT_IDL): look for orbit-idl-2 using pkg-config
+	* backends/Makefile.am (INCLUDES): srcdir != builddir fixage
+
+	* configure.in: increment version for release
+	(ORBIT_IDL): look for orbit-idl-2 using pkg-config
 
 2001-09-17  Havoc Pennington  <hp@redhat.com>
 
diff --git a/backends/Makefile.am b/backends/Makefile.am
index be79f4fd..484458d9 100644
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= -I$(top_srcdir) -I$(top_builddir) \
+INCLUDES= -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/gconf \
 	$(DEPENDENT_WITH_XML_CFLAGS) \
 	-DGCONF_ENABLE_INTERNALS=1 -DG_LOG_DOMAIN=\"GConf-Backends\"
 
diff --git a/configure.in b/configure.in
index 9b2fc873..34152d45 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.1)
+AM_INIT_AUTOMAKE(GConf, 1.1.2)
 
 AM_MAINTAINER_MODE
 
@@ -49,7 +49,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
 dnl libtool versioning for libgconf
 
 dnl increment if the interface has additions, changes, removals.
-GCONF_CURRENT=1
+GCONF_CURRENT=2
 
 dnl increment any time the source changes; set to 
 dnl  0 if you increment CURRENT
diff --git a/po/az.po b/po/az.po
index f742990d..eac696a9 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: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-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,6 +13,34 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: backends/bdb-backend.c:215
+msgid "Unloading BerkeleyDB (BDB) backend module."
+msgstr "BerkeleyDB (BDB) \"backend\" modulunu çıxarıram ."
+
+#: backends/bdb-backend.c:238
+#, c-format
+msgid "Opened BerkeleyDB source at root %s"
+msgstr "BerkeleyDB qaynağı kök \"%s\"da(də) açıldı"
+
+#: backends/bdb-backend.c:578
+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 ."
@@ -22,11 +50,6 @@ 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'"
@@ -41,7 +64,7 @@ msgstr "%s kökündəki XML qaynaq qovluq/fayl səlahiyyətləri : %o/%o"
 msgid "Initializing XML backend module"
 msgstr "XML modulunu əlavə edirəm"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "`%s' XML qovluğunda qıfıllama edə bilmədim : %s"
@@ -49,26 +72,25 @@ msgstr "`%s' XML qovluğunda qıfıllama edə bilmədim : %s"
 #: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
-"XML modulunu qapadırkən sinxronlaşdırılmamış qovluq silinmələri "
-"geriyə qalır"
+"XML modulunu qapadırkən sinxronlaşdırılmamış qovluq silinmələri geriyə qalır"
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 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"
+"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:253
+#: backends/xml-cache.c:256
 #, 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 üzv axtar yaddaşda geriyə qaldı. %u saniyədən köhnə "
-"sinxronlaşdırılmamış üzvlər silinmişdir"
+"%u üzv axtar yaddaşda geriyə qaldı. %u saniyədən köhnə sinxronlaşdırılmamış "
+"üzvlər silinmişdir"
 
 #: backends/xml-dir.c:164
 #, c-format
@@ -80,174 +102,164 @@ 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:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "`%s''yi silə bilmədim : %s"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "`%s' faylını yazarkən xəta oldu : %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: 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
 #, 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:373
+#: backends/xml-dir.c:389
 #, 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:385
+#: backends/xml-dir.c:401
 #, 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:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "`%s''yi aça bilmədim : %s"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Cüt `%s' üzvləri ( `%s''de ), keçirəm"
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, 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:961
+#: backends/xml-dir.c:979
 #, 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:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "`%s' faylını yaradarkən xəta oldu : %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, 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:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "`%s' adlı XML üzvünü keçirəm : %s"
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 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: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: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:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "`%s' adlı XML üzvünü keçirəm : %s"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, 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:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "<%s> üzvü üçün \"type\" xüsusiyyəti bildirilməmişdir"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, 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"
+"Bir üzvün namə'lum bir \"type\" xüsusiyyəti `%s''yi daxil edir, keçirəm"
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "Üzv üçün bir qiymət yoxdur"
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "XML siyahı üzvündəki <%s> XML üzvünü başa düşmədim"
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 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 )"
+"Siyahı üzvünün növü keçərsizdir ( siyahı, yoldaş ya da namə'lum ola bilər )"
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Pis şəkilləndirilmiş XML üzvü : %s"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, 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)"
+msgstr "Siyahı səhv yazılmış bir üzv daxil edir ( %s, amma %s olmalıdır)"
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "XML yoldaşı üçün pis şəkilləndirilmiş `car''ı : %s"
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
-"XML faylını oxuyuram : siyahı və yoldaşlar birlikdə bir yerdə ola "
-"bilməz"
+"XML faylını oxuyuram : siyahı və yoldaşlar birlikdə bir yerdə ola bilməz"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "XML yoldaşı üçün pis şəkilləndirilmiş `cdr''ı : %s"
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, 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:1183
+#: backends/xml-entry.c:1194
 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:1189
+#: backends/xml-entry.c:1200
 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:1196
+#: backends/xml-entry.c:1207
 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:1201
+#: backends/xml-entry.c:1212
 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 "
-"əksikdir"
+"XML faylındakı qiymət yoldaşları üçün `cdr' və `cdr' qiymətləri əksikdir"
 
 #. -- end debug only
 #: gconf/gconf-backend.c:167
@@ -278,57 +290,53 @@ msgstr "`%s' üçün modul tapa bilmədim"
 msgid "Failed to shut down backend"
 msgstr "Modulu Qapada bilmədim"
 
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr "Qiymət oturtma istəyində keçərsiz qiymət tapıldı"
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, 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"
+msgstr "`%s' açarının oturtma istəyindəki CORBA qiymətinə mə'na verə bilmədim"
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 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:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr "Sinxronlaşdırma arzunu aldım"
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 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"
+msgstr "Ağır Xəta: Quraşdırma vericisi üçün cism bağını ala bilmədim"
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
-msgstr ""
-"Bir ya da daha çox mənbələri sinxronlaşdırılırkən xəta oldu : %s"
+msgstr "Bir ya da daha çox mənbələri sinxronlaşdırılırkən xəta oldu : %s"
 
 #. This error is not fatal; we basically ignore it.
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
-"Dinləyicinin diqqəti çəkilə bilmədi (%s): gconf restart'da dinləyici "
-"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."
+"Dinləyicinin diqqəti çəkilə bilmədi (%s): gconf restart'da dinləyici 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:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Dinləyici ID %lu yoxdur"
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -337,47 +345,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:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, 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:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "`%s' üçün qiyməti oturdurkən xəta oldu : %s"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "`%s''yi silə bilmədim : %s"
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, 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:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "`%s' varlığını yoxlarkən xəta oldu : %s"
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "`%s' qovluğu silinərkən xəta oldu : %s"
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, 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:1045
+#: gconf/gconf-database.c:1400
 #, 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:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "`%s' üçün şəkli oturdurkən xəta oldu : %s"
@@ -442,245 +450,29 @@ 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-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-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: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
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "`%s' açarında '/' yoxdur"
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Siyahı üzvü üçün bir CORBA qiymətini tapa bilmədim"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "%s'dəki siyahı üzvünün növü səhvdir"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
-msgstr ""
-"gconfd verici siyahısından xətalı siyahı növünü nəticəsini aldım"
+msgstr "gconfd verici siyahısından xətalı siyahı növünü nəticəsini aldım"
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr "Cism IORa çevrila bilmədi"
 
@@ -689,141 +481,142 @@ msgstr "Cism IORa çevrila bilmədi"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Yol faylı `%s''yi aça bilmədim : %s\n"
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "`%s' qaynağını əlavə edirəm\n"
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "`%s' faylında oxuma xətası oldu: %s\n"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Siyahı gözləyərkən, %s aldım"
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, 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:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Cütünü gözləyərkən, %s aldım"
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, 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"
+"%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:1499
+#: gconf/gconf-internals.c:1474
 #, 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:1615
+#: gconf/gconf-internals.c:1590
 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:1677
+#: gconf/gconf-internals.c:1652
 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:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA xətası : %s"
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, fuzzy, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr "OAF problem izahatı : '%s'"
+
+#: gconf/gconf-internals.c:2154
 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:2182
+#: gconf/gconf-internals.c:2159
 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:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF darama xətası : %s"
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "Namə'lum OAF xətası"
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "`%s' üçün ior faylı yoxdur"
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, 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:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "`%s' qıfıllaması başqa bir proqrama aittir"
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 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:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
-"Sərt qıfıl `%s''yi açıram , çünkü IOR bir cism bağına "
-"döndürülə bilmədi ,IOR `%s'"
+"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:2359
+#: gconf/gconf-internals.c:2314
 #, 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"
+"Möhkam qıfıl `%s''yi açıram , çünkü vericiyə yetişmə problemləri var : %s"
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, 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:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "`%s' qovluğunu yarada bilmədim : %s"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "`%s' qıfılını yarada bilmədim : %s"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "`%s' faylına yaza bilmədim : %s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, 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"
+msgstr "`%s' qıfıl faylını aça bilmədim ; bizim olmadığını fikirləşirəm : %s"
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Xətalı qıfıl faylı `%s' ; onu silirəm"
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -832,53 +625,63 @@ 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:2543
+#: gconf/gconf-internals.c:2519
 #, 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:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "`%s' qaynağını yükləyə bilmədim : %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, 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"
+msgstr "`%s' şəkli `%s' üçün bir şəkil qiyməti olmayan bir qiymət daxil edir"
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 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"
+"'/' adları sadəcə bir qovluq ola bilər, qətiyyan'iyyen bir açar ola bilməz"
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
-"`%s' üçün sırf-oxunan qaynaqda sənin yolundan əvvəl bir qiymət "
-"oturdulub"
+"`%s' üçün sırf-oxunan qaynaqda sənin yolundan əvvəl bir qiymət oturdulub"
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Meta mə'lumatları axtarılırkən xəta oldu : %s"
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Meta mə'lumatları alırkən xəta oldu : %s"
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
-"Açar `%s' `%s' açarı üçün şəkil olaraq bildirilmiş və düzdür "
-"`%s' növünü qeyd edir"
+"Açar `%s' `%s' açarı üçün şəkil olaraq bildirilmiş və düzdür `%s' növünü "
+"qeyd edir"
 
 #: gconf/gconf-value.c:82
 #, c-format
@@ -903,21 +706,17 @@ msgstr "`%s''yi başa düşmədim (true/false - düzgün/səhv gözləyirdim )"
 #: gconf/gconf-value.c:214
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
-msgstr ""
-"`%s''yi başa düşmədim (sətir bir '[' ilə başlamaq "
-"məcburiyyətindədir)"
+msgstr "`%s''yi başa düşmədim (sətir bir '[' ilə başlamaq məcburiyyətindədir)"
 
 #: gconf/gconf-value.c:227
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
-msgstr ""
-"`%s''yi başa düşmədim (sətir bir ']' ilə bitmək məcburiyyətindədir)"
+msgstr "`%s''yi başa düşmədim (sətir bir ']' ilə bitmək məcburiyyətindədir)"
 
 #: gconf/gconf-value.c:278
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
-msgstr ""
-"`%s''yi başa düşmədim (siyahının içində bir əlavə ']' tapdım)"
+msgstr "`%s''yi başa düşmədim (siyahının içində bir əlavə ']' tapdım)"
 
 #: gconf/gconf-value.c:309 gconf/gconf-value.c:462
 #, c-format
@@ -927,14 +726,12 @@ msgstr "`%s''yi başa düşmədim (işe yaramaz hərfləri tapdım)"
 #: gconf/gconf-value.c:348
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
-msgstr ""
-"`%s''yi başa düşmədim (cüt bir '(' ilə başlamaq məcburiyyətindədir)"
+msgstr "`%s''yi başa düşmədim (cüt bir '(' ilə başlamaq məcburiyyətindədir)"
 
 #: gconf/gconf-value.c:361
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
-msgstr ""
-"`%s''yi başa düşmədim (cüt bir ')' ilə başlamaq məcburiyyətindədir)"
+msgstr "`%s''yi başa düşmədim (cüt bir ')' ilə başlamaq məcburiyyətindədir)"
 
 #: gconf/gconf-value.c:391 gconf/gconf-value.c:477
 #, c-format
@@ -951,106 +748,109 @@ msgstr "`%s''yi başa düşmədim (cütdə əlavə bir ')' vardır)"
 msgid "`%s': %s"
 msgstr "`%s' : %s"
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "`%s' ünvanı həll edilə bilmədi"
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 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:1597
+#: gconf/gconf.c:1870
 #, c-format
-msgid "Pinging the server failed, CORBA error: %s"
-msgstr "Vericinin pinglənməsi iflas etdi( CORBA xətası : %s )"
+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 "
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
-"Quraşdırma vericisinə bağlana bilmədim ; OAF 'sıfır' qiymətini "
-"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:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConf'u başlada bilmədim , qurtarıram\n"
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr "Bir bölü işarəti ilə( '/' ) başlamaq məcburiyyətindədir"
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 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:1941
+#: gconf/gconf.c:2259
 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:1962
+#: gconf/gconf.c:2280
 #, 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:1976
+#: gconf/gconf.c:2294
 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:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Quraşdırma vericisini Qapada bilmədim : %s"
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Üzən sayı (float) gözləyərkən, %s aldım"
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Tamsayı (int) gözləyərkən, %s aldım"
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Mətn gözləyərkən, %s aldım"
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Boolean gözləyərkən, %s aldım"
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Sxem gözləyərkən, %s aldım"
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "Qapanma istəyi alındı"
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
-"gconfd vericisi mə'lumatlandırma ilə yoxlanıb ; qaynaq qovluğunda "
-"gconf.path'yuükləməyə cəhd edirəm"
+"gconfd vericisi mə'lumatlandırma ilə yoxlanıb ; qaynaq qovluğunda gconf."
+"path'yuükləməyə cəhd edirəm"
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
-"Quraşdırma faylları tapıla bilmədi , əsas quraşdırma qaynağı "
-"`%s''yi istifadə edirəm"
+"Quraşdırma faylları tapıla bilmədi , əsas quraşdırma qaynağı `%s''yi "
+"istifadə edirəm"
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1058,394 +858,449 @@ 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:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, 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:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
-"Quraşdırma qaynağı ünvanını müvəffəqiyyətlə həll edə "
-"bilmədim, quraşdırma mə'lumatlarını yükləya bilmərəm ya da qeyd "
-"eda bilmərəm"
+"Quraşdırma qaynağı ünvanını müvəffəqiyyətlə həll edə bilmədim, quraşdırma "
+"mə'lumatlarını yükləya bilmərəm ya da qeyd eda bilmərəm"
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 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"
+"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:312 gconf/gconfd.c:324
+#: gconf/gconfd.c:385
 #, c-format
-msgid "Received signal %d, shutting down."
-msgstr "%d siqnalını aldım, qapanıram ."
+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."
 
-#: gconf/gconfd.c:329
+#: gconf/gconfd.c:402
 #, 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:376
+#: gconf/gconfd.c:519
 #, 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:380
-msgid "GConf was built with debugging features enabled"
-msgstr "FConf xəta ayıqlaması qabilliyəti ilə qurulub"
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
+#, fuzzy
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
-"OAF'ı başlada bilmədim ; lütfən OAF yazıçılarına bir xəta raportu "
-"çatdır "
+"OAF'ı başlada bilmədim ; lütfən OAF yazıçılarına bir xəta raportu çatdır "
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Quraşdırma vericisi üçün cism bağını ala bilmədim"
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "`%s' faylını yaradarkən xəta oldu : %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "IOR alıcısı alınması bacarılmadı: %s"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
+#, fuzzy
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
 msgstr ""
-"OAF bizim IID'mizi tanımır ; bu xətalı bir qurmanın göstəricisidir ; "
-"qeyd ola bilmiram ; qurtarıram \n"
+"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:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:613
+#, fuzzy
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
 msgstr "Başqa bir gconfd vericisi OAF'a onsuz da qeydlidir ; qurtarıram\n"
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:618
+#, fuzzy
+msgid "Unknown error registering existing gconfd with OAF; exiting"
+msgstr "gconfd vericisini OAF'a qeyd edərkən namə'lum xəta oldu ; qurtarıram\n"
+
+#: gconf/gconfd.c:645
+#, fuzzy
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
 msgstr ""
-"gconfd vericisini OAF'a qeyd edərkən namə'lum xəta oldu ; qurtarıram\n"
+"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:649
+#, fuzzy
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
+msgstr "Başqa bir gconfd vericisi OAF'a onsuz da qeydlidir ; qurtarıram\n"
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:654
+#, fuzzy
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
+msgstr "gconfd vericisini OAF'a qeyd edərkən namə'lum xəta oldu ; qurtarıram\n"
+
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "`%s' qıfıl qovluğunu aça bilmədim : %s"
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "Çıxıram"
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr "GConf vericisi istifadədə deyildir, qapanıram ."
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Xəta təpməsi: %s"
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 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 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:908
+#: gconf/gconfd.c:1225
 #, 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)"
+msgstr "Gconf qeyd faylı qapadıla bilmədi; data düzgün qeyd edilə bilməz (%s)"
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, 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:980
+#: gconf/gconfd.c:1308
 #, 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:989
+#: gconf/gconfd.c:1317
 #, 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:1003
+#: gconf/gconfd.c:1331
 #, 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:1013
+#: gconf/gconfd.c:1341
 #, 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:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
-"'%s' a(ə) köçürülmüş əsl qeyd edilmiş hal faylını bərpa eda "
-"bilmədim: %s"
+"'%s' a(ə) köçürülmüş əsl qeyd edilmiş hal faylını bərpa eda bilmədim: %s"
 
-#: gconf/gconfd.c:1110
+#: gconf/gconfd.c:1823
 #, 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"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
-"Qeyd edilmiş hal faylından quraşdırma qaynaq ünvanı ayrıla bilmədi: "
-"%s"
+"'%s' ünvanındakı dinləyici bərpa edilə bilmir, database hall edilə bilmir"
 
-#: gconf/gconfd.c:1160
+#: gconf/gconfd.c:1869
 #, 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"
+msgid "Error reading saved state file: %s"
+msgstr "Qeyd edilmiş vəziyyət faylı oxunarkən xəta oldu : %s"
 
-#: gconf/gconfd.c:1180
+#: gconf/gconfd.c:1922
 #, c-format
-msgid "Failed to unquote IOR from saved state file: %s"
-msgstr "Qeyd edilmiş hal dosyesindən IOR ayrıla bilmədi: %s"
+msgid "Unable to open saved state file '%s': %s"
+msgstr "Qeyd edilmiş `%s' hal faylı açıla bilmədi:  %s"
 
-#: gconf/gconfd.c:1204
+#: gconf/gconfd.c:2039
+#, c-format
 msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
+"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 ""
-"Qeyd edilmiş hal faylında eyni dinləyici iki dəfə əlavə edilmişdir: "
-"ikincisini hesaba qatmıram"
+"Dinləyicini təsbitləri qeyd faylına yazıla bilmir; gconfddan çıxdığınız "
+"vaxt  bu qeydləri təzədən əlavə edə bilməyəcəyik (%s)"
 
-#: gconf/gconfd.c:1225
+#: gconf/gconfd.c:2044
+#, c-format
 msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
+"Failed to log removal of listener to gconfd logfile; might erroneously re-"
+"add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
-"Qeyd edilmiş hal faylında əlavə edilməmiş dinləyicinin silindiyi "
-"bildirilir: silinməyi hesaba qatmıram"
+"Gconfd qeyd faylından dinləyici silinə bilmədi; gconfddan çıxdığınız vaxt "
+"eyni dinləyiciyi xətalı olaraq təzədən əlavə edə bilərəm (%s)"
 
-#: gconf/gconfd.c:1346
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
 #, c-format
-msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
-msgstr ""
-"'%s' ünvanındakı dinləyici bərpa edilə bilmir, database hall edilə "
-"bilmir"
+msgid "Failed to get IOR for client: %s"
+msgstr "IOR alıcısı alınması bacarılmadı: %s"
 
-#: gconf/gconfd.c:1377
+#: gconf/gconfd.c:2082
 #, c-format
-msgid "Unable to open saved state file '%s': %s"
-msgstr "Qeyd edilmiş `%s' hal faylı açıla bilmədi:  %s"
+msgid "Failed to open saved state file: %s"
+msgstr "Qeyd edilmiş hal faylı açıla bilmədi:  %s"
 
-#: gconf/gconfd.c:1476
+#: gconf/gconfd.c:2095
 #, 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 ""
-"Dinləyicini təsbitləri qeyd faylına yazıla bilmir; gconfddan "
-"çıxdığınız vaxt  bu qeydləri təzədən əlavə edə bilməyəcəyik "
-"(%s)"
+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:1481
+#: gconf/gconfd.c:2103
 #, 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:2193
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
-"Gconfd qeyd faylından dinləyici silinə bilmədi; gconfddan "
-"çıxdığınız vaxt eyni dinləyiciyi xətalı olaraq təzədən əlavə "
-"edə bilərəm (%s)"
+"Bir alıcı özünü GConf vericisindən çıxardıb və ona görə də əlavə edilməyib."
 
-#: gconf/gconftool.c:62
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr "Kömək seçənəkləri"
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 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:80
+#: gconf/gconftool.c:87
 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:89
+#: gconf/gconftool.c:96
 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 ""
-"Bir şəkli oturt və sinxronlaşdır . --short-desc, --long-desc, --owner "
-"və --type'la birlikdə istifadə edilir ."
+"Bir şəkli oturt və sinxronlaşdır . --short-desc, --long-desc, --owner və --"
+"type'la birlikdə istifadə edilir ."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr "Əmr sətirindəki açarları sil"
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 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:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr "Bir qovluqdakı altqovluqları göstər ."
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 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 ."
+"Bir qovluğun bütün alt qovluqlarını və üzvlərini dərinliyi ilə göstər ."
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 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:144
+#: gconf/gconftool.c:151
 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Ə."
+msgstr "gconfd'yi qapat . BU SEÇƏNƏYİ YAXŞI BIR SƏBƏBİN OLMADAN İSTİFADƏ ETMƏ."
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 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 ."
+"gconfd vericisi işləyirsə 0'ı nəticəsini ver, yoxsa 2'yi nəticəsini ver ."
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
-"Quraşdırma vericisini ( gconfd ) başlatdım. ( Bu onsuz da lazımlı "
-"olduğu vaxt edilir . )"
+"Quraşdırma vericisini ( gconfd ) başlatdım. ( Bu onsuz da lazımlı olduğu "
+"vaxt edilir . )"
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
 msgstr ""
-"Oturtulacaq qiymətin növünü bildir, ya da şəklin anlatdığı "
-"qiymətin növünü başa sal . Həmən başa düşüləcək qısaltmalar "
-"qəbul edilir ."
+"Oturtulacaq qiymətin növünü bildir, ya da şəklin 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:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"Oturdulacaq siyahı qiymətinin növünü bildir, ya da şəklin "
-"anlatdığı qiymətin növünü başa sal. Həmən başa düşüləcək "
-"qısaltmalar qəbul edilir."
+"Oturdulacaq siyahı qiymətinin növünü bildir, ya da şəklin 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:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr "int | bool | float | string"
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"Oturdulacaq car çiftinin növünü bildir, ya da şəklin anlattığı "
-"qiymətin növünü başa sal. Həmən başa düşüləcək qısaltmalar "
-"qəbul edilir."
+"Oturdulacaq car çiftinin növünü bildir, ya da şəklin anlattığı 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:198
+#: gconf/gconftool.c:205
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"Oturdulacaq cdr çiftinin növünü bildir, ya da şəklin anlattığı "
-"qiymətin növünü başa sal. Həmən başa düşüləcək qısaltmalar "
-"qəbul edilir."
+"Oturdulacaq cdr çiftinin növünü bildir, ya da şəklin anlattığı 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:207
+#: gconf/gconftool.c:214
 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 ."
+"Şekilldə yaxşı görünəcək növdə , qısa və yarım-sətir uzunluğunda bir izahı "
+"bildir ."
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr "İZAH"
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 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:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr "Şəklin yiyəsini bildir"
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr "YİYƏ"
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr "Yüklənəcək bir şəkil faylını bildir"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr "FAYLADI"
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 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"
+"Əsas qurğulu qovluq xaricində istifadə ediləcək bir quraşdırma qaynağını "
+"bildir"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr "QAYNAQ"
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
-"Quraşdırma bildi tabanına direkt olaraq yetiş və vericiyi keç . "
-"gconfd'nin fəal olmamalıdır."
+"Quraşdırma bildi tabanına direkt olaraq yetiş və vericiyi keç . gconfd'nin "
+"fəal olmamalıdır."
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 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 ""
-"Şəkil fayllarını mə'lumat tabanına oturdur və yüklər "
-".GCONF_CONFIG_SOURCE verisi əsas quraşdırma qaynağı xaricindəki bir "
-"yerə göstərməyi lazımdır və ya əsas yeri istifadə etmək "
-"istəyirsənsə boş olmalıdır ."
+"Şəkil fayllarını mə'lumat tabanına oturdur və yüklər .GCONF_CONFIG_SOURCE "
+"verisi əsas quraşdırma qaynağı xaricindəki bir 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:270
+#: gconf/gconftool.c:277
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
 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) ."
+"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:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 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) ."
+"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:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1454,465 +1309,496 @@ 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:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Eyni anda data alıb, oturda bilmərəm\n"
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Eyni anda data oturdub, ala bilmərəm\n"
 
-#: 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:413
+#, fuzzy
+msgid "Can't use --all-entries with --get or --set\n"
+msgstr "--get və ya --set'lə birlikdə --all-dirs istifadə edilə bilməz\n"
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 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:371
+#: gconf/gconftool.c:431
+#, fuzzy
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
 "--recursive-list --get, --set, --unset, --all-pairs, və ya --all-dirs'lə "
 "birlikdə istifadə edilə bilməz .\n"
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
+#, fuzzy
 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-entries, --"
+"all-dirs\n"
 msgstr ""
-"--set_schema --get, --set, --unset, --all-pairs və ya --all-dirs'lə "
-"birlikdə istifadə edilə bilməz .\n"
+"--set_schema --get, --set, --unset, --all-pairs və ya --all-dirs'lə birlikdə "
+"istifadə edilə bilməz .\n"
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 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:393
+#: gconf/gconftool.c:453
 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:402
+#: gconf/gconftool.c:463
 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"
+msgstr "Ping seçənəyi öz özünə istifadə edilmək məcburiyyətindədir .\n"
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 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:420
+#: gconf/gconftool.c:483
 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"
+msgstr "--install-schema-file öz özünə istifadə edilmək məcburiyyətindədir .\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 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"
+"--makefile-install-rule öz özünə istifadə edilmək məcburiyyətindədir .\n"
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 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:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
-msgstr ""
-"--break-directory öz özünə istifadə edilmək məcburiyyətindədir .\n"
+msgstr "--break-directory öz özünə istifadə edilmək məcburiyyətindədir .\n"
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 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"
+"--direct'lə --config-source istifadə edildiyi vaxt bir quraşdırma qaynağını "
+"bildir \n"
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf'un başlaması iflas etdi: %s\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 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:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
 "applications are running\n"
 "(though things theoretically work if apps are running).\n"
 msgstr ""
-"Təzə şəkil fayllarını yüklərkən gconfd vericisinin "
-"işləməməməsi daha yaxşı olar .\n"
-"Vericiyi qapatmaq üçün `gconftool --shutdown''i istifadə et ( bu "
-"əməliyyatı əlbətdə ki heç bir bu vericiyi istifadə edən proqramın "
-"işləmədiyi vaxt edilməsitəbiidir) .\n"
+"Təzə şəkil fayllarını yüklərkən gconfd vericisinin işləməməməsi daha yaxşı "
+"olar .\n"
+"Vericiyi qapatmaq üçün `gconftool --shutdown''i istifadə et ( bu əməliyyatı "
+"əlbətdə ki heç bir bu vericiyi istifadə edən proqramın işləmədiyi vaxt "
+"edilməsitəbiidir) .\n"
 "( nəzəri olaraq heç bir fərq olmamalıdır) .\n"
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, 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:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Qapatılma xətası : %s\n"
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 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:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
 msgstr "`%s''dəki yoldaşları sıralarkən xəta oldu : %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr "( qiyməti yoxdur )"
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, 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:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr "Alınacak açar(lar)ı bildirmək məcburiyyətindəsən\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "Nov: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Siyahı növü : %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car növü : %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr növü : %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "Yiyə : %s\n"
+msgid "Default Value: %s\n"
+msgstr "Ana Qiymət: %s\n"
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr "İşarəti Qaldır"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "Yiyə : %s\n"
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Qısa izahat : %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Uzun izahat : %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "`%s' üçün bir qiymət bildirilməyib\n"
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, 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:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "`%s' növünü başa düşmürəm\n"
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 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"
+msgstr "Arqument olaraq dəyişən açar/qiymətlər vermək məcburiyyətindəsən\n"
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, 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:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr "Bir şəkli bir qiymət olaraq oturda bilmərəm\n"
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 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"
+msgstr "Bir siyahıyı bildirirkən siyahı növünü bildirmək məcburiyyətindəsən\n"
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 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"
+"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:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "Xəta : %s\n"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
-#, c-format
-msgid "Error setting value: %s"
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
 msgstr "Qiyməti oturdurkən xəta oldu : %s"
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
-#, c-format
-msgid "Error syncing: %s"
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
 msgstr "Sinxronlaşdırılırkən xəta oldu : %s"
 
-#: gconf/gconftool.c:1107
-msgid "Must specify key (schema name) as the only argument\n"
+#: gconf/gconftool.c:1234
+#, fuzzy
+msgid "Must specify a key or keys on the command line\n"
+msgstr "Alınacak açar(lar)ı bildirmək məcburiyyətindəsən\n"
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "Belə bir fayl yoxdur : `%s'\n"
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "`%s' üçün şəkli oturdurkən xəta oldu : %s"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "Belə bir fayl yoxdur : `%s'\n"
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
 msgstr ""
-"Tək arqument olaraq bir açarı ( şəkli ) bildirmək "
-"məcburiyyətindəsən\n"
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1358
+#, fuzzy
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr "Tək arqument olaraq bir açarı ( şəkli ) bildirmək məcburiyyətindəsən\n"
+
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr ""
+"XƏBƏRDARLIQ : `%s' şəkil faylını `%s' açarı ilə birləşdirə bilmədim : %s\n"
+
+#: gconf/gconftool.c:1385
+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:1427
 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"
+"Siyahı növü bu əsas növlərdən meydana gəlməlidir: string, int, float ya da "
+"bool\n"
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 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"
+msgstr "Cütün car növü bu meydana gəlməlidir: string, int, float ya da bool\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 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"
+msgstr "Cütün cdr növü bu meydana gəlməlidir: string, int, float ya da bool\n"
+
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr "Qiyməti oturdurkən xəta oldu : %s"
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr "Sinxronlaşdırılırkən xəta oldu : %s"
+
+#: gconf/gconftool.c:1511
 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"
+"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:1247
+#: gconf/gconftool.c:1525
 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"
+msgstr "Silinəcək bir ya da daha çox açar vermək məcburiyyətindəsən .\n"
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "`%s''yi silinirkən xəta oldu : %s\n"
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 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:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Qovluqları sıralarkən xəta oldu : %s\n"
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, 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:1366
+#: gconf/gconftool.c:1644
 #, 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"
+msgstr "XƏBƏRDARLIQ : %s şəkli üçün keçərsiz ya da əksik siyahı növü\n"
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, 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"
+"XƏBƏRDARLIQ : şəkil %s üçün əsas qiymət `%s''yi daramasında xəta oldu\n"
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, 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"
+msgstr "XƏBƏRDARLIQ : %s şəkli üçün keçərsiz ya da əksik cdr növü\n"
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 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:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
-"XƏBƏRDARLIQ : gconftool'd daxili bir xəta oldu , namə'lum "
-"GConfValueType\n"
+"XƏBƏRDARLIQ : gconftool'd daxili bir xəta oldu , namə'lum GConfValueType\n"
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, 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:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"XƏBƏRDARLIQ : siyahı növü int, float, string ya da bool ola bilər, "
-"fəqət `%s' ola bilməz\n"
+"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:1535
+#: gconf/gconftool.c:1812
 #, 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"
+"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:1556
+#: gconf/gconftool.c:1833
 #, 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"
+"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:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr "XƏBƏRDARLIQ : boşdur <applyto> nöqtəsi"
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, 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"
+msgstr "XƏBƏRDARLIQ : <schema>'nın altındakı <%s> nöqtəsini başa düşmədim\n"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr "XƏBƏRDARLIQ : bu şəkil üçün açar bildirmədi\n"
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 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"
+"XƏBƏRDARLIQ : <locale> nöqtəsinin `name=\"locale\"' xüsusiyyəti yoxdur, "
+"keçirəm\n"
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
-"XƏBƏRDARLIQ : `%s' lokalizasiyası üçün çoxlu <locale> nöqtələri "
-"var, köhnə ilkləri keçirəm\n"
+"XƏBƏRDARLIQ : `%s' lokalizasiyası üçün çoxlu <locale> nöqtələri var, köhnə "
+"ilkləri keçirəm\n"
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, 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:1745
+#: gconf/gconftool.c:2023
 #, 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"
+"XƏBƏRDARLIQ : `%s' şəkil faylının `%s' lokalizasiyasının yüklənməsində xəta "
+"var : %s\n"
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "`%s' şeklinde `%s' lokalizasiyası yükləndi\n"
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, 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"
+"XƏBƏRDARLIQ : `%s' şəkil faylını `%s' açarı ilə birləşdirə bilmədim : %s\n"
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "`%s' şekilni `%s' anahtarına ekledim\n"
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 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"
+"Bir <schema>'da ən azından bir <locale> nöqtəsi olmaq məcburiyyətindədir\n"
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, 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"
+msgstr "XƏBƏRDARLIQ : <schemalist>'in altındakı <%s> nöqtəsi başa düşülmədi\n"
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "`%s''yi aça bilmədim : %s\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "`%s' sənədi yoxsa boşdur mu ?\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
-"`%s' sənədin ana nöqtəsi (<%s>'in, <gconfschemafile> olmalıdır ) "
-"səhvdir \n"
+"`%s' sənədin ana nöqtəsi (<%s>'in, <gconfschemafile> olmalıdır ) səhvdir \n"
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, 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:1959
+#: gconf/gconftool.c:2237
 #, 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"
+"XƏBƏRDARLIQ : <gconfschemafile> altındakı <%s> nöqtəsi başa düşülmədi\n"
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
-msgstr ""
-"Quraşdurma mə'lumatlarını sinxronlaşdırılırkən xəta oldu : %s"
+msgstr "Quraşdurma mə'lumatlarını sinxronlaşdırılırkən xəta oldu : %s"
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 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"
+msgstr "Yüklənəcək şəkil fayllarını bildirmək məcburiyyətindəsən\n"
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -1921,16 +1807,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, 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:2169
+#: gconf/gconftool.c:2447
 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:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1939,111 +1825,269 @@ msgstr ""
 "Proqramı bə'zi xətalı qiymətləri oturdaraq qırmağa cəhd edirəm : \n"
 "  %s\n"
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 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:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
 "directory:\n"
 "  %s\n"
 msgstr ""
-"Proqramı bə'zi xətalı qiymətləri bu qovuqda oturdaraq qırmağa : "
-"cəhd edirəm :\n"
+"Proqramı bə'zi xətalı qiymətləri bu qovuqda oturdaraq qırmağa : cəhd "
+"edirəm :\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr "GConf Xətası : %s\n"
+
+#: gconf/gconf-client.c:798
 #, 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"
+msgstr "GConf xəbərdarlığı : `%s''dəki yoldaşları sıralarkən xəta oldu : %s"
 
-#: wrappers/gtk/gconf-client.c:985
+#: gconf/gconf-client.c:1000
 #, 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 "Unloading BerkeleyDB (BDB) backend module."
-#~ msgstr "BerkeleyDB (BDB) \"backend\" modulunu çıxarıram ."
+#~ 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ə"
 
-#~ msgid "Opened BerkeleyDB source at root %s"
-#~ msgstr "BerkeleyDB qaynağı kök \"%s\"da(də) açıldı"
+#~ msgid "found <local_schema> with no locale setting"
+#~ msgstr ""
+#~ "<local_scheme> bir yerləşmə qurğuları ilə əlaqəsi olmayan bir yerdə tapdım"
 
-#~ msgid "Initializing BDB backend module"
-#~ msgstr "BDB \"backend\" modulu başladılır"
+#~ 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 "Couldn't find the %s root directory in the address `%s'"
-#~ msgstr "`%s' ünvanda %s ana qovluğunu tapa bilmədim ."
+#~ 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 ""
-#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; "
+#~ "&apos;)"
 #~ msgstr ""
-#~ "`%s' ünvanda %s ana qovluğunda oxuya bilmədim və yaza bilmədim ."
+#~ "Namə'lum '%s' girişi ('&' &amo girişi ila başlamalıdır; &quot; &lt; &gt; "
+#~ "&apos;)"
 
-#~ msgid "Failed to set mode on `%s': %s"
-#~ msgstr "`%s''da(də) mod qurula bilmədi: %s"
+#~ 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"
 
-#~ msgid "No database available to save your configuration"
-#~ msgstr "Qurğularınızın qeyd edilə biləcəyi bir databeyz yoxdur"
+#~ 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 "OAF problem description: '%s'"
-#~ msgstr "OAF problem izahatı : '%s'"
+#~ 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 "Unable to store a value at key '%s'"
-#~ msgstr "'%s' açarında qiymət saxlana bilmədi"
+#~ 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)"
 
-#~ msgid "Adding client to server's list failed, CORBA error: %s"
+#~ msgid ""
+#~ "Character code %#lx is not allowed in XML documents or is not a valid "
+#~ "Unicode character"
 #~ msgstr ""
-#~ "Alıcının verici siyahısına əlavəsi bacarılmadı, CORBA xətası : %s "
+#~ "%#lx Hərf kodu XML sənədlərində yol veriləzdir ya da keçəsiz Unicode "
+#~ "hərfidir"
 
-#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgid ""
+#~ "Documented ended just after an '&', '&' should begin an entity or "
+#~ "character reference."
 #~ msgstr ""
-#~ "%d siqnalını aldım, ayıqlama mə'lumatını tökürəm. Lütfən GConf "
-#~ "baqını raport edin."
+#~ "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."
 
 #~ msgid ""
-#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ "'<' 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 ""
-#~ "%d siqnalını aldım, təmiz sürətdə qapana bilmirəm. Lütfən GConf "
-#~ "xətasını raport edin."
+#~ "'<' 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 "GConf server is not in use, shutting down."
-#~ msgstr "GConf vericisi istifadədə deyildir, qapanıram ."
+#~ 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 "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 "Attribute name must be immediately followed by an '=' character"
+#~ msgstr "Simvol adı '=' xaraketri ilə davam etdirilməlidir"
 
-#~ msgid "Failed to open saved state file: %s"
-#~ msgstr "Qeyd edilmiş hal faylı açıla bilmədi:  %s"
+#~ msgid ""
+#~ "'=' character after attribute must be immediately followed by an '\"' "
+#~ "character"
+#~ msgstr ""
+#~ "simvoldan sonrakı '=' xarakteri mütləq '\"' xatakteri ila davam "
+#~ "etdirilmalidir"
 
-#~ 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 ""
+#~ "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 "Failed to flush client add to saved state file: %s"
+#~ msgid ""
+#~ "Ran out of text before a quote mark ('\"') was seen at the end of an "
+#~ "attribute value"
 #~ msgstr ""
-#~ "Qeyd edilmiş hal faylına \"flush\" alıcı qeyd edilə bilmədi: %s"
+#~ "'\"' dan əvvəl mətn qurtardı: '\"' simvol qiymətinin axırında görüldü"
 
 #~ msgid ""
-#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ "Text ends immediately after an attribute value, before the element was "
+#~ "closed"
 #~ msgstr ""
-#~ "Bir alıcı özünü GConf vericisindən çıxardıb və ona görə də "
-#~ "əlavə edilməyib."
+#~ "Mətn element qapatılmadan əvvəl sivvol qiymətindən həmən sonra qurtarar"
 
-#~ msgid "Default Value: %s\n"
-#~ msgstr "Ana Qiymət: %s\n"
+#~ msgid "Missing '<' at start of element"
+#~ msgstr "Elementin başında '<' yoxdur"
 
-#~ msgid "GConf Error: %s\n"
-#~ msgstr "GConf Xətası : %s\n"
+#~ msgid "Document ended just after '<' character"
+#~ msgstr "Sənəd '<' xarakterindən sonra qurtardı"
 
-#~ msgid "Already-unregistered context ID %lu, request ignored"
+#~ msgid "No closing '>' found for a <? or <!"
+#~ msgstr "<? və ya <! üçün bağlayıcı '<' tapılmadı"
+
+#~ msgid "Character '%s' is not valid at the start of an element name"
+#~ msgstr "'%s' xarakteri element başında işlədilməz"
+
+#~ 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 "Elements should be closed with '>' or '/>', not with '%s'"
+#~ msgstr "Elementlər '>' və ya '/>' ilə qurtarar, '%s' ilə deyil"
+
+#~ msgid ""
+#~ "Element ended just after '/', no '>' seen; empty elements should end with "
+#~ "'/>'"
 #~ msgstr ""
-#~ "Hal ID'si %lu onsuz da ayrılmışdır, istək diqqətə alınmayacaq"
+#~ "Element '/' dan sonra qurtardı, '>' görilmədi; boş elementlər '/>' ilə "
+#~ "qurtarmalıdırlar"
+
+#~ msgid "Close tag not found at end of element"
+#~ msgstr "Element axırında qapatma tagı tapılmadı"
+
+#~ msgid "Close tag ends just after '<' character"
+#~ msgstr "Qapatma tagı '<' xarakterindən sonra qurtarır"
+
+#~ msgid "Close tag should begin with '</', '/' character is missing"
+#~ msgstr ""
+#~ "Qapatma tagı '</' və ya '/'  xarakterlari ilə başlamalıdır, xarakterlər "
+#~ "yoxdur"
+
+#~ msgid "Close tag ends just after '/' character"
+#~ msgstr "Qapatma tagı '/' xarakterindən həmən sonra qurtarır"
+
+#~ 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 "Document ended just after close tag name, no '>' seen"
+#~ msgstr "Sənəd qapatma tagı adından sonra qurtardı, '>' görülmədi"
+
+#~ msgid "Close tag '%s' does not match opening tag '%s'"
+#~ msgstr "'%s' Qapatma tagı '%s' açılış tagına uyğun gəlmir"
+
+#~ 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 "The marked-up text contained nothing but whitespace."
+#~ msgstr "Seçili mətndə boşluqlardan başqa bir şey yoxdur"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "`%s' faylını açarkən xəta oldu : %s"
+
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "`%s' dosyesi oxunarkən xəta oldu : %s"
+
+#~ msgid "Pinging the server failed, CORBA error: %s"
+#~ msgstr "Vericinin pinglənməsi iflas etdi( CORBA xətası : %s )"
+
+#~ 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 ""
+#~ "Quraşdırma vericisinə bağlana bilmədim ; OAF 'sıfır' qiymətini "
+#~ "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 ."
+
+#~ msgid "Received signal %d, shutting down."
+#~ msgstr "%d siqnalını aldım, qapanıram ."
+
+#~ msgid "GConf was built with debugging features enabled"
+#~ msgstr "FConf xəta ayıqlaması qabilliyəti ilə qurulub"
+
+#~ 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 "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 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 "Failed to unquote IOR from saved state file: %s"
+#~ msgstr "Qeyd edilmiş hal dosyesindən IOR ayrıla bilmədi: %s"
+
+#~ 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 ""
+#~ "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 "Can't use --all-pairs with --get or --set\n"
+#~ msgstr "--get və ya --set'lə birlikdə --all-pairs istifadə edilə bilməz\n"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "'%s' açarında qiymət saxlana bilmədi"
+
+#~ 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 "Attempt to unregister invalid context ID"
 #~ msgstr "Keçərsiz hal ID'sini ayırmaya çalışdım"
diff --git a/po/ca.po b/po/ca.po
index 03674924..007da487 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 0.5\n"
-"POT-Creation-Date: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-0400\n"
 "PO-Revision-Date: 2000-04-14 11:35+01:00\n"
 "Last-Translator: Softcatala <linux@softcatala.org>\n"
 "Language-Team: \n"
@@ -13,20 +13,46 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:233
-msgid "Unloading XML backend module."
+#: backends/bdb-backend.c:215
+#, fuzzy
+msgid "Unloading BerkeleyDB (BDB) backend module."
 msgstr "Descarregant el component de fons del XML"
 
-#: backends/xml-backend.c:286
+#: backends/bdb-backend.c:238
 #, c-format
-msgid "Couldn't find the XML root directory in the address `%s'"
+msgid "Opened BerkeleyDB source at root %s"
+msgstr ""
+
+#: backends/bdb-backend.c:578
+#, fuzzy
+msgid "Initializing BDB backend module"
+msgstr "Inicialitzant el component de fons del XML"
+
+#: backends/dir-utils.c:108
+#, fuzzy, c-format
+msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "No s'ha pogut trobar el directori arrel del XML a l'adre�a `%s'"
 
-#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#: 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 s'ha pogut crear el directori `%s': %s"
 
+#: backends/dir-utils.c:212
+#, fuzzy, c-format
+msgid "Can't read from or write to the %s root directory in the address `%s'"
+msgstr ""
+"No es pot llegir des de/escriure al directori arrel del XML a l'adre�a `%s'"
+
+#: backends/xml-backend.c:233
+msgid "Unloading XML backend module."
+msgstr "Descarregant el component de fons del XML"
+
+#: backends/xml-backend.c:286
+#, c-format
+msgid "Couldn't find the XML root directory in the address `%s'"
+msgstr "No s'ha pogut trobar el directori arrel del XML a l'adre�a `%s'"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -37,14 +63,14 @@ msgstr ""
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
-"Els permisos del directori o fitxer per l'origen del XML a l'arrel %s s�n: "
-"%o/%o"
+"Els permisos del directori o fitxer per l'origen del XML a l'arrel %s s�n: %"
+"o/%o"
 
 #: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr "Inicialitzant el component de fons del XML"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Impossible d'abandonar bloqueig en el directori del XML `%s': %s"
@@ -53,18 +79,18 @@ msgstr "Impossible d'abandonar bloqueig en el directori del XML `%s': %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, 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:253
+#: backends/xml-cache.c:256
 #, 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
@@ -77,162 +103,160 @@ msgstr "No s'ha pogut crear el directori `%s': %s"
 msgid "XML filename `%s' is a directory"
 msgstr ""
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, fuzzy, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Impossible d'obrir `%s': %s\n"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, fuzzy, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Impossible de tancar el fitxer `%s': %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: backends/xml-dir.c:359
+#, fuzzy, c-format
+msgid "Failed to set mode on `%s': %s"
+msgstr "Impossible d'obrir `%s': %s\n"
+
+#: backends/xml-dir.c:373 backends/xml-dir.c:383
 #, fuzzy, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Impossible d'obrir `%s': %s\n"
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, fuzzy, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Impossible de prendre valor per `%s': %s\n"
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, fuzzy, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Impossible de tancar el fitxer `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:788
+#: backends/xml-dir.c:806
 #, fuzzy, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Impossible d'obrir `%s': %s\n"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:961
+#: backends/xml-dir.c:979
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1049
+#: backends/xml-dir.c:1067
 #, fuzzy, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Impossible de tancar el fitxer `%s': %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Impossible de tancar el fitxer `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, fuzzy, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Error en definir esquema per `%s': %s"
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, fuzzy, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Error en definir esquema per `%s': %s"
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
-#, c-format
-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 ""
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "Error en definir esquema per `%s': %s"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, fuzzy, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr ""
-"ADVERT�NCIA: Impossible de processar valor per defecte `%s' per esquema "
-"(%s)\n"
+"ADVERT�NCIA: Impossible de processar valor per defecte `%s' per esquema (%"
+"s)\n"
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, fuzzy, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "ADVERT�NCIA: <locale> node no t� `name=\"locale\"' atribut, ignorant\n"
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -265,31 +289,31 @@ msgstr "No s'ha pogut ubicar el m�dul del component de fons per `%s'"
 msgid "Failed to shut down backend"
 msgstr "Impossible de tancar el component de fons"
 
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr "S'ha rebut un valor no v�lid en definir el requeriment"
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "No s'ha pogut tenir en compte el valor CORBA rebut en definir el requeriment "
 "per la clau `%s'"
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr "S'ha rebut el requeriment per deixar anar totes les dades recollides"
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr "S'ha rebut un requeriment per sync sincr�nicament"
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 #, fuzzy
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Impossible d'obtenir les refer�ncies pel ConfigServer"
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Impossible de sincronitzar una o m�s fonts: %s"
@@ -298,7 +322,7 @@ msgstr "Impossible de sincronitzar una o m�s fonts: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -306,59 +330,59 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr ""
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Error en obtenir valor per `%s': %s"
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Error en especificar valor per `%s': %s"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Error d'indefinici� `%s': %s"
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Error en prendre valor per defecte per `%s': %s"
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Error en comprobar l'exist�ncia de `%s': %s"
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Error en eliminar directori `%s': %s"
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Impossible de rebre totes les entrades en `%s': %s"
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Error en llistar directoris en `%s': %s"
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Error en definir esquema per `%s': %s"
@@ -426,208 +450,29 @@ msgstr ""
 msgid "Failed to get a lock"
 msgstr "Impossible de prendre valor per `%s': %s\n"
 
-#: gconf/gconf-glib.c:629
-#, c-format
-msgid ""
-"Error on line %d char %d: %s\n"
-"(Some surrounding text was '%s')\n"
+#: gconf/gconf-error.c:40
+msgid "No database available to save your configuration"
 msgstr ""
 
-#: gconf/gconf-glib.c:749
-msgid ""
-"Text ended in the middle of an entity, or entity name too long to be valid "
-"('&' should begin an entity such as '&quot;')"
-msgstr ""
-
-#: gconf/gconf-glib.c:801
-#, c-format
-msgid ""
-"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
-msgstr ""
-
-#: gconf/gconf-glib.c:841
-msgid ""
-"Markup text ended in the middle of a character reference, just after '&#'"
-msgstr ""
-
-#: gconf/gconf-glib.c:867
-#, c-format
-msgid ""
-"Character reference contained non-digit '%s' ('&#' should begin a reference "
-"to a unicode character, such as '&#2342;')"
-msgstr ""
-
-#: gconf/gconf-glib.c:891
-msgid ""
-"Text ended in the middle of an character reference ('&#' should begin a "
-"character reference such as '&#2342;')"
-msgstr ""
-
-#: gconf/gconf-glib.c:916
-#, c-format
-msgid ""
-"Couldn't parse character reference '%s' ('&#' must begin a character "
-"reference such as '&#2343;')"
-msgstr ""
-
-#: gconf/gconf-glib.c:938
-#, c-format
-msgid ""
-"Character code %#lx is not allowed in XML documents or is not a valid "
-"Unicode character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1013
-msgid ""
-"Documented ended just after an '&', '&' should begin an entity or character "
-"reference."
-msgstr ""
-
-#: gconf/gconf-glib.c:1027
-msgid ""
-"'<' or '>' character not allowed here; only allowed around tags, for example "
-"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
-"&lt; and &gt;"
-msgstr ""
-
-#: gconf/gconf-glib.c:1082
-#, c-format
-msgid "Character '%s' is not valid at the start of an attribute name"
-msgstr ""
-
-#: gconf/gconf-glib.c:1109
-msgid "Document ended just after attribute name"
-msgstr ""
-
-#: gconf/gconf-glib.c:1120
-msgid "Attribute name must be immediately followed by an '=' character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1135
-msgid ""
-"'=' character after attribute must be immediately followed by an '\"' "
-"character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1161
-#, c-format
-msgid ""
-"Character '%c' found inside an attribute value; perhaps your attribute value "
-"is missing the closing quotation mark '\"'"
-msgstr ""
-
-#: gconf/gconf-glib.c:1181
-msgid ""
-"Ran out of text before a quote mark ('\"') was seen at the end of an "
-"attribute value"
-msgstr ""
-
-#: gconf/gconf-glib.c:1194
-msgid ""
-"Text ends immediately after an attribute value, before the element was closed"
-msgstr ""
-
-#: gconf/gconf-glib.c:1508
-msgid "Missing '<' at start of element"
-msgstr ""
-
-#: gconf/gconf-glib.c:1519
-msgid "Document ended just after '<' character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1547
-msgid "No closing '>' found for a <? or <!"
-msgstr ""
-
-#: gconf/gconf-glib.c:1576
-#, c-format
-msgid "Character '%s' is not valid at the start of an element name"
-msgstr ""
-
-#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
-msgid "Document ended just after element name, no '>' seen"
-msgstr ""
-
-#: gconf/gconf-glib.c:1638
-#, c-format
-msgid "Elements should be closed with '>' or '/>', not with '%s'"
-msgstr ""
-
-#: gconf/gconf-glib.c:1655
-msgid ""
-"Element ended just after '/', no '>' seen; empty elements should end with "
-"'/>'"
-msgstr ""
-
-#: gconf/gconf-glib.c:1694
-msgid "Close tag not found at end of element"
-msgstr ""
-
-#: gconf/gconf-glib.c:1709
-msgid "Close tag ends just after '<' character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1723
-msgid "Close tag should begin with '</', '/' character is missing"
-msgstr ""
-
-#: gconf/gconf-glib.c:1737
-msgid "Close tag ends just after '/' character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1772
-msgid "Document ended just after element name in close tag, no '>' seen"
-msgstr ""
-
-#: gconf/gconf-glib.c:1788
-msgid "Document ended just after close tag name, no '>' seen"
-msgstr ""
-
-#: gconf/gconf-glib.c:1807
-#, c-format
-msgid "Close tag '%s' does not match opening tag '%s'"
-msgstr ""
-
-#: gconf/gconf-glib.c:2145
-#, c-format
-msgid ""
-"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
-"bad character was '%s'"
-msgstr ""
-
-#: gconf/gconf-glib.c:2202
-msgid "The marked-up text contained nothing but whitespace."
-msgstr ""
-
-#: gconf/gconf-glib.c:10666
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Impossible de tancar el fitxer `%s': %s"
-
-#: gconf/gconf-glib.c:10683
-#, fuzzy, c-format
-msgid "Error reading file '%s': %s"
-msgstr "Error en eliminar directori `%s': %s"
-
-#: gconf/gconf-internals.c:85
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "No '/' a la clau `%s'"
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "No s'ha pogut interpretar valor CORBA per l'element llista"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Tipus incorrecte per l'element llista en %s"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr "S'ha rebut la llista de gconfd amb un tipus de llista incorrecta"
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 #, fuzzy
 msgid "Failed to convert object to IOR"
 msgstr "Impossible de sincronitzar una o m�s fonts: %s"
@@ -637,94 +482,99 @@ msgstr "Impossible de sincronitzar una o m�s fonts: %s"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "No s'ha pogut obrir el cam� del fitxer `%s': %s\n"
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Afegint origen `%s'\n"
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Error de lectura en el fitxer `%s': %s\n"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "S'esperava llista, s'ha obtingut %s"
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "S'esperava llista de %s, s'ha obtingut llista de %s"
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "S'esperava parella, s'ha obtingut %s"
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "S'esperava parella (%s,%s), s'ha obtingut una parella amb un valor o ambd�s "
 "perduts"
 
-#: gconf/gconf-internals.c:1499
+#: gconf/gconf-internals.c:1474
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 "S'esperava parella del tipus (%s,%s) i se n'ha obtingut del tipus (%s,%s)"
 
-#: gconf/gconf-internals.c:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "La cadena citada no comen�a amb una marca de citaci�"
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "La cadena de citaci� no acaba amb una marca de citaci�"
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Error CORBA: %s"
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "intenta d'eliminar directori d'objectes OAF no llistats"
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr "intenta d'afegir directoris OAF ja llistats"
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Error de parse de OAF: %s"
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "Error desconegut de OAF"
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "No existeix fitxer ior a `%s'"
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd est� blocant `%s' des d'algun altre proc�s"
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Un altre programa ha blocat `%s'"
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "no s'ha pogut trobar el ORB per fer pings en el gconfd existent"
 
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -733,90 +583,103 @@ msgstr ""
 "Eliminant el blocatge antic `%s' degut a que IOR no s'ha pogut convetiren "
 "objecte refer�ncia, IOR `%s'"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
-"Eliminant el blocatge antic `%s' degut a un error en fer pings al servidor: "
-"%s"
+"Eliminant el blocatge antic `%s' degut a un error en fer pings al servidor: %"
+"s"
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "La configuraci� daemon de GConf (gconfd) ha blocat `%s'"
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "no s'ha pogut crear el directori `%s': %s"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "No s'ha pogut crear el bloqueig `%s': %s"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "No s'ha pogut escriure al fitxer `%s': %s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "No s'ha pogut obrir el fitxer blocat `%s'; assumint que no �s el nostre: %s"
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Bloqueig de fitxer `%s' corrupte, eliminant igualment"
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
-"No s'ha creat el fitxer de blocatge `%s' (El creador pid %u, el nostre pid "
-"%u;assumnint que alg� ha pres el nostre blocatge"
+"No s'ha creat el fitxer de blocatge `%s' (El creador pid %u, el nostre pid %"
+"u;assumnint que alg� ha pres el nostre blocatge"
 
-#: gconf/gconf-internals.c:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Impossible de llan�ar el blocatge del directori `%s': %s"
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, fuzzy, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Impossible de tancar el fitxer `%s': %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, fuzzy, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Error en llistar directoris: %s\n"
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, fuzzy, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Error en establir valor: %s"
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -886,90 +749,90 @@ msgstr ""
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "El servidor no ha pogut resoldre l'adre�a `%s'"
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr "No es poden afegir configuracions a una font local de configuraci�"
 
-#: gconf/gconf.c:1597
-#, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+#: gconf/gconf.c:1870
+#, fuzzy, c-format
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Fallada del servidor fent pings, error de CORBA: %s"
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
-"Error contactant la configuraci� del servidor: el OAF ha retornat nul de "
-"oaf_activate_from_id() i no ha trobat una excepci� explicant el problema.Si "
-"us plau arxiveu un report d'error fortu�t"
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr "Impossible d'inicialitzar GConf, abandonant\n"
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr "Ha de comen�ar amb una barra (/)"
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr "No es poden tenir dues barres (/) en una l�nia"
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "No es pot tenir un punt (.) just despr�s d'una barra (/)"
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' no �s un car�cter v�lid en claus/noms de directoris"
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr "La clau/directori pot no acabar amb una barra (/)"
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fallada tancant la configuraci� del servidor: %s"
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr "S'esperava coma flotant, s'ha obtingut %s"
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr "S'esperava un enter, s'ha obtingut %s"
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr "S'esperava una cadena, s'ha obtingut %s"
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "S'esperava un bole�, s'ha obtingut %s"
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "S'esperava un esquema, s'ha obtingut %s"
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "S'ha rebut un requeriment d'apagar"
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -977,7 +840,7 @@ msgstr ""
 "El gconfd ha compilat amb depuraci�; intentant carregar gconf.path des "
 "deldirectori font"
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -985,7 +848,10 @@ msgstr ""
 "No s'han trobat fitxers de configuraci�, intentant d'usar "
 "l'origenpredeterminat de configuraci� `%s'"
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -993,12 +859,16 @@ msgstr ""
 "No existeixen origens de configuraci� en el cam� arrel, la configuraci� no "
 "haestat guardada; editar "
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Error configurant alguns origens de configuraci�: %s"
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1006,7 +876,7 @@ msgstr ""
 "No s'han resolt satisfact�riament els origens de les adreces, no es "
 "podencarregar ni guardar les dades de configuraci�"
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 #, fuzzy
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
@@ -1015,221 +885,271 @@ msgstr ""
 "No s'han pogut escriure satisfact�riament els origens de configuraci�, pot "
 "noser possible de grabar alguns canvis de configuraci�"
 
-#: gconf/gconfd.c:312 gconf/gconfd.c:324
-#, c-format
-msgid "Received signal %d, shutting down."
+#: gconf/gconfd.c:369
+#, fuzzy, c-format
+msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgstr "Rebut senyal %d, apagant."
+
+#: gconf/gconfd.c:385
+#, fuzzy, c-format
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr "Rebut senyal %d, apagant."
 
-#: gconf/gconfd.c:329
+#: gconf/gconfd.c:402
 #, fuzzy, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Rebut senyal %d, apagant."
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:519
 #, fuzzy, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "s'est� iniciant, pid %u usuari `%s'"
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr ""
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
+#, fuzzy
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 "Impossible d'inicialitzar Object Activation Framework: si us plau envieu "
 "unreport d'error fortu�t als qui mantenen OAF"
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Impossible d'obtenir les refer�ncies pel ConfigServer"
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "Impossible de tancar el fitxer `%s': %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "Impossible de prendre valor per `%s': %s\n"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
+#, fuzzy
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
+msgstr ""
+"L'OAF no coneix el vostre IID; aix� indica instal�laci� incorrecta; no pot "
+"ser registrada; sortint\n"
+
+#: gconf/gconfd.c:613
+#, fuzzy
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
+msgstr "Existeix un altre gconfd ja registrat amb OAF; sortint\n"
+
+#: gconf/gconfd.c:618
+#, fuzzy
+msgid "Unknown error registering existing gconfd with OAF; exiting"
+msgstr "Error desconegut en registrar gconfd amb OAF; sortint\n"
+
+#: gconf/gconfd.c:645
+#, fuzzy
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
 msgstr ""
 "L'OAF no coneix el vostre IID; aix� indica instal�laci� incorrecta; no pot "
 "ser registrada; sortint\n"
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:649
+#, fuzzy
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
 msgstr "Existeix un altre gconfd ja registrat amb OAF; sortint\n"
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:654
+#, fuzzy
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
 msgstr "Error desconegut en registrar gconfd amb OAF; sortint\n"
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "Impossible de llan�ar el blocatge del directori `%s': %s"
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "Sortint"
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+#, fuzzy
+msgid "GConf server is not in use, shutting down."
+msgstr "Rebut senyal %d, apagant."
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Retornant excepci�: %s"
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, fuzzy, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "No s'ha pogut obrir el cam� del fitxer `%s': %s\n"
 
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, fuzzy, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "No s'ha pogut escriure al fitxer `%s': %s"
 
-#: gconf/gconfd.c:989
+#: gconf/gconfd.c:1317
 #, fuzzy, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Impossible de tancar el fitxer `%s': %s"
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, fuzzy, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "No s'ha pogut obrir el cam� del fitxer `%s': %s\n"
 
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, fuzzy, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Impossible de tancar el fitxer `%s': %s"
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1110
+#: gconf/gconfd.c:1823
 #, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr ""
-
-#: gconf/gconfd.c:1125
-msgid "Failed to parse connection ID in saved state file"
-msgstr ""
-
-#: gconf/gconfd.c:1140
-#, c-format
-msgid "Failed to unquote config source address from saved state file: %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1160
-#, c-format
-msgid "Failed to unquote listener location from saved state file: %s"
-msgstr ""
+#: gconf/gconfd.c:1869
+#, fuzzy, c-format
+msgid "Error reading saved state file: %s"
+msgstr "Error en eliminar directori `%s': %s"
 
-#: gconf/gconfd.c:1180
+#: gconf/gconfd.c:1922
 #, fuzzy, c-format
-msgid "Failed to unquote IOR from saved state file: %s"
+msgid "Unable to open saved state file '%s': %s"
 msgstr "Impossible de tancar el fitxer `%s': %s"
 
-#: gconf/gconfd.c:1204
-msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
-msgstr ""
-
-#: gconf/gconfd.c:1225
+#: gconf/gconfd.c:2039
+#, c-format
 msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
+"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:1346
+#: gconf/gconfd.c:2044
 #, c-format
 msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+"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:1377
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
 #, fuzzy, c-format
-msgid "Unable to open saved state file '%s': %s"
+msgid "Failed to get IOR for client: %s"
+msgstr "Impossible de prendre valor per `%s': %s\n"
+
+#: gconf/gconfd.c:2082
+#, fuzzy, c-format
+msgid "Failed to open saved state file: %s"
 msgstr "Impossible de tancar el fitxer `%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:2095
+#, fuzzy, c-format
+msgid "Failed to write client add to saved state file: %s"
+msgstr "Impossible de tancar el fitxer `%s': %s"
 
-#: gconf/gconfd.c:1481
-#, c-format
+#: gconf/gconfd.c:2103
+#, fuzzy, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr "Impossible de tancar el fitxer `%s': %s"
+
+#: gconf/gconfd.c:2193
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 
-#: gconf/gconftool.c:62
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr "Opcions d'ajuda"
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 "Definici� d'un valor i sincronitzar amb una tecla. Usar amb --car�cters."
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr "Impressi� del valor d'una tecla com a sortida standard."
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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 ""
-"Definir un esquema i sincronitzar. Usar amb --short-desc, --long-desc, "
-"--owner, i --type."
+"Definir un esquema i sincronitzar. Usar amb --short-desc, --long-desc, --"
+"owner, i --type."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr "Desseleccionar les claus en la l�nia d'ordres"
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr "Impressi� de totes les parelles clau/valor en un directori"
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr "Impressi� de tots els subdirectoris en un directori"
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Impressi� de tots els subdirectoris i entrades per sota d'un directori, "
 "recursivament."
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Retorna 0 si el directori existeix, 2 si no existeix."
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Apagar gconfd. NO USEU AQUESTA OPCI� SENSE UNA BONA RA�."
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Retorna 0 si gconfd s'est� executant, 2 si no �s aix�."
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1237,7 +1157,7 @@ msgstr ""
 "Llan�a el configurador del servidor (gconfd). (Normalment es llan�a "
 "autom�ticament quan �s necessari.)"
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1245,12 +1165,12 @@ msgstr ""
 "Especificar el tipus de valor que s'ha de definir, o el tipus de valor que "
 "un esquema descriu. �nicament abreviacions acceptades."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:179
 #, fuzzy
 msgid "int|bool|float|string|list|pair"
 msgstr "enter|bole�|coma flotant|cadena"
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 #, fuzzy
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
@@ -1259,11 +1179,11 @@ msgstr ""
 "Especificar el tipus de valor que s'ha de definir, o el tipus de valor que "
 "un esquema descriu. �nicament abreviacions acceptades."
 
-#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr "enter|bole�|coma flotant|cadena"
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 #, fuzzy
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
@@ -1272,7 +1192,7 @@ msgstr ""
 "Especificar el tipus de valor que s'ha de definir, o el tipus de valor que "
 "un esquema descriu. �nicament abreviacions acceptades."
 
-#: gconf/gconftool.c:198
+#: gconf/gconftool.c:205
 #, fuzzy
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
@@ -1281,45 +1201,45 @@ msgstr ""
 "Especificar el tipus de valor que s'ha de definir, o el tipus de valor que "
 "un esquema descriu. �nicament abreviacions acceptades."
 
-#: gconf/gconftool.c:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "Especificar una curta descripci� de mitja l�nia per accedir a un esquema"
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr "DESCRIPCI�"
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr "Especificar una descripci� de v�ries l�nies per accedir a un esquema"
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr "Especificar el propietari d'un esquema"
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr "PROPIETARI"
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr "Especificar un fitxer esquema per instal�lar-lo"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr "NOM DEL FITXER"
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Especificar una font de configuraci� per usar enlloc del cam� per defecte"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr "FONT"
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1327,7 +1247,7 @@ msgstr ""
 "Accedir a la base de dades de configuraci� directament, saltant-nos el "
 "servidor. Requereix que el gconfd no estigui en �s "
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1338,7 +1258,7 @@ msgstr ""
 "deconfigurar-se a una font no predeterminada o seleccionar la cadena buida "
 "perusar la predeterminada"
 
-#: gconf/gconftool.c:270
+#: gconf/gconftool.c:277
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1346,7 +1266,7 @@ msgstr ""
 "Proba per tortura una aplicaci� en seleccionar i desseleccionar un munt "
 "devalors de diferents tipus per claus en la l�nia de comandes."
 
-#: gconf/gconftool.c:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1354,7 +1274,27 @@ msgstr ""
 "Proba per tortura una aplicaci� en seleccionar i desseleccionar un munt "
 "declaus dins dels directoris en la l�nia de comandes."
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1364,90 +1304,93 @@ msgstr ""
 "Executeu '%s --help' per veure una llista completa d'opcions d'ordres de "
 "l�nia possibles.\n"
 
-#: gconf/gconftool.c:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "No es pot seleccionar/desseleccionar simult�niament\n"
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "No es pot seleccionar i obtenir/desseleccionar simult�niament\n"
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
-msgstr "No es pot usar --all-pairs amb --get o --set\n"
+#: gconf/gconftool.c:413
+#, fuzzy
+msgid "Can't use --all-entries with --get or --set\n"
+msgstr "No es pot usar --all-dirs amb --get o --set\n"
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "No es pot usar --all-dirs amb --get o --set\n"
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
+#, fuzzy
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
 "--recursive-list no s'hauria d'usar amb --get, --set, --unset, --all-pairs,o "
 "--all-dirs\n"
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
+#, fuzzy
 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-entries, --"
+"all-dirs\n"
 msgstr ""
-"--set-schema no s'hauria d'usar amb --get, --set, --unset, --all-pairs, "
-"--all-dirs\n"
+"--set-schema no s'hauria d'usar amb --get, --set, --unset, --all-pairs, --"
+"all-dirs\n"
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Els tipus dels valors nom�s s�n rellevants quan defineixen un valor\n"
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr "Heu d'especificar un tipus quan definiu un valor\n"
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr "La opci� de fer pings ha de ser usada per ella mateixa.\n"
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "la opci� --dir-exists ha de ser usada per ella mateixa.\n"
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file ha de ser usat per ell mateix.\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule ha de ser usat per ell mateix.\n"
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key ha de ser usat per ell mateix.\n"
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory ha de ser usat per ell mateix.\n"
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
-"Heu d'especificar una font de configuraci� amb --config-source quan useu "
-"--direct\n"
+"Heu d'especificar una font de configuraci� amb --config-source quan useu --"
+"direct\n"
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Impossible d'inicialitzar GConf: %s\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Heu de definir el contorn GCONF_CONFIG_SOURCE com a variable\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1459,242 +1402,298 @@ msgstr ""
 "nohi hagi aplicacions en proc�s\n"
 "(malgrat que hauria de funcionar encara que hi hagi aplicacions en proc�s).\n"
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Impossible d'accedir a la/es font/s de configuraci�: %s\n"
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Error en tancar: %s\n"
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Heu d'especificar un o m�s directoris per llistar recursivament.\n"
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
 msgstr "Fallada en llistar parelles en `%s': %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr "(no hi ha valor definit)"
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Impossible de spawn el servidor de configuraci� (gconfd): %s\n"
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr "Heu d'especificar una clau o claus per obtenir\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tipus: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, fuzzy, c-format
 msgid "List Type: %s\n"
 msgstr "Tipus: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, fuzzy, c-format
 msgid "Car Type: %s\n"
 msgstr "Tipus: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, fuzzy, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Tipus: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "Propietari: %s\n"
+msgid "Default Value: %s\n"
+msgstr ""
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr "Desactivar"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "Propietari: %s\n"
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Curta Desc: %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Llarga Desc: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "No s'ha especificat valor per `%s'\n"
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Impossible de prendre valor per `%s': %s\n"
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "No es compr�n tipus `%s'\n"
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Heu d'especificar alternativament claus/valors com a arguments\n"
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "No existeix valor per definir clau: `%s'\n"
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "Error: %s\n"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
-#, c-format
-msgid "Error setting value: %s"
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
 msgstr "Error en establir valor: %s"
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
-#, c-format
-msgid "Error syncing: %s"
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
 msgstr "Error en sincronitzar: %s"
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1234
+#, fuzzy
+msgid "Must specify a key or keys on the command line\n"
+msgstr "Heu d'especificar una clau o claus per obtenir\n"
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "No arxiu tal que `%s'\n"
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "Error en definir esquema per `%s': %s"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "No arxiu tal que `%s'\n"
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+#, fuzzy
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr "Heu d'especificar clau (nom de l'esquema) com a �nic argument\n"
+
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr "ADVERT�NCIA: impossible d'associar esquema `%s' amb clau `%s': %s\n"
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Heu d'especificar clau (nom de l'esquema) com a �nic argument\n"
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr "Error en establir valor: %s"
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr "Error en sincronitzar: %s"
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Heu d'especificar un o m�s directoris per obtenir-ne parelles clau/valor\n"
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Heu d'especificar una o m�s claus per desactivar.\n"
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Error en desactivar `%s': %s\n"
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Heu d'especificar un o m�s directoris per tal d'obtenir-ne subdirectoris.\n"
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Error en llistar directoris: %s\n"
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "ADVERT�NCIA: tipus no v�lid o perdut per a esquema (%s)\n"
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, fuzzy, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "ADVERT�NCIA: tipus no v�lid o perdut per a esquema (%s)\n"
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
-"ADVERT�NCIA: Impossible de processar valor per defecte `%s' per esquema "
-"(%s)\n"
+"ADVERT�NCIA: Impossible de processar valor per defecte `%s' per esquema (%"
+"s)\n"
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, fuzzy, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "ADVERT�NCIA: tipus no v�lid o perdut per a esquema (%s)\n"
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 #, fuzzy
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
-"ADVERT�NCIA: Impossible de processar valor per defecte `%s' per esquema "
-"(%s)\n"
+"ADVERT�NCIA: Impossible de processar valor per defecte `%s' per esquema (%"
+"s)\n"
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "ADVERT�NCIA: error intern de gconftool, desconegut GConfValueType\n"
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ADVERT�NCIA: impossible de processar nom del tipus `%s'\n"
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr "ADVERT�NCIA: node <applyto> buit"
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ADVERT�NCIA: node <%s> no ent�s sota <schema>\n"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr "ADVERT�NCIA: no s'ha especificat clau per a l'esquema\n"
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr "ADVERT�NCIA: <locale> node no t� `name=\"locale\"' atribut, ignorant\n"
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1702,51 +1701,51 @@ msgstr ""
 "ADVERT�NCIA: Hi ha m�ltiples <locale> nodes per locale `%s', ignorant totes "
 "les primeres passades\n"
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "ADVERT�NCIA: Node <%s> no v�lid en un <locale> node\n"
 
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "ADVERT�NCIA: impossible d'instal�lar esquema `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Instal�lat esquema `%s' per locale `%s'\n"
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "ADVERT�NCIA: impossible d'associar esquema `%s' amb clau `%s': %s\n"
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Esquema `%s' adjunt a tecla `%s'\n"
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Heu de tenir com a m�nim una entrada <locale> en un <schema>\n"
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "ADVERT�NCIA: node <%s> no compr�s sota <schemalist>\n"
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Impossible d'obrir `%s': %s\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Est� buit el document `%s'?\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1755,26 +1754,26 @@ msgstr ""
 "El document `%s' t� un tipus incorrecte de node arrel (<%s>, hauria de "
 "ser<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "El document `%s' no t� nivell superior <gconfschemafile> node\n"
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ADVERT�NCIA: node <%s> sota <gconfschemafile> no compr�s\n"
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Error eincronitzant dades de configuraci�: %s"
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr "Heu d'especificar alguns esquemes de fitxers per instal�lar\n"
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -1783,16 +1782,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Impossible de desactivar la clau de pausa %s: %s\n"
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr "Heu d'especificar algunes claus per pausar\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1801,11 +1800,11 @@ msgstr ""
 "Intentant pausar la vostra aplicaci� especificant valors dolents per clau:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr "Cal especificar alguns directoris per pausar\n"
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1816,16 +1815,37 @@ msgstr ""
 "directori:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, fuzzy, c-format
+msgid "GConf Error: %s\n"
+msgstr "Error: %s\n"
+
+#: gconf/gconf-client.c:798
 #, fuzzy, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Fallada en llistar parelles en `%s': %s"
 
-#: wrappers/gtk/gconf-client.c:985
+#: gconf/gconf-client.c:1000
 #, fuzzy, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "S'esperava llista de %s, s'ha obtingut llista de %s"
 
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Impossible de tancar el fitxer `%s': %s"
+
+#~ 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 ""
+#~ "Error contactant la configuraci� del servidor: el OAF ha retornat nul de "
+#~ "oaf_activate_from_id() i no ha trobat una excepci� explicant el problema."
+#~ "Si us plau arxiveu un report d'error fortu�t"
+
+#~ msgid "Can't use --all-pairs with --get or --set\n"
+#~ msgstr "No es pot usar --all-pairs amb --get o --set\n"
+
 #~ msgid "Received signal %d, ignoring"
 #~ msgstr "Rebut senyal %d, ignorant"
 
diff --git a/po/cs.po b/po/cs.po
index 2a084428..e005922c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf VERSION\n"
-"POT-Creation-Date: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-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,20 +13,43 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:233
-msgid "Unloading XML backend module."
+#: backends/bdb-backend.c:215
+msgid "Unloading BerkeleyDB (BDB) backend module."
 msgstr ""
 
-#: backends/xml-backend.c:286
+#: backends/bdb-backend.c:238
 #, c-format
-msgid "Couldn't find the XML root directory in the address `%s'"
+msgid "Opened BerkeleyDB source at root %s"
+msgstr ""
+
+#: backends/bdb-backend.c:578
+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/xml-backend.c:301 backends/xml-dir.c:1033
+#: 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�it 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 ""
+
+#: backends/xml-backend.c:286
+#, c-format
+msgid "Couldn't find the XML root directory in the address `%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'"
@@ -41,7 +64,7 @@ msgstr ""
 msgid "Initializing XML backend module"
 msgstr ""
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Nelze otev��t adres�� `%s': %s"
@@ -50,18 +73,18 @@ msgstr "Nelze otev��t adres�� `%s': %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, 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:253
+#: backends/xml-cache.c:256
 #, 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
@@ -74,160 +97,158 @@ msgstr "`stat' selhal na `%s': %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML soubor `%s' je adres��"
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Nelze vymazat `%s': %s"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, fuzzy, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Nelze zav��t soubor `%s': %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: 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
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Nelze p�ejmenovat `%s' na `%s': %s"
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, fuzzy, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Nelze p�ejmenovat `%s' na `%s': %s"
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, 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:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "`stat' selhal na `%s': %s"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, fuzzy, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Zdvojen� polo�ka `%s' v `%s', vymaz�v�m"
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, fuzzy, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Polo�ka beze jm�na v XML souboru `%s', vymaz�v�m"
 
-#: backends/xml-dir.c:961
+#: backends/xml-dir.c:979
 #, fuzzy, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Polo�ka beze jm�na v XML souboru `%s', vymaz�v�m"
 
-#: backends/xml-dir.c:1049
+#: backends/xml-dir.c:1067
 #, fuzzy, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Nelze zav��t soubor `%s': %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Nelze zav��t soubor `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr ""
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
+#: backends/xml-entry.c:376
 #, c-format
-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"
+msgid "Ignoring XML node `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr ""
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -260,28 +281,28 @@ msgstr ""
 msgid "Failed to shut down backend"
 msgstr ""
 
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr ""
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr ""
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr ""
@@ -290,7 +311,7 @@ msgstr ""
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -298,59 +319,59 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr ""
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr ""
@@ -416,208 +437,29 @@ msgstr ""
 msgid "Failed to get a lock"
 msgstr "Nelze vymazat `%s': %s"
 
-#: 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"
+#: gconf/gconf-error.c:40
+msgid "No database available to save your configuration"
 msgstr ""
 
-#: gconf/gconf-glib.c:1508
-msgid "Missing '<' at start of element"
-msgstr ""
-
-#: gconf/gconf-glib.c:1519
-msgid "Document ended just after '<' character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1547
-msgid "No closing '>' found for a <? or <!"
-msgstr ""
-
-#: gconf/gconf-glib.c:1576
-#, c-format
-msgid "Character '%s' is not valid at the start of an element name"
-msgstr ""
-
-#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
-msgid "Document ended just after element name, no '>' seen"
-msgstr ""
-
-#: gconf/gconf-glib.c:1638
-#, c-format
-msgid "Elements should be closed with '>' or '/>', not with '%s'"
-msgstr ""
-
-#: gconf/gconf-glib.c:1655
-msgid ""
-"Element ended just after '/', no '>' seen; empty elements should end with "
-"'/>'"
-msgstr ""
-
-#: gconf/gconf-glib.c:1694
-msgid "Close tag not found at end of element"
-msgstr ""
-
-#: gconf/gconf-glib.c:1709
-msgid "Close tag ends just after '<' character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1723
-msgid "Close tag should begin with '</', '/' character is missing"
-msgstr ""
-
-#: gconf/gconf-glib.c:1737
-msgid "Close tag ends just after '/' character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1772
-msgid "Document ended just after element name in close tag, no '>' seen"
-msgstr ""
-
-#: gconf/gconf-glib.c:1788
-msgid "Document ended just after close tag name, no '>' seen"
-msgstr ""
-
-#: gconf/gconf-glib.c:1807
-#, c-format
-msgid "Close tag '%s' does not match opening tag '%s'"
-msgstr ""
-
-#: gconf/gconf-glib.c:2145
-#, c-format
-msgid ""
-"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
-"bad character was '%s'"
-msgstr ""
-
-#: gconf/gconf-glib.c:2202
-msgid "The marked-up text contained nothing but whitespace."
-msgstr ""
-
-#: gconf/gconf-glib.c:10666
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Nelze zav��t soubor `%s': %s"
-
-#: gconf/gconf-glib.c:10683
-#, fuzzy, c-format
-msgid "Error reading file '%s': %s"
-msgstr "Chyba v �ten� souboru `%s': %s\n"
-
-#: gconf/gconf-internals.c:85
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr ""
 
@@ -626,176 +468,194 @@ msgstr ""
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Zdroj `%s' p�id�n\n"
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Chyba v �ten� souboru `%s': %s\n"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1499
+#: gconf/gconf-internals.c:1474
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA chyba: %s"
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, fuzzy, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "Nelze vytvo�it adres�� `%s': %s"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, fuzzy, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Nelze vytvo�it soubor `%s': %s"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, fuzzy, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Nelze ps�t do souboru `%s': %s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, 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:2543
+#: gconf/gconf-internals.c:2519
 #, fuzzy, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Nelze otev��t adres�� `%s': %s"
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, fuzzy, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Nelze zav��t soubor `%s': %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -865,512 +725,581 @@ msgstr ""
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#: gconf/gconfd.c:369
 #, c-format
-msgid "Received signal %d, shutting down."
+msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgstr ""
+
+#: gconf/gconfd.c:385
+#, c-format
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 
-#: gconf/gconfd.c:329
+#: gconf/gconfd.c:402
 #, 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:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr ""
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "Nelze zav��t soubor `%s': %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "Nelze vymazat `%s': %s"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
 msgstr ""
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:613
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
+msgstr ""
+
+#: gconf/gconfd.c:618
+msgid "Unknown error registering existing gconfd with OAF; exiting"
+msgstr ""
+
+#: gconf/gconfd.c:645
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:649
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:654
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "Nelze otev��t adres�� `%s': %s"
+
+#: gconf/gconfd.c:706
 #, fuzzy
 msgid "Exiting"
 msgstr "Norm�ln� konec"
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr ""
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, fuzzy, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Nelze ps�t do souboru `%s': %s"
 
-#: gconf/gconfd.c:989
+#: gconf/gconfd.c:1317
 #, fuzzy, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Nelze zav��t soubor `%s': %s"
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, fuzzy, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "`stat' selhal na `%s': %s"
 
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, fuzzy, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Nelze zav��t soubor `%s': %s"
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1110
-#, fuzzy, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr "Nelze zav��t soubor `%s': %s"
-
-#: 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 "Failed to unquote config source address from saved state file: %s"
-msgstr "Nelze zav��t soubor `%s': %s"
+#: gconf/gconfd.c:1823
+#, c-format
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
 
-#: gconf/gconfd.c:1160
+#: gconf/gconfd.c:1869
 #, fuzzy, c-format
-msgid "Failed to unquote listener location from saved state file: %s"
-msgstr "Nelze zav��t soubor `%s': %s"
+msgid "Error reading saved state file: %s"
+msgstr "Chyba v �ten� souboru `%s': %s\n"
 
-#: gconf/gconfd.c:1180
+#: gconf/gconfd.c:1922
 #, fuzzy, c-format
-msgid "Failed to unquote IOR from saved state file: %s"
+msgid "Unable to open saved state file '%s': %s"
 msgstr "Nelze zav��t soubor `%s': %s"
 
-#: gconf/gconfd.c:1204
-msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
-msgstr ""
-
-#: gconf/gconfd.c:1225
+#: gconf/gconfd.c:2039
+#, c-format
 msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
+"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:1346
+#: gconf/gconfd.c:2044
 #, c-format
 msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+"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:1377
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
 #, fuzzy, c-format
-msgid "Unable to open saved state file '%s': %s"
+msgid "Failed to get IOR for client: %s"
+msgstr "Nelze vymazat `%s': %s"
+
+#: gconf/gconfd.c:2082
+#, fuzzy, c-format
+msgid "Failed to open 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:2095
+#, fuzzy, c-format
+msgid "Failed to write client add to saved state file: %s"
+msgstr "Nelze zav��t soubor `%s': %s"
 
-#: gconf/gconfd.c:1481
-#, c-format
+#: gconf/gconfd.c:2103
+#, fuzzy, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr "Nelze zav��t soubor `%s': %s"
+
+#: gconf/gconfd.c:2193
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 
-#: gconf/gconftool.c:62
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr ""
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr ""
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr ""
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr ""
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 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:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr ""
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 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:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr ""
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 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:198
+#: gconf/gconftool.c:205
 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:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr ""
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr ""
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr ""
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr ""
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr ""
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr ""
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 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:270
+#: gconf/gconftool.c:277
 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:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, 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:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
+#: gconf/gconftool.c:413
+msgid "Can't use --all-entries with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
 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-entries, --"
+"all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 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:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1378,338 +1307,392 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
-msgstr ""
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
+msgstr "Nelze zav��t soubor `%s': %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, fuzzy, c-format
 msgid "List Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, fuzzy, c-format
 msgid "Car Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, fuzzy, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "Vlastn�k: %s\n"
+msgid "Default Value: %s\n"
+msgstr ""
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "Vlastn�k: %s\n"
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "Chyba: %s\n"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
+msgstr "Chyba v �ten� souboru `%s': %s\n"
+
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
+msgstr "Chyba: %s\n"
+
+#: gconf/gconftool.c:1234
+msgid "Must specify a key or keys on the command line\n"
+msgstr ""
+
+#: gconf/gconftool.c:1254
 #, c-format
-msgid "Error setting value: %s"
+msgid "No schema known for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
+#: gconf/gconftool.c:1287
 #, c-format
-msgid "Error syncing: %s"
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "Chyba v �ten� souboru `%s': %s\n"
+
+#: gconf/gconftool.c:1299
+#, c-format
+msgid "No schema stored at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1365
+#, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr ""
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr ""
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Nelze otev��t `%s': %s\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument `%s' je pr�zdn�?\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, fuzzy, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Nelze vytvo�it soubor `%s': %s"
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1717,35 +1700,48 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, fuzzy, c-format
+msgid "GConf Error: %s\n"
+msgstr "Chyba: %s\n"
+
+#: gconf/gconf-client.c:798
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:985
+#: gconf/gconf-client.c:1000
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Failed to set mode on `%s': %s"
-#~ msgstr "Nelze otev��t `%s': %s\n"
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Nelze zav��t soubor `%s': %s"
 
 #, fuzzy
-#~ msgid "Unable to store a value at key '%s'"
+#~ msgid "Didn't understand line in saved state file: '%s'"
 #~ msgstr "Nelze zav��t soubor `%s': %s"
 
 #, fuzzy
-#~ msgid "Failed to get IOR for client: %s"
-#~ msgstr "Nelze vymazat `%s': %s"
+#~ msgid "Failed to parse connection ID in saved state file"
+#~ msgstr "Nelze zav��t soubor `%s': %s"
 
 #, fuzzy
-#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgid "Failed to unquote config source address from saved state file: %s"
 #~ msgstr "Nelze zav��t soubor `%s': %s"
 
 #, fuzzy
-#~ msgid "GConf Error: %s\n"
-#~ msgstr "Chyba: %s\n"
+#~ msgid "Failed to unquote listener location from saved state file: %s"
+#~ msgstr "Nelze zav��t soubor `%s': %s"
+
+#, fuzzy
+#~ msgid "Failed to unquote IOR from saved state file: %s"
+#~ msgstr "Nelze zav��t soubor `%s': %s"
+
+#, fuzzy
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Nelze zav��t soubor `%s': %s"
 
 #~ msgid "Key"
 #~ msgstr "Kl��"
diff --git a/po/da.po b/po/da.po
index 3d18c1d2..3a40e029 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf\n"
-"POT-Creation-Date: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-0400\n"
 "PO-Revision-Date: 2000-12-21 21:35+01:00\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -14,6 +14,34 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: backends/bdb-backend.c:215
+msgid "Unloading BerkeleyDB (BDB) backend module."
+msgstr "Afl�sser BerkeleyDB-backend-modulet."
+
+#: backends/bdb-backend.c:238
+#, c-format
+msgid "Opened BerkeleyDB source at root %s"
+msgstr "�bnede BerkeleyDB kilde med rod %s"
+
+#: backends/bdb-backend.c:578
+msgid "Initializing BDB backend module"
+msgstr "Opstarter 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 finde %s-rodkatalog p� 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 oprette kataloget `%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 l�se fra eller skrive til %s-rodkatalog p� adressen '%s'"
+
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "L�s XML-backend-modulet af."
@@ -23,11 +51,6 @@ msgstr "L�s 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'"
@@ -42,7 +65,7 @@ msgstr "Mappe/filrettigheder for XML-kilde ved roden %s er %o/%o"
 msgid "Initializing XML backend module"
 msgstr "Opstarter XML-backend-modul"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Kunne ikke opgive l�s p� XML-katalog '%s': %s"
@@ -51,7 +74,7 @@ msgstr "Kunne ikke opgive l�s 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:228
+#: backends/xml-cache.c:229
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -60,11 +83,11 @@ msgstr ""
 "Kunne ikke fjerne katalog `%s' fra XML-backend bufferen, fordi den ikke er "
 "synkroniseret til disk"
 
-#: backends/xml-cache.c:253
+#: backends/xml-cache.c:256
 #, 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 punkter er i bufferen efter fjerning af allerede-synkroniserede punkter "
 "�ldre end %u sekunder"
@@ -79,160 +102,158 @@ msgstr "Kunne ikke stat `%s': %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML-filnavn `%s' er et katalog"
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Kunne ikke slette '%s': %s"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Kunne ikke skrive filen `%s': %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: backends/xml-dir.c:359
+#, fuzzy, c-format
+msgid "Failed to set mode on `%s': %s"
+msgstr "Kunne ikke �bne '%s': %s\n"
+
+#: backends/xml-dir.c:373 backends/xml-dir.c:383
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Kunne ikke omd�be '%s'til %s : %s"
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Kunne ikke genskabe '%s' fra %s : %s"
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, 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:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Kunne ikke stat '%s': %s"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Duplikeret punkt `%s' i `%s', ignorerer"
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, 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:961
+#: backends/xml-dir.c:979
 #, 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:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Kunne ikke oprette filen `%s': %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Kunne ikke lukke filen `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorerer XML-node med navn `%s': %s"
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "ignorerer skemanavn `%s', ugyldig: %s"
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
-#, c-format
-msgid "Ignoring XML node `%s', except for possible schema name: %s"
-msgstr "Ignorerer XML-node `%s', bortset fra mulig skema navn:: %s"
-
-#: backends/xml-entry.c:699
-msgid "found <local_schema> with no locale setting"
-msgstr ""
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "Ignorerer XML-node med navn `%s': %s"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Kunne ikke l�se standardv�rdi for skema: %s"
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Ingen \"type\" attribut for <%s> node"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "En node har ukendt \"type\" attribut `%s', ignorerer"
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "Ingen \"v�rdi\" attribut for node"
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Forstod ikke XML-node <%s> inde i en XML listenode"
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 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:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Ugyldig XML-node: %s"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Listen indeholder en fejlskrevet node (%s, skulle v�re %s)"
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorerer ugyldig car fra XML-par: %s"
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "tolker XML-fil: lister og par kan ikke placeres inde i et par"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorerer ugyldig cdr fra XML-par: %s"
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, 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:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Fandt ikke car og cdr for XML-parnode"
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Manglende cdr fra v�rdipar i XML-fil"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "Manglende car fra v�rdipar i XML-fil"
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Mangler b�de car og cdr v�rdier fra par i XML-fil"
 
@@ -265,29 +286,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:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr "Modtog ugyldig v�rdi i s�t-foresp�rgsel"
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Kunne ikke forst� CORBA-v�rdien modtaget i s�t-foresp�rgsel efter n�gle `%s'"
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr "Modtog foresp�rgsel om at slippe alle mellemlagrede data"
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr "Modtog foresp�rgsel om at udf�re synkron synkronisering"
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Fatal fejl: kunne ikke hente objektreference for ConfigDatabase"
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Fejlede ved synkronisering af en eller flere kilder: %s"
@@ -296,7 +317,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:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -307,12 +328,12 @@ msgstr ""
 "lytter ved genstart af gconfd, noget som vil resultere i up�lidelig "
 "notifikation af konfigurations�ndringer."
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Lytter-ID %lu eksisterer ikke"
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -321,47 +342,47 @@ msgstr ""
 "Kunne ikke logge fjernelse af lytter til logfil (h�jst sandsynligt harml�st, "
 "kan resultere i at notifikation genindtr�ffer p� uforklarlig vis): %s"
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fejl ved foresp�rgsel p� v�rdi af '%s': %s"
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Fejl ved ops�tning af v�rdi for '%s': %s"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Fejl under nulstilling af `%s': %s"
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Fejl ved skafning af standard v�rdi for '%s': %s"
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Fejl ved tjekning af eksisterende `%s': %s"
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Fejl under fjernelse af katalog '%s': %s"
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Kunne ikke f� alle indgange i '%s': %s"
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Fejl under listning af kataloger i `%s': %s"
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Fejl under ops�tning af skema for `%s': %s"
@@ -426,208 +447,29 @@ msgstr "Operation ikke tilladt uden konfigurationstjener"
 msgid "Failed to get a lock"
 msgstr "Kunne ikke f� en l�s"
 
-#: 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-error.c:40
+msgid "No database available to save your configuration"
+msgstr "Ingen database tilg�ngelig for lagring af din konfiguration"
 
-#: 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
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Ingen '/' i n�gle `%s'"
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Kunne ikke tolke CORBA v�rdi for listeelement"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Ukorrekt type for listeelement i %s"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr "Modtog liste fra gconfd med en ugyldig listetype"
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr "Kunne ikke konvertere objekt til IOR"
 
@@ -636,91 +478,96 @@ msgstr "Kunne ikke konvertere objekt til IOR"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Kunne ikke �bne sti-fil `%s': %s\n"
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Tilf�jer kilde '%s'\n"
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "L�sefejl p� fil '%s': %s\n"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Forventede liste, fik %s"
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Forventede liste af %s, fik liste af %s"
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Forventede par, fik %s"
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr "Forventede (%s,%s) par, fik par hvor �n eller begge v�rdier manglede"
 
-#: gconf/gconf-internals.c:1499
+#: gconf/gconf-internals.c:1474
 #, 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:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Tekst i anf�rselstegn begynder ikke med anf�rselstegn"
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Tekst i anf�rselstegn ender ikke p� anf�rselstegn"
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-fejl: %s"
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, fuzzy, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr "OAF-problemsbeskrivelse: %s"
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "fors�g p� at fjerne ikke-listet OAF-objektmappe"
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr "fors�g p� at tilf�je allerede-listet OAF-mappe"
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF-fortolkningsfejl: %s"
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "Ukendt OAF-fejl"
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Ingen ior-fil i '%s'"
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd overtager l�s '%s' fra en anden proces"
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Et andet program har l�s '%s'"
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "kunne ikke kontakte ORB for at pinge eksisterende gconfd"
 
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -729,42 +576,42 @@ msgstr ""
 "Fjerner udg�et l�s `%s' fordi IOR ikke kunne konverteres til "
 "objektreference, IOR `%s'"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr "Fjerner udg�et l�s `%s' pga fejl under pingning af tjener: %s"
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf-konfigurationsd�mon (gconfd) har l�s '%s'"
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "kunne ikke oprette kataloget '%s': %s"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Kan ikke oprette l�s '%s': %s"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kan ikke skrive til filen '%s': %s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "Kan ikke �bne l�sefil '%s'; antager det ikke er vores: %s"
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "�delagt l�sefil '%s', fjerner alligevel"
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -773,26 +620,26 @@ msgstr ""
 "Oprettede ikke l�sefil '%s' (skabers pid %u, vores pid %u; antager at en "
 "anden har overtaget vores l�s "
 
-#: gconf/gconf-internals.c:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Kunne ikke frigive l�sekatalog '%s': %s"
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Kunne ikke indl�se kilden `%s': %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Skema `%s' specificeret for `%s' lagrer en v�rdi som ikke er for skema"
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Navnet '/' kan kun v�re et katalog, ikke en n�gle"
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -801,17 +648,30 @@ msgstr ""
 "V�rdi for `%s' sat i en skrivebeskyttet kilde i begyndelsen af din "
 "konfigurationssti."
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Fejl ved finding af metainfo: %s"
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Fejl under hentning af metainfo: %s"
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr "N�gle `%s' listet som skema for n�gle `%s' lagrer faktisk type `%s'"
@@ -881,90 +741,90 @@ msgstr "Forstod ikke `%s' (ekstra \"unescaped\" ')' fundet inde i par)"
 msgid "`%s': %s"
 msgstr "'%s': %s"
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Server kunne ikke �bne adressen '%s'"
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr "Kan ikke tilf�je notifikationer til en lokal konfigurationskilde"
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, fuzzy, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Tilf�jelse af klient til serverens liste mislykkedes, CORBA fejl: %s"
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
-"Fejl under fors�g p� kontakt med konfigurationstjeneren: OAF returnerede nul "
-"fra oaf_activate_from_id() og satte ikke en undtagelse som forklarede "
-"problemet. Venligst udfyld en fejlrapport for OAF."
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr "Kunne ikke starte GConf, afslutter\n"
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr "Skal begynde med en skr�streg (/)"
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan ikke have to skr�streger (/) efter hinanden"
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan ikke have et punktum (.) lige efter en skr�streg (/)"
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' er et ugyldigt tegn i n�gle-/katalognavne"
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr "N�gle/katalog skal ikke ende med en skr�streg (/)"
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fejl ved nedlukning af konfigtjener: %s"
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Forventede flydendetal, fik %s"
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Forventede heltal, fik %s"
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Forventede streng, fik %s"
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Forventede boolsk, fik %s"
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Forventede skema, fik %s"
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "Nedlukningsforesp�rgsel modtaget"
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -972,7 +832,7 @@ msgstr ""
 "gconfd kompileret med debugning; fors�ger at hente gconf.sh fra "
 "kildekataloget"
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -980,7 +840,10 @@ msgstr ""
 "Ingen konfigurationsfiler fundet, fors�ger at bruge standard "
 "konfigurationskilde `%s'"
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -988,12 +851,16 @@ msgstr ""
 "Ingen konfigurationskilder i kildestien, konfigurationen vil ikke blive "
 "gemt; redig�r"
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Fejl ved indl�sning af nogle konfigkilder: %s"
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1001,7 +868,7 @@ msgstr ""
 "Kunne ikke sl� nogen adresser op for konfigurationskilde, kan ikke hente "
 "eller gemme konfigurationsdata"
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1009,65 +876,122 @@ msgstr ""
 "Ingen skrivbare konfigurationskilder fundet, kan ikke gemme dele af "
 "konfigurations�ndringene"
 
-#: 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�de"
+#: gconf/gconfd.c:369
+#, c-format
+msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgstr ""
+"Modtog signal %d, dumper hukommelsen. Rapport�r venligst en GConf fejl."
+
+#: gconf/gconfd.c:385
+#, c-format
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgstr ""
+"Modtog signal %d, lukker unormalt ned. Rapport�r venligst en GConf fejl."
 
-#: gconf/gconfd.c:329
+#: gconf/gconfd.c:402
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Modtog signal %d, lukker ned p� rigtig m�de"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "starter (version %s), pid %u bruger '%s'"
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr "GConf er bygget med fejls�gningsfunktioner aktiveret"
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
+#, fuzzy
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 "Kunne ikke initialisere Object Activation Framework: venligst send en "
 "fejlrapport til OAF udviklerene"
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Kunne ikke hente objektreference for ConfigServer"
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "Kunne ikke oprette filen `%s': %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "Kunne ikke f� IOR for klient: %s"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
+#, fuzzy
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
 msgstr ""
 "OAF kender ikke vor IID; indikerer fejl i installation; kan ikke\n"
 "registrere; afslutter\n"
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:613
+#, fuzzy
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
 msgstr "En anden gconfd er allerede registreret hos OAF; afslutter\n"
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:618
+#, fuzzy
+msgid "Unknown error registering existing gconfd with OAF; exiting"
 msgstr "Ukendt fejl ved registrering af gconfd hos OAF, afslutter\n"
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:645
+#, fuzzy
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
+msgstr ""
+"OAF kender ikke vor IID; indikerer fejl i installation; kan ikke\n"
+"registrere; afslutter\n"
+
+#: gconf/gconfd.c:649
+#, fuzzy
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
+msgstr "En anden gconfd er allerede registreret hos OAF; afslutter\n"
+
+#: gconf/gconfd.c:654
+#, fuzzy
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
+msgstr "Ukendt fejl ved registrering af gconfd hos OAF, afslutter\n"
+
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "Kunne ikke frigive l�sekatalog '%s': %s"
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "Afslutter"
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr "GConf server er ikke i brug, lukker ned."
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Returnerede undtagelse: %s"
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1076,38 +1000,38 @@ msgstr ""
 "Kunne ikke �bne gconfd logfil; vil ikke kunne genoprette lyttere efter "
 "nedlukning af gconfd (%s)"
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr "Kunne ikke lukke gconfd logfil; data blev m�ske ikke gemt rigtigt (%s)"
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Kunne ikke �bne tilstandsgemmefil '%s' for skriving: %s"
 
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, 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:989
+#: gconf/gconfd.c:1317
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Kunne ikke lukke ny tilstandsgemmefil '%s': %s"
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Kunne ikke flytte gammel tilstandsgemmefil '%s': %s"
 
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, 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:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1115,123 +1039,117 @@ msgstr ""
 "Kunne ikke genoprette oprindelig tilstandsgemmefil som er blevet flyttet til "
 "'%s': %s"
 
-#: gconf/gconfd.c:1110
-#, fuzzy, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr "Kunne ikke �bne tilstandsgemmefil: %s"
-
-#: gconf/gconfd.c:1125
-#, fuzzy
-msgid "Failed to parse connection ID in saved state file"
-msgstr "Kunne ikke �bne 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�jelse 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�jelse 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 �bne 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
+#: gconf/gconfd.c:1823
 #, 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:1377
+#: gconf/gconfd.c:1869
+#, c-format
+msgid "Error reading saved state file: %s"
+msgstr "Fejl ved l�sning af tilstandsgemmefil: %s"
+
+#: gconf/gconfd.c:1922
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Kunne ikke �bne tilstandsgemmefil '%s': %s"
 
-#: gconf/gconfd.c:1476
+#: gconf/gconfd.c:2039
 #, 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 ""
 "Kunne ikke logge tilf�jelse af lytter til gconfd logfilen; vil ikke kunne "
 "tilf�je lytteren hvis gconfd afslutter eller lukker ned (%s)"
 
-#: gconf/gconfd.c:1481
+#: gconf/gconfd.c:2044
 #, 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 ""
 "Kunne ikke logge fjernelse af lytter i gconfd-logfilen; kan medf�re at "
 "lytter l�gges ind igen hvis gconfd afsluttes eller maskinen lukkes ned (%s)."
 
-#: gconf/gconftool.c:62
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
+#, c-format
+msgid "Failed to get IOR for client: %s"
+msgstr "Kunne ikke f� IOR for klient: %s"
+
+#: gconf/gconfd.c:2082
+#, fuzzy, c-format
+msgid "Failed to open saved state file: %s"
+msgstr "Kunne ikke �bne tilstandsgemmefil '%s': %s"
+
+#: gconf/gconfd.c:2095
+#, fuzzy, c-format
+msgid "Failed to write client add to saved state file: %s"
+msgstr "Kunne ikke afslutte tilf�jelse af klient til tilstandsgemmefil: %s"
+
+#: gconf/gconfd.c:2103
+#, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr "Kunne ikke afslutte tilf�jelse af klient til tilstandsgemmefil: %s"
+
+#: gconf/gconfd.c:2193
+msgid ""
+"Some client removed itself from the GConf server when it hadn't been added."
+msgstr ""
+"En klient fjernede sig selv fra GConf serveren da den ikke blev tilf�jet."
+
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr "Hj�lpeindstillinger"
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "S�t en n�gle til en v�rdi og synkronis�r. Brug med --type."
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr "Udskriv v�rdien for en n�gle til standard ud."
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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 ""
-"S�t et skema og synkroniser. Brug --short-desc, --long-desc, --owner, og "
-"--type."
+"S�t et skema og synkroniser. Brug --short-desc, --long-desc, --owner, og --"
+"type."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr "Nulstil n�glerne fra kommandolinien"
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr "Udskriv alle n�gle/v�rdi-par i et katalog."
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr "Udskriv alle underkataloger i et katalog."
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Udskriv alle underunderkataloger og indgange under et katalog, rekursivt."
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Return�r 0 hvis kataloget eksisterer, 2 hvis ikke."
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Luk gconfd ned. BRUG IKKE DETTE VALG UDEN GOD GRUND."
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Return�r 0 hvis gconfd k�rer, 2 hvis ikke."
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1239,7 +1157,7 @@ msgstr ""
 "Start konfigurationstjeneren (gconfd). (Sker normalt automatisk n�r det er "
 "n�dvendigt.)"
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1247,11 +1165,11 @@ msgstr ""
 "Specific�r typen af v�rdien som s�ttes, eller typen af v�rdien som et skema "
 "beskriver. Unikke forkortelser er OK."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|liste|par"
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1259,11 +1177,11 @@ msgstr ""
 "Specific�r type listev�rdi som s�ttes, eller typen for v�rdien som et skema "
 "beskriver. Unikke forkortelser er OK."
 
-#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr "heltal|boolsk|flydende|streng"
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1271,7 +1189,7 @@ msgstr ""
 "Specific�r car-type v�rdi som s�ttes, eller typen for v�rdien som et skema "
 "beskriver. Unikke forkortelser er OK."
 
-#: gconf/gconftool.c:198
+#: gconf/gconftool.c:205
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1279,44 +1197,44 @@ msgstr ""
 "Specific�r type v�rdi for cdr-par som s�ttes, eller typen for v�rdien som et "
 "skema beskriver. Unikke forkortelser er OK."
 
-#: gconf/gconftool.c:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "Specific�r en kort beskrivelse p� en halv linie som skal bruges i et skema."
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr "Specific�r en beskrivelse p� flere linjer som skal bruges i et skema."
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr "Angiv ejeren af et skema"
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr "OWNER"
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr "Angiv en skemafil som skal installeres"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr "FILENAME"
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "Angiv en konfigurationskilde som skal bruges i stedet for standard sti"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr "SOURCE"
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1324,7 +1242,7 @@ msgstr ""
 "Accept�r konfigurationsdatabasen direkte, g�r udenom tjeneren. Det kr�ves at "
 "gconfd ikke k�rer."
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1335,7 +1253,7 @@ msgstr ""
 "standardv�rdien for konfigurationskilde eller v�re tom for at "
 "standardv�rdien skal bruges."
 
-#: gconf/gconftool.c:270
+#: gconf/gconftool.c:277
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1343,7 +1261,7 @@ msgstr ""
 "Udf�r en torturtest af en applikation ved at s�tte og t�mme en r�kke v�rdier "
 "af forskellige typer for n�gler fra kommandolinjen."
 
-#: gconf/gconftool.c:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1351,7 +1269,27 @@ msgstr ""
 "Udf�r en torturtest af en applikation ved at s�tte og t�mme en r�kke n�gler "
 "inde i katalogerne fra kommandolinien."
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1361,90 +1299,93 @@ msgstr ""
 "K�r '%s --help' for at se en fuld liste over tilg�ngelige "
 "kommandolinieflag.\n"
 
-#: gconf/gconftool.c:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Kan ikke hente og s�tte/nulstille samtidig\n"
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Kan ikke s�tte og hente/nulstille samtidig\n"
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
-msgstr "Kan ikke bruge --all-pairs med --get eller --set\n"
+#: gconf/gconftool.c:413
+#, fuzzy
+msgid "Can't use --all-entries with --get or --set\n"
+msgstr "Kan ikke bruge --all-dirs med --get eller --set\n"
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Kan ikke bruge --all-dirs med --get eller --set\n"
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
+#, fuzzy
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
 "--recursive-list b�r ikke bruges med --get, --set, --unset, --all-pairs, "
 "eller --all-dirs\n"
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
+#, fuzzy
 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-entries, --"
+"all-dirs\n"
 msgstr ""
-"--set_schema b�r ikke bruges med --get, --set, --unset, --all-pairs, "
-"--all-dirs\n"
+"--set_schema b�r ikke bruges med --get, --set, --unset, --all-pairs, --all-"
+"dirs\n"
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr "V�rdi type er kun interessant n�r en v�rdi skal s�ttes\n"
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr "En type skal angives hvis en v�rdi skal s�ttes\n"
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping flaget skal bruges alene.\n"
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists flaget skal bruges alene.\n"
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file skal bruges alene.\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule skal bruges alene.\n"
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key skal bruges alene.\n"
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory skal bruges alene.\n"
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
-"Du skal angive en konfigurationskilde med --config-source n�r du bruger "
-"--direct\n"
+"Du skal angive en konfigurationskilde med --config-source n�r du bruger --"
+"direct\n"
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Kunne ikke starte GConf: %s\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Skal s�tte GCONF_CONFIG_SOURCE milj�variablen\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1456,245 +1397,301 @@ msgstr ""
 "k�rer nogen applikationer\n"
 "(selvom ting virker i teorien selv n�r applikationer k�rer).\n"
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Kunne ikke f� fat i konfigurationskilde(r): %s\n"
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Nedlukningsfejl: %s\n"
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Du skal angive en eller flere kataloger som skal vises rekursivt.\n"
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
 msgstr "Fejl under listning af par i `%s': %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr "(ingen v�rdi sat)"
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Fejl under splitning af konfigurationstjeneren (gconfd): %s\n"
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr "Skal angive n�gle eller n�gler for at f�\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "Type: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listetype: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car-type: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr-type: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "Ejer: %s\n"
+msgid "Default Value: %s\n"
+msgstr "Standardv�rdi: %s\n"
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr "Nulstil"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "Ejer: %s\n"
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kort beskriv.: %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Lang beskriv.: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Ingen v�rdi sat for '%s'\n"
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Kunne ikke f� v�rdi for '%s': %s\n"
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Forst�r ikke type `%s'\n"
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Skal angive skiftevis n�gler/v�rdier som argumenter\n"
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Ingen v�rdi sat for n�gle: `%s'\n"
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr "Kan ikke s�tte skema som v�rdi\n"
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "N�r en liste s�ttes skal du angive en primitiv liste-type\n"
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "N�r et par s�ttes skal du angive en primitiv car-type og cdr-type\n"
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fejl: %s\n"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
-#, c-format
-msgid "Error setting value: %s"
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
 msgstr "Fejl under s�tning af v�rdi: %s"
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
-#, c-format
-msgid "Error syncing: %s"
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
 msgstr "Fejl ved synkronisering: %s"
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1234
+#, fuzzy
+msgid "Must specify a key or keys on the command line\n"
+msgstr "Skal angive n�gle eller n�gler for at f�\n"
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "Ingen s�dan fil `%s'\n"
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "Fejl under ops�tning af skema for `%s': %s"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "Ingen s�dan fil `%s'\n"
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+#, fuzzy
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr "Du skal angive n�gle (skemanavn) som eneste argument\n"
+
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr "ADVARSEL: kunne ikke associere skema `%s' med n�gle `%s': %s\n"
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Du skal angive n�gle (skemanavn) som eneste argument\n"
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Listetype skal v�re en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Parrets car-type skal v�re en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Parrets cdr-type skal v�re en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr "Fejl under s�tning af v�rdi: %s"
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr "Fejl ved synkronisering: %s"
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Der skal angives en eller flere kataloger der kan hentes n�gle/v�rdi-par "
 "fra.\n"
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Der skal angives en eller flere n�gler som skal nulstilles.\n"
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Fejl under nulstilling af `%s': %s\n"
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 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:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Fejl ved visning af kataloger: %s\n"
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, 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:1366
+#: gconf/gconftool.c:1644
 #, 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:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "ADVARSEL: Kunne ikke fortolke standardv�rdi `%s' for skema (%s)\n"
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, 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:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "ADVARSEL: Du kan ikke s�tte en standardv�rdi for et skema\n"
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "ADVARSEL: gconftool, intern fejl, ukendt GConfValueType\n"
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ADVARSEL: kunne ikke tolke typenavn '%s'\n"
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: list_type kan kun v�re int, float, string eller bool og ikke `%s'\n"
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: car_type kan kun v�re int, float, string eller bool og ikke `%s'\n"
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVARSEL: cdr_type kan kun v�re int, float, string eller bool og ikke `%s'\n"
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr "ADVARSEL: tom <applyto> node"
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ADVARSEL: node <%s> ikke forst�et under <skema>\n"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr "ADVARSEL: ingen n�gle angivet for skema\n"
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 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:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1702,51 +1699,51 @@ msgstr ""
 "ADVARSEL: flere <lokale> noder for lokale '%s', ignorerer alle andre end den "
 "f�rste\n"
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, 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:1745
+#: gconf/gconftool.c:2023
 #, 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:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Installerede skema '%s' for lokale '%s'\n"
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "ADVARSEL: kunne ikke associere skema `%s' med n�gle `%s': %s\n"
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Vedh�ftede skema '%s' til n�gle '%s'\n"
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 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:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "ADVARSEL: node <%s> ikke forst�et under <skemaliste>\n"
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Kunne ikke �bne '%s': %s\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokumentet '%s' er tomt?\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1755,26 +1752,26 @@ msgstr ""
 "Dokument `%s' har forkert type rod-node (<%s>, skulle v�re "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, 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:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ADVARSEL: node <%s> herunder <gconfskemafil> ikke forst�et\n"
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Fejl ved synkronisering af konfigdata: %s"
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr "Skal angive nogen skema-filer til installering\n"
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -1783,16 +1780,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Kunne ikke fjerne afbrydelsesn�gle %s: %s\n"
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr "Skal angive en eller flere n�gler for afbrydelse.\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1802,11 +1799,11 @@ msgstr ""
 "n�gle:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr "Skal angive nogle kataloger som skal kn�kkes\n"
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1817,69 +1814,70 @@ msgstr ""
 "n�gler i katalog:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr "GConf fejl: %s\n"
+
+#: gconf/gconf-client.c:798
 #, 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:985
+#: gconf/gconf-client.c:1000
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Forventede %s, fik %s for n�gle %s"
 
-#~ msgid "Unloading BerkeleyDB (BDB) backend module."
-#~ msgstr "Afl�sser BerkeleyDB-backend-modulet."
+#~ msgid "Ignoring XML node `%s', except for possible schema name: %s"
+#~ msgstr "Ignorerer XML-node `%s', bortset fra mulig skema navn:: %s"
 
-#~ msgid "Opened BerkeleyDB source at root %s"
-#~ msgstr "�bnede BerkeleyDB kilde med rod %s"
-
-#~ msgid "Initializing BDB backend module"
-#~ msgstr "Opstarter BDB-backend-modul"
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Kunne ikke lukke filen `%s': %s"
 
-#~ msgid "Couldn't find the %s root directory in the address `%s'"
-#~ msgstr "Kunne ikke finde %s-rodkatalog p� adressen '%s'"
+#, fuzzy
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "Fejl under fjernelse af katalog '%s': %s"
 
 #~ msgid ""
-#~ "Can't read from or write to the %s root directory in the address `%s'"
-#~ msgstr "Kunne ikke l�se fra eller skrive til %s-rodkatalog p� adressen '%s'"
-
-#~ msgid "No database available to save your configuration"
-#~ msgstr "Ingen database tilg�ngelig 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�rdi i n�gle '%s'"
-
-#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ "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 ""
-#~ "Modtog signal %d, dumper hukommelsen. Rapport�r venligst en GConf fejl."
+#~ "Fejl under fors�g p� kontakt med konfigurationstjeneren: OAF returnerede "
+#~ "nul fra oaf_activate_from_id() og satte ikke en undtagelse som forklarede "
+#~ "problemet. Venligst udfyld en fejlrapport for OAF."
 
-#~ msgid ""
-#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
-#~ msgstr ""
-#~ "Modtog signal %d, lukker unormalt ned. Rapport�r venligst en GConf fejl."
+#, fuzzy
+#~ msgid "Received signal %d, shutting down."
+#~ msgstr "Modtog signal %d, lukker ned p� rigtig m�de"
+
+#~ msgid "GConf was built with debugging features enabled"
+#~ msgstr "GConf er bygget med fejls�gningsfunktioner aktiveret"
 
-#~ msgid "GConf server is not in use, shutting down."
-#~ msgstr "GConf server er ikke i brug, lukker ned."
+#, fuzzy
+#~ msgid "Didn't understand line in saved state file: '%s'"
+#~ msgstr "Kunne ikke �bne tilstandsgemmefil: %s"
 
-#~ msgid "Error reading saved state file: %s"
-#~ msgstr "Fejl ved l�sning af tilstandsgemmefil: %s"
+#, fuzzy
+#~ msgid "Failed to parse connection ID in saved state file"
+#~ msgstr "Kunne ikke �bne tilstandsgemmefil: %s"
 
-#~ msgid "Failed to get IOR for client: %s"
-#~ msgstr "Kunne ikke f� IOR for klient: %s"
+#, fuzzy
+#~ msgid "Failed to unquote config source address from saved state file: %s"
+#~ msgstr "Kunne ikke skrive tilf�jelse af klient til tilstandsgemmefil: %s"
 
-#~ msgid "Failed to flush client add to saved state file: %s"
-#~ msgstr "Kunne ikke afslutte tilf�jelse af klient til tilstandsgemmefil: %s"
+#, fuzzy
+#~ msgid "Failed to unquote listener location from saved state file: %s"
+#~ msgstr "Kunne ikke skrive tilf�jelse 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�jet."
+#, fuzzy
+#~ msgid "Failed to unquote IOR from saved state file: %s"
+#~ msgstr "Kunne ikke �bne tilstandsgemmefil: %s"
 
-#~ msgid "Default Value: %s\n"
-#~ msgstr "Standardv�rdi: %s\n"
+#~ msgid "Can't use --all-pairs with --get or --set\n"
+#~ msgstr "Kan ikke bruge --all-pairs med --get eller --set\n"
 
-#~ msgid "GConf Error: %s\n"
-#~ msgstr "GConf fejl: %s\n"
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Kunne ikke lagre v�rdi i n�gle '%s'"
diff --git a/po/de.po b/po/de.po
index 4ded5661..1e980ef8 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-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-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"
@@ -20,20 +20,45 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:233
-msgid "Unloading XML backend module."
+#: backends/bdb-backend.c:215
+#, fuzzy
+msgid "Unloading BerkeleyDB (BDB) backend module."
 msgstr "XML-Backend-Modul wird aus dem Speicher entfernt."
 
-#: backends/xml-backend.c:286
+#: backends/bdb-backend.c:238
 #, c-format
-msgid "Couldn't find the XML root directory in the address `%s'"
+msgid "Opened BerkeleyDB source at root %s"
+msgstr ""
+
+#: backends/bdb-backend.c:578
+#, fuzzy
+msgid "Initializing BDB backend module"
+msgstr "Initialisiere XML-Backend-Modul"
+
+#: backends/dir-utils.c:108
+#, fuzzy, c-format
+msgid "Couldn't find the %s 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:1033
+#: 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 "Konnte Verzeichnis `%s' nicht erstellen: %s"
 
+#: backends/dir-utils.c:212
+#, fuzzy, c-format
+msgid "Can't read from or write to the %s root directory in the address `%s'"
+msgstr "Kann nicht in XML-Verzeichnis an Adresse `%s' lesen oder schreiben"
+
+#: backends/xml-backend.c:233
+msgid "Unloading XML backend module."
+msgstr "XML-Backend-Modul wird aus dem Speicher entfernt."
+
+#: backends/xml-backend.c:286
+#, c-format
+msgid "Couldn't find the XML root directory in the address `%s'"
+msgstr "Konnte das XML-Rootverzeichnis nicht an der Adresse `%s' finden"
+
 #: backends/xml-backend.c:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -49,7 +74,7 @@ msgstr ""
 msgid "Initializing XML backend module"
 msgstr "Initialisiere XML-Backend-Modul"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Konnte Sperre auf XML-Verzeichnis `%s' nicht l�sen: %s"
@@ -60,7 +85,7 @@ msgstr ""
 "Unsynchronisiertes Verzeichnis wird gel�scht, wenn das XML-Backend beendet "
 "wird"
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -69,11 +94,11 @@ msgstr ""
 "Kann das Verzeichnis %s nicht vom XML-Backand-Cache entfernen, weil es nicht "
 "erfolgreich synchronisiert werden konnte"
 
-#: backends/xml-cache.c:253
+#: backends/xml-cache.c:256
 #, 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 Elemente bleiben im Cache, wenn alle bereits synchronisierten Elemente, "
 "die �lter als %u Sekunden sind gel�scht werden"
@@ -88,161 +113,159 @@ msgstr "Konnte `%s' nicht mit stat() untersuchen: %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML-Dateiname %s ist ein Verzeichnis"
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "L�schen von %s gescheitert: %s"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Schreiben von %s gescheitert: %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: backends/xml-dir.c:359
+#, fuzzy, c-format
+msgid "Failed to set mode on `%s': %s"
+msgstr "Konnte `%s' nicht �ffnen. %s\n"
+
+#: backends/xml-dir.c:373 backends/xml-dir.c:383
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "umbenennen von `%s' in `%s' gescheitert: %s"
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "wiederherstellen von %s aus %s gescheitert: %s"
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "l�schen der alten Datei %s gescheitert: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Konnte `%s' nicht mit stat() untersuchen: %s"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "doppelter Eintrag %s in %s, ignoriere"
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, 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:961
+#: backends/xml-dir.c:979
 #, 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:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Erstellen von Datei %s gescheitert: %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Konnte Datei `%s' nicht schlie�en: %s"
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignoriere XML-Element mit Namen %s: %s"
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "ignoriere Schema mit Namen %s, ung�ltig: %s"
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
-#, c-format
-msgid "Ignoring XML node `%s', except for possible schema name: %s"
-msgstr "Ignoriere XML-Element %s, au�er f�r das m�gliche Schema: %s"
-
-#: backends/xml-entry.c:699
-msgid "found <local_schema> with no locale setting"
-msgstr "<local_schema> ohne lokale Einstellungen gefunden"
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "Ignoriere XML-Element mit Namen %s: %s"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Konnte voreingestellten Wert f�r Schema (%s) nicht lesen"
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Kein \"type\"-Attribut f�r <%s>-Element"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Ein Element hat unbekanntes \"type\"-Attribut `%s', ignoriere"
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "Kein \"value\"-Attribut f�r Element"
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Verstehe XML-Element <%s> in einem XML-Listen-Element nicht"
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Ung�ltiger Typ (Liste, Paar oder unbekannt) in einem Listen-Element"
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Schlechtes XML-Element: %s"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 "Liste beinhaltet ein schlecht-geschriebenes Element (%s, sollte %s sein)"
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignoriere ung�ltiges car aus XML-Paar: %s"
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "parse XML-Datei: Liste und Paare sollen nicht in einem Paar sein"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignoriere ung�ltiges cdr aus XML-Paar: %s"
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Verstehe XML-Element <%s> in einem XML-Paar-Element nicht"
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Konnte car und cdr f�r XML-Paarknoten nicht finden"
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Fehlendes cdr in Wertepaar aus XML-Datei"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "Fehlendes car in Wertepaar aus XML-Datei"
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "car- und cdr-Werte fehlen beide in Paar aus XML-Datei"
 
@@ -276,30 +299,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:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr "Habe ung�ltigen Wert in Einstellungsanfrage erhalten"
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Konnte Sinn des CORBA-Wertes in Einstellungsanfrage f�r Schl�ssel `%s' nicht "
 "ausmachen"
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr "Habe Anfrage zum Fallenlassen aller Daten im Cache erhalten"
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr "Habe Anfrage zum synchronen Synchronisieren erhalten"
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Schwere Fehler: Konnte Objektreferenz f�r ConfigServer nicht erhalten"
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Konnte ein oder mehrere Quellen nicht synchronisieren: %s"
@@ -308,7 +331,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:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -320,12 +343,12 @@ msgstr ""
 "wiederherzustellen, was zu einer unzuverl�ssigen Benachrichtigung �ber "
 "Konfigurations�nderungen f�hren wird."
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Zuh�rer-ID %lu existiert nicht"
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -335,47 +358,47 @@ msgstr ""
 "(wahrscheinlich harmlos, k�nnte zu einer seltsamerweise neu erscheinenden "
 "Benachrichtung f�hren): %s"
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fehler beim Erhalten des Wertes f�r `%s': %s"
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Fehler beim Einstellen des Wertes f�r `%s': %s"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Fehler beim L�schen von `%s': %s"
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, 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:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Fehler beim Pr�fen der Existenz von `%s': %s"
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Fehler beim Entfernen von Verzeichnis `%s': %s"
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Fehler beim Erhalten aller Eintr�ge in `%s': %s"
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Fehler beim Auflisten der Verzeichnisse in `%s': %s"
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Fehler beim Einstellen des Schemas f�r `%s': %s"
@@ -440,243 +463,29 @@ msgstr "Operation ohne Konfigurationsserver nicht erlaubt"
 msgid "Failed to get a lock"
 msgstr "Konnte kein Lock erhalten"
 
-#: gconf/gconf-glib.c:629
-#, c-format
-msgid ""
-"Error on line %d char %d: %s\n"
-"(Some surrounding text was '%s')\n"
-msgstr ""
-"Fehler in Zeile %d, Zeichen %d: %s\n"
-"(Der umgebende Text war '%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 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: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)"
-
-#: 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:867
-#, c-format
-msgid ""
-"Character reference contained non-digit '%s' ('&#' should begin a reference "
-"to a unicode character, such as '&#2342;')"
-msgstr ""
-"Zeichenreferenz enhielt `non-digit' '%s' ('&#' sollte am Anfang einer "
-"Referenz mit einem Unicode-Zeichen stehen, z.B. '&#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 ""
-"Text endete in der Mitte einer Zeichenreferenz ('&#' sollte am Anfang einer "
-"Zeichenreferenz wie '&#2342;' stehen)"
-
-#: gconf/gconf-glib.c:916
-#, c-format
-msgid ""
-"Couldn't parse character reference '%s' ('&#' must begin a character "
-"reference such as '&#2343;')"
-msgstr ""
-"Konnte Zeichenreferenz '%s' nicht parsen ('&#' muss am Anfang einer "
-"Zeichenreferenz stehen, z.B. '&#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 ""
-"Zeichencode %#lx ist in XML-Dokumenten nicht erlaubt oder ist kein g�ltiges "
-"Unicode-Zeichen"
-
-#: gconf/gconf-glib.c:1013
-#, fuzzy
-msgid ""
-"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: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 ""
-"Die Zeichen'<' oder '>' sind hier nicht erlaubt, sondern nur bei Tags wie "
-"<bold> oder <paragraph>. Um sie sonst zu verwenden, bitte &lt; and &gt; "
-"benutzen"
-
-#: 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:1109
-msgid "Document ended just after attribute name"
-msgstr "Dokument h�rte genau nach einem Attributnamen auf"
-
-#: 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:1135
-msgid ""
-"'=' character after attribute must be immediately followed by an '\"' "
-"character"
-msgstr "'=' Zeichen muss unmittelbar nach einem'\"' Zeichen stehen"
-
-#: 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�ende Anf�hrungszeichen '\"'"
-
-#: gconf/gconf-glib.c:1181
-msgid ""
-"Ran out of text before a quote mark ('\"') was seen at the end of an "
-"attribute value"
-msgstr ""
-"Text ging �ber ein Anf�hrungszeichen ('\"') hinaus. Es wurde kein "
-"Anf�hrungszeichen gefunden"
-
-#: 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:1508
-msgid "Missing '<' at start of element"
-msgstr "'<' fehlt am Anfang des Elements"
-
-#: gconf/gconf-glib.c:1519
-msgid "Document ended just after '<' character"
-msgstr "Dokument endete genau nach einem '<' Zeichen"
-
-#: gconf/gconf-glib.c:1547
-msgid "No closing '>' found for a <? or <!"
-msgstr "Kein schlie�endes '>' gefunden f�r <? oder <!"
-
-#: 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: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: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:1655
-msgid ""
-"Element ended just after '/', no '>' seen; empty elements should end with "
-"'/>'"
-msgstr ""
-"Element endete ganau nach '/', '>' wurde nicht gefunden; leere Elemente "
-"sollten mit einem '/>' geschlossen werden"
-
-#: gconf/gconf-glib.c:1694
-msgid "Close tag not found at end of element"
-msgstr "Tag zum Schlie�en am Ende des Elements nicht gefunden"
-
-#: gconf/gconf-glib.c:1709
-msgid "Close tag ends just after '<' character"
-msgstr "Tag zum Schlie�en endet genau nach '<' Zeichen"
+#: 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:1723
-msgid "Close tag should begin with '</', '/' character is missing"
-msgstr ""
-"Tag zum Schlie�en sollte mit einem '</' Zeichen beginnen, '/' Zeichen fehlt"
-
-#: gconf/gconf-glib.c:1737
-msgid "Close tag ends just after '/' character"
-msgstr "Tag zum Schlie�en endet genau nach einem '/' Zeichen"
-
-#: gconf/gconf-glib.c:1772
-msgid "Document ended just after element name in close tag, no '>' seen"
-msgstr ""
-"Dokument endete genau nach Elementnamen im Tag f�r Schlie�en, '>' wurde "
-"nicht gefunden"
-
-#: gconf/gconf-glib.c:1788
-msgid "Document ended just after close tag name, no '>' seen"
-msgstr ""
-"Dokument endete genau nach Tag Name f�r Schlie�en, '>' wurde nicht gefunden"
-
-#: gconf/gconf-glib.c:1807
-#, c-format
-msgid "Close tag '%s' does not match opening tag '%s'"
-msgstr "Tag f�r Schlie�en '%s' passt nicht zum Tag f�r �ffnen '%s'"
-
-#: gconf/gconf-glib.c:2145
-#, c-format
-msgid ""
-"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
-"bad character was '%s'"
-msgstr ""
-"Ung�ltiges UTF-8 Zeichen bei Byte %d im markierten Text. Der Text vor dem "
-"falschen Zeichen war '%s'"
-
-#: 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:10666
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Konnte Datei `%s' nicht �ffnen: %s"
-
-#: gconf/gconf-glib.c:10683
-#, c-format
-msgid "Error reading file '%s': %s"
-msgstr "Fehler beim Lesen der Datei '%s': %s"
-
-#: gconf/gconf-internals.c:85
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Kein `/' in Schl�ssel `%s'"
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Konnte CORBA-Wert f�r Listenelement nicht interpretieren"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Ung�ltiger Typ f�r Listenelement in %s"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr "Habe Liste von gconfd mit falschem Listentyp empfangen"
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr "Konnte Objekt nicht in IOR umwandeln"
 
@@ -685,94 +494,99 @@ msgstr "Konnte Objekt nicht in IOR umwandeln"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Konnte Pfaddatei `%s' nicht �ffnen: %s\n"
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "F�ge Quelle `%s' hinzu\n"
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Lesefehler auf Datei `%s': %s\n"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Habe Liste erwartet, erhielt %s"
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Habe Liste von %s erwartet, erhielt Liste von %s"
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Habe Paar erwartet, erhielt %s"
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Habe Paar (%s,%s) erwartet, erhielt ein Paar, bei dem ein oder beide Werte "
 "fehlten"
 
-#: gconf/gconf-internals.c:1499
+#: gconf/gconf-internals.c:1474
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Habe Paar von Typ (%s,%s) erwartet, erhielt Typ (%s,%s)"
 
-#: gconf/gconf-internals.c:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Zeichenkette in Anf�hrungszeichen beginnt nicht mit Anf�hrungszeichen"
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 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:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-Fehler: %s"
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, fuzzy, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr "OAF Problembeschreibung: '%s'"
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "Versuch, nicht aufgelistetes OAF-Objektverzeichnis zu entfernen"
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr "Versuch, bereits aufgelistetes OAF-Verzeichnis hinzuzuf�gen"
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF-Parserfehler: %s"
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "Unbekannter OAF-Fehler"
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Keine ior-Datei in `%s'"
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd erh�lt Sperre `%s' von einem anderen Prozess"
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Ein anderes Programm hat die Sperre `%s'"
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 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:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -781,44 +595,44 @@ msgstr ""
 "Entferne verfallene Sperre `%s', da IOR nicht in Objektreferenz umgewandelt "
 "werden konnte, IOR `%s'"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, 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:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf-Konfigurationsd�mon (gconfd) hat Sperre `%s'"
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "Konnte Verzeichnis `%s' nicht anlegen: %s"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Kann Sperre `%s' nicht anlegen: %s"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kann nicht in Datei `%s' schreiben: %s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "Kann Sperrdatei `%s' nicht �ffnen; nehme an, dass sie nicht Ihnen geh�rt: %s"
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Besch�digte Sperrdatei `%s', entferne sie sowieso"
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -827,26 +641,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:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Konnte Sperrverzeichnis `%s' nicht freigeben: %s"
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Fehler beim Laden der Quelle %s: %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, 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:539
+#: gconf/gconf-sources.c:567
 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:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -855,17 +669,30 @@ msgstr ""
 "Wert f�r '%s' gesetzt in einem Read-Only Bereich am Anfang des "
 "Konfigurationspfades."
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Fehler beim Finden der Meta-Informationen: %s"
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Fehler beim Ermitteln der Meta-Informationen: %s"
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -937,95 +764,94 @@ msgstr "Verstehe %s nicht (zus�tzliches Uncodiertes ')' im Paar gefunden)"
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Server konnte Adresse `%s' nicht aufl�sen"
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 "Kann keine Benachrichtigungen zu einer lokalen Konfigurationsquelle "
 "hinzuf�gen"
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, fuzzy, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
-"Das Hinzuf�gen des Clients zu der Serverliste ist fehlgeschlagen. "
-"CORBA-Fehler: %s"
+"Das Hinzuf�gen des Clients zu der Serverliste ist fehlgeschlagen. CORBA-"
+"Fehler: %s"
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 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�ren w�rde. Bitte schicken Sie einen Fehlerbericht zu OAF "
-"ein."
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr "Konnte GConf nicht initialisieren, breche ab\n"
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr "Muss mit einem Schr�gstrich beginnen (/)"
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kann keine zwei Schr�gstriche (/) hintereinander haben"
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kann keinen Punkt (.) direkt hinter einem Schr�gstrich (/) haben"
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, 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:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Schl�ssel/Verzeichnis darf nicht mit einem Schr�gstrich (/) enden"
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fehler beim Herunterfahren des Konfigurationsservers: %s"
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Habe float erwartet, erhielt %s"
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Habe int erwartet, erhielt %s"
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Habe Zeichenkette erwartet, erhielt %s"
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Habe bool erwartet, erhielt %s"
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Habe Schema erwartet, erhielt %s"
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "Beendigungsanfrage empfangen"
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -1033,7 +859,7 @@ msgstr ""
 "gconfd mit Fehlerdiagnose compiliert; versuche, gconf.path aus dem "
 "Quellverzeichnis zu laden"
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1041,7 +867,10 @@ msgstr ""
 "Keine Konfigurationsdateien gefunden, versuche, die voreingestellte "
 "Konfigurationsquelle `%s' zu benutzen"
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1049,12 +878,16 @@ msgstr ""
 "Keine Konfigurationsquellen im Quellpfad, Konfiguration wird nicht "
 "gespeichert werden; "
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Fehler beim Laden von Konfigurationsquellen: %s"
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1062,7 +895,7 @@ msgstr ""
 "Keine Konfigurations-Quelladressen erfolgreich aufgel�st, kann "
 "Konfigurationsdaten nicht laden oder speichern"
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1070,65 +903,121 @@ msgstr ""
 "Keine schreibbaren Konfigurationsquellen konnten erfolgreich aufgel�st "
 "werden; manche Konfigurations�nderungen k�nnen nicht gespeichert werden"
 
-#: 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:369
+#, 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:385
+#, 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:329
+#: gconf/gconfd.c:402
 #, 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:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "(version %s) wird gestartet, PID %u, Benutzer `%s'"
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr "GConf wurde mit Debugging Funktionen kompiliert"
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
+#, fuzzy
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 "Konnte Object Activation Framework nicht initialisieren; bitte schicken Sie "
 "einen Fehlerbericht an die Paketpfleger von OAf"
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Konnte Objektreferenz f�r ConfigServer nicht erhalten"
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "Erstellen von Datei %s gescheitert: %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "Empfangen des IOR f�r Client fehlgeschlagen: %s"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
+#, fuzzy
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
+msgstr ""
+"OAF kennt unsere IID nicht; dies weist auf eine besch�digte Installation "
+"hin; kann nicht registrieren; breche ab\n"
+
+#: gconf/gconfd.c:613
+#, fuzzy
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
+msgstr "Ein anderer gconfd ist bereits im OAF registriert; breche ab\n"
+
+#: gconf/gconfd.c:618
+#, fuzzy
+msgid "Unknown error registering existing gconfd with OAF; exiting"
+msgstr "Unbekannter Fehler beim Registrieren von gconfd im OAF; breche ab\n"
+
+#: gconf/gconfd.c:645
+#, fuzzy
+msgid ""
+"bonobo-activation 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�digte Installation "
 "hin; kann nicht registrieren; breche ab\n"
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:649
+#, fuzzy
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
 msgstr "Ein anderer gconfd ist bereits im OAF registriert; breche ab\n"
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:654
+#, fuzzy
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
 msgstr "Unbekannter Fehler beim Registrieren von gconfd im OAF; breche ab\n"
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "Konnte Sperrverzeichnis `%s' nicht freigeben: %s"
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "Breche ab"
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr "GConf-Server wird nicht benutzt, wird beendet."
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Ausnahmefehler: %s"
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1137,7 +1026,7 @@ msgstr ""
 "Konnte gconfd-Logdatei nicht �ffnen; werde nicht in der Lage sein, Zuh�rer "
 "nach gconfd-Herunterfahren wiederherzustellen (%s)"
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1145,32 +1034,32 @@ msgstr ""
 "Konnte gconfd-Logdatei nicht schlie�en; Daten k�nnen evtl. nicht "
 "ordnungsgem�� gespeichert worden sein (%s)"
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Konnte Statusspeicherungs-Datei '%s' nicht zum Schreiben �ffnen: %s"
 
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, 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:989
+#: gconf/gconfd.c:1317
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Konnte neue Statusspeicherungs-Datei '%s' nicht schlie�en: %s"
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, 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:1013
+#: gconf/gconfd.c:1341
 #, 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:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1178,48 +1067,7 @@ msgstr ""
 "Konnte urspr�ngliche Statusspeicherungs-Datei, die auf '%s' verschoben "
 "worden war, nicht wiederherstellen: %s"
 
-#: gconf/gconfd.c:1110
-#, fuzzy, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr "�ffnen der gespeicherten Status-Datei nicht m�glich: %s"
-
-#: gconf/gconfd.c:1125
-#, fuzzy
-msgid "Failed to parse connection ID in saved state file"
-msgstr "�ffnen der gespeicherten Status-Datei nicht m�glich: %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 "�ffnen der gespeicherten Status-Datei nicht m�glich: %s"
-
-#: gconf/gconfd.c:1204
-msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
-msgstr ""
-
-#: gconf/gconfd.c:1225
-msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
-msgstr ""
-
-#: gconf/gconfd.c:1346
+#: gconf/gconfd.c:1823
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1227,85 +1075,121 @@ msgstr ""
 "Kann keinen Zuh�rer auf Adresse '%s' wiederherstellen, konnte Datenbank "
 "nicht aufl�sen"
 
-#: gconf/gconfd.c:1377
+#: gconf/gconfd.c:1869
+#, c-format
+msgid "Error reading saved state file: %s"
+msgstr "Lesen der gespeicherten Statusdatei fehlgeschlagen: %s"
+
+#: gconf/gconfd.c:1922
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "�ffnen der gespeicherten Status Datei '%s' nicht m�glich: %s"
 
-#: gconf/gconfd.c:1476
+#: gconf/gconfd.c:2039
 #, 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�rers nicht in der gconfd-Logdatei verzeichnen; "
 "werde nicht in der Lage sein, ihn wieder hinzuzuf�gen, wenn gconfd beendet "
 "wird oder herunterf�hrt (%s)"
 
-#: gconf/gconfd.c:1481
+#: gconf/gconfd.c:2044
 #, 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�rers nicht in der gconfd-Logdatei verzeichnen; "
 "werde ihn vielleicht irrt�mlich wieder hinzuf�gen, wenn gconfd beendet wird "
 "oder herunterf�hrt (%s)"
 
-#: gconf/gconftool.c:62
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
+#, c-format
+msgid "Failed to get IOR for client: %s"
+msgstr "Empfangen des IOR f�r Client fehlgeschlagen: %s"
+
+#: gconf/gconfd.c:2082
+#, fuzzy, c-format
+msgid "Failed to open saved state file: %s"
+msgstr "�ffnen der gespeicherten Status Datei '%s' nicht m�glich: %s"
+
+#: gconf/gconfd.c:2095
+#, fuzzy, c-format
+msgid "Failed to write client add to saved state file: %s"
+msgstr ""
+"Entfernen des Clients, der zur gespeicherten Statusdatei hinzugef�gt wurde, "
+"fehlgeschlagen: %s"
+
+#: gconf/gconfd.c:2103
+#, 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:2193
+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:69
 msgid "Help options"
 msgstr "Hilfeoptionen"
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 "Einen Schl�sse auf einen Wert einstellen und synchronisieren. Mit --type "
 "benutzen."
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr "Den Wert eines Schl�ssels auf der Standardausgabe ausgeben."
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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 ""
-"Ein Schema einstellen und synchronisieren. Mit --short-desc, --long-desc, "
-"--owner und --type benutzen."
+"Ein Schema einstellen und synchronisieren. Mit --short-desc, --long-desc, --"
+"owner und --type benutzen."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr "Die Schl�ssel auf der Kommandozeile l�schen"
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr "Alle Schl�ssel/Wert-Paare in einem Verzeichnis ausgeben."
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr "Alle Unterverzeichnisse in einem Verzeichnis ausgeben."
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Alle Unterverzeichnisse und Eintr�ge unterhalb eines Verzeichnisses rekursiv "
 "ausgeben."
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "0 zur�ckgeben, wenn Verzeichnis existiert, andernfalls 2."
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 "gconfd herunterfahren. DIESE OPTION NICHT OHNE EINEN GUTEN GRUND BENUTZEN."
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "0 zur�ckgeben, wenn gconfd l�uft, andernfalls 2."
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1313,7 +1197,7 @@ msgstr ""
 "Den Konfigurationsserver (gconfd) starten. (Passiert normalerweise "
 "automatisch wenn n�tig.)"
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1321,11 +1205,11 @@ msgstr ""
 "Gibt den Typ des einzustellenden Wertes ein, oder aber den Typ eines Wertes, "
 "den ein Schema beschreibt. Eindeutige Abk�rzungen werden akzeptiert."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1333,11 +1217,11 @@ msgstr ""
 "Gibt den Typ des einzustellenden Wertes ein, oder aber den Typ eines Wertes, "
 "den ein Schema beschreibt. Eindeutige Abk�rzungen werden akzeptiert."
 
-#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1345,7 +1229,7 @@ msgstr ""
 "Gibt den Typ des car Paares ein, oder aber den Typ eines Wertes, den ein "
 "Schema beschreibt. Eindeutige Abk�rzungen werden akzeptiert."
 
-#: gconf/gconftool.c:198
+#: gconf/gconftool.c:205
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1353,46 +1237,46 @@ msgstr ""
 "Gibt den Typ des cdr Paares ein, oder aber den Typ eines Wertes, den ein "
 "Schema beschreibt. Eindeutige Abk�rzungen werden akzeptiert."
 
-#: gconf/gconftool.c:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "Gibt eine kurze, halbzeile Beschreibung an, die in ein Schema einflie�t."
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr "BESCHREIBUNG"
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr "Gibt eine vielzeilige Beschreibung an, die in ein Schema einflie�t."
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr "Gibt den Besitzer eines Schemas an"
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr "BESITZER"
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr "Gibt die zu installierende Schemadatei an"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr "DATEINAME"
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Gibt eine Konfigurationsquelle an, die statt des voreingestellten Pfades zu "
 "verwenden ist"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr "QUELLE"
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1400,7 +1284,7 @@ msgstr ""
 "Direkt auf die Konfigurationsdatenbank zugreifen, ohne den Server zu "
 "verwenden. Setzt voraus, dass gconfd nicht l�uft."
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1411,7 +1295,7 @@ msgstr ""
 "Konfigurationsquelle als die voreingestellte gesetzt sein oder zur "
 "Verwendung der Voreinstellung die leere Zeichenkette enthalten."
 
-#: gconf/gconftool.c:270
+#: gconf/gconftool.c:277
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1419,7 +1303,7 @@ msgstr ""
 "Eine Anwendung foltern, indem ein Haufen Werte verschiedener Typen f�r die "
 "Schl�ssel auf der Kommandozeile gesetzt und gel�scht wird."
 
-#: gconf/gconftool.c:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1427,7 +1311,27 @@ msgstr ""
 "Eine Anwendung foltern, indem ein Haufen Schl�ssel in den auf der "
 "Kommandozeile angegebenen Verzeichnissen gesetzt und gel�scht wird."
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1437,90 +1341,93 @@ msgstr ""
 "`%s --help' auff�hren, um eine vollst�ndige Liste verf�gbarer\n"
 "Kommandozeilenoptionen auszugeben.\n"
 
-#: gconf/gconftool.c:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Kann nicht gleichzeitig abrufen und setzen/l�schen\n"
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Kann nicht gleichzeitig setzen und abrufen/l�schen\n"
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
-msgstr "Kann --all-pairs nicht mit --get oder --set verwenden\n"
+#: gconf/gconftool.c:413
+#, fuzzy
+msgid "Can't use --all-entries with --get or --set\n"
+msgstr "Kann --all-dirs nicht mit --get oder --set verwenden\n"
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Kann --all-dirs nicht mit --get oder --set verwenden\n"
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
+#, fuzzy
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
-"--recursive-list sollte nicht mit --get, --set, --unset, --all-pairs oder "
-"--all-dirs verwendet werden\n"
+"--recursive-list sollte nicht mit --get, --set, --unset, --all-pairs oder --"
+"all-dirs verwendet werden\n"
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
+#, fuzzy
 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-entries, --"
+"all-dirs\n"
 msgstr ""
-"--set_schema sollte nicht mit --get, --set, --unset, --all-pairs oder "
-"--all-dirs verwendet werden\n"
+"--set_schema sollte nicht mit --get, --set, --unset, --all-pairs oder --all-"
+"dirs verwendet werden\n"
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Werttyp ist nur beim Setzen eines Wertes von Belang\n"
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr "Beim Setzen eines Wertes muss ein Typ angegeben werden\n"
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping-Option muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "Option --dir-exists muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "Option --install-schema-file muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "Option --makefile-install-rule muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr "Option --break-key muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr "Option --break-directory muss alleinstehend verwendet werden.\n"
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
-"Sie m�ssen eine Konfigurationsquelle mit --config-source angeben, wenn Sie "
-"--direct verwenden\n"
+"Sie m�ssen eine Konfigurationsquelle mit --config-source angeben, wenn Sie --"
+"direct verwenden\n"
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Konnte GConf nicht initialisieren: %s\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Umgebungsvariable GCONF_CONFIG_SOURCE muss gesetzt sein\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1533,251 +1440,308 @@ msgstr ""
 "sichersten geschieht dies, wenn keine Anwendungen laufen\n"
 "(auch, wenn theoretisch auch alles funktioniert, wenn welche laufen).\n"
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Konnte nicht auf Konfigurationsquelle(n) zugreifen: %s\n"
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Fehler beim Herunterfahren: %s\n"
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "Sie m�ssen ein oder mehrere Verzeichnisse zum rekursiven Auflisten angeben.\n"
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
 msgstr "Fehler beim Auflisten von Paaren in `%s': %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr "(kein Wert eingestellt)"
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Konnte den Konfigurationsserver (gconfd) nicht starten: %s\n"
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr "Sie m�ssen ein oder mehrere Schl�ssel zum Abrufen angeben\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listen-Typ: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "car-Typ: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "cdr.Typ: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "Besitzer: %s\n"
+msgid "Default Value: %s\n"
+msgstr ""
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr "Gel�scht"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "Besitzer: %s\n"
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kurzbeschr.: %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Langbeschr.: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Kein Wert eingestellt f�r `%s'\n"
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Konnte Wert f�r `%s' nicht abrufen: %s\n"
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Verstehe Typ `%s' nicht\n"
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Sie m�ssen abwechselnd Schl�ssel und Werte als Parameter angeben\n"
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Kein einzustellender Wert f�r Schl�ssel `%s'\n"
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr "Kann kein Schema als Wert setzen\n"
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Wenn eine Liste gesetzt wird, muss man eine einfache Liste angeben\n"
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Wenn eine Liste gesetzt wird, muss man einfache car- und cdr-Typen angeben\n"
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fehler: %s\n"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
-#, c-format
-msgid "Error setting value: %s"
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
 msgstr "Fehler beim Einstellen des Wertes: %s"
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
-#, c-format
-msgid "Error syncing: %s"
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
 msgstr "Fehler beim Synchronisieren: %s"
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1234
+#, fuzzy
+msgid "Must specify a key or keys on the command line\n"
+msgstr "Sie m�ssen ein oder mehrere Schl�ssel zum Abrufen angeben\n"
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "Keine Datei `%s'\n"
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "Fehler beim Einstellen des Schemas f�r `%s': %s"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "Keine Datei `%s'\n"
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+#, fuzzy
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr ""
+"Sie m�ssen einen Schl�ssel (Schemaname) als einziges Argument angeben\n"
+
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr "WARNUNG: konnte Schema `%s' nicht mit Schl�ssel `%s' verkn�pfen: %s\n"
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 "Sie m�ssen einen Schl�ssel (Schemaname) als einziges Argument angeben\n"
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Listen-Typ muss ein einfacher Typ sein: string, int, float oder bool\n"
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Paar car-Typ muss ein einfacher Typ sein: string, int, float oder bool\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Paar cdr-Typ muss ein einfacher Typ sein: string, int, float oder bool\n"
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr "Fehler beim Einstellen des Wertes: %s"
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr "Fehler beim Synchronisieren: %s"
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
-"Sie m�ssen ein oder mehrere Verzeichnisse zum Abrufen der "
-"Schl�ssel/Wert-Paare angeben.\n"
+"Sie m�ssen ein oder mehrere Verzeichnisse zum Abrufen der Schl�ssel/Wert-"
+"Paare angeben.\n"
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Sie m�ssen ein oder mehrere zu l�schende Schl�ssel angeben.\n"
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Fehler beim L�schen von `%s': %s\n"
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Sie m�ssen ein oder mehrere Verzeichnisse zum Auflisten der "
 "Unterverzeichnisse angeben.\n"
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Fehler beim Auflisten der Verzeichnisse. %s\n"
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "WARNUNG: ung�ltiger oder fehlender Typ f�r Schema (%s)\n"
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "WARNUNG: ung�ltiger oder fehlender Listen-Typ f�r Schema (%s)\n"
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "WARNUNG: Konnte voreingestellten Wert `%s' f�r Schema (%s) nicht parsen\n"
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "WARNUNG: ung�ltiger oder fehlender car- oder cdr-Typ f�r Schema (%s)\n"
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "WARNUNG: Sie k�nnen keinen Standardwert f�r ein Schema angeben\n"
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "WARNUNG: interner gconftool-Fehler, unbekannter GConfValueType\n"
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "WARNUNG: konnte Typname `%s' nicht parsen\n"
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 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
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "Warnung: car-Typ can nur int, float, string oder bool sein, aber nicht %s\n"
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "Warnung: cdr-Typ can nur int, float, string oder bool sein, aber nicht %s\n"
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr "WARNUNG: leerer <applyto>-Knoten"
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "WARNUNG: Knoten <%s> unter <schema> ist nicht verst�ndlich\n"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr "WARNUNG: kein Schl�ssel f�r Schema angegeben\n"
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "WARNUNG: Knoten <locale> hat kein Attribut `name=\"locale\"', ignoriere "
 "dies\n"
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1785,51 +1749,51 @@ msgstr ""
 "WARNUNG: Mehrere <locale>-Knoten f�r Locale `%s', ignoriere alle hinter dem "
 "ersten\n"
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "WARNUNG: Ung�ltiger Knoten <%s> in einem <locale>-Knoten\n"
 
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "WARNUNG: Konnte Schema `%s', Locale `%s', nicht installieren: %s\n"
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Habe Schema `%s' f�r Locale `%s' installiert\n"
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "WARNUNG: konnte Schema `%s' nicht mit Schl�ssel `%s' verkn�pfen: %s\n"
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Habe Schema `%s' an Schl�ssel `%s' gekoppelt\n"
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Sie m�ssen in einem <schema> mindestens einen <locale>-Eintrag haben\n"
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "WARNUNG: Knoten <%s> ist unterhalb von <schemalist> unverst�ndlich\n"
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Konnte `%s' nicht �ffnen. %s\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument `%s' ist leer?\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1838,27 +1802,27 @@ msgstr ""
 "Dokument `%s' hat den falschen Typ von Wurzelknoten (<%s>, sollte "
 "<gconfschemafile> sein)\n"
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokument `%s' hat keinen Knoten <gconfschemafile> in oberster Ebene\n"
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 "WARNUNG: Knoten <%s> ist unverst�ndlich unterhalb von <gconfschemafile>\n"
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Fehler beim Synchronisieren von Konfigurationsdaten: %s"
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr "Sie m�ssen Schemadateien zum Installieren angeben\n"
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -1867,16 +1831,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Konnte zu besch�digenden Schl�ssel %s nicht l�schen: %s\n"
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr "Sie m�ssen zu besch�digende Schl�ssel angeben\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1886,11 +1850,11 @@ msgstr ""
 "besch�digen:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr "Sie m�ssen zu besch�digende Verzeichnisse angeben\n"
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1901,53 +1865,245 @@ msgstr ""
 "einem Verzeichnis zu besch�digen:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr "GConf-Fehler: %s\n"
+
+#: gconf/gconf-client.c:798
 #, 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:985
+#: gconf/gconf-client.c:1000
 #, 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"
+#~ msgid "Ignoring XML node `%s', except for possible schema name: %s"
+#~ msgstr "Ignoriere XML-Element %s, au�er f�r das m�gliche Schema: %s"
+
+#~ msgid "found <local_schema> with no locale setting"
+#~ msgstr "<local_schema> ohne lokale Einstellungen gefunden"
+
+#~ msgid ""
+#~ "Error on line %d char %d: %s\n"
+#~ "(Some surrounding text was '%s')\n"
+#~ msgstr ""
+#~ "Fehler in Zeile %d, Zeichen %d: %s\n"
+#~ "(Der umgebende Text war '%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 ""
-#~ "Es wurde keine Datenbank gefunden, um die Konfiguration abzuspeichern."
+#~ "Text endete mitten in einer Entity, oder Entityname ist zu lang, um "
+#~ "g�ltig zu sein ('&' sollte am Anfang einer Entity wie '&quot;' stehen)"
 
-#~ msgid "OAF problem description: '%s'"
-#~ msgstr "OAF Problembeschreibung: '%s'"
+#~ 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)"
 
-#~ msgid "Unable to store a value at key '%s'"
-#~ msgstr "Speichern des Wertes bei Schl�ssel '%s' nicht m�glich"
+#~ msgid ""
+#~ "Markup text ended in the middle of a character reference, just after '&#'"
+#~ msgstr ""
+#~ "Markierter Text endete mitten in einer Zeichenreferenz, gleich nach '&#'"
+
+#~ msgid ""
+#~ "Character reference contained non-digit '%s' ('&#' should begin a "
+#~ "reference to a unicode character, such as '&#2342;')"
+#~ msgstr ""
+#~ "Zeichenreferenz enhielt `non-digit' '%s' ('&#' sollte am Anfang einer "
+#~ "Referenz mit einem Unicode-Zeichen stehen, z.B. '&#2342;')"
+
+#~ msgid ""
+#~ "Text ended in the middle of an character reference ('&#' should begin a "
+#~ "character reference such as '&#2342;')"
+#~ msgstr ""
+#~ "Text endete in der Mitte einer Zeichenreferenz ('&#' sollte am Anfang "
+#~ "einer Zeichenreferenz wie '&#2342;' stehen)"
+
+#~ msgid ""
+#~ "Couldn't parse character reference '%s' ('&#' must begin a character "
+#~ "reference such as '&#2343;')"
+#~ msgstr ""
+#~ "Konnte Zeichenreferenz '%s' nicht parsen ('&#' muss am Anfang einer "
+#~ "Zeichenreferenz stehen, z.B. '&#2342;')"
+
+#~ msgid ""
+#~ "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"
+
+#, fuzzy
+#~ msgid ""
+#~ "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."
+
+#~ 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 ""
+#~ "Die Zeichen'<' oder '>' sind hier nicht erlaubt, sondern nur bei Tags wie "
+#~ "<bold> oder <paragraph>. Um sie sonst zu verwenden, bitte &lt; and &gt; "
+#~ "benutzen"
+
+#~ msgid "Character '%s' is not valid at the start of an attribute name"
+#~ msgstr "Zeichen '%s' ist am Anfang eines Attributnamens ung�ltig"
+
+#~ msgid "Document ended just after attribute name"
+#~ msgstr "Dokument h�rte genau nach einem Attributnamen auf"
+
+#~ msgid "Attribute name must be immediately followed by an '=' character"
+#~ msgstr "Nach einem Attributnamen muss sofort ein '=' Zeichen folgen"
+
+#~ msgid ""
+#~ "'=' character after attribute must be immediately followed by an '\"' "
+#~ "character"
+#~ msgstr "'=' Zeichen muss unmittelbar nach einem'\"' Zeichen stehen"
 
-#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
-#~ msgstr "Signal %d erhalten, Absturz. Bitte melden Sie einen GConf-Bug."
+#~ 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�ende Anf�hrungszeichen '\"'"
+
+#~ msgid ""
+#~ "Ran out of text before a quote mark ('\"') was seen at the end of an "
+#~ "attribute value"
+#~ msgstr ""
+#~ "Text ging �ber ein Anf�hrungszeichen ('\"') hinaus. Es wurde kein "
+#~ "Anf�hrungszeichen gefunden"
+
+#~ 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"
+
+#~ msgid "Missing '<' at start of element"
+#~ msgstr "'<' fehlt am Anfang des Elements"
+
+#~ msgid "Document ended just after '<' character"
+#~ msgstr "Dokument endete genau nach einem '<' Zeichen"
+
+#~ msgid "No closing '>' found for a <? or <!"
+#~ msgstr "Kein schlie�endes '>' gefunden f�r <? oder <!"
+
+#~ msgid "Character '%s' is not valid at the start of an element name"
+#~ msgstr "Zeichen '%s' ist am Anfang eines Elementnamens nicht erlaubt"
+
+#~ msgid "Document ended just after element name, no '>' seen"
+#~ msgstr "Dokument endete genau nach einem Elementnamen, kein '>' gefunden"
+
+#~ msgid "Elements should be closed with '>' or '/>', not with '%s'"
+#~ msgstr ""
+#~ "Elemente sollten mit '>' oder '/>' geschlossen werden, nicht mit '%s'"
 
 #~ msgid ""
-#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ "Element ended just after '/', no '>' seen; empty elements should end with "
+#~ "'/>'"
 #~ msgstr ""
-#~ "Signal %d erhalten, unplanm��iges Beenden. Bitte melden Sie einen GConf-Bug."
+#~ "Element endete ganau nach '/', '>' wurde nicht gefunden; leere Elemente "
+#~ "sollten mit einem '/>' geschlossen werden"
+
+#~ msgid "Close tag not found at end of element"
+#~ msgstr "Tag zum Schlie�en am Ende des Elements nicht gefunden"
 
-#~ msgid "GConf server is not in use, shutting down."
-#~ msgstr "GConf-Server wird nicht benutzt, wird beendet."
+#~ msgid "Close tag ends just after '<' character"
+#~ msgstr "Tag zum Schlie�en endet genau nach '<' Zeichen"
 
-#~ msgid "Error reading saved state file: %s"
-#~ msgstr "Lesen der gespeicherten Statusdatei fehlgeschlagen: %s"
+#~ msgid "Close tag should begin with '</', '/' character is missing"
+#~ msgstr ""
+#~ "Tag zum Schlie�en sollte mit einem '</' Zeichen beginnen, '/' Zeichen "
+#~ "fehlt"
+
+#~ msgid "Close tag ends just after '/' character"
+#~ msgstr "Tag zum Schlie�en endet genau nach einem '/' Zeichen"
+
+#~ msgid "Document ended just after element name in close tag, no '>' seen"
+#~ msgstr ""
+#~ "Dokument endete genau nach Elementnamen im Tag f�r Schlie�en, '>' wurde "
+#~ "nicht gefunden"
+
+#~ msgid "Document ended just after close tag name, no '>' seen"
+#~ msgstr ""
+#~ "Dokument endete genau nach Tag Name f�r Schlie�en, '>' wurde nicht "
+#~ "gefunden"
 
-#~ msgid "Failed to get IOR for client: %s"
-#~ msgstr "Empfangen des IOR f�r Client fehlgeschlagen: %s"
+#~ msgid "Close tag '%s' does not match opening tag '%s'"
+#~ msgstr "Tag f�r Schlie�en '%s' passt nicht zum Tag f�r �ffnen '%s'"
 
-#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgid ""
+#~ "Invalid UTF-8 character at byte %d in marked-up text. Some text before "
+#~ "the bad character was '%s'"
 #~ msgstr ""
-#~ "Entfernen des Clients, der zur gespeicherten Statusdatei hinzugef�gt wurde, "
-#~ "fehlgeschlagen: %s"
+#~ "Ung�ltiges UTF-8 Zeichen bei Byte %d im markierten Text. Der Text vor dem "
+#~ "falschen Zeichen war '%s'"
+
+#~ msgid "The marked-up text contained nothing but whitespace."
+#~ msgstr "Dieser markierte Text enthielt nicht mehr als nur Leerzeichen."
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Konnte Datei `%s' nicht �ffnen: %s"
+
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "Fehler beim Lesen der Datei '%s': %s"
 
 #~ msgid ""
-#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ "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�ren w�rde. Bitte schicken Sie einen Fehlerbericht zu OAF "
+#~ "ein."
+
+#, fuzzy
+#~ msgid "Received signal %d, shutting down."
+#~ msgstr "Signal %d erhalten, saubers Herunterfahren"
+
+#~ msgid "GConf was built with debugging features enabled"
+#~ msgstr "GConf wurde mit Debugging Funktionen kompiliert"
+
+#, fuzzy
+#~ msgid "Didn't understand line in saved state file: '%s'"
+#~ msgstr "�ffnen der gespeicherten Status-Datei nicht m�glich: %s"
+
+#, fuzzy
+#~ msgid "Failed to parse connection ID in saved state file"
+#~ msgstr "�ffnen der gespeicherten Status-Datei nicht m�glich: %s"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Failed to unquote listener location from saved state file: %s"
 #~ msgstr ""
-#~ "Einige Clients entfernten sich selbst aus dem GConf-Server. Sie wurden "
-#~ "jedoch nicht hinzugef�gt."
+#~ "Schreiben des Clients, der zur gespeicherten Statusdatei hinzugef�gt "
+#~ "wurde, fehlgeschlagen: %s"
 
-#~ msgid "GConf Error: %s\n"
-#~ msgstr "GConf-Fehler: %s\n"
+#, fuzzy
+#~ msgid "Failed to unquote IOR from saved state file: %s"
+#~ msgstr "�ffnen der gespeicherten Status-Datei nicht m�glich: %s"
+
+#~ msgid "Can't use --all-pairs with --get or --set\n"
+#~ msgstr "Kann --all-pairs nicht mit --get oder --set verwenden\n"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Speichern des Wertes bei Schl�ssel '%s' nicht m�glich"
diff --git a/po/el.po b/po/el.po
index 9da590ab..6abb6aaa 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: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-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,6 +18,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # backends/xml-backend.c:247
+#: backends/bdb-backend.c:215
+msgid "Unloading BerkeleyDB (BDB) backend module."
+msgstr "������������ � ������ ����������� BerkeleyDB (BDB)."
+
+#: backends/bdb-backend.c:238
+#, c-format
+msgid "Opened BerkeleyDB source at root %s"
+msgstr "��������� � ���� BerkeleyDB ��� ������ �������� %s"
+
+# backends/xml-backend.c:694
+#: backends/bdb-backend.c:578
+msgid "Initializing BDB backend module"
+msgstr "�������������� � ������ ����������� BDB"
+
+# backends/xml-backend.c:300
+#: backends/dir-utils.c:108
+#, 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:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "���������� ��������� ������� `%s': %s"
+
+# backends/xml-backend.c:400
+#: 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:247
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "������������ � ������ ����������� XML"
@@ -28,12 +61,6 @@ 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
@@ -55,7 +82,7 @@ msgid "Initializing XML backend module"
 msgstr "�������������� � ������ ����������� XML"
 
 # backends/xml-backend.c:759
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "������� � �������� ����������� ���� �������� XML `%s': %s"
@@ -64,18 +91,18 @@ msgstr "������� � �������� ����������� ���� �������� XML `%s': %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, 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:253
+#: backends/xml-cache.c:256
 #, 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-backend.c:315
@@ -90,172 +117,172 @@ msgid "XML filename `%s' is a directory"
 msgstr ""
 
 # gconf/gconftool.c:1639
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "�������� ��������� ��� `%s': %s"
 
 # gconf/gconf-internals.c:2416
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "������� � ������� ��� ������� `%s': %s"
 
 # gconf/gconftool.c:1639
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: backends/xml-dir.c:359
+#, fuzzy, c-format
+msgid "Failed to set mode on `%s': %s"
+msgstr "�������� ���������� `%s': %s\n"
+
+# gconf/gconftool.c:1639
+#: backends/xml-dir.c:373 backends/xml-dir.c:383
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "�������� ������������ ��� `%s' �� `%s': %s"
 
 # gconf/gconftool.c:881
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "�������� ��������� ��� `%s' ��� �� `%s': %s"
 
 # gconf/gconf-internals.c:2416
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "������� �������� ��� ������� ������� `%s': %s"
 
 # gconf/gconftool.c:1639
 #. These are all fatal errors
-#: backends/xml-dir.c:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "�������� ����������� ��� `%s': %s"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:961
+#: backends/xml-dir.c:979
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
 # gconf/gconf-internals.c:2416
-#: backends/xml-dir.c:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "������� � ���������� ��� ������� `%s': %s"
 
 # gconf/gconf-internals.c:2416
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "������� �� �������� ��� ������� `%s': %s"
 
 # gconf/gconfd.c:1745
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "������� ������ XML �� ����� `%s': %s"
 
 # gconf/gconf-internals.c:2120
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 # gconf/gconfd.c:1745
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "������� �������� �������� `%s', �� ������: %s"
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
-#, c-format
-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/gconfd.c:1745
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "������� ������ XML �� ����� `%s': %s"
 
 # gconf/gconftool.c:1243
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "�������� ���� �������� ��� ��' ������� ����� ��� �� �����: %s"
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
 # gconf/gconftool.c:1373
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "���� ������ ���� ������� �������� \"�����\" `%s', ���������"
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -296,12 +323,12 @@ msgid "Failed to shut down backend"
 msgstr "�������� ����������� ��� ����������� (backend)"
 
 # gconf/gconfd.c:511
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr "������� ����� ���� ���� ������ �����������"
 
 # gconf/gconfd.c:519
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
@@ -309,23 +336,23 @@ msgstr ""
 "��� �� ������ `%s"
 
 # gconf/gconfd.c:802
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr "������� ������ ��������� ���� ��� ������������� ���������"
 
 # gconf/gconfd.c:822
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr "������� ������ ��� �������� �����������"
 
 # gconf/gconfd.c:1056
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "������� ������: �������� ����� �������� ������������ ��� �� ConfigDatabase"
 
 # gconf/gconfd.c:1194
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "�������� ������������ ���� � ������������ �����: %s"
@@ -334,7 +361,7 @@ msgstr "�������� ������������ ���� � ������������ �����: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -342,12 +369,12 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr ""
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -355,55 +382,55 @@ msgid ""
 msgstr ""
 
 # gconf/gconfd.c:1523
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "������ ���� �� ���� ����� ��� `%s': %s"
 
 # gconf/gconfd.c:1561
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "������ ���� ��� ������� ����� ��� `%s': %s"
 
 # gconf/gconfd.c:1593
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "������ ��������� `%s': %s"
 
 # gconf/gconfd.c:1614
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "������ ���� �� ���� �� ������� ����� ��� `%s': %s"
 
 # gconf/gconfd.c:1652
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "������ ������� ������� `%s': %s"
 
 # gconf/gconfd.c:1676
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "������ ��������� ��������� `%s': %s"
 
 # gconf/gconfd.c:1701
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "�������� ����� ���� ��� �������� ��� `%s': %s"
 
 # gconf/gconfd.c:1725
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "������ ����������� ��������� ��� `%s': %s"
 
 # gconf/gconfd.c:1745
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "������ �������� �������� ��� `%s': %s"
@@ -471,215 +498,34 @@ msgstr ""
 msgid "Failed to get a lock"
 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"
+#: gconf/gconf-error.c:40
+msgid "No database available to save your configuration"
 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
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "��� ������� '/' ��� ������ `%s'"
 
 # gconf/gconf-internals.c:264
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "������� � ���������� ��� ����� CORBA ��� �� �������� ��� ������"
 
 # gconf/gconf-internals.c:266
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "����� ����� ��� �� �������� ��� ������ ��� %s"
 
 # gconf/gconf-internals.c:279
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr "������������ ����� ��� �� gconfd �� ���������� ���� ������"
 
 # gconf/gconfd.c:1194
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr "�������� ���������� ������������ �� IOR"
 
@@ -690,37 +536,37 @@ msgid "Couldn't open path file `%s': %s\n"
 msgstr "������� �� ������� ��� ������� ��������� `%s': %s\n"
 
 # gconf/gconf-internals.c:844
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "����������� ������� ������� `%s'\n"
 
 # gconf/gconf-internals.c:856
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "������ ��������� ��� ������ `%s': %s\n"
 
 # gconf/gconf-internals.c:1282
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "���������� �����, ������� %s"
 
 # gconf/gconf-internals.c:1292
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "���������� ����� ��� %s, ������� ����� ��� %s"
 
 # gconf/gconf-internals.c:1431
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "���������� ������, ������� %s"
 
 # gconf/gconf-internals.c:1445
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
@@ -728,73 +574,79 @@ msgstr ""
 "�����"
 
 # gconf/gconf-internals.c:1461
-#: gconf/gconf-internals.c:1499
+#: gconf/gconf-internals.c:1474
 #, 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:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "�� ������������ ������������� ��� ������� �� ���������� ������"
 
 # gconf/gconf-internals.c:1639
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "�� ������������ ������������� ��� ��������� �� ���������� ������"
 
 # gconf/gconf-internals.c:2105 gconf/gconf.c:2607
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "������ CORBA: %s"
 
+# gconf/gconf-internals.c:2137
+#: gconf/gconf-internals.c:2148
+#, fuzzy, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr "��������� ����������� OAF: '%s'"
+
 # gconf/gconf-internals.c:2125
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "���������� ��������� �� ������������� ��������� ������������ OAF"
 
 # gconf/gconf-internals.c:2130
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr "���������� ��������� ��� ������������� ��������� OAF"
 
 # gconf/gconf-internals.c:2137
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "������ ����������� �������� OAF: %s"
 
 # gconf/gconf-internals.c:2142
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "������� ������ OAF"
 
 # gconf/gconf-internals.c:2225
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "��� ������� ������ ior ��� `%s'"
 
 # gconf/gconf-internals.c:2256
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "�� gconfd ������� �� �������� `%s' ��� ������ ���� ���������"
 
 # gconf/gconf-internals.c:2267
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "������ ���� ��������� ���� �� �������� `%s'"
 
 # gconf/gconf-internals.c:2287
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "������� � ����� �� �� ORB ��� ��������� ���������� gconfd"
 
 # gconf/gconf-internals.c:2295
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -804,38 +656,38 @@ msgstr ""
 "������� ������������, IOR `%s'"
 
 # gconf/gconf-internals.c:2307
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, 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:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "� �������� ����������� GConf (gconfd) ���� �� �������� `%s'"
 
 # gconf/gconf-internals.c:2333
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "������� � ���������� ��������� `%s': %s"
 
 # gconf/gconf-internals.c:2368
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "������� � ���������� ����������� `%s': %s"
 
 # gconf/gconf-internals.c:2404
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "������� � ������� ��� ������ `%s': %s"
 
 # gconf/gconf-internals.c:2447
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
@@ -843,62 +695,75 @@ msgstr ""
 "���� ���: %s"
 
 # gconf/gconf-internals.c:2464
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "�������� ������ ����������� `%s', ���������� ����� � �����"
 
 # gconf/gconf-internals.c:2474
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
-"��� ������������� ������ ����������� `%s' (���������� pid %u, ���� ��� pid "
-"%u� ���������� ��� ������� ���� �� �������� ���"
+"��� ������������� ������ ����������� `%s' (���������� pid %u, ���� ��� pid %"
+"u� ���������� ��� ������� ���� �� �������� ���"
 
 # gconf/gconf-internals.c:2491
-#: gconf/gconf-internals.c:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "������� � ����������� ����������� ��������� `%s': %s"
 
 # gconf/gconf-internals.c:2416
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "������� � ������� ��� ����� `%s': %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
 # gconf/gconftool.c:1181
-#: gconf/gconf-sources.c:1063
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "������ ���� ������ ���������������: %s"
 
 # gconf/gconftool.c:964 gconf/gconftool.c:1070
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "������ ���� ���� ���������������: %s"
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -970,108 +835,107 @@ msgid "`%s': %s"
 msgstr "`%s': %s"
 
 # gconf/gconf.c:261
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "� ���������� ��� ������� �� �������� �� ��������� `%s'"
 
 # gconf/gconf.c:391
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr "������� � �������� ������������ �� ��� ������ ������ �����������"
 
 # gconf/gconf.c:1449
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, fuzzy, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 "� �������� ��� ������ ��� ����� ��� ����������� �������, ������ CORBA: %s"
 
-# gconf/gconf.c:1463
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
-"������ ���� ����� �� ��� ��������� �����������: �� OAF ��������� ����� ��� "
-"��� oaf_activate_from_id() ��� ��� �������� ��� �������� ��� �� ������ �� "
-"��������. �������� ������� ��� ������� ��������� OAF"
 
 # gconf-editor/gconf-editor.c:69 gconf/gconftool.c:447
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr "�������� ������������� GConf, �����������\n"
 
 # gconf/gconf.c:1689
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr "������ �� ������� �� ��� ������ (/)"
 
 # gconf/gconf.c:1711
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr "�� ������� �� �������� ��� ������� (/) ��� �����"
 
 # gconf/gconf.c:1713
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "�� ������� �� ������� ��� ������ (.) ������ ���� ��� ��� ������ (/)"
 
 # gconf/gconf.c:1734
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' ��� ����� ������� ���������� �� ������� ��������/���������"
 
 # gconf/gconf.c:1748
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr "�� ������/��������� ��� ������ �� ��������� �� ������ (/)"
 
 # gconf/gconf.c:2079
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "������� �� �������� ��� ��������� �����������: %s"
 
 # gconf/gconf.c:2140
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr "���������� ������� ������� ������������, ������� %s"
 
 # gconf/gconf.c:2175
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr "���������� ��������, ������� %s"
 
 # gconf/gconf.c:2210
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr "���������� �������������, ������� %s"
 
 # gconf/gconf.c:2247
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "���������� ������� ����, ������� %s"
 
 # gconf/gconf.c:2280
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "���������� �����, ������� %s"
 
 # gconf/gconfd.c:789
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "������� ������ �����������"
 
 # gconf/gconfd.c:861
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -1080,7 +944,7 @@ msgstr ""
 "�������� �� gconf.path ��� ��� ������ ��������"
 
 # gconf/gconfd.c:879
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1089,7 +953,10 @@ msgstr ""
 "����������� `%s'"
 
 # gconf/gconfd.c:888
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1097,14 +964,18 @@ msgstr ""
 "��� �������� ������� ������������ ���� ������ ��������, � ���������� �� �� "
 "����������߷ ����������� "
 
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
 # gconf/gconfd.c:901
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "������ ���� �� ������� ������� ������� ������������: %s"
 
 # gconf/gconfd.c:913
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1113,7 +984,7 @@ msgstr ""
 "���������� ��������� �����������"
 
 # gconf/gconfd.c:930
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1122,13 +993,22 @@ msgstr ""
 "�� ������������ ������� ������� �����������"
 
 # gconf/gconfd.c:955 gconf/gconfd.c:967
-#: gconf/gconfd.c:312 gconf/gconfd.c:324
-#, fuzzy, c-format
-msgid "Received signal %d, shutting down."
-msgstr "������� ���� %d, ����� ��������"
+#: 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:329
+#: 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:955 gconf/gconfd.c:967
+#: gconf/gconfd.c:402
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "������� ���� %d, ����� ��������"
@@ -1136,246 +1016,297 @@ 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:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "���������� (������ %s), ����. �����. %u ������� `%s'"
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr ""
-
 # gconf/gconfd.c:1036
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
+#, fuzzy
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 "������� � ������������ ��� �������� ������������� ������������: �������� "
 "�������� ������� ����������� ����� ���������� ��� ��� (OAF)"
 
 # gconf/gconfd.c:1056
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr "������� � ���� �������� ������������ ��� ��� ��������� �����������"
 
+# gconf/gconf-internals.c:2416
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "������� � ���������� ��� ������� `%s': %s"
+
+# gconf/gconftool.c:881
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "�������� ����� IOR ��� �� ������: %s"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
 # gconf/gconfd.c:1075
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:609
+#, fuzzy
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
 msgstr ""
 "�� ��� (OAF) �� �������� ���� ��� IID ��� �� ������ �� ����������߷ "
 "��������\n"
 
 # gconf/gconfd.c:1079
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:613
+#, fuzzy
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
 msgstr "��� ���� gconfd ����� ��� ������������ ��� ��� (OAF)� ��������\n"
 
 # gconf/gconfd.c:1084
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:618
+#, fuzzy
+msgid "Unknown error registering existing gconfd with OAF; exiting"
 msgstr "������� ����� ����������� ��� gconfd ��� ��� (OAF)� ��������\n"
 
+# gconf/gconfd.c:1075
+#: gconf/gconfd.c:645
+#, fuzzy
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
+msgstr ""
+"�� ��� (OAF) �� �������� ���� ��� IID ��� �� ������ �� ����������߷ "
+"��������\n"
+
+# gconf/gconfd.c:1079
+#: gconf/gconfd.c:649
+#, fuzzy
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
+msgstr "��� ���� gconfd ����� ��� ������������ ��� ��� (OAF)� ��������\n"
+
+# gconf/gconfd.c:1084
+#: gconf/gconfd.c:654
+#, fuzzy
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
+msgstr "������� ����� ����������� ��� gconfd ��� ��� (OAF)� ��������\n"
+
+# gconf/gconf-internals.c:2491
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "������� � ����������� ����������� ��������� `%s': %s"
+
 # gconf/gconfd.c:1100
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "��������"
 
+# gconf/gconfd.c:955 gconf/gconfd.c:967
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr "� ������������ GConf ��� ����� �� �����, �����������."
+
 # gconf/gconfd.c:2115
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr "������������ ��������: %s"
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, 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:966
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 "������� �� ������� ������������� ������� ���������� `%s' ��� �������: %s"
 
 # gconf/gconf-internals.c:2404
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
-"������� � ������� ������������� ������� ���������� `%s' �����. �������: %d: "
-"%s"
+"������� � ������� ������������� ������� ���������� `%s' �����. �������: %d: %"
+"s"
 
 # gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:989
+#: gconf/gconfd.c:1317
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "�������� ����������� ���� ������������� ������� ���������� `%s': %s"
 
 # gconf/gconf-internals.c:789
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
-"������� � ���������� ���� ���� ��� ������� ������������� ������� ���������� "
-"`%s': %s"
+"������� � ���������� ���� ���� ��� ������� ������������� ������� ���������� `"
+"%s': %s"
 
 # gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "������� � �������� ���� ������������� ������� ���������� ��� ����: %s"
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-# 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"
+#: gconf/gconfd.c:1823
+#, c-format
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 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/gconfd.c:1676
+#: gconf/gconfd.c:1869
+#, c-format
+msgid "Error reading saved state file: %s"
+msgstr "������ ��������� ������������� ������� ����������: %s"
 
 # gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:1180
-#, fuzzy, c-format
-msgid "Failed to unquote IOR from saved state file: %s"
-msgstr "�������� ���������� ������� ������������� ����������: %s"
+#: gconf/gconfd.c:1922
+#, c-format
+msgid "Unable to open saved state file '%s': %s"
+msgstr "������� �� ������� ������� ������������� ���������� `%s': %s"
 
-#: gconf/gconfd.c:1204
+#: gconf/gconfd.c:2039
+#, c-format
 msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
+"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:1225
+#: gconf/gconfd.c:2044
+#, c-format
 msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
+"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:1346
+# gconf/gconftool.c:881
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
 #, c-format
-msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
-msgstr ""
+msgid "Failed to get IOR for client: %s"
+msgstr "�������� ����� IOR ��� �� ������: %s"
 
 # gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:1377
-#, c-format
-msgid "Unable to open saved state file '%s': %s"
+#: gconf/gconfd.c:2082
+#, fuzzy, c-format
+msgid "Failed to open saved state file: %s"
 msgstr "������� �� ������� ������� ������������� ���������� `%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)"
+# gconf/gconf-internals.c:2416
+#: gconf/gconfd.c:2095
+#, fuzzy, c-format
+msgid "Failed to write client add to saved state file: %s"
 msgstr ""
+"�������� ����������� ��������� ������ ��� ������ �������������� ����������: %"
+"s"
 
-#: gconf/gconfd.c:1481
+# gconf/gconf-internals.c:2416
+#: gconf/gconfd.c:2103
 #, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr ""
+"�������� ����������� ��������� ������ ��� ������ �������������� ����������: %"
+"s"
+
+#: gconf/gconfd.c:2193
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 
 # gconf/gconftool.c:73
-#: gconf/gconftool.c:62
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr "�������� ��������"
 
 # gconf/gconftool.c:82
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "������� ���� ����� �� ��� ������ ��� ������������. ����� �� --type."
 
 # gconf/gconftool.c:91
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr "�������� ��� ����� ���� �������� ���� ��������  �����"
 
 # gconf/gconftool.c:100
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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 ""
 "������� ���� �������� ��� ������������. ����� �� --short-desc, --long-desc, "
 "--owner, ��� --type."
 
 # gconf/gconftool.c:110
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr "������������� �������� ��� ������ �������"
 
 # gconf/gconftool.c:119
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr "�������� ���� ��� ������ ��������/����� �� ��� ��������."
 
 # gconf/gconftool.c:128
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr "�������� ���� ��� ������������ ���� ��� ��� ��������."
 
 # gconf/gconftool.c:137
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "�������� ���� ��� ������������ ��� �������� ���� ��� ��� ��������, "
 "����������."
 
 # gconf/gconftool.c:146
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "���������� 0 �� � ��������� �������, 2 �� ��� �������."
 
 # gconf/gconftool.c:155
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "�������� gconfd. �� �������������� ����� ��� ������� ������."
 
 # gconf/gconftool.c:164
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "���������� 0 �� �� gconfd ����������, 2 �� ���"
 
 # gconf/gconftool.c:173
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1384,7 +1315,7 @@ msgstr ""
 "�������� ���� ����������)."
 
 # gconf/gconftool.c:182
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1393,12 +1324,12 @@ msgstr ""
 "���������� ��� �����. ������������ ������������ OK."
 
 # gconf/gconftool.c:183
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr "��������|��������|������� ������������|�������������|�����|������"
 
 # gconf/gconftool.c:182
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1407,12 +1338,12 @@ msgstr ""
 "����� ��� ���������� ��� �����. ������������ ������������ ����� �������."
 
 # gconf/gconftool.c:183
-#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr "��������|��������|������� ������������|�������������"
 
 # gconf/gconftool.c:182
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1421,7 +1352,7 @@ msgstr ""
 "���������� ��� �����. ������������ ������������ ����� �������."
 
 # gconf/gconftool.c:182
-#: gconf/gconftool.c:198
+#: gconf/gconftool.c:205
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1430,53 +1361,53 @@ msgstr ""
 "���������� ��� �����. ������������ ������������ ����� �������."
 
 # gconf/gconftool.c:191
-#: gconf/gconftool.c:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr "��������� ��� ����� ��������� ����� ������� ��� ��� �����."
 
 # gconf/gconftool.c:192 gconf/gconftool.c:201
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr "���������"
 
 # gconf/gconftool.c:200
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr "��������� ��� ��������� ������� ������� ��� ��� �����."
 
 # gconf/gconftool.c:209
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr "��������� ��� ��������� ���� ��������"
 
 # gconf/gconftool.c:210
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr "����������"
 
 # gconf/gconftool.c:218
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr "��������� ��� ����� ���� �����������"
 
 # gconf/gconftool.c:219
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr "����� �������"
 
 # gconf/gconftool.c:227
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "��������� ��� ������ ���������� ���� ����� ���� ��� ��� �� ������� ��������"
 
 # gconf/gconftool.c:228
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr "����"
 
 # gconf/gconftool.c:236
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1485,7 +1416,7 @@ msgstr ""
 "���������. ���������� ��� �� gconfd ��� ����������."
 
 # gconf/gconftool.c:245
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1497,7 +1428,7 @@ msgstr ""
 "�� �������."
 
 # gconf/gconftool.c:254
-#: gconf/gconftool.c:270
+#: gconf/gconftool.c:277
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1506,7 +1437,7 @@ msgstr ""
 "������������ ����� ��� ������� ��� ������ �������."
 
 # gconf/gconftool.c:263
-#: gconf/gconftool.c:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1514,8 +1445,28 @@ msgstr ""
 "������������ ������� ���� ��������� �� ������� ��� �������� ������� �������� "
 "���� ����� ���������� ��� ������ �������."
 
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
 # gconf/gconftool.c:310
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:386
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1526,86 +1477,89 @@ msgstr ""
 "�������.\n"
 
 # gconf/gconftool.c:322
-#: gconf/gconftool.c:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "������� � ���������� ���� ��� � �������/��������\n"
 
 # gconf/gconftool.c:329
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "������� � ���������� ������� ��� � ����/��������\n"
 
-# gconf/gconftool.c:337
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
-msgstr "������� � ����� ��� --all-pairs �� ��� --get � --set\n"
+# gconf/gconftool.c:345
+#: gconf/gconftool.c:413
+#, fuzzy
+msgid "Can't use --all-entries with --get or --set\n"
+msgstr "������� � ����� ��� --all-dirs �� ��� --get � --set\n"
 
 # gconf/gconftool.c:345
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "������� � ����� ��� --all-dirs �� ��� --get � --set\n"
 
 # gconf/gconftool.c:355
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
+#, fuzzy
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
-"� ������� --recursive-list �� �� ������ �� ��������������� �� ��� --get, "
-"--set, --unset, --all-pairs, � --all-dirs\n"
+"� ������� --recursive-list �� �� ������ �� ��������������� �� ��� --get, --"
+"set, --unset, --all-pairs, � --all-dirs\n"
 
 # gconf/gconftool.c:365
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
+#, fuzzy
 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-entries, --"
+"all-dirs\n"
 msgstr ""
 "� ������� --set_schema �� �� ������ �� ��������������� �� ��� --get, --set, "
 "--all-pairs, � --all-dirs\n"
 
 # gconf/gconftool.c:371
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr "� ����� ����� ����� �������� ���� ���� ��� ������� ���� �����\n"
 
 # gconf/gconftool.c:377
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr "������ �� ����������� ���� ����� ���� ������� ��� ����\n"
 
 # gconf/gconftool.c:386
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr "� ������� ���������� (ping) ������ �� ��������������� ���� ���.\n"
 
 # gconf/gconftool.c:395
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "� ������� --dir-exists ������ �� ��������������� ���� ���.\n"
 
 # gconf/gconftool.c:404
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "� ������� --install-schema-file ������ �� ��������������� ���� ���.\n"
 
 # gconf/gconftool.c:414
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 "� ������� --makefile-install-rule ������ �� ��������������� ���� ���.\n"
 
 # gconf/gconftool.c:424
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr "� ������� --break-key ������ �� ��������������� ���� ���.\n"
 
 # gconf/gconftool.c:434
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr "� ������� --break-directory ������ �� ��������������� ���� ���.\n"
 
 # gconf/gconftool.c:441
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
@@ -1613,13 +1567,13 @@ msgstr ""
 "�������������� ��� --direct\n"
 
 # gconf-editor/gconf-editor.c:69 gconf/gconftool.c:447
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "�������� ������������� GConf: %s\n"
 
 # gconf/gconftool.c:472
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "������ �� ����� � ��������� ������������� GCONF_CONFIG_SOURCE\n"
 
@@ -1627,7 +1581,7 @@ msgstr "������ �� ����� � ��������� ������������� GCONF_CONFIG_SOURCE\n"
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1641,215 +1595,280 @@ msgstr ""
 "(�� ��� ��������� �� ������ �� �������� �� ����������� ���������).\n"
 
 # gconf/gconftool.c:510
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "�������� ��������� ����(��) ����(��) �����������: %s\n"
 
 # gconf/gconftool.c:670
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "������ �����������: %s\n"
 
 # gconf/gconftool.c:715
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "������ �� ���������� ���� � ������������ ��������� ��� ���������� "
 "����������.\n"
 
 # gconf/gconftool.c:749
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
 msgstr "�������� ����������� ������ ��� `%s': %s"
 
 # gconf/gconftool.c:767
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr "(��� ���� ����� ����)"
 
 # gconf/gconftool.c:820
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "�������� ��������������� ��������� �����������: %s\n"
 
 # gconf/gconftool.c:834
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr "������ �� ���������� ��� ������ � ������� ��� ����\n"
 
 # gconf/gconftool.c:865
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "�����: %s\n"
 
 # gconf/gconftool.c:865
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr "����� ������: %s\n"
 
 # gconf/gconftool.c:865
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "����� Car: %s\n"
 
 # gconf/gconftool.c:865
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "����� Cdr: %s\n"
 
-# gconf/gconftool.c:866
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "����������: %s\n"
+msgid "Default Value: %s\n"
+msgstr "��' ������� ����: %s\n"
 
 # gconf/gconftool.c:866 gconf/gconftool.c:867 gconf/gconftool.c:868
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr "��������"
 
+# gconf/gconftool.c:866
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "����������: %s\n"
+
 # gconf/gconftool.c:867
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "������� ���������: %s\n"
 
 # gconf/gconftool.c:868
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "����� ���������: %s\n"
 
 # gconf/gconftool.c:877
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "��� ���� ����� ���� ��� `%s'\n"
 
 # gconf/gconftool.c:881
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, 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:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "��� ����� ���������� � ����� `%s'\n"
 
 # gconf/gconftool.c:900
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "������ �� ����������� ������������� �������/����� �� ��������\n"
 
 # gconf/gconftool.c:917
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "��� ���� ����� ���� ��� �� ������: `%s'\n"
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
 # gconf/gconftool.c:951
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "������: %s\n"
 
 # gconf/gconftool.c:964 gconf/gconftool.c:1070
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
-#, c-format
-msgid "Error setting value: %s"
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
 msgstr "������ ���� ��� ������� �����: %s"
 
 # gconf/gconftool.c:982 gconf/gconftool.c:1084
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
-#, c-format
-msgid "Error syncing: %s"
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
 msgstr "������ ��� �����������: %s"
 
+# gconf/gconftool.c:834
+#: gconf/gconftool.c:1234
+#, fuzzy
+msgid "Must specify a key or keys on the command line\n"
+msgstr "������ �� ���������� ��� ������ � ������� ��� ����\n"
+
+# gconf/gconf-backend.c:180
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "��� ������� ������ `%s'\n"
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+# gconf/gconfd.c:1745
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "������ �������� �������� ��� `%s': %s"
+
+# gconf/gconf-backend.c:180
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "��� ������� ������ `%s'\n"
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+# gconf/gconftool.c:1000
+#: gconf/gconftool.c:1358
+#, fuzzy
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr "������ �� ���������� ������ (����� ��������) �� �������� ������\n"
+
+# gconf/gconftool.c:1510
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr ""
+"�������������: �������� ���������� �������� `%s' �� �� ������ `%s': %s\n"
+
 # gconf/gconftool.c:1000
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "������ �� ���������� ������ (����� ��������) �� �������� ������\n"
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
+# gconf/gconftool.c:964 gconf/gconftool.c:1070
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr "������ ���� ��� ������� �����: %s"
+
+# gconf/gconftool.c:982 gconf/gconftool.c:1084
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr "������ ��� �����������: %s"
+
 # gconf/gconftool.c:1099
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "������ �� ����������� ���� � ������������ ��������� ��� ���� �� ������� �� "
 "����� ��������/�����.\n"
 
 # gconf/gconftool.c:1113
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr "������ �� ����������� ��� � ����������� ������� ���� ��������.\n"
 
 # gconf/gconftool.c:1124
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "������ ���� �������� `%s': %s\n"
 
 # gconf/gconftool.c:1147
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "������ �� ����������� ���� � ������������ ��������� ��� ���� �� ������� �� "
 "������������.\n"
 
 # gconf/gconftool.c:1181
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "������ ���� ���������� ���������: %s\n"
 
 # gconf/gconftool.c:1220
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "�������������: ������ � ���� ����� ��� �� ����� (%s)\n"
 
 # gconf/gconftool.c:1220
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, 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:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
@@ -1857,53 +1876,53 @@ msgstr ""
 "(%s)\n"
 
 # gconf/gconftool.c:1220
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, 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:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 "�������������: ��� ����� ������ �� ����� ��' ������� ���� ��� ��� �����\n"
 
 # gconf/gconftool.c:1256
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 "�������������: ��������� ������ ��� gconftool, ������� GConfValueType\n"
 
 # gconf/gconftool.c:1304
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "�������������: �������� ����������� �������� �������� ����� `%s'\n"
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, 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:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr "�������������: ����� ������ <applyto>"
 
 # gconf/gconftool.c:1330 gconf/gconftool.c:1575
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
@@ -1911,19 +1930,19 @@ msgstr ""
 "<schema>\n"
 
 # gconf/gconftool.c:1340
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr "�������������: ��� ���� ���������� ������ ��� �� �����\n"
 
 # gconf/gconftool.c:1373
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "�������������: � ������ <locale> ��� ���� ��� �������� `name=\"locale\", "
 "���������\n"
 
 # gconf/gconftool.c:1379
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1932,46 +1951,46 @@ msgstr ""
 "���������� ���� ���� ��� �����\n"
 
 # gconf/gconftool.c:1451
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "�������������: ������ ������ <%s> �� ��� ����� <locale>\n"
 
 # gconf/gconftool.c:1480
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
-"�������������: �������� ������������ �������� `%s' ������� �������� `%s': "
-"%s\n"
+"�������������: �������� ������������ �������� `%s' ������� �������� `%s': %"
+"s\n"
 
 # gconf/gconftool.c:1488
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "������������� ����� `%s' ��� ��� ������ ������� `%s'\n"
 
 # gconf/gconftool.c:1510
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, 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:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "����� `%s' ������������ ��� ������ `%s'\n"
 
 # gconf/gconftool.c:1588
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 "������ �� ������� ����������� ��� ���������� <locale> �� ��� <schema>\n"
 
 # gconf/gconftool.c:1617
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
@@ -1979,19 +1998,19 @@ msgstr ""
 "<schemalist>\n"
 
 # gconf/gconftool.c:1639
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "�������� ���������� `%s': %s\n"
 
 # gconf/gconftool.c:1646
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "�� ������� `%s' ����� ����;\n"
 
 # gconf/gconftool.c:1658
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -2001,13 +2020,13 @@ msgstr ""
 "����� <gconfschemafile>)\n"
 
 # gconf/gconftool.c:1671
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "�� ������� `%s' ��� ���� ����� <gconfschemafile> ��������� ��������\n"
 
 # gconf/gconftool.c:1685
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
@@ -2015,18 +2034,18 @@ msgstr ""
 "<gconfschemafile>\n"
 
 # gconf/gconftool.c:1696 gconf/gconftool.c:1728
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "������ ��� ����������� ��������� �����������: %s"
 
 # gconf/gconftool.c:1712
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr "������ �� ����������� ������ ������ �������� ���� �����������\n"
 
 # gconf/gconftool.c:1749
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -2036,18 +2055,18 @@ msgstr ""
 "%s\n"
 
 # gconf/gconftool.c:1769
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "�������� ���� �������� �������� ���������� %s: %s\n"
 
 # gconf/gconftool.c:1895
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr "������ �� ����������� ������ ������� ��� �������\n"
 
 # gconf/gconftool.c:1901
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -2058,12 +2077,12 @@ msgstr ""
 "  %s\n"
 
 # gconf/gconftool.c:1919
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr "������ �� ����������� ������� ��������� ���� �������\n"
 
 # gconf/gconftool.c:1938
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -2074,83 +2093,84 @@ msgstr ""
 "�� ������ ���� ��������:\n"
 "  %s\n"
 
+# gconf/gconftool.c:951
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr "������ GConf: %s\n"
+
 # gconf/gconftool.c:749
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:798
 #, 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:985
+#: gconf/gconf-client.c:1000
 #, 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"
+# gconf/gconf-internals.c:2416
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "������� �� �������� ��� ������� `%s': %s"
 
-# backends/xml-backend.c:300
-#~ msgid "Couldn't find the %s root directory in the address `%s'"
-#~ msgstr "������� � ������ ������� ��������� %s ��� ��������� `%s'"
+# gconf/gconfd.c:1676
+#, fuzzy
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "������ ��������� ��������� `%s': %s"
 
-# backends/xml-backend.c:400
+# gconf/gconf.c:1463
 #~ msgid ""
-#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ "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 ""
-#~ "������� � �������� � ������� ��� ������ �������� %s ��� ��������� `%s'"
+#~ "������ ���� ����� �� ��� ��������� �����������: �� OAF ��������� ����� "
+#~ "��� ��� oaf_activate_from_id() ��� ��� �������� ��� �������� ��� �� "
+#~ "������ �� ��������. �������� ������� ��� ������� ��������� OAF"
 
-# gconf/gconf-internals.c:2137
-#~ msgid "OAF problem description: '%s'"
-#~ msgstr "��������� ����������� OAF: '%s'"
+# gconf/gconfd.c:955 gconf/gconfd.c:967
+#, fuzzy
+#~ msgid "Received signal %d, shutting down."
+#~ msgstr "������� ���� %d, ����� ��������"
 
 # gconf/gconf-internals.c:2416
-#~ msgid "Unable to store a value at key '%s'"
-#~ msgstr "������� � ���������� ����� ��� ������ `%s'"
+#, fuzzy
+#~ msgid "Didn't understand line in saved state file: '%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/gconf-internals.c:2416
+#, fuzzy
+#~ msgid "Failed to parse connection ID in saved state file"
+#~ msgstr "�������� ���������� ������� ������������� ����������: %s"
 
-# gconf/gconfd.c:955 gconf/gconfd.c:967
-#~ msgid ""
-#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+# gconf/gconf-internals.c:2416
+#, fuzzy
+#~ msgid "Failed to unquote config source address from saved state file: %s"
 #~ 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"
+#~ "�������� �������� ��������� ������ ��� ������ �������������� ����������: %"
+#~ "s"
 
 # gconf/gconf-internals.c:2416
-#~ msgid "Failed to flush client add to saved state file: %s"
+#, fuzzy
+#~ msgid "Failed to unquote listener location from saved state file: %s"
 #~ msgstr ""
-#~ "�������� ����������� ��������� ������ ��� ������ �������������� ����������: "
-#~ "%s"
+#~ "�������� �������� ��������� ������ ��� ������ �������������� ����������: %"
+#~ "s"
 
-#~ msgid "Default Value: %s\n"
-#~ msgstr "��' ������� ����: %s\n"
+# gconf/gconf-internals.c:2416
+#, fuzzy
+#~ msgid "Failed to unquote IOR from saved state file: %s"
+#~ msgstr "�������� ���������� ������� ������������� ����������: %s"
 
-# gconf/gconftool.c:951
-#~ msgid "GConf Error: %s\n"
-#~ msgstr "������ GConf: %s\n"
+# gconf/gconftool.c:337
+#~ msgid "Can't use --all-pairs with --get or --set\n"
+#~ msgstr "������� � ����� ��� --all-pairs �� ��� --get � --set\n"
+
+# gconf/gconf-internals.c:2416
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "������� � ���������� ����� ��� ������ `%s'"
 
 # gconf/gconfd.c:972
 #~ msgid "Received signal %d, ignoring"
diff --git a/po/es.po b/po/es.po
index 62d06b38..5a1cba6e 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-09-16 16:17+0200\n"
+"POT-Creation-Date: 2001-09-14 12:44-0400\n"
 "PO-Revision-Date: 2001-01-23 16:58-04:00\n"
 "Last-Translator: H�ctor Garc�a �lvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 1d7da1c5..3556bccd 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-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-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,6 +18,36 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: backends/bdb-backend.c:215
+msgid "Unloading BerkeleyDB (BDB) backend module."
+msgstr "BerkeleyDB (BDB) -taustamoduuli poistuu muistista."
+
+#: backends/bdb-backend.c:238
+#, c-format
+msgid "Opened BerkeleyDB source at root %s"
+msgstr "BerkeleyDB-l�hteen juuri %s avattu."
+
+#: backends/bdb-backend.c:578
+msgid "Initializing BDB backend module"
+msgstr "BDB-taustamoduuli k�ynnistyy"
+
+#: backends/dir-utils.c:108
+#, c-format
+msgid "Couldn't find the %s root directory in the address `%s'"
+msgstr "%s-juurihakemistoa ei l�ytynyt osoitteesta \"%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 "Hakemistoa '%s' ei voitu luoda: %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-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."
@@ -27,11 +57,6 @@ msgstr "XML-taustamoduuli poistuu muistista."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "XML-juurihakemistoa ei l�ytynyt 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'"
@@ -48,7 +73,7 @@ msgstr "XML-l�hteen hakemiston tai tiedoston oikeudet juuressa %s ovat: %o/%o"
 msgid "Initializing XML backend module"
 msgstr "XML-taustamoduuli k�ynnistyy"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "XML-hakemiston '%s' lukituksen luovutus ep�onnistui: %s"
@@ -57,7 +82,7 @@ msgstr "XML-hakemiston '%s' lukituksen luovutus ep�onnistui: %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "Synkronoimattomia hakemistoja poistui XML-taustamoduulia sammuttaessa"
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -66,11 +91,11 @@ msgstr ""
 "Hakemiston '%s' poistaminen XML-taustamoduulin v�limuistista ei onnistu, "
 "koska se ei ole onnistuneesti synkronoitunut levylle"
 
-#: backends/xml-cache.c:253
+#: backends/xml-cache.c:256
 #, 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 kohdetta on j�ljell� v�limuistissa %u sekuntia vanhempien jo "
 "synkronoitujen kohteiden poiston j�lkeen"
@@ -85,161 +110,159 @@ msgstr "Tiedoston '%s' tilatietoja ei voitu lukea: %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML-tiedostonnimi '%s' on hakemisto"
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Tiedoston '%s' poisto ep�onnistui: %s"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Tiedoston '%s' kirjoittaminen ep�onnistui: %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: backends/xml-dir.c:359
+#, fuzzy, c-format
+msgid "Failed to set mode on `%s': %s"
+msgstr "Tiedoston '%s' avaaminen ep�onnistui: %s\n"
+
+#: backends/xml-dir.c:373 backends/xml-dir.c:383
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Tiedoston '%s' nime�minen tiedostoksi '%s' ep�onnistui: %s"
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Tiedoston '%s' palauttaminen tiedostosta '%s' ep�onnistui: %s"
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Vanhan tiedoston '%s' poisto ep�onnistui: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Tiedoston '%s' tilatietojen lukeminen ep�onnistui: %s"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Toinenkin '%s'-merkint� tiedostossa '%s': se j�� huomiotta"
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Nimet�n merkint� XML-tiedostossa '%s': se j�� huomiotta"
 
-#: backends/xml-dir.c:961
+#: backends/xml-dir.c:979
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Yl�tason solmu XML-tiedostossa '%s' ei ole <entry>: se j�� huomiotta"
 
-#: backends/xml-dir.c:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Tiedoston '%s' luominen ep�onnistui: %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Tiedoston '%s' sulkeminen ep�onnistui: %s"
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "'%s'-niminen XML-solmu j�� huomiotta: %s"
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Virheellinen kaavaimen nimi '%s' j�� huomiotta: %s"
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
-#, c-format
-msgid "Ignoring XML node `%s', except for possible schema name: %s"
-msgstr "XML-solmu '%s' j�� huomiotta, paitsi mahdollisena kaavaimen nimen�: %s"
-
-#: backends/xml-entry.c:699
-msgid "found <local_schema> with no locale setting"
-msgstr "l�ydettiin <local_schema> ilman localeasetusta"
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "'%s'-niminen XML-solmu j�� huomiotta: %s"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Kaavaimen oletusarvon lukeminen ep�onnistui: %s"
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Solmulla <%s> ei ole \"type\"-ominaisuutta"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Solmulla on tuntematon \"type\"-ominaisuus '%s': se j�� huomiotta"
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "Solmulla ei ole \"value\"-ominaisuutta"
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "En ymm�rt�nyt XML-luettelosolmu sis�ll� olevaa XML-solmua <%s>"
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Virheellinen tyyppi (luettelo, pari tai tuntematon) luettelosolmussa"
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Virheellinen XML-solmu: %s"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Luettelo sis�lt�� v��rin kirjoitetun solmun (%s, kun pit�isi olla %s)"
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "XML-parin virheellinen car j�� huomiotta: %s"
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "XML-tiedosto tulkitessa: luettelot ja parit eiv�t voi olla parin sis�ll�"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Virheellinen XML-parin cdr j�� huomiotta: %s"
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "En ymm�rt�nyt XML-parisolmun sis�ll� olevaa XML-solmuta <%s>"
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "XML-parin car ja cdr eiv�t l�ytyneet"
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Parin cdr puuttuu XML-tiedostosta"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "Parin car puuttuu XML-tiedostosta"
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Parin sek� car:n ett� cdr:n arvot puuttuvat XML-tiedostosta"
 
@@ -272,28 +295,28 @@ msgstr "Taustamoduulia '%s' ei l�ytynyt"
 msgid "Failed to shut down backend"
 msgstr "Taustamoduulin sammutus ep�onnistui"
 
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr "Asetuspyynt��n vastaanotettiin virheellinen arvo."
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr "Avaimen '%s' asetuspyynn�st� saatu CORBA-arvo ei ole j�rkev�"
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr "Pyynt� kaiken v�livarastoidun tiedon hylk��miseen vastaanotettu"
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr "Synkronointipyynt� vastaanotettu"
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Vakava virhe: objektiin ConfigDatabase ei saatu viittausta"
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Yhden tai useamman l�hteen synkronointi ep�onnistui: %s"
@@ -302,7 +325,7 @@ msgstr "Yhden tai useamman l�hteen synkronointi ep�onnistui: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -313,12 +336,12 @@ msgstr ""
 "palauttaa gconfd:n k�ynnistyess� uudestaan, mik� johtaa ep�luotettavaan "
 "asetusten muutosten ilmoittamiseen."
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Kuuntelija ID %lu ei ole olemassa"
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -328,47 +351,47 @@ msgstr ""
 "harmitonta, mutta saattaa johtaa ilmoituksen kummalliseen uudelleen "
 "ilmaantumiseen): %s"
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Virhe avaimen '%s' arvoa hakiessa: %s"
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Virhe avaimen '%s' arvoa asettaessa: %s"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Virhe avaimen '%s' arvoa poistaessa: %s"
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Virhe avaimen '%s' oletusarvoa hakiessa: %s"
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Virhe hakemiston '%s' olemassaoloa tarkistaessa: %s"
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Virhe hakemistoa '%s' poistaessa: %s"
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Kaikkien hakemiston '%s' merkint�jen saaminen ep�onnistui: %s"
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Virhe hakemiston '%s' hakemistoja luetteloidessa: %s"
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Virhe avaimen '%s' kaavainta asettaessa: %s"
@@ -433,208 +456,29 @@ msgstr "Toiminto ei ole sallittu ilman asetuspalvelinta"
 msgid "Failed to get a lock"
 msgstr "Lukituksen saaminen ep�onnistui"
 
-#: gconf/gconf-glib.c:629
-#, c-format
-msgid ""
-"Error on line %d char %d: %s\n"
-"(Some surrounding text was '%s')\n"
-msgstr ""
-
-#: gconf/gconf-glib.c:749
-msgid ""
-"Text ended in the middle of an entity, or entity name too long to be valid "
-"('&' should begin an entity such as '&quot;')"
-msgstr ""
-
-#: gconf/gconf-glib.c:801
-#, c-format
-msgid ""
-"Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; &apos;)"
-msgstr ""
-
-#: gconf/gconf-glib.c:841
-msgid ""
-"Markup text ended in the middle of a character reference, just after '&#'"
-msgstr ""
-
-#: gconf/gconf-glib.c:867
-#, c-format
-msgid ""
-"Character reference contained non-digit '%s' ('&#' should begin a reference "
-"to a unicode character, such as '&#2342;')"
-msgstr ""
-
-#: gconf/gconf-glib.c:891
-msgid ""
-"Text ended in the middle of an character reference ('&#' should begin a "
-"character reference such as '&#2342;')"
-msgstr ""
-
-#: gconf/gconf-glib.c:916
-#, c-format
-msgid ""
-"Couldn't parse character reference '%s' ('&#' must begin a character "
-"reference such as '&#2343;')"
-msgstr ""
-
-#: gconf/gconf-glib.c:938
-#, c-format
-msgid ""
-"Character code %#lx is not allowed in XML documents or is not a valid "
-"Unicode character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1013
-msgid ""
-"Documented ended just after an '&', '&' should begin an entity or character "
-"reference."
-msgstr ""
-
-#: gconf/gconf-glib.c:1027
-msgid ""
-"'<' or '>' character not allowed here; only allowed around tags, for example "
-"<bold> or <paragraph>. Elsewhere, encode these characters as the entities "
-"&lt; and &gt;"
-msgstr ""
-
-#: gconf/gconf-glib.c:1082
-#, c-format
-msgid "Character '%s' is not valid at the start of an attribute name"
-msgstr ""
-
-#: gconf/gconf-glib.c:1109
-msgid "Document ended just after attribute name"
-msgstr ""
-
-#: gconf/gconf-glib.c:1120
-msgid "Attribute name must be immediately followed by an '=' character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1135
-msgid ""
-"'=' character after attribute must be immediately followed by an '\"' "
-"character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1161
-#, c-format
-msgid ""
-"Character '%c' found inside an attribute value; perhaps your attribute value "
-"is missing the closing quotation mark '\"'"
-msgstr ""
-
-#: gconf/gconf-glib.c:1181
-msgid ""
-"Ran out of text before a quote mark ('\"') was seen at the end of an "
-"attribute value"
-msgstr ""
-
-#: gconf/gconf-glib.c:1194
-msgid ""
-"Text ends immediately after an attribute value, before the element was closed"
-msgstr ""
-
-#: gconf/gconf-glib.c:1508
-msgid "Missing '<' at start of element"
-msgstr ""
-
-#: gconf/gconf-glib.c:1519
-msgid "Document ended just after '<' character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1547
-msgid "No closing '>' found for a <? or <!"
-msgstr ""
-
-#: gconf/gconf-glib.c:1576
-#, c-format
-msgid "Character '%s' is not valid at the start of an element name"
-msgstr ""
-
-#: gconf/gconf-glib.c:1600 gconf/gconf-glib.c:1613
-msgid "Document ended just after element name, no '>' seen"
-msgstr ""
-
-#: gconf/gconf-glib.c:1638
-#, c-format
-msgid "Elements should be closed with '>' or '/>', not with '%s'"
-msgstr ""
-
-#: gconf/gconf-glib.c:1655
-msgid ""
-"Element ended just after '/', no '>' seen; empty elements should end with "
-"'/>'"
-msgstr ""
-
-#: gconf/gconf-glib.c:1694
-msgid "Close tag not found at end of element"
-msgstr ""
-
-#: gconf/gconf-glib.c:1709
-msgid "Close tag ends just after '<' character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1723
-msgid "Close tag should begin with '</', '/' character is missing"
-msgstr ""
-
-#: gconf/gconf-glib.c:1737
-msgid "Close tag ends just after '/' character"
-msgstr ""
-
-#: gconf/gconf-glib.c:1772
-msgid "Document ended just after element name in close tag, no '>' seen"
-msgstr ""
-
-#: gconf/gconf-glib.c:1788
-msgid "Document ended just after close tag name, no '>' seen"
-msgstr ""
-
-#: gconf/gconf-glib.c:1807
-#, c-format
-msgid "Close tag '%s' does not match opening tag '%s'"
-msgstr ""
-
-#: gconf/gconf-glib.c:2145
-#, c-format
-msgid ""
-"Invalid UTF-8 character at byte %d in marked-up text. Some text before the "
-"bad character was '%s'"
-msgstr ""
-
-#: gconf/gconf-glib.c:2202
-msgid "The marked-up text contained nothing but whitespace."
-msgstr ""
-
-#: gconf/gconf-glib.c:10666
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Tiedoston '%s' sulkeminen ep�onnistui: %s"
+#: gconf/gconf-error.c:40
+msgid "No database available to save your configuration"
+msgstr "Tietokantaa ei ole asetusten tallentamista varten."
 
-#: 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
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Ei merkki� '/' avaimessa '%s'"
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "CORBA-arvoa ei voitu muuntaa luettelon osaksi"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "V��r�ntyyppinen luettelon osa %s"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr "V��r�ntyyppinen luettelo vastaanotettu gconfd:lt�"
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr "Objektin muunto IOR:ksi ep�onnistui"
 
@@ -643,94 +487,99 @@ msgstr "Objektin muunto IOR:ksi ep�onnistui"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Polkutiedostoa '%s' ei voitu avata: %s\n"
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Lis�t��n l�hde '%s'\n"
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Virhe luettaessa tiedostoa '%s': %s\n"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Odotettiin luetteloa, saatiin %s"
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, 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:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Odotettiin paria, saatiin %s"
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, 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:1499
+#: gconf/gconf-internals.c:1474
 #, 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:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Lainattu merkkijono ei ala lainausmerkill�"
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Lainattu merkkijono ei lopu lainausmerkkiin"
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-virhe: %s"
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, fuzzy, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr "OAF:n ongelman kuvaus: '%s'"
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "yritettiin poistaa luetteloimaton OAF-olio hakemistosta"
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr "yritettiin lis�t� jo luetteloitu OAF hakemisto"
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF-j�sennysvirhe: %s"
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "Tuntematon OAF-virhe"
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Ei IOR-tiedostoa hakemistossa '%s'"
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd vei lukituksen '%s' toiselta prosessilta"
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Toinen ohjelma on jo lukinnut hakemiston '%s'"
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 "ORB:iin ei saatu yhteytt� yritett�ess� ping:i� olemassaolevaan gconfd:hen"
 
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -739,43 +588,43 @@ msgstr ""
 "Poistetaan tyhj� lukitus '%s', koska IOR:ia ei voitu muuntaa "
 "olioviittaukseksi. IOR '%s'"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr "Poistetaan tyhj� lukitus '%s' ping:in ep�onnistuttua palvelimeen: %s"
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf asetusdemoni (gconfd) omistaa lukituksen '%s'"
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "hakemistoa '%s' ei voitu luoda: %s"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Lukitusta '%s' ei voi luoda: %s"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Tiedostoon '%s' ei voi kirjoittaa: %s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, 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:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Virheellinen lukitustiedosto '%s': poistetaan"
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -784,28 +633,28 @@ msgstr ""
 "Lukitustiedostoa '%s' ei luotu. (luojan pid %u, oma pid %u; oletetaan jonkin "
 "vieneen lukituksen)"
 
-#: gconf/gconf-internals.c:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Lukitushakemiston '%s' palauttaminen ep�onnistui: %s"
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "L�hteen '%s' lataaminen ep�onnistui: %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 "Kaavain '%s', joka on m��ritelty arvolle '%s' sis�lt�� arvon, joka ei ole "
 "kaavain."
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Nimi '/' voi olla vain hakemisto, ei avain"
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -813,17 +662,30 @@ msgid ""
 msgstr ""
 "Arvo avaimelle '%s' on asetettu vain-luku-l�hteess� asetuspolkusi alussa."
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Virhe metainfoa etsiess�: %s"
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Virhe metainfoa saadessa: %s"
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -896,91 +758,91 @@ msgstr "En ymm�rt�nyt arvoa '%s' (ylim��r�inen lainaamaton ')' parin sis�ll�)"
 msgid "`%s': %s"
 msgstr "'%s': %s"
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Palvelin ei voinut selvitt�� osoitetta '%s'"
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr "Paikalliseen asetusl�hteeseen ei voi lis�t� huomautuksia"
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, fuzzy, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 "Asiakkaan lis��minen palvelimen luetteloon ep�onnistui, CORBA-virhe: %s"
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
-"Virhe yhdist�ess� asetuspalvelimeen: OAF palautti tyhj�n arvon funktiosta "
-"oaf_activate_from_id() ja ei asettanut ongelmaa selitt�v�� virhekeskeytyst�. "
-"Olkaa hyv�, ja tehk�� OAF:ista virheilmoitus."
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConfin k�ynnistyminen ep�onnistui, lopetetaan\n"
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr "T�ytyy alkaa kauttaviivalla (/)"
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kahta kauttaviivaa (/) ei voi olla per�kk�in"
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Pistett� (.) ei voi olla heti kauttaviivan (/) j�lkeen"
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' on virheellinen merkki avaimien ja hakemistojen nimiss�"
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Avaimen tai hakemiston nimi ei voi p��tty� kauttaviivaan (/)"
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Asetuspalvelimen sammutus ep�onnistui: %s"
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Odotettiin liukulukua, saatiin %s"
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Odotettiin kokonaislukua, mutta saatiin %s"
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Odotettiin merkkijonoa, mutta saatiin %s"
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Odotettiin totuusarvoa, mutta saatiin %s"
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Odotettiin kaavainta, mutta saatiin %s"
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "Sammutuspyynt� vastaanotettu"
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -988,25 +850,32 @@ msgstr ""
 "gconfd k��nnetty debug-tietojen kanssa. Yritet��n ladata gconf.path "
 "l�hdekoodihakemistosta"
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 "Asetustiedostoja ei l�ytynyt: yritet��n k�ytt�� oletusasetusl�hdett� '%s'"
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr "Ei asetusl�hteit� l�hdehakemistossa: asetuksia ei tallenneta. Muokkaa "
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Virhe joitakin asetusl�hteit� ladatessa: %s"
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1014,7 +883,7 @@ msgstr ""
 "L�hdehakemistoja ei saatu selville: asetustietoja ei voi ladata eik� "
 "tallentaa"
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1022,65 +891,124 @@ msgstr ""
 "Kirjoitettavissa olevia asetusl�hteit� ei saatu selville: joitakin asetusten "
 "muutoksia ei v�ltt�m�tt� voi tallentaa "
 
-#: 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:369
+#, 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:385
+#, c-format
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgstr ""
+"Signaali %d vastaanotettu: sammutetaan ep�normaalisti. Tee ilmoitus GConfin "
+"virheest�."
 
-#: gconf/gconfd.c:329
+#: gconf/gconfd.c:402
 #, 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:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "k�ynnistyy (versio %s), pid %u, k�ytt�j� '%s'"
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr "GConf on k��nnetty virheenetsint�ominaisuuksineen"
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
+#, fuzzy
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 "Object Activation Frameworkin k�ynnistys ep�onnistui: olkaa hyv� ja "
 "l�hett�k�� virheilmoitus OAF:in yll�pit�jille"
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Olioon ConfigServer ei saatu viittausta"
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "Tiedoston '%s' luominen ep�onnistui: %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "Asiakkaan IOR:n saaminen ep�onnistui: '%s'"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
+#, fuzzy
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
 msgstr ""
 "OAF ei tunne IID:t�mme, joten asennus on virheellinen. Ei voitu "
 "rekister�ity�: poistutaan\n"
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:613
+#, fuzzy
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
 msgstr "Toinen gconfd on jo rekister�itynyt OAF:iin: poistutaan\n"
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:618
+#, fuzzy
+msgid "Unknown error registering existing gconfd with OAF; exiting"
 msgstr "Tuntematon virhe rekister�it�ess� gconfd:t� OAF:iin: poistutaan\n"
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:645
+#, fuzzy
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
+msgstr ""
+"OAF ei tunne IID:t�mme, joten asennus on virheellinen. Ei voitu "
+"rekister�ity�: poistutaan\n"
+
+#: gconf/gconfd.c:649
+#, fuzzy
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
+msgstr "Toinen gconfd on jo rekister�itynyt OAF:iin: poistutaan\n"
+
+#: gconf/gconfd.c:654
+#, fuzzy
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
+msgstr "Tuntematon virhe rekister�it�ess� gconfd:t� OAF:iin: poistutaan\n"
+
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "Lukitushakemiston '%s' palauttaminen ep�onnistui: %s"
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "Poistutaan"
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr "GConf-palvelin ei ole k�yt�ss�: sammutetaan"
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Palautetaan poikkeus: %s"
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1089,7 +1017,7 @@ msgstr ""
 "gconfd:n lokitiedoston avaaminen ep�onnistui: kuuntelijoita ei voi palauttaa "
 "gconfd:n sammutuksen j�lkeen (%s)"
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1097,32 +1025,32 @@ msgstr ""
 "gconfd:n lokitiedoston sulkeminen ep�onnistui: tietoja saattaa olla h�vinnyt "
 "(%s)"
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, 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:980
+#: gconf/gconfd.c:1308
 #, 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:989
+#: gconf/gconfd.c:1317
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Uuden tilatiedoston '%s' sulkeminen ep�onnistui: %s"
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, 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:1013
+#: gconf/gconfd.c:1341
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Uuden tilatiedoston siirt�minen paikalleen ep�onnistui: %s"
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1130,44 +1058,7 @@ msgstr ""
 "Alkuper�isen tilatiedoston, joka on nimetty tiedostoksi '%s', palauttaminen "
 "ep�onnistui: %s"
 
-#: gconf/gconfd.c:1110
-#, fuzzy, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr "Tilatiedoston avaaminen ep�onnistui: %s"
-
-#: gconf/gconfd.c:1125
-#, fuzzy
-msgid "Failed to parse connection ID in saved state file"
-msgstr "Tilatiedoston avaaminen ep�onnistui: %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�onnistui: %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�onnistui: %s"
-
-#: gconf/gconfd.c:1180
-#, fuzzy, c-format
-msgid "Failed to unquote IOR from saved state file: %s"
-msgstr "Tilatiedoston avaaminen ep�onnistui: %s"
-
-#: gconf/gconfd.c:1204
-msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
-msgstr ""
-
-#: gconf/gconfd.c:1225
-msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
-msgstr ""
-
-#: gconf/gconfd.c:1346
+#: gconf/gconfd.c:1823
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1175,79 +1066,110 @@ msgstr ""
 "Kuuntelijan, osoitteessa '%s', palauttaminen ei onnistu: tietokannan "
 "selvitt�minen ei onnistunut"
 
-#: gconf/gconfd.c:1377
+#: gconf/gconfd.c:1869
+#, c-format
+msgid "Error reading saved state file: %s"
+msgstr "Virhe tilatiedostoa lukiessa: %s"
+
+#: gconf/gconfd.c:1922
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Tilatiedoston '%s' avaaminen ei onnistu: %s"
 
-#: gconf/gconfd.c:1476
+#: gconf/gconfd.c:2039
 #, 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 ""
 "Kuuntelijan lis��misen kirjaaminen gconfd:n lokitiedostoon ep�onnistui: sit� "
 "ei voi lis�t� uudestaan, kun gconfd lopetetaan tai sammuu (%s)"
 
-#: gconf/gconfd.c:1481
+#: gconf/gconfd.c:2044
 #, 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 ""
 "Kuuntelijan poiston kirjaaminen gconfd:n lokitiedostoon ep�onnistui; se "
 "saattaa virheellisesti tulla lis�tyksi uudestaan, kun gconfd lopetetaan tai "
 "sammuu (%s)"
 
-#: gconf/gconftool.c:62
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
+#, c-format
+msgid "Failed to get IOR for client: %s"
+msgstr "Asiakkaan IOR:n saaminen ep�onnistui: '%s'"
+
+#: gconf/gconfd.c:2082
+#, fuzzy, c-format
+msgid "Failed to open saved state file: %s"
+msgstr "Tilatiedoston '%s' avaaminen ei onnistu: %s"
+
+#: gconf/gconfd.c:2095
+#, fuzzy, c-format
+msgid "Failed to write client add to saved state file: %s"
+msgstr "Asiakkaan lis��misen fflush() tilatiedostoon ep�onnistui: '%s'"
+
+#: gconf/gconfd.c:2103
+#, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr "Asiakkaan lis��misen fflush() tilatiedostoon ep�onnistui: '%s'"
+
+#: gconf/gconfd.c:2193
+msgid ""
+"Some client removed itself from the GConf server when it hadn't been added."
+msgstr ""
+"Jokin asiakas poisti itsens� GConf-palvelimesta, kun sit� ei oltu lis�tty."
+
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr "Ohjevalitsimet"
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Aseta avain arvolle ja synkronoi. K�yt� --type :n kanssa."
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr "Tulosta avaimen arvo stdout:iin"
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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 ""
-"Aseta kaavain ja synkronoi. K�yt� asetusten --short-desc, --long-desc, "
-"--owner ja --type kanssa."
+"Aseta kaavain ja synkronoi. K�yt� asetusten --short-desc, --long-desc, --"
+"owner ja --type kanssa."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr "Poista annetut avaimet."
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr "Tulosta hakemiston kaikki avain+arvo -parit."
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr "Tulosta hakemiston kaikki alihakemistot."
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "Tulosta hakemiston kaikki alihakemistot ja tiedot rekursiivisesti."
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Palauta 0 jos hakemisto on olemassa, 2 jos ei."
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Sammuta gconfd. �L� K�YT� T�T� VALITSINTA ILMAN HYV�� SYYT�."
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Palauta 0, jos gconfd on k�ynniss�, ja 2 jos ei."
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1255,7 +1177,7 @@ msgstr ""
 "K�ynnist� asetuspalvelin (gconfd). (Mik� yleens� tehd��n tarvittaessa "
 "automaattisesti.)"
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1263,11 +1185,11 @@ msgstr ""
 "M��rit� asetettavan arvon, tai kaavaimen arvon, tyyppi. Yksiselitteiset "
 "lyhenteet kelpaavat."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1275,11 +1197,11 @@ msgstr ""
 "M��rit� kaavaimen tai asetettavan luettelon arvon tyyppi. Yksiselitteiset "
 "lyhenteet kelpaavat."
 
-#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1287,7 +1209,7 @@ msgstr ""
 "M��rit� kaavaimen tai parin car:n arvon tyyppi. Yksiselitteiset lyhenteet "
 "kelpaavat."
 
-#: gconf/gconftool.c:198
+#: gconf/gconftool.c:205
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1295,43 +1217,43 @@ msgstr ""
 "M��rit� kaavaimen tai parin cdr:n arvon tyyppi. Yksiselitteiset lyhenteet "
 "kelpaavat."
 
-#: gconf/gconftool.c:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Kirjoita lyhyt puolen rivin selostus kaavaimeen laitettavaksi"
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr "SELOSTUS"
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr "Kirjoita useamman rivin selostus kaavaimeen laitettavaksi"
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr "M��rit� kaavaimen omistaja"
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr "OMISTAJA"
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr "M��rit� asennettava kaavaintiedosto"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr "TIEDOSTO"
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "M��rit� oletuksen sijaan k�ytett�v� oletusl�hde"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr "L�HDE"
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1339,7 +1261,7 @@ msgstr ""
 "K�yt� asetustietokantaa suoraan, ei palvelimen kautta. T�m� vaatii, ett� "
 "gconfd ei ole k�ynniss�."
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1350,7 +1272,7 @@ msgstr ""
 "osoittamaan ei-oletusasetusl�hteeseen, tai, jos halutaan k�ytt�� oletusta, "
 "tyhj�ksi."
 
-#: gconf/gconftool.c:270
+#: gconf/gconftool.c:277
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1358,7 +1280,7 @@ msgstr ""
 "Rasitustestaa sovellusta asettamalla ja poistamalla joukkoa erityyppisi� "
 "komentorivill� m��riteltyj� arvoja."
 
-#: gconf/gconftool.c:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1366,7 +1288,27 @@ msgstr ""
 "Rasitustestaa sovellusta asettamalla ja poistamalla joukkoa avaimia "
 "komentorivill� m��ritellyiss� hakemistoissa."
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1376,94 +1318,97 @@ msgstr ""
 "Aja '%s --help' n�hd�ksesi t�ydellisen luettelon k�ytett�viss� olevista\n"
 "valitsimista.\n"
 
-#: gconf/gconftool.c:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Ei voi hakea ja poistaa tai asettaa samanaikaisesti\n"
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Ei voi asettaa ja hakea tai poistaa samanaikaisesti\n"
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
+#: gconf/gconftool.c:413
+#, fuzzy
+msgid "Can't use --all-entries with --get or --set\n"
 msgstr ""
-"--all-pairs -valitsinta ei voi k�ytt�� --get tai --set -valitsinten kanssa\n"
+"--all-dirs -valitsinta ei voi k�ytt�� --get tai --set -valitsinten kanssa\n"
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 "--all-dirs -valitsinta ei voi k�ytt�� --get tai --set -valitsinten kanssa\n"
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
+#, fuzzy
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
 "--recursive-list asetusta ei pit�isi k�ytt�� --get, --set, --unset,\n"
 "--all-pairs tai --all-dirs asetusten kanssa\n"
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
+#, fuzzy
 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-entries, --"
+"all-dirs\n"
 msgstr ""
 "--set_schema asetusta ei pit�isi k�ytt�� --get, --set, --unset, --all-pairs\n"
 "tai --all-dirs asetusten kanssa\n"
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Arvotyypill� on merkityst� vain arvoa asetettaessa\n"
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr "Arvoa asetettaessa sen tyyppi t�ytyy m��ritell�\n"
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping-valitsimen kanssa ei voi k�ytt�� muita valitsimia.\n"
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "Valitsimen --dir-exist kanssa ei voi k�ytt�� muita valitsimia.\n"
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 "Valitsimen --install-schema-file kanssa ei voi k�ytt�� muita valitsimia.\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 "Valitsimen --makefile-install-rule kanssa ei voi k�ytt�� muita valitsimia.\n"
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr "Valitsimen --break-key kanssa ei voi k�ytt�� muita valitsimia.\n"
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr "Valitsimen --break-directory kanssa ei voi k�ytt�� muita valitsimia.\n"
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "Valitsinta --direct k�ytett�ess� t�ytyy m��ritell� asetusl�hde valitsimella "
 "--config-source\n"
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConfin k�ynnistys ep�onnistui: %s\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE ymp�rist�muuttuja t�ytyy asettaa\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1475,243 +1420,299 @@ msgstr ""
 "muita sovelluksia ei ole k�ynniss�. (Vaikka sen pit�isi teoriassa toimia \n"
 "my�s ohjelmien k�ynniss� ollessa.)\n"
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Asetusl�hteen tai l�hteiden k�ytt�minen ep�onnistui: %s\n"
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Sammutusvirhe: %s\n"
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "Yksi tai useampi hakemisto t�ytyy m��ritell� luetteloitaessa "
 "rekursiivisesti.\n"
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
 msgstr "Hakemiston '%s' parien luettelointi ep�onnistui: %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr "(ei arvoa)"
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Asetuspalvelimen (gconfd) k�ynnistys ep�onnistui: %s\n"
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr "T�ytyy m��ritell� haettavat avaimet\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tyyppi: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Luettelon tyyppi: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car:n tyyppi: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr:n tyyppi: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "Omistaja: %s\n"
+msgid "Default Value: %s\n"
+msgstr ""
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr "Poista"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "Omistaja: %s\n"
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Lyhyt seloste: %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Pitk� seloste: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Avaimella '%s' ei ole arvoa\n"
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Avaimen '%s' arvon hakeminen ep�onnistui: %s\n"
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Tyyppi '%s' ei ole tuettu\n"
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "T�ytyy m��ritell� avain+arvo -pari parametreina\n"
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Avaimella '%s' ei arvoa\n"
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr "Kaavainta ei voi asettaa arvoksi\n"
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 "Luetteloa asettaessasi t�ytyy sinun m��ritell� luettelo perustyyppiseksi.\n"
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Paria asettaessasi t�ytyy sinun m��ritell� car-type sek� cdr-type "
 "perustyypeiksi.\n"
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "Virhe: %s\n"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
-#, c-format
-msgid "Error setting value: %s"
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
 msgstr "Virhe arvoa asettaessa: %s"
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
-#, c-format
-msgid "Error syncing: %s"
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
 msgstr "Virhe synkronoidessa: %s"
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1234
+#, fuzzy
+msgid "Must specify a key or keys on the command line\n"
+msgstr "T�ytyy m��ritell� haettavat avaimet\n"
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "Tiedostoa '%s' ei l�ydy\n"
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "Virhe avaimen '%s' kaavainta asettaessa: %s"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "Tiedostoa '%s' ei l�ydy\n"
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+#, fuzzy
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr "Arvo (kaavaimen nimi) t�ytyy olla ainoa parametri\n"
+
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr "VAROITUS: kaavaimen '%s' kytkent� avaimeen '%s' ep�onnistui: %s\n"
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Arvo (kaavaimen nimi) t�ytyy olla ainoa parametri\n"
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Luettelon t�ytyy olla perustyyppinen: string, int, float tai bool\n"
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr "Parin car:n t�ytyy olla perustyyppinen: string, int, float tai bool\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr "Parin cdr:n t�ytyy olla perustyyppinen: string, int, float tai bool\n"
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr "Virhe arvoa asettaessa: %s"
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr "Virhe synkronoidessa: %s"
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr "Hakemistot, joista avain+arvo -parit haetaan, t�ytyy m��ritell�.\n"
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr "T�ytyy m��ritell� poistettavat avaimet.\n"
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Virhe avainta '%s' tyhjent�ess�: %s\n"
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr "Hakemistoja, joiden alihakemistot saadaan, t�ytyy m��ritell�.\n"
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Virhe hakemistoja luetteloidessa: %s\n"
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "VAROITUS: kaavaimen (%s) tyyppi on virheellinen tai puuttuu\n"
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "VAROITUS: kaavaimen (%s) list_type puuttuu tai on virheellinen\n"
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "VAROITUS: Kaavaimen (%s) oletusarvon '%s' tulkinta ep�onnistui\n"
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "VAROITUS: parin (%s) car_type tai cdr_type puuttuu tai on virheellinen\n"
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "VAROITUS: Et voi asettaa kaavaimen oletusarvoa\n"
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "VAROITUS: gconftool:in sis�inen virhe: tuntematon GConfValueType\n"
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "VAROITUS: tyypin '%s' nimen j�sennys ep�onnistui\n"
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr "VAROITUS: list_type voi olla int, float, string tai bool eik� \"%s\"\n"
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr "VAROITUS: car_type voi olla int, float, string tai bool eik� \"%s\"\n"
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr "VAROITUS: cdr_type voi olla int, float, string tai bool eik� \"%s\"\n"
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr "VAROITUS: tyhj� <applyto>-solmu"
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "VAROITUS: solmu <%s> ei ole ymm�rrett�viss� <schema>:n j�lkeen\n"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr "VAROITUS: kaavaimelle ei ole m��ritelty avainta\n"
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "VAROITUS: <locale>-solmulla ei ole 'name=\"locale\"'-ominaisuutta: j�� "
 "huomiotta\n"
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1719,51 +1720,51 @@ msgstr ""
 "VAROITUS: useita <locale> solmuja localelle '%s': vain ensimm�inen otetaan "
 "huomioon\n"
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "VAROITUS: Virheellinen solmu <%s> solmussa <locale>\n"
 
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "VAROITUS: kaavaimen '%s' (locale '%s') asennus ep�onnistui: %s\n"
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Kaavain '%s' asentui localeen '%s'\n"
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "VAROITUS: kaavaimen '%s' kytkent� avaimeen '%s' ep�onnistui: %s\n"
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Kaavain '%s' kytkeytyi avaimeen '%s'\n"
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Jokaisessa <schema>:ssa t�ytyy olla v�hint��n yksi <locale>-merkint�\n"
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "VAROITUS: solmu <%s> ei ole ymm�rrett�viss� <schemalist>:in alla\n"
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Tiedoston '%s' avaaminen ep�onnistui: %s\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Asiakirja '%s' on tyhj�?\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1772,28 +1773,28 @@ msgstr ""
 "Asiakirjalla '%s' on v��r�ntyyppinen juurisolmu (<%s>, pit�isi olla "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Asiakirjalla '%s' ei ole p��tason <gconschemafile> -solmua\n"
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 "VAROITUS: solmu <%s> solmun <gconfschemafile> j�lkeen ei ole "
 "ymm�rrett�viss�\n"
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Virhe asetustietoja synkronoidessa: %s"
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr "Asennettavat kaavaintiedostot pit�� m��ritell�\n"
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -1802,16 +1803,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Rikkomisavaimen %s poisto ep�onnistui: %s\n"
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr "Rikottavat avaimet t�ytyy m��ritell�\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1820,11 +1821,11 @@ msgstr ""
 "Yritet��n rikkoa sovellus asettamalla virheellisi� arvoja avaimelle:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr "T�ytyy m��ritell� rikottavat hakemistot\n"
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1835,70 +1836,76 @@ msgstr ""
 "hakemistossa:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr "GConf-virhe: %s\n"
+
+#: gconf/gconf-client.c:798
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf-varoitus: Hakemiston '%s' parien luetteloiminen ep�onnistui: %s"
 
-#: wrappers/gtk/gconf-client.c:985
+#: gconf/gconf-client.c:1000
 #, 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 "Ignoring XML node `%s', except for possible schema name: %s"
+#~ msgstr ""
+#~ "XML-solmu '%s' j�� huomiotta, paitsi mahdollisena kaavaimen nimen�: %s"
 
-#~ msgid "Opened BerkeleyDB source at root %s"
-#~ msgstr "BerkeleyDB-l�hteen juuri %s avattu."
+#~ msgid "found <local_schema> with no locale setting"
+#~ msgstr "l�ydettiin <local_schema> ilman localeasetusta"
 
-#~ msgid "Initializing BDB backend module"
-#~ msgstr "BDB-taustamoduuli k�ynnistyy"
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Tiedoston '%s' sulkeminen ep�onnistui: %s"
 
-#~ msgid "Couldn't find the %s root directory in the address `%s'"
-#~ msgstr "%s-juurihakemistoa ei l�ytynyt osoitteesta \"%s\""
+#, fuzzy
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "Virhe hakemistoa '%s' poistaessa: %s"
 
 #~ msgid ""
-#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ "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 ""
-#~ "%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."
+#~ "Virhe yhdist�ess� asetuspalvelimeen: OAF palautti tyhj�n arvon funktiosta "
+#~ "oaf_activate_from_id() ja ei asettanut ongelmaa selitt�v�� "
+#~ "virhekeskeytyst�. Olkaa hyv�, ja tehk�� OAF:ista virheilmoitus."
 
-#~ 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"
+#, fuzzy
+#~ msgid "Received signal %d, shutting down."
+#~ msgstr "Signaali %d vastaanotettu: sammutetaan siististi"
 
-#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
-#~ msgstr ""
-#~ "Signaali %d vastaanotettu, core-tiedosto kirjoitetaan. Tee ilmoitus GConfin "
-#~ "virheest�."
+#~ msgid "GConf was built with debugging features enabled"
+#~ msgstr "GConf on k��nnetty virheenetsint�ominaisuuksineen"
 
-#~ msgid ""
-#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
-#~ msgstr ""
-#~ "Signaali %d vastaanotettu: sammutetaan ep�normaalisti. Tee ilmoitus GConfin "
-#~ "virheest�."
+#, fuzzy
+#~ msgid "Didn't understand line in saved state file: '%s'"
+#~ msgstr "Tilatiedoston avaaminen ep�onnistui: %s"
 
-#~ msgid "GConf server is not in use, shutting down."
-#~ msgstr "GConf-palvelin ei ole k�yt�ss�: sammutetaan"
+#, fuzzy
+#~ msgid "Failed to parse connection ID in saved state file"
+#~ msgstr "Tilatiedoston avaaminen ep�onnistui: %s"
 
-#~ msgid "Error reading saved state file: %s"
-#~ msgstr "Virhe tilatiedostoa lukiessa: %s"
+#, fuzzy
+#~ msgid "Failed to unquote config source address from saved state file: %s"
+#~ msgstr "Asiakkaan lis��misen kirjoittaminen tilatiedostoon ep�onnistui: %s"
 
-#~ msgid "Failed to get IOR for client: %s"
-#~ msgstr "Asiakkaan IOR:n saaminen ep�onnistui: '%s'"
+#, fuzzy
+#~ msgid "Failed to unquote listener location from saved state file: %s"
+#~ msgstr "Asiakkaan lis��misen kirjoittaminen tilatiedostoon ep�onnistui: %s"
 
-#~ msgid "Failed to flush client add to saved state file: %s"
-#~ msgstr "Asiakkaan lis��misen fflush() tilatiedostoon ep�onnistui: '%s'"
+#, fuzzy
+#~ msgid "Failed to unquote IOR from saved state file: %s"
+#~ msgstr "Tilatiedoston avaaminen ep�onnistui: %s"
 
-#~ msgid ""
-#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ msgid "Can't use --all-pairs with --get or --set\n"
 #~ msgstr ""
-#~ "Jokin asiakas poisti itsens� GConf-palvelimesta, kun sit� ei oltu lis�tty."
+#~ "--all-pairs -valitsinta ei voi k�ytt�� --get tai --set -valitsinten "
+#~ "kanssa\n"
 
-#~ msgid "GConf Error: %s\n"
-#~ msgstr "GConf-virhe: %s\n"
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Avaimen '%s' arvon tallentaminen ei onnistu"
diff --git a/po/fr.po b/po/fr.po
index 275269c5..483ed017 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: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-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,6 +14,34 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: backends/bdb-backend.c:215
+msgid "Unloading BerkeleyDB (BDB) backend module."
+msgstr "D�chargement du module BerkeleyDB (BDB)."
+
+#: backends/bdb-backend.c:238
+#, c-format
+msgid "Opened BerkeleyDB source at root %s"
+msgstr "Source BerkeleyDB ouverte � la racine %s"
+
+#: backends/bdb-backend.c:578
+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�pertoire 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�er le r�pertoire � %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 �crire vers le r�pertoire racine %s � l'adresse � %s �"
+
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "D�chargement du module XML."
@@ -23,11 +51,6 @@ msgstr "D�chargement du module XML."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Ne peut trouver le r�pertoire 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�er le r�pertoire � %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'"
@@ -38,14 +61,14 @@ msgstr ""
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
-"Les permissions du r�pertoire/fichier pour la source XML � la racine %s sont "
-": %o/%o"
+"Les permissions du r�pertoire/fichier pour la source XML � la racine %s "
+"sont : %o/%o"
 
 #: backends/xml-backend.c:680
 msgid "Initializing XML backend module"
 msgstr "Initialisation du module XML"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "�chec pour donner le verrou sur le r�pertoire XML � %s � : %s"
@@ -56,7 +79,7 @@ msgstr ""
 "Suppressions de r�pertoire non synchronis�es durant l'extinction du module "
 "XML"
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -65,11 +88,11 @@ msgstr ""
 "Ne peut supprimer le r�pertoire � %s � depuis le cache XML, parce qu'il n'a "
 "pas �t� convenablement synchronis� sur le disque"
 
-#: backends/xml-cache.c:253
+#: backends/xml-cache.c:256
 #, 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 �l�ments restent dans le cache apr�s avoir nettoy� les �l�ments d�j� "
 "synchronis�s plus vieux que %u secondes"
@@ -84,167 +107,165 @@ 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�pertoire"
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Impossible de supprimer � %s � : %s"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Impossible d'�crire le fichier � %s � : %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: backends/xml-dir.c:359
+#, c-format
+msgid "Failed to set mode on `%s': %s"
+msgstr "Impossible de d�finir le mode de � %s � : %s"
+
+#: backends/xml-dir.c:373 backends/xml-dir.c:383
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Impossible de renommer � %s � vers � %s � : %s"
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Impossible de restaurer � %s � depuis � %s � : %s"
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, 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:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "�chec de statistiques � %s � : %s"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Ignore l'entr�e � %s � dupliqu�e dans � %s �"
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Ignore l'entr�e sans nom dans le fichier XML � %s �"
 
-#: backends/xml-dir.c:961
+#: backends/xml-dir.c:979
 #, 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:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Impossible de cr�er le fichier � %s � : %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, 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:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignore le noeud XML nomm� � %s � : %s"
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignore le nom de sch�ma � %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: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�ma : %s"
-
-#: backends/xml-entry.c:699
-msgid "found <local_schema> with no locale setting"
-msgstr "a trouv� <local_schema> avec aucun r�glage de locale"
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "Ignore le noeud XML nomm� � %s � : %s"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "�chec durant la lecture de la valeur par d�faut pour le sch�ma : %s"
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Aucun attribut \"type\" pour le noeud <%s>"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, 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:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "Aucun attribut \"value\" pour le noeud"
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 "Impossible de comprendre le noeud XML <%s> � l'int�rieur d'un noeud XML list"
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 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:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Mauvais noeud XML : %s"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "La liste contient un noeud mal form� (%s, devrait �tre %s)"
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignore le mauvais car de la paire XML : %s"
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "analyse le fichier XML : listes et paires ne doivent pas �tre situ�es � "
 "l'int�rieur d'une paire"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignore le mauvais cdr de la paire XML : %s"
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 "Impossible de comprendre le noeud XML <%s> � l'int�rieur du noeud de paire "
 "XML"
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 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:1189
+#: backends/xml-entry.c:1200
 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:1196
+#: backends/xml-entry.c:1207
 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:1201
+#: backends/xml-entry.c:1212
 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"
 
@@ -278,32 +299,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:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr "R�ception d'une valeur invalide dans la requ�te de d�finition"
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Impossible de comprendre le sens de la valeur CORBA re�u dans la requ�te de "
 "d�finition de la cl� � %s �"
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr "R�ception de la requ�te d'abandonner toutes les donn�es cach�es"
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr "R�ception de la requ�te de synchronisation synchrone"
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "Erreur fatale : impossible d'obtenir la r�f�rence de l'objet pour "
 "ConfigDatabase"
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Impossible de synchroniser une ou plusieurs sources : %s"
@@ -312,7 +333,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:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -323,12 +344,12 @@ msgstr ""
 "restorer cet �couteur au red�marrage de gconfd, r�sultant en une "
 "notification non s�r de changements de configuration."
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "L'�couteur ID %lu n'existe pas"
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -338,47 +359,47 @@ msgstr ""
 "d'historique (la plupart du temps sans probl�me, mais peut r�sulter � la "
 "r�apparition d'une notification g�nante) : %s"
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Erreur durant l'obtention de la valeur de � %s � : %s"
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Erreur durant la d�finition de la valeur de � %s � : %s"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Erreur durant l'annulation de � %s � : %s"
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Erreur durant l'obtention de la valeur par d�faut de � %s � : %s"
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Erreur durant la v�rification de l'existence de � %s � : %s"
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Erreur durant la suppression du r�pertoire � %s � : %s"
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Impossible d'obtenir toutes les entr�es dans � %s � : %s"
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Erreur durant le listage des r�pertoires dans � %s � : %s"
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Erreur durant la definition du sch�ma pour � %s � : %s"
@@ -443,250 +464,29 @@ msgstr "Op�ration interdite sans un serveur de configuration"
 msgid "Failed to get a lock"
 msgstr "Impossible d'obtenir un verrou"
 
-#: 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�res %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 �tre 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�s &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�f�rence de caract�re, just apr�s '&#'"
-
-#: 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�f�rence du caract�re n'est pas un nombre � %s � ('&#' doit commencer "
-"une r�f�rence vers un caract�re 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�f�rence de caract�re ('&#' doit commencer "
-"une r�f�rence de caract�re 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�f�rence de caract�re � %s � ('&#' doit commencer une "
-"r�f�rence de caract�re 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�re %#lx n'est pas permis dans les documents XML ou n'est "
-"pas un caract�re 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�s un '&', '&' doit commencer une entit� ou une "
-"r�f�rence de caract�re."
-
-#: 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�res '<' ou '>' ne sont pas permis ici; il ne sont permis "
-"qu'autour de balises, par exemple <bold> ou <paragraph>. Sinon, encodez ces "
-"caract�res comme les entit�s &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�re � %s � n'est pas valide au d�but d'un nom d'attribut"
-
-#: gconf/gconf-glib.c:1109
-msgid "Document ended just after attribute name"
-msgstr "Le document finit just apr�s 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 �tre imm�diatement suivi par un caract�re '='"
-
-#: gconf/gconf-glib.c:1135
-msgid ""
-"'=' character after attribute must be immediately followed by an '\"' "
-"character"
-msgstr ""
-"Le caract�re '=' apr�s un attribut doit �tre imm�diatement suivi par le "
-"caract�re '\"'"
-
-#: 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�re '%c' a �t� trouv� a l'int�rieur d'une valeur d'attribut; peut "
-"�tre 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 �t� rencontr�e avant le guillement final � \" � � "
-"l'int�rieur 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�diatement apr�s une valeur d'attribut avant que l'�l�ment "
-"soit ferm�"
-
-#: gconf/gconf-glib.c:1508
-msgid "Missing '<' at start of element"
-msgstr "Le caract�re � < � est manquant au d�but de l'�l�ment"
-
-#: gconf/gconf-glib.c:1519
-msgid "Document ended just after '<' character"
-msgstr "Le document finit juste apr�s le caract�re � < �"
-
-#: gconf/gconf-glib.c:1547
-msgid "No closing '>' found for a <? or <!"
-msgstr "Aucun caract�re � > � 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�re � %s � n'est pas valide au d�but du nom d'un �l�ment"
-
-#: 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�s un nom d'�l�ment, aucun � > � vu"
-
-#: gconf/gconf-glib.c:1638
-#, c-format
-msgid "Elements should be closed with '>' or '/>', not with '%s'"
-msgstr ""
-"Les �l�ments doivent �tre 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'�l�ment finit juste apr�s � / �, aucun � > � vu; les �l�ments 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'�l�ment"
-
-#: gconf/gconf-glib.c:1709
-msgid "Close tag ends just after '<' character"
-msgstr "Une balise de fermeture finit juste apr�s le caract�re � < �"
-
-#: gconf/gconf-glib.c:1723
-msgid "Close tag should begin with '</', '/' character is missing"
-msgstr ""
-"Une balise de fermeture doit commencer avec � </ �, le caract�re � / � est "
-"manquant"
-
-#: gconf/gconf-glib.c:1737
-msgid "Close tag ends just after '/' character"
-msgstr "Une balise de fermeture finit juste apr�s le caract�re � / �"
-
-#: gconf/gconf-glib.c:1772
-msgid "Document ended just after element name in close tag, no '>' seen"
-msgstr ""
-"Le document finit juste apr�s un nom d'�l�ment 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�s 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�re UTF-8 invalide � l'octet %d du texte marqu�. Une portion du texte "
-"avant le mauvais caract�re 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-error.c:40
+msgid "No database available to save your configuration"
+msgstr "Aucune base de donn�es disponible pour sauvegarder votre configuration"
 
-#: 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
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Pas de � / � dans la cl� � %s �"
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Impossible d'interpr�ter la valeur CORBA pour l'�l�ment de liste"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Type incorrect pour un �l�ment de liste dans %s"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr "R�ception d'une liste depuis gconfd avec un mauvais type de liste"
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr "Impossible de convertir l'objet vers IOR"
 
@@ -695,92 +495,97 @@ 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�s des fichiers � %s � : %s\n"
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Ajout de la source � %s �\n"
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Erreur lu dans le fichier � %s � : %s\n"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Attend une liste, obtient %s"
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, 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:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Attend une paire, obtient %s"
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, 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:1499
+#: gconf/gconf-internals.c:1474
 #, 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:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "La cha�ne guillemet�e ne commence pas avec une marque de citation"
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "La cha�ne guillemet�e ne se finit pas avec une marque de citation"
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Erreur CORBA : %s"
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, fuzzy, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr "Description du probl�me OAF : � %s �"
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "tentative de supprimer un objet r�pertoire OAF non list�"
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr "tentative d'ajouter un r�pertoire OAF d�j� list�"
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Erreur OAF d'analyse : %s"
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "Erreur OAF inconnu"
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Pas de fichier ior dans � %s �"
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, 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:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Un autre programme a le verrou � %s �"
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "impossible de contacter ORB pour � pinger � le gconfd existant"
 
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -789,46 +594,46 @@ msgstr ""
 "Suppression du verrrou p�rim� � %s � parce que IOR ne peut �tre converti "
 "vers une r�f�rence d'objet, IOR � %s �"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "Suppression du verrou p�rim� � %s � � cause d'une erreur de contact du "
 "serveur : %s"
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "Le d�mon de configuration GConf (gconfd) a le verrou � %s �"
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "impossible de cr�er le r�pertoire � %s � : %s"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Impossible de cr�er le verrou � %s � : %s"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Impossible d'�crire vers le fichier � %s � : %s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "Impossible d'ouvrir le verrou de fichier � %s � ; pr�sume que ce n'est pas "
 "le notre : %s"
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Verrou de fichier � %s � corrompu, supprim�"
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -837,27 +642,27 @@ msgstr ""
 "Impossible de cr�er le verrou de fichier � %s � (pid du cr�ateur %u, votre "
 "pid %u; pr�sume que quelqu'un � pris votre verrou"
 
-#: gconf/gconf-internals.c:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Impossible de lib�rer le verrou de r�pertoire � %s � : %s"
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Impossible de charger la source � %s � : %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 "Le sch�ma � %s � sp�cifi� pour � %s � ne contient pas une valeur de sch�ma"
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Le nom � / � peut seulement �tre un r�pertoire, pas une cl�"
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -866,22 +671,35 @@ msgstr ""
 "La valeur pour � %s � est d�fini dans une source en lecture seulement en "
 "premier dans votre chemin d'acc�s de configuration."
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Erreur lors de la recherche de la m�tainfo : %s"
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Erreur durant l'obtention de la m�tainfo : %s"
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
-"Cl� � %s � list� comme sch�ma pour la cl� � %s � est actuellement de type � "
-"%s �"
+"Cl� � %s � list� comme sch�ma pour la cl� � %s � est actuellement de type � %"
+"s �"
 
 #: gconf/gconf-value.c:82
 #, c-format
@@ -953,91 +771,91 @@ msgstr ""
 msgid "`%s': %s"
 msgstr "� %s � : %s"
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Le serveur ne peut r�soudre l'adresse � %s �"
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 "Impossible d'ajouter des notifications � une source de configuration locale"
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, fuzzy, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "L'ajout de client � la liste de serveurs a �chou�, erreur CORBA : %s"
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
-"Erreur de contact du serveur de configuration : OAF � retourn� nil depuis "
-"oaf_activate_from_id() et ne d�finit pas une exception expliquant le "
-"probl�me. Envoyez par courrier �lectronique un rapport d'anomalies, SVP."
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr "Impossible d'initialiser GConf, quitte\n"
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr "Doit commencer avec un slash (/)"
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr "Impossible d'avoir deux slashs (/) dans une rang�e"
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Impossible d'avoir un point (.) juste apr�s un slash (/)"
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "� %c � est un caract�re invalide dans un nom de cl�/r�pertoire"
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Une cl�/r�pertoire ne peut se finir avec un slash (/)"
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "�chec d'extinction du serveur de configuration : %s"
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Flottant attendu, obtenu %s"
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Entier attendu, obtenu %s"
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Cha�ne attendu, obtenu %s"
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Bool�ain attendu, obtenu %s"
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Sch�ma attendu, obtenu %s"
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "R�ception de la requ�te d'extinction"
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -1045,7 +863,7 @@ msgstr ""
 "gconfd compil� avec d�bogage; tente de charger gconf.path depuis le "
 "r�pertoire de source"
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1053,7 +871,10 @@ msgstr ""
 "Aucuns fichiers de configuration trouv�s, tente d'utiliser la source de "
 "configuration par d�faut � %s �"
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1061,12 +882,16 @@ msgstr ""
 "Aucunes sources de configuration dans le chemin d'acc�s des sources, "
 "configuration ne seront pas sauv�es; �ditez "
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Erreur lors du chargement de quelques sources de configuration : %s"
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1074,7 +899,7 @@ msgstr ""
 "Aucunes adresses de source de configuration correctement r�solues, "
 "impossible de charger ou d'enregistrer de donn�es de configuration."
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1083,66 +908,126 @@ msgstr ""
 "il est possible que quelques changements de configuration ne puissent �tre "
 "sauv�s"
 
-#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#: gconf/gconfd.c:369
+#, c-format
+msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgstr ""
+"R�ception du signal %d, cr�e un fichier core. Veuillez rapporter l'anomalie "
+"GConf."
+
+#: gconf/gconfd.c:385
 #, c-format
-msgid "Received signal %d, shutting down."
-msgstr "R�ception du signal %d, acheve."
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgstr ""
+"R�ception du signal %d, s'�teind anormalement. Veuillez faire un rapport "
+"d'anomalie GConf."
 
-#: gconf/gconfd.c:329
+#: gconf/gconfd.c:402
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "R�ception 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:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "d�marrage (version %s), pid %u utilisateur � %s �"
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr "GConf a �t� compil� avec les fonctionnalit�s de d�bogage activ�es"
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
+#, fuzzy
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 "Impossible d'initialiser � Object Activation Framework � : envoyer un "
 "rapport d'anomalies par courrier �lectronique aux mainteneurs d'OAF, SVP."
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Impossible d'obtenir la r�f�rence de l'objet pour ConfigServer"
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "Impossible de cr�er le fichier � %s � : %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "Impossible d'obtenir l'IOR pour le client : %s"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
+#, fuzzy
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
 msgstr ""
 "OAF ne connait rien de votre IID ; s�rement une mauvaise installation ; "
 "impossible de s'enregistrer ; quitte\n"
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:613
+#, fuzzy
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
 msgstr "Un autre gconfd est d�j� enregistr� aupr�s de OAF ; quitte\n"
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:618
+#, fuzzy
+msgid "Unknown error registering existing gconfd with OAF; exiting"
 msgstr ""
 "Erreur inconnu durant l'enregistrement de gconfd aupr�s de OAF ; quitte\n"
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:645
+#, fuzzy
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
+msgstr ""
+"OAF ne connait rien de votre IID ; s�rement une mauvaise installation ; "
+"impossible de s'enregistrer ; quitte\n"
+
+#: gconf/gconfd.c:649
+#, fuzzy
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
+msgstr "Un autre gconfd est d�j� enregistr� aupr�s de OAF ; quitte\n"
+
+#: gconf/gconfd.c:654
+#, fuzzy
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
+msgstr ""
+"Erreur inconnu durant l'enregistrement de gconfd aupr�s de OAF ; quitte\n"
+
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "Impossible de lib�rer le verrou de r�pertoire � %s � : %s"
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "Quitte"
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr "Le serveur GConf n'est pas en cours d'utilisation, extinction."
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Exception retourn�e : %s"
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1151,7 +1036,7 @@ msgstr ""
 "Impossible d'ouvrir le fichier de trace de gconfd ; ne sera pas capable de "
 "restorer les �couteurs apr�s l'extinction de gconfd (%s)"
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1159,32 +1044,32 @@ msgstr ""
 "Impossible de fermer le fichier de trace de gconfd ; des donn�es peuvent ne "
 "pas avoir �t� correctement enregistr�es (%s)"
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Ne peut ouvrir le fichier d'�tat enregistr� � %s � pour �criture : %s"
 
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Ne peut �crire le fichier d'�tat enregistr� � %s � fd : %d : %s"
 
-#: gconf/gconfd.c:989
+#: gconf/gconfd.c:1317
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Ne peut fermer le nouveau fichier d'�tat enregistr� � %s � : %s"
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Ne peut d�placer le vieux fichier d'�tat enregistr� � %s � : %s"
 
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Ne peut d�placer le nouveau fichier d'�tat enregistr� � la place : %s"
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1192,134 +1077,123 @@ msgstr ""
 "Impossible de restorer le fichier d'�tat original enregistr� qui a �t� "
 "d�plac� vers � %s � : %s"
 
-#: gconf/gconfd.c:1110
+#: gconf/gconfd.c:1823
 #, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr "Ne peut comprendre une ligne du fichier d'�tat enregistr� : � %s �"
-
-#: gconf/gconfd.c:1125
-msgid "Failed to parse connection ID in saved state file"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
-"Impossible d'analyser l'ID de connection dans le fichier d'�tat enregistr�"
+"Incapable de restorer un �couteur � l'adresse � %s �, ne peut r�soudre la "
+"base de donn�es"
 
-#: gconf/gconfd.c:1140
+#: gconf/gconfd.c:1869
 #, c-format
-msgid "Failed to unquote config source address from saved state file: %s"
-msgstr ""
-"Impossible de d�guillemetter l'adresse de la source de configuration du "
-"fichier d'�tat enregistr� : %s"
+msgid "Error reading saved state file: %s"
+msgstr "Erreur de lecture du fichier d'�tat enregistr� : %s"
 
-#: gconf/gconfd.c:1160
+#: gconf/gconfd.c:1922
 #, c-format
-msgid "Failed to unquote listener location from saved state file: %s"
-msgstr ""
-"Impossible de d�guillemetter l'emplacement de l'�couteur du fichier d'�tat "
-"enregistr� : %s"
+msgid "Unable to open saved state file '%s': %s"
+msgstr "Incapable d'ouvrir le fichier d'�tat enregistr� � %s � : %s"
 
-#: gconf/gconfd.c:1180
+#: gconf/gconfd.c:2039
 #, c-format
-msgid "Failed to unquote IOR from saved state file: %s"
-msgstr "Impossible de d�guillemetter l'IOR du fichier d'�tat enregistr� : %s"
-
-#: gconf/gconfd.c:1204
 msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
+"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 ""
-"Le fichier d'�tat enregistr� enregistre le m�me �couteur ajout� deux fois ; "
-"Ignore la seconde instance"
+"Impossible d'enregistrer l'addition d'un �couteur au fichier de trace de "
+"gconfd; ne sera pas capable de r�ajouter l'�couteur si gconfd quitte ou "
+"s'eteinds (%s)"
 
-#: gconf/gconfd.c:1225
+#: gconf/gconfd.c:2044
+#, c-format
 msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
+"Failed to log removal of listener to gconfd logfile; might erroneously re-"
+"add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
-"Le fichier d'�tat enregistr� a une suppression d'un �couteur qui n'a pas �t� "
-"ajout� ; ignore la suppression"
+"Impossible d'enregistrer la suppression de l'�couteur au fichier de trace de "
+"gconfd; peut r�ajouter par erreur l'�couteur si gconfd quitte ou s'�teinds (%"
+"s)"
 
-#: gconf/gconfd.c:1346
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
 #, c-format
-msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
-msgstr ""
-"Incapable de restorer un �couteur � l'adresse � %s �, ne peut r�soudre la "
-"base de donn�es"
+msgid "Failed to get IOR for client: %s"
+msgstr "Impossible d'obtenir l'IOR pour le client : %s"
 
-#: gconf/gconfd.c:1377
+#: gconf/gconfd.c:2082
 #, c-format
-msgid "Unable to open saved state file '%s': %s"
-msgstr "Incapable d'ouvrir le fichier d'�tat enregistr� � %s � : %s"
+msgid "Failed to open saved state file: %s"
+msgstr "Impossible d'ouvrir le fichier d'�tat enregistr� : %s"
 
-#: gconf/gconfd.c:1476
+#: gconf/gconfd.c:2095
 #, 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 write client add to saved state file: %s"
 msgstr ""
-"Impossible d'enregistrer l'addition d'un �couteur au fichier de trace de "
-"gconfd; ne sera pas capable de r�ajouter l'�couteur si gconfd quitte ou "
-"s'eteinds (%s)"
+"Impossible d'�crire l'ajout du client au fichier d'�tat enregistr� : %s"
 
-#: gconf/gconfd.c:1481
+#: gconf/gconfd.c:2103
 #, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr ""
+"Impossible de vider l'ajout du client au fichier d'�tat enregistr� : %s"
+
+#: gconf/gconfd.c:2193
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
-"Impossible d'enregistrer la suppression de l'�couteur au fichier de trace de "
-"gconfd; peut r�ajouter par erreur l'�couteur si gconfd quitte ou s'�teinds "
-"(%s)"
+"Quelque client se sont supprim� d'eux-m�me du serveur GConf alors qu'ils "
+"n'avaient m�me pas �t� ajout�s"
 
-#: gconf/gconftool.c:62
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr "Options d'aide"
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "D�finit une valeur � une cl� et synchronise. � utiliser avec --type."
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr "Affiche la valeeur d'une cl� sur la sortie standard."
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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 ""
 "D�finit un sch�ma et synchronise. � utiliser avec --short-desc, --long-desc, "
 "--owner, et --type."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr "Annule les cl�s pr�sentes sur la ligne de commande."
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr "Affiche toutes les paires cl�/valeur d'un r�pertoire."
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr "Affiche tous les sous-r�pertoires d'un r�pertoire."
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Affiche tous les sous-r�pertoires et entr�es d'un r�pertoire, recursivement."
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Retourne 0 si le r�pertoire existe, sinon 2."
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Ach�ve gconfd. N'UTILISEZ PAS CETTE OPTION SANS UNE BONNE RAISON."
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Retourne 0 si gconfd fonctionne, sinon 2."
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1327,7 +1201,7 @@ msgstr ""
 "Ex�cute le serveur de configuration (gconfd). (Normallement cela ce fait "
 "automatiquement quand c'est n�cessaire.)"
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1335,11 +1209,11 @@ msgstr ""
 "Sp�cifie le type d'une valeur � d�finir, ou le type d'une valeur que d�crit "
 "un sch�ma.  Abbr�viation unique OK."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1347,11 +1221,11 @@ msgstr ""
 "Sp�cifie le type d'une liste de valeur � d�finir, ou le type d'une valeur "
 "que d�crit un sch�ma. Abbr�viation unique OK."
 
-#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1359,7 +1233,7 @@ msgstr ""
 "Sp�cifie le type de la valeur du premier �l�ment d'une paire � d�finir, ou "
 "le type d'une valeur que d�crit un sch�ma. Abbr�viation unique OK."
 
-#: gconf/gconftool.c:198
+#: gconf/gconftool.c:205
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1367,46 +1241,46 @@ msgstr ""
 "Sp�cifie le type de la valeur du second �l�ment d'une paire � d�finir, ou le "
 "type d'une valeur que d�crit un sch�ma. Abbr�viation unique OK."
 
-#: gconf/gconftool.c:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "Sp�cifie une courte description d'une demi-ligne allant dans un sch�ma."
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr "Sp�cifie une description de plusieurs ligne allant dans un sch�ma."
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr "Sp�cifie le propri�taire d'un sch�ma."
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr "PROPRI�TAIRE"
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr "Sp�cifie le fichier du sch�ma � installer."
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr "NOMDUFICHIER"
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Sp�cifie une source de configuration � utiliser plut�t que le chemin par "
 "d�faut."
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr "SOURCE"
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1414,7 +1288,7 @@ msgstr ""
 "Acc�de directement � la base de donn�es de configuration, outrepassant le "
 "serveur. Il est n�cessaire que gconfd ne fonctionne pas."
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1425,7 +1299,7 @@ msgstr ""
 "�tre d�fini sur la source de configuration par d�faut ou doit �tre d�fini � "
 "une cha�ne vide pour utiliser la valeur par d�faut."
 
-#: gconf/gconftool.c:270
+#: gconf/gconftool.c:277
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1433,7 +1307,7 @@ msgstr ""
 "Torture-test une application en d�finissant et annulant un ensemble de "
 "valeurs de diff�rents types pour les cl�s de la ligne de commande."
 
-#: gconf/gconftool.c:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1441,7 +1315,27 @@ msgstr ""
 "Torture-test une application en d�finissant et annulant un ensemble de cl�s "
 "� l'int�rieur des r�pertoires de la ligne de commande."
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1451,91 +1345,94 @@ msgstr ""
 "Executez � %s --help � pour voir la liste compl�te des options en ligne de "
 "commande disponibles.\n"
 
-#: gconf/gconftool.c:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Impossible d'obtenir ou d�finir/annuler simultanement\n"
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Impossible de d�finir ou d'obtenir/annuler simultan�ment\n"
 
-#: 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:413
+#, fuzzy
+msgid "Can't use --all-entries with --get or --set\n"
+msgstr "Impossible d'utiliser --all-dirs avec --get ou --set\n"
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 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:371
+#: gconf/gconftool.c:431
+#, fuzzy
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
-"--recursive-list ne devrait pas �tre utilis� avec --get, --set, --unset, "
-"--all-pairs, ou --all-dirs\n"
+"--recursive-list ne devrait pas �tre utilis� avec --get, --set, --unset, --"
+"all-pairs, ou --all-dirs\n"
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
+#, fuzzy
 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-entries, --"
+"all-dirs\n"
 msgstr ""
-"--set_schema ne devrait pas �tre utilis� avec --get, --set, --unset, "
-"--all-pairs, et --all-dirs\n"
+"--set_schema ne devrait pas �tre utilis� avec --get, --set, --unset, --all-"
+"pairs, et --all-dirs\n"
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 "Le type de valeur est n�cessaire seulement lorsque l'on d�finie une valeur\n"
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr "Vous devez sp�cifier un type lorsque vous d�finissez une valeur\n"
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr "L'option ping doit �tre utilis�e seule.\n"
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "L'option --dir-exists doit �tre utilis�e seule.\n"
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "L'option --install-schema-file doit �tre utilis�e seule.\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "L'option --makefile-install-rule doit �tre utilis�e seule.\n"
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr "L'option --break-key doit �tre utilis�e seule.\n"
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr "L'option --break-directory doit �tre utilis�e seule.\n"
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "You devez sp�cifier une source de configuration avec --config-source quand "
 "vous utilisez --direct\n"
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Echec � l'initialisation de GConf : %s\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Vous devez d�finir la variable d'environnement GCONF_CONFIG_SOURCE\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1548,258 +1445,315 @@ msgstr ""
 "qu'aucune applications ne fonctionne (cepandant, th�oriquement, cela devrait "
 "fonctionner m�me si des applications sont en cours de fonctionnement).\n"
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Impossible d'acc�der a(ux) source(s) de configuration : %s\n"
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Erreur d'extinction : %s\n"
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "Vous devez sp�cifier un ou plusieurs r�pertoires � lister r�cursivement.\n"
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
 msgstr "�chec lors du listage des paires dans � %s � : %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr "(aucune valeur d�fini)"
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, 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:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr "Vous devez sp�cifier une ou plusieurs cl�s � d�finir\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "Type : %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Type Liste : %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Type Car : %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Type Cdr : %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "Propri�taire : %s\n"
+msgid "Default Value: %s\n"
+msgstr "Valeur par d�faut : %s\n"
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr "Ind�fini"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "Propri�taire : %s\n"
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Courte desc. : %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Longue desc. : %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Aucune valeur d�finie pour � %s �\n"
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Impossible d'obtenir de valeur pour � %s � : %s\n"
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Ne comprend pas le type � %s �\n"
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Vous devez sp�cifier au choix des cl�s/valeurs comme param�tres\n"
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Aucune valeur � d�finir pour la cl� : � %s �\n"
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr "Impossible de d�finir le sch�ma comme valeur\n"
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
-"Quand vous d�finissez une liste vous devez sp�cifier une primitive "
-"list-type\n"
+"Quand vous d�finissez une liste vous devez sp�cifier une primitive list-"
+"type\n"
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Quand vous d�finissez une paire vous devez sp�cifier une primitive car-type "
 "et cdr-type\n"
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erreur : %s\n"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
-#, c-format
-msgid "Error setting value: %s"
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
 msgstr "Erreur � l'attribution de la valeur : %s"
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
-#, c-format
-msgid "Error syncing: %s"
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
 msgstr "Erreur de synchronisation : %s"
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1234
+#, fuzzy
+msgid "Must specify a key or keys on the command line\n"
+msgstr "Vous devez sp�cifier une ou plusieurs cl�s � d�finir\n"
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "Aucun fichier � %s �\n"
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "Erreur durant la definition du sch�ma pour � %s � : %s"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "Aucun fichier � %s �\n"
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+#, fuzzy
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr "Vous devez sp�cifier un cl� (nom du sch�ma) comme seul param�tre\n"
+
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr ""
+"AVERT. : impossible d'associer le sch�ma � %s � avec la cl� � %s � : %s\n"
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Vous devez sp�cifier un cl� (nom du sch�ma) comme seul param�tre\n"
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Le type de la liste doit �tre un type primitif : string, int, float ou bool\n"
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Le type car de la paire doit �tre un type primitif : string, int, float ou "
 "bool\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Le type cdr de la paire doit �tre un type primitif : string, int, float ou "
 "bool\n"
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr "Erreur � l'attribution de la valeur : %s"
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr "Erreur de synchronisation : %s"
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Vous devez sp�cifier un ou plusieurs r�pertoires pour en obtenir les paires "
 "cl�s/valeurs.\n"
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Vous devez sp�cifier une ou plusieurs cl�s � annuler.\n"
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Erreur d'annulation de � %s � : %s\n"
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
-"Vous devez sp�cifier un ou plusieurs r�pertoires pour en obtenir les "
-"sous-r�pertoires.\n"
+"Vous devez sp�cifier un ou plusieurs r�pertoires pour en obtenir les sous-"
+"r�pertoires.\n"
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Erreur lors du listage des r�pertoires : %s\n"
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "AVERT. : type invalide ou manquant pour le sch�ma (%s)\n"
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "AVERT. : list_type invalide ou manquant pour le sch�ma (%s)\n"
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "AVERT. : �chec d'analyse de la valeur par d�faut � %s � pour le sch�ma (%s)\n"
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, 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�ma (%s)\n"
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "AVERT. : Vous ne pouvez d�finir une valeur par d�faut pour un sch�ma\n"
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "AVERT. : erreur interne gconftool, GConfValueType inconnu\n"
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, 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:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"AVERT. : list_type peur seulement �tre int, float, string ou bool et non � "
-"%s �\n"
+"AVERT. : list_type peur seulement �tre int, float, string ou bool et non � %"
+"s �\n"
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVERT. : car_type peur seulement �tre int, float, string ou bool et non � %s "
 "�\n"
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVERT. : cdr_type peur seulement �tre int, float, string ou bool et non � %s "
 "�\n"
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr "AVERT. : noeud <applyto> vide"
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, 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:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr "AVERT. : aucune cl� sp�cifi� pour le sch�ma\n"
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 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:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1807,53 +1761,53 @@ msgstr ""
 "AVERT. : plusieurs noeuds <locale> pour la locale � %s �, ignore tous sauf "
 "le premier\n"
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, 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:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 "AVERT. : impossible d'installer le sch�ma � %s � pour la locale � %s � : %s\n"
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Sch�ma � %s � install� pour la locale � %s �\n"
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 "AVERT. : impossible d'associer le sch�ma � %s � avec la cl� � %s � : %s\n"
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Sch�ma � %s � attach� � la cl� � %s �\n"
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Vous devez avoir au moins une entr�e <locale> dans un <schema>\n"
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, 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:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Impossible d'ouvrir � %s � : %s\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Le document � %s � est vide ?\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1862,26 +1816,26 @@ msgstr ""
 "Le document � %s � a le mauvais type de noeud racine (<%s>, devrait �tre "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, 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:1959
+#: gconf/gconftool.c:2237
 #, 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:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Erreur de synchronisation des donn�es de configuration : %s"
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr "Vous devez sp�cifier quelques fichiers de sch�ma � installer\n"
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -1890,16 +1844,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "�chec de l'annulation de la cl� de torture %s : %s\n"
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr "Vous devez sp�cifier quelques cl�s � torturer\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1909,11 +1863,11 @@ msgstr ""
 "valeurs pour les cl�s :\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr "Vous devez sp�cifier quelques r�pertoires � torturer\n"
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1924,89 +1878,266 @@ msgstr ""
 "valeurs pour les cl�s dans le r�pertoire :\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr "Erreur GConf : %s\n"
+
+#: gconf/gconf-client.c:798
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 "Avertissement GConf : �chec lors du listage des paires dans � %s � : %s"
 
-#: wrappers/gtk/gconf-client.c:985
+#: gconf/gconf-client.c:1000
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "� %s � attendu, obtenu � %s � pour la cl� %s"
 
-#~ msgid "Unloading BerkeleyDB (BDB) backend module."
-#~ msgstr "D�chargement du module BerkeleyDB (BDB)."
+#~ msgid "Ignoring XML node `%s', except for possible schema name: %s"
+#~ msgstr ""
+#~ "Ignore le noeud XML � %s �, � part pour le nom possible de sch�ma : %s"
 
-#~ msgid "Opened BerkeleyDB source at root %s"
-#~ msgstr "Source BerkeleyDB ouverte � la racine %s"
+#~ msgid "found <local_schema> with no locale setting"
+#~ msgstr "a trouv� <local_schema> avec aucun r�glage de locale"
 
-#~ msgid "Initializing BDB backend module"
-#~ msgstr "Initialisation du module BDB"
+#~ msgid ""
+#~ "Error on line %d char %d: %s\n"
+#~ "(Some surrounding text was '%s')\n"
+#~ msgstr ""
+#~ "Erreur � la ligne %d caract�res %d : %s\n"
+#~ "(Le texte englobant est � %s �)\n"
 
-#~ msgid "Couldn't find the %s root directory in the address `%s'"
-#~ msgstr "Ne peut trouver le r�pertoire racine %s � l'adresse � %s �"
+#~ 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 �tre valide ('&' doit commencer une entit� comme '&quot;')"
 
 #~ msgid ""
-#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; "
+#~ "&apos;)"
 #~ msgstr ""
-#~ "Ne peut lire ou �crire vers le r�pertoire racine %s � l'adresse � %s �"
+#~ "Entit� inconnue � %s � ('&' doit commencer les entit�s &amps; &quot; &lt; "
+#~ "&gt; &apos;)"
 
-#~ msgid "Failed to set mode on `%s': %s"
-#~ msgstr "Impossible de d�finir le mode de � %s � : %s"
+#~ msgid ""
+#~ "Markup text ended in the middle of a character reference, just after '&#'"
+#~ msgstr ""
+#~ "Le texte marqu� finit au mileu d'une r�f�rence de caract�re, just apr�s "
+#~ "'&#'"
 
-#~ msgid "No database available to save your configuration"
+#~ msgid ""
+#~ "Character reference contained non-digit '%s' ('&#' should begin a "
+#~ "reference to a unicode character, such as '&#2342;')"
 #~ msgstr ""
-#~ "Aucune base de donn�es disponible pour sauvegarder votre configuration"
+#~ "La r�f�rence du caract�re n'est pas un nombre � %s � ('&#' doit commencer "
+#~ "une r�f�rence vers un caract�re unicode, comme '&#2342;')"
 
-#~ msgid "OAF problem description: '%s'"
-#~ msgstr "Description du probl�me OAF : � %s �"
+#~ 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�f�rence de caract�re ('&#' doit "
+#~ "commencer une r�f�rence de caract�re comme '&#2342;')"
 
-#~ msgid "Unable to store a value at key '%s'"
-#~ msgstr "Incapable d'enregistrer une valeur � la cl� � %s �"
+#~ msgid ""
+#~ "Couldn't parse character reference '%s' ('&#' must begin a character "
+#~ "reference such as '&#2343;')"
+#~ msgstr ""
+#~ "Ne peut analyser la r�f�rence de caract�re � %s � ('&#' doit commencer "
+#~ "une r�f�rence de caract�re comme '%#2343;')"
+
+#~ msgid ""
+#~ "Character code %#lx is not allowed in XML documents or is not a valid "
+#~ "Unicode character"
+#~ msgstr ""
+#~ "Le code du caract�re %#lx n'est pas permis dans les documents XML ou "
+#~ "n'est pas un caract�re Unicode valide."
+
+#, fuzzy
+#~ msgid ""
+#~ "Documented ended just after an '&', '&' should begin an entity or "
+#~ "character reference."
+#~ msgstr ""
+#~ "Le document finit juste apr�s un '&', '&' doit commencer une entit� ou "
+#~ "une r�f�rence de caract�re."
+
+#~ 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�res '<' ou '>' ne sont pas permis ici; il ne sont permis "
+#~ "qu'autour de balises, par exemple <bold> ou <paragraph>. Sinon, encodez "
+#~ "ces caract�res comme les entit�s &lt; et &gt;"
+
+#~ msgid "Character '%s' is not valid at the start of an attribute name"
+#~ msgstr "Le caract�re � %s � n'est pas valide au d�but d'un nom d'attribut"
+
+#~ msgid "Document ended just after attribute name"
+#~ msgstr "Le document finit just apr�s un nom d'attribut"
+
+#~ msgid "Attribute name must be immediately followed by an '=' character"
+#~ msgstr ""
+#~ "Le nom d'attribut doit �tre imm�diatement suivi par un caract�re '='"
+
+#~ msgid ""
+#~ "'=' character after attribute must be immediately followed by an '\"' "
+#~ "character"
+#~ msgstr ""
+#~ "Le caract�re '=' apr�s un attribut doit �tre imm�diatement suivi par le "
+#~ "caract�re '\"'"
+
+#~ msgid ""
+#~ "Character '%c' found inside an attribute value; perhaps your attribute "
+#~ "value is missing the closing quotation mark '\"'"
+#~ msgstr ""
+#~ "Le caract�re '%c' a �t� trouv� a l'int�rieur d'une valeur d'attribut; "
+#~ "peut �tre qu'il manque � votre valeur d'attibut le guillemet de fermeture "
+#~ "'\"'"
 
-#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgid ""
+#~ "Ran out of text before a quote mark ('\"') was seen at the end of an "
+#~ "attribute value"
 #~ msgstr ""
-#~ "R�ception du signal %d, cr�e un fichier core. Veuillez rapporter l'anomalie "
-#~ "GConf."
+#~ "La fin du texte a �t� rencontr�e avant le guillement final � \" � � "
+#~ "l'int�rieur d'une valeur d'attribut."
 
 #~ msgid ""
-#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ "Text ends immediately after an attribute value, before the element was "
+#~ "closed"
 #~ msgstr ""
-#~ "R�ception du signal %d, s'�teind anormalement. Veuillez faire un rapport "
-#~ "d'anomalie GConf."
+#~ "Le texte finit imm�diatement apr�s une valeur d'attribut avant que "
+#~ "l'�l�ment soit ferm�"
 
-#~ msgid "GConf server is not in use, shutting down."
-#~ msgstr "Le serveur GConf n'est pas en cours d'utilisation, extinction."
+#~ msgid "Missing '<' at start of element"
+#~ msgstr "Le caract�re � < � est manquant au d�but de l'�l�ment"
 
-#~ msgid "Error reading saved state file: %s"
-#~ msgstr "Erreur de lecture du fichier d'�tat enregistr� : %s"
+#~ msgid "Document ended just after '<' character"
+#~ msgstr "Le document finit juste apr�s le caract�re � < �"
 
-#~ msgid "Failed to get IOR for client: %s"
-#~ msgstr "Impossible d'obtenir l'IOR pour le client : %s"
+#~ msgid "No closing '>' found for a <? or <!"
+#~ msgstr "Aucun caract�re � > � trouv� pour <? ou <!"
 
-#~ msgid "Failed to open saved state file: %s"
-#~ msgstr "Impossible d'ouvrir le fichier d'�tat enregistr� : %s"
+#~ msgid "Character '%s' is not valid at the start of an element name"
+#~ msgstr "Le caract�re � %s � n'est pas valide au d�but du nom d'un �l�ment"
 
-#~ msgid "Failed to write client add to saved state file: %s"
+#~ msgid "Document ended just after element name, no '>' seen"
+#~ msgstr "Le document finit juste apr�s un nom d'�l�ment, aucun � > � vu"
+
+#~ msgid "Elements should be closed with '>' or '/>', not with '%s'"
 #~ msgstr ""
-#~ "Impossible d'�crire l'ajout du client au fichier d'�tat enregistr� : %s"
+#~ "Les �l�ments doivent �tre ferm� avec � > � ou � /> �, et non avec � %s �"
 
-#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgid ""
+#~ "Element ended just after '/', no '>' seen; empty elements should end with "
+#~ "'/>'"
 #~ msgstr ""
-#~ "Impossible de vider l'ajout du client au fichier d'�tat enregistr� : %s"
+#~ "L'�l�ment finit juste apr�s � / �, aucun � > � vu; les �l�ments vides "
+#~ "doivent finir avec � /> �"
+
+#~ msgid "Close tag not found at end of element"
+#~ msgstr "Balise de fermeture non trouv� � la fin de l'�l�ment"
+
+#~ msgid "Close tag ends just after '<' character"
+#~ msgstr "Une balise de fermeture finit juste apr�s le caract�re � < �"
+
+#~ msgid "Close tag should begin with '</', '/' character is missing"
+#~ msgstr ""
+#~ "Une balise de fermeture doit commencer avec � </ �, le caract�re � / � "
+#~ "est manquant"
+
+#~ msgid "Close tag ends just after '/' character"
+#~ msgstr "Une balise de fermeture finit juste apr�s le caract�re � / �"
+
+#~ msgid "Document ended just after element name in close tag, no '>' seen"
+#~ msgstr ""
+#~ "Le document finit juste apr�s un nom d'�l�ment dans une balise de "
+#~ "fermeture, aucun � > � vu"
+
+#~ msgid "Document ended just after close tag name, no '>' seen"
+#~ msgstr ""
+#~ "Le document finit juste apr�s le nom d'une balise de fermeture, aucun � > "
+#~ "� vu"
+
+#~ msgid "Close tag '%s' does not match opening tag '%s'"
+#~ msgstr ""
+#~ "La balise de fermeture � %s � ne correspond pas � la balise d'ouverture � "
+#~ "%s �"
 
 #~ msgid ""
-#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ "Invalid UTF-8 character at byte %d in marked-up text. Some text before "
+#~ "the bad character was '%s'"
 #~ msgstr ""
-#~ "Quelque client se sont supprim� d'eux-m�me du serveur GConf alors qu'ils "
-#~ "n'avaient m�me pas �t� ajout�s"
+#~ "Caract�re UTF-8 invalide � l'octet %d du texte marqu�. Une portion du "
+#~ "texte avant le mauvais caract�re est � %s �"
 
-#~ msgid "Default Value: %s\n"
-#~ msgstr "Valeur par d�faut : %s\n"
+#~ 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 ""
+#~ "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 ""
+#~ "Erreur de contact du serveur de configuration : OAF � retourn� nil depuis "
+#~ "oaf_activate_from_id() et ne d�finit pas une exception expliquant le "
+#~ "probl�me. Envoyez par courrier �lectronique un rapport d'anomalies, SVP."
 
-#~ msgid "GConf Error: %s\n"
-#~ msgstr "Erreur GConf : %s\n"
+#~ msgid "Received signal %d, shutting down."
+#~ msgstr "R�ception du signal %d, acheve."
+
+#~ msgid "GConf was built with debugging features enabled"
+#~ msgstr "GConf a �t� compil� avec les fonctionnalit�s de d�bogage activ�es"
+
+#~ msgid "Didn't understand line in saved state file: '%s'"
+#~ msgstr "Ne peut comprendre une ligne du fichier d'�tat enregistr� : � %s �"
+
+#~ msgid "Failed to parse connection ID in saved state file"
+#~ msgstr ""
+#~ "Impossible d'analyser l'ID de connection dans le fichier d'�tat enregistr�"
+
+#~ msgid "Failed to unquote config source address from saved state file: %s"
+#~ msgstr ""
+#~ "Impossible de d�guillemetter l'adresse de la source de configuration du "
+#~ "fichier d'�tat enregistr� : %s"
+
+#~ msgid "Failed to unquote listener location from saved state file: %s"
+#~ msgstr ""
+#~ "Impossible de d�guillemetter l'emplacement de l'�couteur du fichier "
+#~ "d'�tat enregistr� : %s"
+
+#~ msgid "Failed to unquote IOR from saved state file: %s"
+#~ msgstr ""
+#~ "Impossible de d�guillemetter l'IOR du fichier d'�tat enregistr� : %s"
+
+#~ msgid ""
+#~ "Saved state file records the same listener added twice; ignoring the "
+#~ "second instance"
+#~ msgstr ""
+#~ "Le fichier d'�tat enregistr� enregistre le m�me �couteur 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'�tat enregistr� a une suppression d'un �couteur qui n'a pas "
+#~ "�t� ajout� ; ignore la suppression"
+
+#~ msgid "Can't use --all-pairs with --get or --set\n"
+#~ msgstr "Impossible d'utiliser --all-pairs avec --get ou --set\n"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Incapable d'enregistrer une valeur � la cl� � %s �"
 
 #~ msgid ""
 #~ "Saved state file records the same client added twice; ignoring the second "
@@ -2016,11 +2147,11 @@ msgstr "� %s � attendu, obtenu � %s � pour la cl� %s"
 #~ "ignore la seconde instance"
 
 #~ msgid ""
-#~ "Saved state file had a removal of a client that wasn't added; ignoring the "
-#~ "removal."
+#~ "Saved state file had a removal of a client that wasn't added; ignoring "
+#~ "the removal."
 #~ msgstr ""
-#~ "Le fichier d'�tat enregistr� a une suppression d'un client qui n'a pas �t� "
-#~ "ajout� ; ignore la suppression."
+#~ "Le fichier d'�tat enregistr� a une suppression d'un client qui n'a pas "
+#~ "�t� ajout� ; ignore la suppression."
 
 #~ msgid "Received signal %d, ignoring"
 #~ msgstr "R�ception du signal %d, ignore"
diff --git a/po/ga.po b/po/ga.po
index e80eec95..5439c020 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf.pot\n"
-"POT-Creation-Date: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-0400\n"
 "PO-Revision-Date: 2000-03-13 18:23+0000\n"
 "Last-Translator:  Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -13,20 +13,43 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: backends/xml-backend.c:233
-msgid "Unloading XML backend module."
+#: backends/bdb-backend.c:215
+msgid "Unloading BerkeleyDB (BDB) backend module."
 msgstr ""
 
-#: backends/xml-backend.c:286
+#: backends/bdb-backend.c:238
 #, c-format
-msgid "Couldn't find the XML root directory in the address `%s'"
+msgid "Opened BerkeleyDB source at root %s"
+msgstr ""
+
+#: backends/bdb-backend.c:578
+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/xml-backend.c:301 backends/xml-dir.c:1033
+#: 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 ""
+
+#: backends/xml-backend.c:286
+#, c-format
+msgid "Couldn't find the XML root directory in the address `%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'"
@@ -41,7 +64,7 @@ msgstr ""
 msgid "Initializing XML backend module"
 msgstr ""
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr ""
@@ -50,18 +73,18 @@ msgstr ""
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, 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:253
+#: backends/xml-cache.c:256
 #, 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
@@ -74,160 +97,158 @@ msgstr ""
 msgid "XML filename `%s' is a directory"
 msgstr ""
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: 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
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr ""
 
 #. These are all fatal errors
-#: backends/xml-dir.c:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:961
+#: backends/xml-dir.c:979
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr ""
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr ""
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
+#: backends/xml-entry.c:376
 #, c-format
-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"
+msgid "Ignoring XML node `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr ""
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -260,28 +281,28 @@ msgstr ""
 msgid "Failed to shut down backend"
 msgstr ""
 
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr ""
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr ""
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr ""
@@ -290,7 +311,7 @@ msgstr ""
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -298,59 +319,59 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr ""
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr ""
@@ -415,208 +436,29 @@ msgstr ""
 msgid "Failed to get a lock"
 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
-#, c-format
-msgid "Failed to open file '%s': %s"
+#: gconf/gconf-error.c:40
+msgid "No database available to save your configuration"
 msgstr ""
 
-#: gconf/gconf-glib.c:10683
-#, c-format
-msgid "Error reading file '%s': %s"
-msgstr ""
-
-#: gconf/gconf-internals.c:85
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr ""
 
@@ -625,176 +467,194 @@ msgstr ""
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1499
+#: gconf/gconf-internals.c:1474
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, 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:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -864,510 +724,580 @@ msgstr ""
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#: gconf/gconfd.c:369
+#, c-format
+msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgstr ""
+
+#: gconf/gconfd.c:385
 #, c-format
-msgid "Received signal %d, shutting down."
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 
-#: gconf/gconfd.c:329
+#: gconf/gconfd.c:402
 #, 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:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr ""
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, c-format
+msgid "Failed to create %s: %s"
+msgstr ""
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr ""
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
+msgstr ""
+
+#: gconf/gconfd.c:613
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
+msgstr ""
+
+#: gconf/gconfd.c:618
+msgid "Unknown error registering existing gconfd with OAF; exiting"
 msgstr ""
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:645
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:649
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:654
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:698
+#, c-format
+msgid "Failed to release lockfile: %s"
+msgstr ""
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "Ag eirigh as"
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr ""
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 
-#: gconf/gconfd.c:989
+#: gconf/gconfd.c:1317
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1110
+#: gconf/gconfd.c:1823
 #, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr ""
-
-#: gconf/gconfd.c:1125
-msgid "Failed to parse connection ID in saved state file"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1140
+#: gconf/gconfd.c:1869
 #, c-format
-msgid "Failed to unquote config source address from saved state file: %s"
+msgid "Error reading saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1160
+#: gconf/gconfd.c:1922
 #, c-format
-msgid "Failed to unquote listener location from saved state file: %s"
+msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1180
+#: gconf/gconfd.c:2039
 #, c-format
-msgid "Failed to unquote IOR from saved state file: %s"
-msgstr ""
-
-#: gconf/gconfd.c:1204
 msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
+"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:1225
+#: gconf/gconfd.c:2044
+#, c-format
 msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
+"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:1346
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
 #, c-format
-msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgid "Failed to get IOR for client: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1377
+#: gconf/gconfd.c:2082
 #, c-format
-msgid "Unable to open saved state file '%s': %s"
+msgid "Failed to open saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1476
+#: gconf/gconfd.c:2095
 #, 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 write client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1481
+#: gconf/gconfd.c:2103
 #, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr ""
+
+#: gconf/gconfd.c:2193
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 
-#: gconf/gconftool.c:62
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr "Roghnachais Cabhair"
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr ""
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr ""
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr ""
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 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:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr ""
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 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:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr ""
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 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:198
+#: gconf/gconftool.c:205
 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:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr ""
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr ""
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr "�INEAR"
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr ""
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr "AINMCOMHAD"
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr ""
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 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:270
+#: gconf/gconftool.c:277
 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:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, 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:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
+#: gconf/gconftool.c:413
+msgid "Can't use --all-entries with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
 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-entries, --"
+"all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 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:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1375,311 +1305,365 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:764
+#: gconf/gconftool.c:879
 #, c-format
-msgid "Failure listing pairs in `%s': %s"
+msgid "Failure listing entries in `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "Saghas: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, fuzzy, c-format
 msgid "List Type: %s\n"
 msgstr "Saghas: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, fuzzy, c-format
 msgid "Car Type: %s\n"
 msgstr "Saghas: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, fuzzy, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Saghas: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "�in�ar: %s\n"
+msgid "Default Value: %s\n"
+msgstr ""
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "�in�ar: %s\n"
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "Earr�id: %s\n"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
+#: gconf/gconftool.c:1193
 #, c-format
-msgid "Error setting value: %s"
+msgid "Error setting value: %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
+msgstr "Earr�id: %s\n"
+
+#: gconf/gconftool.c:1234
+msgid "Must specify a key or keys on the command line\n"
 msgstr ""
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
+#: gconf/gconftool.c:1254
 #, c-format
-msgid "Error syncing: %s"
+msgid "No schema known for `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, c-format
+msgid "Error getting schema at '%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1299
+#, c-format
+msgid "No schema stored at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr ""
+
+#: gconf/gconftool.c:1365
+#, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr ""
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr ""
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Is Cap�is '`%s' folamh?\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -1688,27 +1672,27 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1716,12 +1700,17 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, fuzzy, c-format
+msgid "GConf Error: %s\n"
+msgstr "Earr�id: %s\n"
+
+#: gconf/gconf-client.c:798
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:985
+#: gconf/gconf-client.c:1000
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index bb8d51dd..5d455f26 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2001-08-19 15:17+0200\n"
+"POT-Creation-Date: 2001-09-14 12:44-0400\n"
 "PO-Revision-Date: 2001-08-19 15:21+0200\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -678,10 +678,10 @@ msgstr ""
 "para este problema: 1) o ficheiro do cami�o da configuraci�n non se atopou "
 "ou non cont�n ningunha base de datos, ou 2) bonobo-activation creou "
 "erroneamente dous procesos gconfd. Se ten dous procesos gconfd (ou ti�a dous "
-"no momento en que se lanzou o segundo), ent�n � un erro do bonobo-activation, "
-"non do GConf. Pode axudar sa�ndo, matando o bonobo-activation e o gconfd, e "
-"entrando de novo. Coma sempre, comprobe os rexistros do sistema user.* para "
-"detalles dos problemas atopados polo gconfd."
+"no momento en que se lanzou o segundo), ent�n � un erro do bonobo-"
+"activation, non do GConf. Pode axudar sa�ndo, matando o bonobo-activation e "
+"o gconfd, e entrando de novo. Coma sempre, comprobe os rexistros do sistema "
+"user.* para detalles dos problemas atopados polo gconfd."
 
 #: gconf/gconf-sources.c:1164
 #, c-format
diff --git a/po/hu.po b/po/hu.po
index 861f405e..2e1cd5f7 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: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-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,6 +12,34 @@ 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 "BerkeleyDB (BDB) backend-modul elt�vol�t�sa."
+
+#: backends/bdb-backend.c:238
+#, c-format
+msgid "Opened BerkeleyDB source at root %s"
+msgstr "BerkeleyDB forr�s nyitva van a gy�k�rben %s"
+
+#: backends/bdb-backend.c:578
+msgid "Initializing BDB backend module"
+msgstr "BDB backend-modul ind�t�sa"
+
+#: backends/dir-utils.c:108
+#, c-format
+msgid "Couldn't find the %s root directory in the address `%s'"
+msgstr "Nem tal�lhat� a %s gy�k�r k�nyvt�r a `%s' c�men"
+
+#: 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�nyvt�rat l�trehozni `%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�r k�nyvt�rban a `%s' c�men"
+
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Nincs bet�ltve az XML h�tt�r modul."
@@ -21,11 +49,6 @@ msgstr "Nincs bet�ltve az XML h�tt�r modul."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nem tal�lhat� az XML gy�k�r k�nyvt�r a `%s' c�men"
 
-#: backends/xml-backend.c:301 backends/xml-dir.c:1033
-#, c-format
-msgid "Could not make directory `%s': %s"
-msgstr "Nem lehet a k�nyvt�rat l�trehozni `%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'"
@@ -40,7 +63,7 @@ msgstr "K�nyvt�r/f�jl jogosults�gok az XML forr�snak a gy�k�rben %s are: %o/%o"
 msgid "Initializing XML backend module"
 msgstr "XML h�tt�r modul ind�t�sa"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Sikertelen az XML `%s' k�nyvt�r z�rol�s�nak felold�sa: %s"
@@ -49,7 +72,7 @@ msgstr "Sikertelen az XML `%s' k�nyvt�r z�rol�s�nak felold�sa: %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "Szinkroniz�latlan k�nyvt�r t�rl�sek az XML h�tt�r le�ll�t�sakor"
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -58,11 +81,11 @@ msgstr ""
 "Lehetetlen a `%s' k�nyvt�r t�rl�se az XML h�tt�r gyorst�rb�l, mert nem "
 "lehetett eredm�nyesen szinkroniz�lni a lemezhez"
 
-#: backends/xml-cache.c:253
+#: backends/xml-cache.c:256
 #, 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
@@ -75,163 +98,160 @@ msgstr "Nem siker�lt a `%s' f�jl adatait lek�rdezni: %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML `%s' f�jln�v egy k�nyvt�r"
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Sikertelen `%s' t�rl�se: %s"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Nem tudom �rni `%s' f�jlt: %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: backends/xml-dir.c:359
+#, fuzzy, c-format
+msgid "Failed to set mode on `%s': %s"
+msgstr "Sikertelen `%s' t�rl�se: %s"
+
+#: backends/xml-dir.c:373 backends/xml-dir.c:383
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Sikertelen �tnevez�s `%s'-r�l `%s'-re: %s"
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Sikertelen vissza�ll�t�s `%s'-re `%s'-r�l: %s"
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Sikertelen a r�gi `%s' f�jl t�rl�se: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Sikertelen adat lek�rdez�s a `%s'-r�l: %s"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Kett�s bejegyz�s `%s' a `%s'-ben, elvetem"
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "N�v n�lk�li bejegyz�s az XML `%s' f�jlban, elvetem"
 
-#: backends/xml-dir.c:961
+#: backends/xml-dir.c:979
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "Fels� szint� node az XML `%s' f�jlban nem <bejegyez�s>, elvetem"
 
-#: backends/xml-dir.c:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Sikertelen a `%s' f�jl bez�r�sa: %s"
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Figyelmen k�v�l hagyott XML node `%s' n�vvel: %s"
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Figyelmen k�v�l hagyott `%s' s�man�v, �rv�nytelen: %s"
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
-#, c-format
-msgid "Ignoring XML node `%s', except for possible schema name: %s"
-msgstr ""
-"Figyelmen k�v�l hagyott XML node `%s', kiv�ve a lehets�ges s�ma n�v: %s"
-
-#: backends/xml-entry.c:699
-msgid "found <local_schema> with no locale setting"
-msgstr "Tal�ltam <helyi_s�ma>-t nem helyi be�ll�t�sokkal"
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "Figyelmen k�v�l hagyott XML node `%s' n�vvel: %s"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Sikertelen beolvas�sa a s�ma alap�rt�keinek: %s"
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Nem �rtelmeztem az XML node <%s>-t egy XML lista node-on bel�l"
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "�rv�nytelen t�pus (lista, p�r, vagy ismeretlen) a lista node-ban"
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Rossz XML node: %s"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "A lista tartalmaz egy rosszul-g�pelt node-t (%s, kellene lenni %s)"
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Figyelmen k�v�l hagyott rossz car az XML p�rb�l: %s"
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "XML f�jl �rtelmez�se: a list�kat �s a p�rokat nem lehet egy p�ron bel�lre "
 "helyezni"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Figyelmen k�v�l hagyott rossz cdr az XML p�rb�l: %s"
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Nem �rtelmeztem az XML node <%s>-t egy XML p�r node-on bel�l"
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Nem tal�ltam az XML p�r node-nak car-t �s cdr-t"
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Hi�nyzik a cdr �rt�ke a p�rb�l az XML f�jlban"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "Hi�nyzik a car �rt�ke a p�rb�l az XML f�jlban"
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Hi�nyzik a car �s a cdr �rt�kek is a p�rb�l az XML f�jlban"
 
@@ -264,28 +284,28 @@ msgstr "Nem tal�ltam a h�tt�r modult `%s' sz�m�ra"
 msgid "Failed to shut down backend"
 msgstr "Nem siker�lt le�ll�tani a h�tt�rt"
 
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr ""
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr ""
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Nem siker�lt szinkroniz�lni egy vagy t�bb forr�st: %s"
@@ -294,7 +314,7 @@ msgstr "Nem siker�lt szinkroniz�lni egy vagy t�bb forr�st: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -302,59 +322,59 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr ""
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Hiba az �rt�k be�ll�t�skor `%s' sz�m�ra: %s"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Hiba k�nyvt�r t�rl�sekor `%s': %s"
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Hiba a k�nyvt�rak list�z�sakor a `%s'-ban: %s"
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Hiba a s�ma be�ll�t�sakor `%s': %s"
@@ -419,208 +439,29 @@ msgstr "A m�velet nem enged�lyezett a konfigur�ci�s szerver n�lk�l"
 msgid "Failed to get a lock"
 msgstr "Nem siker�lt lez�rni"
 
-#: 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 '&#'"
+#: gconf/gconf-error.c:40
+msgid "No database available to save your configuration"
 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�jl bez�r�sa: %s"
-
-#: gconf/gconf-glib.c:10683
-#, fuzzy, c-format
-msgid "Error reading file '%s': %s"
-msgstr "Hiba k�nyvt�r t�rl�sekor `%s': %s"
-
-#: gconf/gconf-internals.c:85
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Nem lehet '/' a kulcsban `%s'"
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr ""
 
@@ -629,176 +470,194 @@ msgstr ""
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1499
+#: gconf/gconf-internals.c:1474
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, 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:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -868,510 +727,580 @@ msgstr ""
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#: gconf/gconfd.c:369
 #, c-format
-msgid "Received signal %d, shutting down."
+msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgstr ""
+
+#: gconf/gconfd.c:385
+#, c-format
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 
-#: gconf/gconfd.c:329
+#: gconf/gconfd.c:402
 #, 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:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr ""
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "Sikertelen `%s' t�rl�se: %s"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
 msgstr ""
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:613
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
+msgstr ""
+
+#: gconf/gconfd.c:618
+msgid "Unknown error registering existing gconfd with OAF; exiting"
+msgstr ""
+
+#: gconf/gconfd.c:645
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:649
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:654
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr ""
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr ""
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 
-#: gconf/gconfd.c:989
+#: gconf/gconfd.c:1317
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1110
+#: gconf/gconfd.c:1823
 #, c-format
-msgid "Didn't understand line in saved state file: '%s'"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1125
-msgid "Failed to parse connection ID in saved state file"
-msgstr ""
+#: gconf/gconfd.c:1869
+#, fuzzy, c-format
+msgid "Error reading saved state file: %s"
+msgstr "Hiba k�nyvt�r t�rl�sekor `%s': %s"
 
-#: gconf/gconfd.c:1140
+#: gconf/gconfd.c:1922
 #, c-format
-msgid "Failed to unquote config source address from saved state file: %s"
+msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1160
+#: gconf/gconfd.c:2039
 #, c-format
-msgid "Failed to unquote listener location from saved state file: %s"
-msgstr ""
-
-#: gconf/gconfd.c:1180
-#, fuzzy, c-format
-msgid "Failed to unquote IOR from saved state file: %s"
-msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
-
-#: gconf/gconfd.c:1204
 msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
+"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:1225
-msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
-msgstr ""
-
-#: gconf/gconfd.c:1346
+#: gconf/gconfd.c:2044
 #, c-format
 msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+"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:1377
-#, c-format
-msgid "Unable to open saved state file '%s': %s"
-msgstr ""
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
+#, fuzzy, c-format
+msgid "Failed to get IOR for client: %s"
+msgstr "Nem siker�lt lez�rni"
 
-#: 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:2082
+#, fuzzy, c-format
+msgid "Failed to open saved state file: %s"
+msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
 
-#: gconf/gconfd.c:1481
-#, c-format
+#: gconf/gconfd.c:2095
+#, fuzzy, c-format
+msgid "Failed to write client add to saved state file: %s"
+msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
+
+#: gconf/gconfd.c:2103
+#, fuzzy, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
+
+#: gconf/gconfd.c:2193
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 
-#: gconf/gconftool.c:62
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr ""
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr ""
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr ""
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr ""
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 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:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr ""
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 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:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr ""
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 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:198
+#: gconf/gconftool.c:205
 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:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr ""
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr ""
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr ""
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr ""
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr ""
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr ""
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 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:270
+#: gconf/gconftool.c:277
 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:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, 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:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
+#: gconf/gconftool.c:413
+msgid "Can't use --all-entries with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
 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-entries, --"
+"all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 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:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1379,338 +1308,392 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
-msgstr ""
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
+msgstr "Hiba a k�nyvt�rak list�z�sakor a `%s'-ban: %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
+msgid "Default Value: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
+msgstr "Hiba az �rt�k be�ll�t�skor `%s' sz�m�ra: %s"
+
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
+msgstr "Hiba a modul megnyit�sakor `%s': %s\n"
+
+#: gconf/gconftool.c:1234
+msgid "Must specify a key or keys on the command line\n"
+msgstr ""
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "Nincs ilyen f�jl `%s'\n"
+
+#: gconf/gconftool.c:1287
 #, c-format
-msgid "Error setting value: %s"
+msgid "No doc string stored in schema at '%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "Hiba a s�ma be�ll�t�sakor `%s': %s"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "Nincs ilyen f�jl `%s'\n"
+
+#: gconf/gconftool.c:1302
 #, c-format
-msgid "Error syncing: %s"
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr "Figyelmen k�v�l hagyott `%s' s�man�v, �rv�nytelen: %s"
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr ""
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr ""
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr ""
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1718,32 +1701,28 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr ""
+
+#: gconf/gconf-client.c:798
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:985
+#: gconf/gconf-client.c:1000
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
 
-#~ msgid "Unloading BerkeleyDB (BDB) backend module."
-#~ msgstr "BerkeleyDB (BDB) backend-modul elt�vol�t�sa."
-
-#~ msgid "Opened BerkeleyDB source at root %s"
-#~ msgstr "BerkeleyDB forr�s nyitva van a gy�k�rben %s"
-
-#~ msgid "Initializing BDB backend module"
-#~ msgstr "BDB backend-modul ind�t�sa"
-
-#~ msgid "Couldn't find the %s root directory in the address `%s'"
-#~ msgstr "Nem tal�lhat� a %s gy�k�r k�nyvt�r a `%s' c�men"
+#~ msgid "Ignoring XML node `%s', except for possible schema name: %s"
+#~ msgstr ""
+#~ "Figyelmen k�v�l hagyott XML node `%s', kiv�ve a lehets�ges s�ma n�v: %s"
 
-#~ 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�r k�nyvt�rban a `%s' c�men"
+#~ msgid "found <local_schema> with no locale setting"
+#~ msgstr "Tal�ltam <helyi_s�ma>-t nem helyi be�ll�t�sokkal"
 
 #, fuzzy
-#~ msgid "Failed to set mode on `%s': %s"
-#~ msgstr "Sikertelen `%s' t�rl�se: %s"
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Sikertelen a `%s' f�jl bez�r�sa: %s"
diff --git a/po/it.po b/po/it.po
index ddfe706c..a99333eb 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: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-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,6 +13,34 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: backends/bdb-backend.c:215
+msgid "Unloading BerkeleyDB (BDB) backend module."
+msgstr "Scaricamento del modulo backend BerkeleyDB (BDB)."
+
+#: backends/bdb-backend.c:238
+#, c-format
+msgid "Opened BerkeleyDB source at root %s"
+msgstr "Aperto sorgente BerkeleyDB alla radice %s"
+
+#: backends/bdb-backend.c:578
+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 ""
@@ -22,11 +50,6 @@ 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'"
@@ -41,7 +64,7 @@ msgstr ""
 msgid "Initializing XML backend module"
 msgstr ""
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr ""
@@ -50,18 +73,18 @@ msgstr ""
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, 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:253
+#: backends/xml-cache.c:256
 #, 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
@@ -74,160 +97,158 @@ msgstr ""
 msgid "XML filename `%s' is a directory"
 msgstr ""
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: 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
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr ""
 
 #. These are all fatal errors
-#: backends/xml-dir.c:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:961
+#: backends/xml-dir.c:979
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr ""
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr ""
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
+#: backends/xml-entry.c:376
 #, c-format
-msgid "Ignoring XML node `%s', except for possible schema name: %s"
+msgid "Ignoring XML node `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:699
-msgid "found <local_schema> with no locale setting"
-msgstr ""
-
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr ""
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -260,28 +281,28 @@ msgstr ""
 msgid "Failed to shut down backend"
 msgstr ""
 
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr ""
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr ""
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr ""
@@ -290,7 +311,7 @@ msgstr ""
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -298,59 +319,59 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr ""
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr ""
@@ -415,208 +436,29 @@ msgstr ""
 msgid "Failed to get a lock"
 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'"
+#: gconf/gconf-error.c:40
+msgid "No database available to save your configuration"
 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
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr ""
 
@@ -625,176 +467,194 @@ msgstr ""
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1499
+#: gconf/gconf-internals.c:1474
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, 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:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -864,510 +724,580 @@ msgstr ""
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#: gconf/gconfd.c:369
 #, c-format
-msgid "Received signal %d, shutting down."
+msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgstr ""
+
+#: gconf/gconfd.c:385
+#, c-format
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 
-#: gconf/gconfd.c:329
+#: gconf/gconfd.c:402
 #, 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:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr ""
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, c-format
+msgid "Failed to create %s: %s"
+msgstr ""
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr ""
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
+msgstr ""
+
+#: gconf/gconfd.c:613
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
 msgstr ""
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:618
+msgid "Unknown error registering existing gconfd with OAF; exiting"
 msgstr ""
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:645
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:649
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:654
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:698
+#, c-format
+msgid "Failed to release lockfile: %s"
 msgstr ""
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr ""
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr ""
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 
-#: gconf/gconfd.c:989
+#: gconf/gconfd.c:1317
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1110
+#: gconf/gconfd.c:1823
 #, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr ""
-
-#: gconf/gconfd.c:1125
-msgid "Failed to parse connection ID in saved state file"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1140
+#: gconf/gconfd.c:1869
 #, c-format
-msgid "Failed to unquote config source address from saved state file: %s"
+msgid "Error reading saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1160
+#: gconf/gconfd.c:1922
 #, c-format
-msgid "Failed to unquote listener location from saved state file: %s"
+msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1180
+#: gconf/gconfd.c:2039
 #, c-format
-msgid "Failed to unquote IOR from saved state file: %s"
-msgstr ""
-
-#: gconf/gconfd.c:1204
 msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
+"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:1225
+#: gconf/gconfd.c:2044
+#, c-format
 msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
+"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:1346
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
 #, c-format
-msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgid "Failed to get IOR for client: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1377
+#: gconf/gconfd.c:2082
 #, c-format
-msgid "Unable to open saved state file '%s': %s"
+msgid "Failed to open saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1476
+#: gconf/gconfd.c:2095
 #, 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 write client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1481
+#: gconf/gconfd.c:2103
 #, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr ""
+
+#: gconf/gconfd.c:2193
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 
-#: gconf/gconftool.c:62
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr ""
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr ""
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr ""
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr ""
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 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:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr ""
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 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:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr ""
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 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:198
+#: gconf/gconftool.c:205
 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:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr ""
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr ""
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr ""
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr ""
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr ""
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr ""
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 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:270
+#: gconf/gconftool.c:277
 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:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, 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:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
+#: gconf/gconftool.c:413
+msgid "Can't use --all-entries with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
 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-entries, --"
+"all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 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:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1375,338 +1305,392 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:764
+#: gconf/gconftool.c:879
 #, c-format
-msgid "Failure listing pairs in `%s': %s"
+msgid "Failure listing entries in `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
+msgid "Default Value: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
+#: gconf/gconftool.c:1193
 #, c-format
-msgid "Error setting value: %s"
+msgid "Error setting value: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
+#: gconf/gconftool.c:1211
 #, c-format
-msgid "Error syncing: %s"
+msgid "Error syncing: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1234
+msgid "Must specify a key or keys on the command line\n"
+msgstr ""
+
+#: gconf/gconftool.c:1254
+#, c-format
+msgid "No schema known for `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1299
+#, c-format
+msgid "No schema stored at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr ""
+
+#: gconf/gconftool.c:1365
+#, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr ""
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr ""
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr ""
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1714,21 +1698,17 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr ""
+
+#: gconf/gconf-client.c:798
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:985
+#: gconf/gconf-client.c:1000
 #, 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 46c09532..27d345ed 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: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-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,6 +13,35 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: backends/bdb-backend.c:215
+msgid "Unloading BerkeleyDB (BDB) backend module."
+msgstr "BerkeleyDB (BDB) �Хå�����ɥ⥸�塼��������Ǥ���"
+
+#: backends/bdb-backend.c:238
+#, c-format
+msgid "Opened BerkeleyDB source at root %s"
+msgstr "%s �Υ롼�Ȥ˳����줿 BerkeleyDB ������"
+
+#: backends/bdb-backend.c:578
+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 �Хå�����ɥ⥸�塼��������Ǥ���"
@@ -22,11 +51,6 @@ 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'"
@@ -42,7 +66,7 @@ msgstr "�롼�Ȥˤ��� %s �� XML �������ѤΥǥ��쥯�ȥ�/�ե����븢��: %o/%o"
 msgid "Initializing XML backend module"
 msgstr "XML �Хå�����ɥ⥸�塼��ν������Ǥ���"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "XML ��Υǥ��쥯�ȥ� '%s' �Υ��å��˼��Ԥ��ޤ���: %s"
@@ -52,7 +76,7 @@ msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 "XML �Хå�����ɥ⥸�塼���λ������硢Ʊ�������ǥ��쥯�ȥ�������ޤ���"
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -61,14 +85,14 @@ msgstr ""
 "�ǥ������Ȥ�Ʊ���˼��Ԥ������ᡢXML �Хå�����ɤΥ���å��夫��ǥ��쥯�ȥ� "
 "'%s' �����Ǥ��ޤ���"
 
-#: backends/xml-cache.c:253
+#: backends/xml-cache.c:256
 #, 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 �ĤΥ����ƥब %u "
-"�ä���Ť�Ʊ�����������ƥ����������Υ���å���˻ĤäƤ��ޤ���"
+"%u �ĤΥ����ƥब %u �ä���Ť�Ʊ�����������ƥ����������Υ���å����"
+"�ĤäƤ��ޤ���"
 
 #: backends/xml-dir.c:164
 #, c-format
@@ -80,167 +104,165 @@ msgstr "'%s' �ξ��֤�����Ǥ��ޤ���Ǥ���: %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML �ե�����̾ '%s' �ϥǥ��쥯�ȥ�Ǥ���"
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "'%s' �κ���˼��Ԥ��ޤ���: %s"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "�ե����� '%s' �ؤν񤭹��ߤ˼��Ԥ��ޤ���: %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: 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
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "̾�� '%s' ���� '%s' ���ѹ��˼��Ԥ��ޤ���: %s"
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "'%s' ���� '%s' �������˼��Ԥ��ޤ���: %s"
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "�Ť��ե����� '%s' �κ���˼��Ԥ��ޤ���: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "'%s' �ξ��֤������Ǥ��ޤ���Ǥ���: %s"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "'%s' �� '%s' ����ǽ�ʣ���Ƥ��ޤ���̵�뤷�ޤ���"
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 "XML �ե����� '%s' �����̾����̵������ȥ꤬�ޤޤ�Ƥ��ޤ���̵�뤷�ޤ���"
 
-#: backends/xml-dir.c:961
+#: backends/xml-dir.c:979
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
-"XML �ե����� '%s' ����Υȥåץ�٥�Ρ��ɤ� 1 �Ĥ� <entry> "
-"�ǤϤ���ޤ���̵�뤷�ޤ���"
+"XML �ե����� '%s' ����Υȥåץ�٥�Ρ��ɤ� 1 �Ĥ� <entry> �ǤϤ���ޤ���"
+"̵�뤷�ޤ���"
 
-#: backends/xml-dir.c:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "�ե����� '%s' �κ����˼��Ԥ��ޤ���: %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "�ե����� '%s' ���Ĥ���Τ˼��Ԥ��ޤ���: %s"
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "̾�� '%s' �� XML �Ρ��ɤ�̵�뤷�ޤ�: %s"
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "��������̾ '%s' ��̵�뤷�ޤ��������ʥ�������: %s"
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
-#, c-format
-msgid "Ignoring XML node `%s', except for possible schema name: %s"
-msgstr "XML �Ρ��� '%s' ��̵�뤷�ޤ���ͭ���ʥ�������̾ '%s' ���㳰�Ǥ���"
-
-#: backends/xml-entry.c:699
-msgid "found <local_schema> with no locale setting"
-msgstr "������������̵���� <local_schema> ��ȯ�����ޤ�����"
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "̾�� '%s' �� XML �Ρ��ɤ�̵�뤷�ޤ�: %s"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "�������ޤΥǥե�����ͤ��ɤ߹��ߤ˼��Ԥ��ޤ���: %s"
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "<%s> �Ρ��ɤ� \"type\" °��������ޤ���"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "�Ρ��ɤ������� \"type\" °�� '%s' ����äƤ��ޤ���̵�뤷�ޤ���"
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "�Ρ��ɤ� \"value\" °��������ޤ���"
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "XML �ꥹ�ȥΡ��ɤ���ˤ��� XML �Ρ��� <%s> ���ᤷ�ޤ���Ǥ�����"
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
-"�ꥹ�ȥΡ��ɤ���������ʷ� (�ꥹ�ȡ��������ͤΥڥ����⤷���������ʷ�) "
-"������ޤ���"
+"�ꥹ�ȥΡ��ɤ���������ʷ� (�ꥹ�ȡ��������ͤΥڥ����⤷���������ʷ�) ������"
+"�ޤ���"
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "���ѤǤ��ʤ� XML �Ρ���: %s"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "�ꥹ�Ȥϻ��ѤǤ��ʤ����ΥΡ��ɤ�ޤ�Ǥ��ޤ���(%s �� %s �Ǥ���٤�)"
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "XML (�������ͤ�)�ڥ�������ѤǤ��ʤ� car ��̵�뤷�ޤ�: %s"
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
-"XML �ե�����������: "
-"�ꥹ�Ȥ�(�������ͤ�)�ڥ���(�������ͤ�)�ڥ��β��̥�٥��̵�����⤷��ޤ���"
+"XML �ե�����������: �ꥹ�Ȥ�(�������ͤ�)�ڥ���(�������ͤ�)�ڥ��β��̥�٥�"
+"��̵�����⤷��ޤ���"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "XML (�������ͤ�)�ڥ�������ѤǤ��ʤ� cdr ��̵�뤷�ޤ�: %s"
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "XML �ڥ��Ρ��ɤβ��̤ˤ��� XML �Ρ��� <%s> ���ᤷ�ޤ���Ǥ�����"
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "XML �ڥ��Ρ��ɤ� car �� cdr �򸫤Ĥ����ޤ���Ǥ�����"
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "XML �ե��������ˤ����ͤΥڥ��� cdr ������ޤ���"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "XML �ե��������ˤ����ͤΥڥ��� cdr ������ޤ���"
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "XML �ե��������ˤ���ڥ��� car �� cdr ���ͤ�����ޤ���"
 
@@ -273,31 +295,31 @@ msgstr "'%s' �ѤΥХå�����ɥ⥸�塼�뤬����Ǥ��ޤ���"
 msgid "Failed to shut down backend"
 msgstr "�Хå�����ɥ⥸�塼��Υ���åȥ�����˼��Ԥ��ޤ�����"
 
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr "���ꤷ���׵������������ͤ�������ޤ�����"
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "���� '%s' �Ѥ����ꤵ�줿�׵�Ǽ�����ä� CORBA �ͤ���Ǥ��ޤ���Ǥ�����"
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr "���ƤΥ���å���ǡ�����ΤƤ��׵��������ޤ�����"
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr "Ʊ�������׵��������ޤ�����"
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
-"��̿Ū�ʥ��顼: ConfigDatabase "
-"�ѤΥ��֥������ȥ�ե���󥹤μ����˼��Ԥ��ޤ���"
+"��̿Ū�ʥ��顼: ConfigDatabase �ѤΥ��֥������ȥ�ե���󥹤μ����˼��Ԥ��ޤ�"
+"��"
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "1 �İʾ�Υե������Ʊ���ǥ��顼: %s"
@@ -306,71 +328,71 @@ msgstr "1 �İʾ�Υե������Ʊ���ǥ��顼: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
-"�ꥹ�ʡ�(%s)�Υ����ɲä˼��Ԥ��ޤ�����gconf "
-"��Ƶ�ư���Ƥ⡢�����ѹ����Գ�������Τη�̡��ꥹ�ʡ��������ϤǤ��ޤ���"
+"�ꥹ�ʡ�(%s)�Υ����ɲä˼��Ԥ��ޤ�����gconf ��Ƶ�ư���Ƥ⡢�����ѹ����Գ���"
+"�����Τη�̡��ꥹ�ʡ��������ϤǤ��ޤ���"
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "�ꥹ�ʡ� ID %lu ��¸�ߤ��ޤ���"
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
-"�����ե�����إꥹ�ʡ��Υ�����ư�˼��Ԥ��ޤ��� "
-"(�ؤɼ³��Ϥ���ޤ��󡢺��٤����������Τ����뤫�⤷��ޤ��󤻤�): %s"
+"�����ե�����إꥹ�ʡ��Υ�����ư�˼��Ԥ��ޤ��� (�ؤɼ³��Ϥ���ޤ��󡢺��٤�"
+"���������Τ����뤫�⤷��ޤ��󤻤�): %s"
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "'%s' ���ͤμ����ǥ��顼: %s"
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "'%s' ���ͤΥ��åȤǥ��顼: %s"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "'%s' ��̵�����ǥ��顼: %s"
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "'%s' �Υǥե�����ͤμ����ǥ��顼: %s"
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "'%s' ��¸�߳�ǧ�ǥ��顼: %s"
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "�ǥ��쥯�ȥ� '%s' �κ���ǥ��顼: %s"
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "'%s' �����ƤΥ���ȥ�μ����˼���: %s"
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "'%s' ����Υǥ��쥯�ȥ�Υꥹ�Ȳ��ǥ��顼: %s"
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "'%s'�ѤΥ�����������ǥ��顼: %s"
@@ -435,234 +457,29 @@ msgstr "���ꥵ���С�̵���Ǥ����ϤǤ��ޤ���"
 msgid "Failed to get a lock"
 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-error.c:40
+msgid "No database available to save your configuration"
+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 "��λ������ '</' �dz��Ϥ���ɬ�פ�����ޤ���ʸ�� '/' ������ޤ���"
-
-#: 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
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "���� '%s' ����� '/' ������ޤ���"
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "�ꥹ�ȥ����ƥ��Ѥ� CORBA ���ͤ����Ǥ��ޤ���"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "%s ����Υꥹ�ȥ����ƥ�η��������Ǥ���"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr "gconfd ���餪�����ʥꥹ�ȥ����פ�������ޤ�����"
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr "IOR �ؤΥ��֥��������Ѵ��˼��Ԥ��ޤ���"
 
@@ -671,191 +488,210 @@ msgstr "IOR �ؤΥ��֥��������Ѵ��˼��Ԥ��ޤ���"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "�ե����� '%s' �������ޤ���Ǥ���: %s\n"
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "������ '%s' ���ɲä��Ƥ��ޤ���\n"
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "�ե����� '%s' ��˥��顼������ޤ�: %s\n"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "�ꥹ�Ȥ���Ԥ��줿��������줿�Τ� %s �Ǥ���"
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "%s �Υꥹ�Ȥ���Ԥ��줿��������줿�Τ� %s �Υꥹ�ȤǤ���"
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "(�������ͤ�)�ڥ�����Ԥ��줿��������줿�Τ� %s �Ǥ���"
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, 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:1499
+#: gconf/gconf-internals.c:1474
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 "(%s �� %s)�Υ����פΥڥ�����Ԥ��줿��������줿�Τ�(%s �� %s)�Υ����פǤ���"
 
-#: gconf/gconf-internals.c:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "���Ѥ��줿ʸ����ϥ������ơ�����󵭹�(')�ǻϤޤäƤ��ޤ���"
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "���Ѥ��줿ʸ����ϥ������ơ�����󵭹�(')�ǽ���äƤ��ޤ���"
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA ���顼: %s"
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, fuzzy, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr "OAF ������: '%s'"
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 "�ꥹ�Ȳ�����Ƥ��ʤ� OAF ���֥������ȥǥ��쥯�ȥ�������褦�Ȥ��Ƥ��ޤ���"
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr "���˥ꥹ�Ȳ����줿 OAF �ǥ��쥯�ȥ���ɲä��褦�Ȥ��Ƥ��ޤ���"
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF ���ϥ��顼: %s"
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "������ OAF ���顼"
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "'%s' ����ˤ� ior �ե����뤬����ޤ���"
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd ��¾�Υץ��������� ���å� '%s' �������Ǥ���"
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "����¾�Υץ������ϥ��å� '%s' ����äƤ��ޤ���"
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "¸�ߤ��Ƥ��� gconfd �˥ԥ󥰤��뤿��� ORB ����³�Ǥ��ޤ���Ǥ�����"
 
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
-"�Ť����å� '%s' �������ޤ�����(IOR �����֥������ȥ�ե���󥹡�IOR '%s' "
-"���Ѵ��Ǥ��ʤ��ä�����)"
+"�Ť����å� '%s' �������ޤ�����(IOR �����֥������ȥ�ե���󥹡�IOR '%s' ��"
+"�Ѵ��Ǥ��ʤ��ä�����)"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "�Ť����å� '%s' �������ޤ�����(Ping�����С��˥��顼��ȯ����������: %s)"
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf ����ǡ����(gconfd)�����å� '%s' ����äƤ��ޤ���"
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "�ǥ��쥯�ȥ� '%s' �������Ǥ��ޤ���Ǥ���: %s"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "���å� '%s' �������Ǥ��ޤ���Ǥ���: %s"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "�ե����� '%s' ���񤭹���ޤ���Ǥ���: %s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "���å��ե����� '%s' �������ޤ���Ǥ��������Υ��å��� GConf ��ʪ�Ǥ�̵���Ǥ�: "
 "%s"
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "�����ʥ��å��ե����� '%s'�Ǥ���������Ƥ��ޤ���"
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
-"���å��ե����� '%s' �������Ǥ��ޤ���Ǥ����� (������PID: %u GConf PID: %u  "
-"ï�����桹�Υ��å����������Ȳ��ꤷ�����)"
+"���å��ե����� '%s' �������Ǥ��ޤ���Ǥ����� (������PID: %u GConf PID: %u  ï"
+"�����桹�Υ��å����������Ȳ��ꤷ�����)"
 
-#: gconf/gconf-internals.c:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "���å��ǥ��쥯�ȥ� '%s' �β����˼��Ԥ��ޤ���: %s"
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "�ե����� '%s' ���ɤ߹��ߤ˼��Ԥ��ޤ���: %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "�������� '%s' �ϥ������ޤǤ�̵���� '%s' ����¸����褦���ꤵ��ޤ�����"
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 msgid "The '/' name can only be a directory, not a key"
 msgstr "̾�� '/' �ϥǥ��쥯�ȥ�ξ������ǡ������ˤϻȤ��ޤ���"
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, 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:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "�᥿����θ�����˥��顼: %s"
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "�᥿����μ�����˥��顼: %s"
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
-"���� '%s' �ϥ��� '%s'(�ºݤ� '%s' "
-"�η�����¸���줿���)�Ѥ˥������ޤȤ��ƥꥹ�Ȥ���ޤ�����"
+"���� '%s' �ϥ��� '%s'(�ºݤ� '%s' �η�����¸���줿���)�Ѥ˥������ޤȤ��ƥꥹ"
+"�Ȥ���ޤ�����"
 
 #: gconf/gconf-value.c:82
 #, c-format
@@ -923,90 +759,90 @@ msgstr ""
 msgid "`%s': %s"
 msgstr "'%s' : %s"
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "�����С��ϥ��ɥ쥹 '%s' �β�褬�Ǥ��ޤ���Ǥ�����"
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr "����������������Τ��ɲäǤ��ޤ���"
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, fuzzy, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "�����С��ꥹ�ȤؤΥ��饤������ɲä˼��Ԥ��ޤ�����CORBA���顼: %s"
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
-"���ꥵ���С�����³���顼: OAF �� oaf_activate_id()���� nil "
-"���֤��Ƥ��ޤ��������ˤ�����������������㳰�򥻥åȤ��ޤ���Ǥ����� "
-"���Υե������ OAF �Х���ݡ��Ȥ����դ��Ʋ�������"
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConf �ν�����˼��Ԥ��ޤ�������λ���ޤ���\n"
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr "����å��� '/' �ǻϤ��ɬ�פ�����ޤ���"
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr "����ˣ��ĤΥ���å��� '/' ������ޤ���"
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "����å��� '/' �α�¦�˥ԥꥪ�� '.' ������ޤ���"
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' �� ����/�ǥ��쥯�ȥ�̾����Ǥ�������ʸ���Ǥ���"
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr "����/�ǥ��쥯�ȥ�ϥ���å��� '/' �ǽ�λ���Ƥ��ʤ����⤷��ޤ���"
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "���ꥵ���С��Υ���åȥ�����˼��Ԥ��ޤ���: %s"
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr "'float' ������Ԥ��줿��������줿�Τ� %s �Ǥ���"
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr "'int' ������Ԥ��줿��������줿�Τ� %s �Ǥ���"
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr "'string' ������Ԥ��줿��������줿�Τ� %s �Ǥ���"
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "'bool' ������Ԥ��줿��������줿�Τ� %s �Ǥ���"
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "'schema' ������Ԥ��줿��������줿�Τ� %s �Ǥ���"
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "����åȥ������׵��������ޤ�����"
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -1014,109 +850,174 @@ msgstr ""
 "�ǥХå������դ��ǥ���ѥ��뤵�줿 gconfd; �������ǥ��쥯�ȥ꤫�� gconf.path "
 "���ɤ߹��⤦�Ȥ��Ƥ��ޤ���"
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
-"����ե����뤬���Ĥ���ޤ��󡣥ǥե��������ե����� '%s' "
-"��Ȥ����Ȥ��Ƥ��ޤ���"
+"����ե����뤬���Ĥ���ޤ��󡣥ǥե��������ե����� '%s' ��Ȥ����Ȥ��Ƥ���"
+"����"
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr "�������ѥ����������ե����뤬����ޤ����������¸����ޤ���; "
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr "/path ���Խ����Ƥ�������"
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "���Ĥ�������ե�������ɤ߹��ߤ˼��Ԥ��ޤ���: %s"
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
-"����ե�����ϥ��ɥ쥹��ݤ���褷�Ƥ��ޤ��� "
-"�ǡ������ɤ߹��ߤޤ�����¸���Ǥ��ޤ���"
+"����ե�����ϥ��ɥ쥹��ݤ���褷�Ƥ��ޤ��� �ǡ������ɤ߹��ߤޤ�����¸����"
+"���ޤ���"
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
-"�ݤ���褵�줿�񤭹��߲�ǽ������ե�����ǤϤʤ��Τǡ� "
-"���Ĥ����������¸�Ǥ��ʤ����⤷��ޤ���"
+"�ݤ���褵�줿�񤭹��߲�ǽ������ե�����ǤϤʤ��Τǡ� ���Ĥ����������¸�Ǥ�"
+"�ʤ����⤷��ޤ���"
 
-#: gconf/gconfd.c:312 gconf/gconfd.c:324
-#, fuzzy, c-format
-msgid "Received signal %d, shutting down."
-msgstr "�����ʥ� %d ��������ޤ���������åȥ����󤷤ޤ�"
+#: 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:329
+#: gconf/gconfd.c:402
 #, 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:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "��ư�� (�С������ %s), PID %u �桼���� '%s'"
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr "GConf �ϥǥХå���ǽ��ͭ���Ǥ�"
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
+#, fuzzy
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
-"���֥������ȳ������ե졼�����ν�����˼��Ԥ��ޤ���: OAF "
-"���ƥʡ��˥Х����򤷤Ƥ���������"
+"���֥������ȳ������ե졼�����ν�����˼��Ԥ��ޤ���: OAF ���ƥʡ��˥Х�"
+"���򤷤Ƥ���������"
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr "���ꥵ���С��ѤΥ��֥������ȥ�ե���󥹤μ����˼��Ԥ��ޤ�����"
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "�ե����� '%s' �κ����˼��Ԥ��ޤ���: %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "���饤����Ȥ� IOR �����˼��Ԥ��ޤ���: %s"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
+#, fuzzy
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
 msgstr ""
-"OAF �� GConf �� IID �ˤĤ��Ƥϲ��ʤ��Ǥ���; "
-"���󥹥ȡ��뤬���Ԥ������Ȥ򼨤��ޤ���; ��Ͽ�Ǥ��ޤ���; ��λ���ޤ���\n"
+"OAF �� GConf �� IID �ˤĤ��Ƥϲ��ʤ��Ǥ���; ���󥹥ȡ��뤬���Ԥ������Ȥ�"
+"���ޤ���; ��Ͽ�Ǥ��ޤ���; ��λ���ޤ���\n"
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:613
+#, fuzzy
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
 msgstr "¾�� gconfd ������ OAF ����Ͽ����Ƥ��ޤ���; ��λ���ޤ���\n"
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:618
+#, fuzzy
+msgid "Unknown error registering existing gconfd with OAF; exiting"
 msgstr "OAF ����Ͽ��� gconfd �������ʥ��顼�Ǥ���; ��λ���ޤ���\n"
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:645
+#, fuzzy
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
+msgstr ""
+"OAF �� GConf �� IID �ˤĤ��Ƥϲ��ʤ��Ǥ���; ���󥹥ȡ��뤬���Ԥ������Ȥ�"
+"���ޤ���; ��Ͽ�Ǥ��ޤ���; ��λ���ޤ���\n"
+
+#: gconf/gconfd.c:649
+#, fuzzy
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
+msgstr "¾�� gconfd ������ OAF ����Ͽ����Ƥ��ޤ���; ��λ���ޤ���\n"
+
+#: gconf/gconfd.c:654
+#, fuzzy
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
+msgstr "OAF ����Ͽ��� gconfd �������ʥ��顼�Ǥ���; ��λ���ޤ���\n"
+
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "���å��ǥ��쥯�ȥ� '%s' �β����˼��Ԥ��ޤ���: %s"
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "��λ���ޤ���"
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr "GConf �����С������Ѥ���Ƥ��ޤ��󡣥���åȥ����󤷤ޤ���"
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr "�֤��줿�㳰: %s"
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
-"gconfd �����ե�����Υ����ץ�˼��Ԥ��ޤ���: gconf "
-"�򥷥�åȥ����󤷤���˥��������褹�뤳�ȤϤǤ��ޤ��� (%s)"
+"gconfd �����ե�����Υ����ץ�˼��Ԥ��ޤ���: gconf �򥷥�åȥ����󤷤���˥�"
+"�������褹�뤳�ȤϤǤ��ޤ��� (%s)"
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1124,162 +1025,157 @@ msgstr ""
 "gconfd �����ե�����Υ��������˼��Ԥ��ޤ���: �����餯�ǡ�������¸����ޤ��� "
 "(%s)"
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "�����ݻ��ե����� '%s' ��񤭹��ߥ⡼�ɤdz����ޤ���Ǥ���: %s"
 
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "�����ݻ��ե����� '%s' �˽񤭹���ޤ���Ǥ�����fd: %d: %s"
 
-#: gconf/gconfd.c:989
+#: gconf/gconfd.c:1317
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "�����������ݻ��ե����� '%s' ���Ĥ���Τ˼��Ԥ��ޤ���: %s"
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "�Ť������ݻ��ե����� '%s' ���̤ξ��˰�ư�Ǥ��ޤ���Ǥ���: %s"
 
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "�����������ݻ��ե�����ΰ�ư�˼��Ԥ��ޤ���: %s"
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr "'%s' �˰�ư���������ݻ��ե�����������˼��Ԥ��ޤ���: %s"
 
-#: gconf/gconfd.c:1110
-#, fuzzy, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr "�����ݻ��ե����� �Υ����ץ�˼��Ԥ��ޤ���: %s"
-
-#: gconf/gconfd.c: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
+#: gconf/gconfd.c:1823
+#, c-format
 msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
+"���ɥ쥹 '%s' �Υꥹ�ʡ����������Ǥ��ޤ��󡣥ǡ����١�������Ǥ��ޤ���Ǥ�"
+"��"
 
-#: gconf/gconfd.c:1225
+#: gconf/gconfd.c:1869
+#, c-format
+msgid "Error reading saved state file: %s"
+msgstr "�����ݻ��ե�������ɤ߹��ߤǥ��顼: %s"
+
+#: gconf/gconfd.c:1922
+#, c-format
+msgid "Unable to open saved state file '%s': %s"
+msgstr "�����ݻ��ե����� '%s' �Υ����ץ�˼��Ԥ��ޤ���: %s"
+
+#: gconf/gconfd.c:2039
+#, c-format
 msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
+"Failed to log addition of listener to gconfd logfile; won't be able to re-"
+"add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
+"gconfd �����ե�����ؤΥ������ɲä˼��Ԥ��ޤ�����gconfd ��λ�ޤ��ϥ���å�"
+"�����󤷤���ꥹ�ʡ����ɲäϤǤ��ޤ��� (%s)"
 
-#: gconf/gconfd.c:1346
+#: gconf/gconfd.c:2044
 #, c-format
 msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+"Failed to log removal of listener to gconfd logfile; might erroneously re-"
+"add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
-"���ɥ쥹 '%s' �Υꥹ�ʡ����������Ǥ��ޤ��󡣥ǡ����١�������Ǥ��ޤ���Ǥ���"
+"gconfd �����ե�����ؤΥ����κ���˼��Ԥ��ޤ�����gconfd ��λ�ޤ��ϥ���å�"
+"�����󤷤���ꥹ�ʡ��κ��ɲäϥ��顼�ˤʤ뤫�⤷��ޤ��� (%s)"
 
-#: gconf/gconfd.c:1377
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
 #, c-format
-msgid "Unable to open saved state file '%s': %s"
+msgid "Failed to get IOR for client: %s"
+msgstr "���饤����Ȥ� IOR �����˼��Ԥ��ޤ���: %s"
+
+#: gconf/gconfd.c:2082
+#, fuzzy, c-format
+msgid "Failed to open saved state file: %s"
 msgstr "�����ݻ��ե����� '%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 ""
-"gconfd �����ե�����ؤΥ������ɲä˼��Ԥ��ޤ�����gconfd "
-"��λ�ޤ��ϥ���åȥ����󤷤���ꥹ�ʡ����ɲäϤǤ��ޤ��� (%s)"
+#: gconf/gconfd.c:2095
+#, fuzzy, c-format
+msgid "Failed to write client add to saved state file: %s"
+msgstr "�����ݻ��ե�����ؤ��ɲå��饤����ȤΥե�å���˼��Ԥ��ޤ���: %s"
 
-#: gconf/gconfd.c:1481
+#: gconf/gconfd.c:2103
 #, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr "�����ݻ��ե�����ؤ��ɲå��饤����ȤΥե�å���˼��Ԥ��ޤ���: %s"
+
+#: gconf/gconfd.c:2193
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
-"gconfd �����ե�����ؤΥ����κ���˼��Ԥ��ޤ�����gconfd "
-"��λ�ޤ��ϥ���åȥ����󤷤���ꥹ�ʡ��κ��ɲäϥ��顼�ˤʤ뤫�⤷��ޤ��� "
-"(%s)"
+"���Ĥ��Υ��饤����Ȥ��ɲä���ʤ��ä��Τǡ�GConf �����С����鼫ʬ���Ȥ���"
+"���ޤ�����"
 
-#: gconf/gconftool.c:62
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr "�إ�ץ��ץ����"
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "\"--type\" ��Ȥäơ��ͤ��Ф��륭���򥻥åȤ�Ʊ�����ޤ���"
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr "ɸ����Ϥ˥������ͤ�ɽ�����ޤ���"
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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 ""
-"\"--short-desc, --long-desc, --owner, --type\" "
-"��Ȥäƥ������ޤ򥻥åȤ���Ʊ�����ޤ���"
+"\"--short-desc, --long-desc, --owner, --type\" ��Ȥäƥ������ޤ򥻥åȤ���Ʊ"
+"�����ޤ���"
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr "���ޥ�ɥ饤��ǥ�����̵���ˤ��ޤ���"
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr "�ǥ��쥯�ȥ�������ƤΥ������ͤΥڥ���ɽ�����ޤ���"
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr "�ǥ��쥯�ȥ�������ƤΥ��֥ǥ��쥯�ȥ��ɽ�����ޤ���"
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "�ǥ��쥯�ȥ겼�Υ���ȥ�ȥ��֥ǥ��쥯�ȥ�����Ƥ�Ƶ�Ū��ɽ�����롣"
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "�ǥ��쥯�ȥ꤬¸�ߤ����� 0 ���֤���¸�ߤ��ʤ���� 2 ���֤��ޤ���"
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 "gconfd �򥷥�åȥ����󤷤ޤ�����ͳ̵���ˤ��Υ��ץ�������Ѥ��ʤ�����!!"
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "�⤷ gconfd ����ư��ʤ�� 0 ���֤��������Ǥʤ���� 2 ���֤��ޤ���"
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 "gcnofd ���ꥵ���С���Ω���夲�ޤ���(���̤�ɬ�פ˱����Ƽ�ưŪ�˵�ư���ޤ���)"
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1287,95 +1183,93 @@ msgstr ""
 "���åȤ����ͤη��ޤ��ϥ������ޤη�����ꤷ�Ʋ������� ��ʣ���ʤ���о�ά���� "
 "OK �Ǥ���"
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"���åȤ���ꥹ�Ȥη��ޤ��ϵ��Ҥ��륹�����ޤη�����ꤷ�Ʋ������� "
-"��ʣ���ʤ���о�ά���� OK �Ǥ���"
+"���åȤ���ꥹ�Ȥη��ޤ��ϵ��Ҥ��륹�����ޤη�����ꤷ�Ʋ������� ��ʣ���ʤ���"
+"�о�ά���� OK �Ǥ���"
 
-#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"���åȤ��� car "
-"�ڥ��η��ޤ��ϵ��Ҥ��륹�����ޤη�����ꤷ�Ʋ���������ʣ���ʤ���о�ά���� "
-"OK �Ǥ���"
+"���åȤ��� car �ڥ��η��ޤ��ϵ��Ҥ��륹�����ޤη�����ꤷ�Ʋ���������ʣ���ʤ�"
+"��о�ά���� OK �Ǥ���"
 
-#: gconf/gconftool.c:198
+#: gconf/gconftool.c:205
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"���åȤ��� cdr "
-"�ڥ��η��ޤ��ϥ������ޤη�����ꤷ�Ʋ���������ʣ���ʤ���о�ά���� OK �Ǥ���"
+"���åȤ��� cdr �ڥ��η��ޤ��ϥ������ޤη�����ꤷ�Ʋ���������ʣ���ʤ���о�ά"
+"���� OK �Ǥ���"
 
-#: gconf/gconftool.c:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr "�������ޤ������˿ʤि���Ⱦ������������ꤷ�Ʋ�������"
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr "����"
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr "�������ޤ������ѿʤि�����������������ꤷ�Ʋ�������"
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr "�������ޤΥ����ʡ�����ꤷ�Ʋ�������"
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr "�����ʡ�"
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr "���󥹥ȡ��뤹�륹�����ޥե��������ꤷ�Ƥ���������"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr "�ե�����̾"
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "�ǥե���ȥѥ�����ष�����Ѥ��뤿������꥽��������ꤷ�Ʋ�������"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr "������"
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
-"�Х��ѥ����Ƥ��륵���С�������ǡ����١�����ľ�ܥ����������Ʋ�������gconfd "
-"����ư���Ƥ��ʤ����Ȥ����Ǥ���"
+"�Х��ѥ����Ƥ��륵���С�������ǡ����١�����ľ�ܥ����������Ʋ�������gconfd ��"
+"��ư���Ƥ��ʤ����Ȥ����Ǥ���"
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
 "config source or set to the empty string to use the default."
 msgstr ""
-"���ޥ�ɥ饤�󤫤�ǡ����١����˥������ޥե���������������󥹥ȡ��� "
-"���Ʋ��������Ķ��ѿ� GCONF_CONFIG_SOURCE �ϥǥե���ȤǤʤ����꥽������ "
-"���ꤵ��Ƥ��뤫���⤷���ϥǥե���ȤȤ��ƶ���ʸ�������ꤵ��Ƥ��� "
-"ɬ�פ�����ޤ���"
+"���ޥ�ɥ饤�󤫤�ǡ����١����˥������ޥե���������������󥹥ȡ��� ���Ʋ���"
+"�����Ķ��ѿ� GCONF_CONFIG_SOURCE �ϥǥե���ȤǤʤ����꥽������ ���ꤵ��Ƥ�"
+"�뤫���⤷���ϥǥե���ȤȤ��ƶ���ʸ�������ꤵ��Ƥ��� ɬ�פ�����ޤ���"
 
-#: gconf/gconftool.c:270
+#: gconf/gconftool.c:277
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1383,7 +1277,7 @@ msgstr ""
 "���ޥ�ɥ饤���ǥ����ΰۤʤ뷿���ͤΤޤȤޤ������/̤���ꤹ����ˤ�ꥢ�ץ�"
 "����������ƥ��ȤǤ��ޤ���"
 
-#: gconf/gconftool.c:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1391,434 +1285,513 @@ msgstr ""
 "���ޥ�ɥ饤���ǥǥ��쥯�ȥ������Υ����ΤޤȤޤ������/̤����ˤ�����ˤ��"
 "���ץꥱ��������ƥ��ȤǤ��ޤ���"
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "���ץ���� %s �ǥ��顼: %s\n"
-"'%s --help' "
-"��¹Ԥ��ơ�ͭ���ʥ��ޥ�ɥ饤�󡦥��ץ����ꥹ�Ȥ򻲾Ȥ��Ʋ�������\n"
+"'%s --help' ��¹Ԥ��ơ�ͭ���ʥ��ޥ�ɥ饤�󡦥��ץ����ꥹ�Ȥ򻲾Ȥ��Ʋ���"
+"����\n"
 
-#: gconf/gconftool.c:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "����������/̤�����Ʊ���ˤϼ¹ԤǤ��ޤ���\n"
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "����ȼ���/̤�����Ʊ���ˤϼ¹ԤǤ��ޤ���\n"
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
-msgstr "--get �ޤ��� --set �Ȱ��� --all-pairs �ϻȤ��ޤ���\n"
+#: gconf/gconftool.c:413
+#, fuzzy
+msgid "Can't use --all-entries with --get or --set\n"
+msgstr "--get �ޤ��� --set �Ȱ��� --all-dirs �ϻȤ��ޤ���\n"
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "--get �ޤ��� --set �Ȱ��� --all-dirs �ϻȤ��ޤ���\n"
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
+#, fuzzy
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
-"--recursive-list �� --get, --set, --unset, --all-pairs, --all-dirs "
-"�Ȱ��˻Ȥ��٤��ǤϤ���ޤ���\n"
+"--recursive-list �� --get, --set, --unset, --all-pairs, --all-dirs �Ȱ��˻�"
+"���٤��ǤϤ���ޤ���\n"
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
+#, fuzzy
 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-entries, --"
+"all-dirs\n"
 msgstr ""
-"--set_schema �� --get, --set, --unset, --all-pairs, --all-dirs "
-"�Ȱ��˻Ȥ��٤��ǤϤ���ޤ���\n"
+"--set_schema �� --get, --set, --unset, --all-pairs, --all-dirs �Ȱ��˻Ȥ���"
+"���ǤϤ���ޤ���\n"
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr "�ͤ����ꤹ������ͤη�����Ϣ���Ƥ���������ɤ��Ǥ���\n"
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr "�ͤ����ꤹ����Ϸ�����ꤹ��ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping ���ץ����Ϥ��켫�ȤǻȤ���ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists ���ץ����� ���켫�ȤǻȤ���ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file �Ϥ��켫�ȤǻȤ���ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule �Ϥ��켫�ȤǻȤ���ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key �Ϥ��켫�ȤǻȤ���ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directroy �Ϥ��켫�ȤǻȤ���ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
-"--direct ����Ѥ������ --config-source "
-"�դ�������ե��������ꤹ��ɬ�פ�����ޤ���\n"
+"--direct ����Ѥ������ --config-source �դ�������ե��������ꤹ��ɬ�פ�"
+"����ޤ���\n"
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf �ν�����˼���: %s\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "�Ķ��ѿ� GCONF_CONFIG_SOURCE �򥻥åȤ���ɬ�פ�����ޤ���\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
 "applications are running\n"
 "(though things theoretically work if apps are running).\n"
 msgstr ""
-"�������������ޥե�����򥤥󥹥ȡ��뤷�Ƥ������� gconfd "
-"��¹Ԥ��ƤϤ����ޤ���\n"
+"�������������ޥե�����򥤥󥹥ȡ��뤷�Ƥ������� gconfd ��¹Ԥ��ƤϤ�����"
+"����\n"
 "���⥢�ץꥱ������󤬵�ư��Ǥʤ����֤ǡ�'gconftool --shutdown' �� gconfd "
 "�ǡ����򥷥�åȥ����󤷤Ƥ���������\n"
 "(�㤨���ץ꤬����Ū��ư���Ƥ����Ȥ��Ƥ�)\n"
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "����ե�����Υ��������˼���: %s\n"
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "����åȥ����󥨥顼: %s\n"
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "�Ƶ��ꥹ�Ȥˣ��İʾ�Υǥ��쥯�ȥ����ꤹ��ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
 msgstr "'%s' �Υڥ���ꥹ�Ȳ���˥��顼: %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr "(���⥻�åȤ���Ƥ��ޤ���)"
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "���ꥵ���С�(gconfd)�ε�ư�˼���: %s\n"
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr "���ĤΥ����ޤ��ϼ������뤿��Υ�������ꤹ��ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "��: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr "�ꥹ�ȷ�: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car ��: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr ��: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "�����ʡ�: %s\n"
+msgid "Default Value: %s\n"
+msgstr "�����: %s\n"
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr "̤����"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "�����ʡ�: %s\n"
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "���硼��Desc: %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "����Desc: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "'%s' �˲����ͤ����ꤵ��Ƥ��ޤ���\n"
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "'%s' ���ͤμ����˼���: %s\n"
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "'%s' �η��������Ǥ���\n"
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "�����ǥ���/�ͤθ򴹤���ꤹ��ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "�����˲����ͤ����åȤ���Ƥ��ޤ���: '%s'\n"
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr "�ͤȤ��ƥ������ޤ򥻥åȤǤ��ޤ���\n"
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "�ꥹ�Ȥ�����Ǥϡ��Ť��ꥹ�ȷ�����ꤹ��ɬ�פ�����ޤ�\n"
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "�ڥ�������Ǥϡ��Ť� car ���� cdr ������ꤹ��ɬ�פ�����ޤ�\n"
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "���顼: %s\n"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
-#, c-format
-msgid "Error setting value: %s"
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
 msgstr "�ͤ����ꥨ�顼: %s"
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
-#, c-format
-msgid "Error syncing: %s"
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
 msgstr "Ʊ����˥��顼: %s"
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1234
+#, fuzzy
+msgid "Must specify a key or keys on the command line\n"
+msgstr "���ĤΥ����ޤ��ϼ������뤿��Υ�������ꤹ��ɬ�פ�����ޤ���\n"
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "'%s' �Ȥ����ե�����Ϥ���ޤ���\n"
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "'%s'�ѤΥ�����������ǥ��顼: %s"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "'%s' �Ȥ����ե�����Ϥ���ޤ���\n"
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+#, fuzzy
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr "�����ǤΤߥ���(��������̾)����ꤹ��ɬ�פ�����ޤ���\n"
+
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr "�ٹ�: �������� '%s' ��Ϣ��˼���(������'%s'): %s\n"
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "�����ǤΤߥ���(��������̾)����ꤹ��ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "�ꥹ�ȷ��ϸŤ����ˤ���ɬ�פ�����ޤ�: string, int, float �ޤ��� bool\n"
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 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:1189
+#: gconf/gconftool.c:1467
 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:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr "�ͤ����ꥨ�顼: %s"
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr "Ʊ����˥��顼: %s"
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "����/�ͤΥڥ���������뤿��ˤϣ��ʾ�Υǥ��쥯�ȥ�λ��꤬ɬ�פǤ���\n"
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr "̵���ˤ��뤿��ˣ��İʾ�Υ�������ꤹ��ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "'%s' ̤������˥��顼: %s\n"
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "���֥ǥ��쥯�ȥ��������뤿��ˣ��İʾ�Υǥ��쥯�ȥ�λ��꤬ɬ�פǤ���\n"
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "�ǥ��쥯�ȥ�Υꥹ�Ȳ���˥��顼: %s\n"
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "�ٹ�: �����⤷���Ϸ���̵����������(%s)�Ǥ���\n"
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "�ٹ�: �����⤷���ϥꥹ�ȷ���̵����������(%s)�Ǥ���\n"
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "�ٹ�: �ǥե������ '%s' �β��Ϥ˼���: (�������ޤ� %s)\n"
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "�ٹ�: �����⤷���� Car ���ޤ��� Cdr ����̵����������(%s)�Ǥ���\n"
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "�ٹ�: �������ޤΥǥե�����ͤ�����Ǥ��ޤ���\n"
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "�ٹ�: gconftool ���������顼�Ǥ��������� GConfValueType �Ǥ���\n"
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "�ٹ�: ��̾ '%s' �β��Ϥ˼��Ԥ��ޤ���\n"
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"�ٹ�: list_type �� '%s' �ǤϤʤ���int, float, string �ޤ��� bool "
-"�����ˤʤ�ޤ���\n"
+"�ٹ�: list_type �� '%s' �ǤϤʤ���int, float, string �ޤ��� bool �����ˤʤ��"
+"����\n"
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, 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"
+"�ٹ�: car_type �� '%s' �ǤϤʤ���int, float, string �ޤ��� bool �����ˤʤ��"
+"����\n"
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, 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"
+"�ٹ�: cdr_type �� '%s' �ǤϤʤ� int, float, string �ޤ��� bool �ˤ����ʤ��"
+"����\n"
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr "�ٹ�: ���ΥΡ���"
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "�ٹ�: �Ρ��� <%s> �ϥ������ޤǤϲ��ɤǤ��ޤ���\n"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr "�ٹ�: �������ޤ˻��ꤵ�줿�����Ϥ���ޤ���\n"
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
-"�ٹ�: <locale> �Ρ��ɤˤ� °�� 'name = "
-"\"��������̾\"������ޤ���̵�뤷�ޤ���\n"
+"�ٹ�: <locale> �Ρ��ɤˤ� °�� 'name = \"��������̾\"������ޤ���̵�뤷��"
+"����\n"
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 "�ٹ�: �������� '%s' �Ѥ�¿�� <locale> �Ρ��ɤǤ������Ƥκǽ��̵�뤷�ޤ���\n"
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "�ٹ�: <locale>�Ρ�����������ʥΡ��� <%s> ������ޤ���\n"
 
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "�ٹ�: �������� '%s' �Υ��󥹥ȡ���˼���(��������� '%s'): %s\n"
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "�������� '%s' �Υ��󥹥ȡ��� (�������� '%s'��)\n"
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "�ٹ�: �������� '%s' ��Ϣ��˼���(������'%s'): %s\n"
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "�������� '%s' ��Ϣ�� (������ '%s')\n"
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "���Ĥ� <schema> ���դ����Ĥ� <locale> ����ȥ꤬ɬ�פǤ���\n"
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "�ٹ�: �Ρ��� <%s> �� <schemalist> �Ǥϲ��ϤǤ��ޤ���Ǥ�����\n"
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "'%s' �������ޤ���Ǥ���: %s\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "�ɥ������ '%s' �϶��Ǥ���?\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
-"�ɥ������ '%s' �Υ롼�ȥΡ��ɤη����ְ�äƤ��ޤ���( "
-"<%s>��<gconfschemafile>)\n"
+"�ɥ������ '%s' �Υ롼�ȥΡ��ɤη����ְ�äƤ��ޤ���( <%s>��"
+"<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 "�ɥ������ '%s' �ˤϥȥåץ�٥� <gconfshemafile> �Ρ��ɤ�����ޤ���\n"
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "�ٹ�: <gconfshemafile> ���ΥΡ��� <%s> �ϲ��ϤǤ��ޤ���Ǥ�����\n"
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "����ǡ�����Ʊ���ǥ��顼: %s"
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr ""
 "���󥹥ȡ��뤹�뤿��˴��Ĥ��Υ������ޥե��������ꤹ��ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -1827,111 +1800,264 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "�Դ����ʥ��� '%s' ��̵�����˼���: %s\n"
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr "��λ���뤿��ˤϴ��Ĥ��Υ�������ꤹ��ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
-"�����ˤ��������ͤ����ꤹ����ˤ�ä� "
-"���ץꥱ��������λ�����褦�Ȥ��Ƥ��ޤ�:\n"
+"�����ˤ��������ͤ����ꤹ����ˤ�ä� ���ץꥱ��������λ�����褦�Ȥ��Ƥ���"
+"��:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr "��λ���뤿��ˤϴ��Ĥ��Υǥ��쥯�ȥ����ꤹ��ɬ�פ�����ޤ���\n"
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
 "directory:\n"
 "  %s\n"
 msgstr ""
-"�ǥ��쥯�ȥ�Υ����ˤ��������ͤ����ꤹ����ˤ�ä� "
-"���ץꥱ��������λ�����褦�Ȥ��Ƥ��ޤ�:\n"
+"�ǥ��쥯�ȥ�Υ����ˤ��������ͤ����ꤹ����ˤ�ä� ���ץꥱ��������λ����"
+"�褦�Ȥ��Ƥ��ޤ�:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr "GConf ���顼: %s\n"
+
+#: gconf/gconf-client.c:798
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf ����ٹ�: '%s' ����Υڥ��Υꥹ�Ȳ��˼���: %s"
 
-#: wrappers/gtk/gconf-client.c:985
+#: gconf/gconf-client.c:1000
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "'%s' ����Ԥ��줿��������줿�Τ� '%s'(������'%s')�Ǥ���"
 
-#~ msgid "Unloading BerkeleyDB (BDB) backend module."
-#~ msgstr "BerkeleyDB (BDB) �Хå�����ɥ⥸�塼��������Ǥ���"
+#~ msgid "Ignoring XML node `%s', except for possible schema name: %s"
+#~ msgstr "XML �Ρ��� '%s' ��̵�뤷�ޤ���ͭ���ʥ�������̾ '%s' ���㳰�Ǥ���"
 
-#~ msgid "Opened BerkeleyDB source at root %s"
-#~ msgstr "%s �Υ롼�Ȥ˳����줿 BerkeleyDB ������"
+#~ msgid "found <local_schema> with no locale setting"
+#~ msgstr "������������̵���� <local_schema> ��ȯ�����ޤ�����"
 
-#~ msgid "Initializing BDB backend module"
-#~ msgstr "BDB �Хå�����ɥ⥸�塼��ν������Ǥ���"
+#~ msgid ""
+#~ "Error on line %d char %d: %s\n"
+#~ "(Some surrounding text was '%s')\n"
+#~ msgstr ""
+#~ "�饤�� %d �� %d ʸ���ܤǥ��顼: %s\n"
+#~ "(�Ϥޤ�Ƥ���ʸ�� '%s')\n"
 
-#~ msgid "Couldn't find the %s root directory in the address `%s'"
-#~ msgstr "%s �롼�ȥǥ��쥯�ȥ�ϥ��ɥ쥹 '%s' ��˸��Ĥ���ޤ���Ǥ�����"
+#~ 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 ""
-#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; "
+#~ "&apos;)"
 #~ msgstr ""
-#~ "%s �롼�ȥǥ��쥯�ȥ�ؤ��ɤ߼��/�񤭹��ߤ� ���ɥ쥹 '%s' �ǤϤǤ��ޤ���"
+#~ "'%s' �������ʥ���ȥ�Ǥ� ('&' �ϥ���ȥ����Ƭ���դ���ɬ��ͭ�� ��: &amp; "
+#~ "&quot; &lt; &gt; &apos;)"
 
-#~ msgid "Failed to set mode on `%s': %s"
-#~ msgstr "'%s' �Υ⡼�����꤬���Ԥ��ޤ���: %s"
+#~ msgid ""
+#~ "Markup text ended in the middle of a character reference, just after '&#'"
+#~ msgstr ""
+#~ "ʸ�����Ȥο����� (���礦�� '&#' �θ��) �ǥޡ������å�ʸ����λ���Ƥ��ޤ�"
 
-#~ msgid "No database available to save your configuration"
-#~ msgstr "�������¸���뤿��Υǡ����١�����ͭ���ǤϤ���ޤ���"
+#~ msgid ""
+#~ "Character reference contained non-digit '%s' ('&#' should begin a "
+#~ "reference to a unicode character, such as '&#2342;')"
+#~ msgstr ""
+#~ "ʸ�����Ȥǿ����Ǥʤ�ʪ '%s' ���ޤޤ�Ƥ��ޤ� ('&#' �� '&#2342;' �Τ褦�˻�"
+#~ "�Ȥ��� Unicode ʸ������Ƭ���դ��ޤ�)"
 
-#~ msgid "OAF problem description: '%s'"
-#~ msgstr "OAF ������: '%s'"
+#~ msgid ""
+#~ "Text ended in the middle of an character reference ('&#' should begin a "
+#~ "character reference such as '&#2342;')"
+#~ msgstr ""
+#~ "ʸ��ʸ�����Ȥο�����ǽ�λ���Ƥޤ� ('&#' �� '&#2342' �Τ褦�˻��Ȥ���ʸ��"
+#~ "����Ƭ���դ���ɬ��ͭ��)"
 
-#~ msgid "Unable to store a value at key '%s'"
-#~ msgstr "���� '%s' ���ͤ���¸���뤳�Ȥ�����ޤ���"
+#~ msgid ""
+#~ "Couldn't parse character reference '%s' ('&#' must begin a character "
+#~ "reference such as '&#2343;')"
+#~ msgstr ""
+#~ "ʸ������ '%s' ����ϤǤ��ޤ���Ǥ��� ('&#' �� '&#2343' �Τ褦�˻��Ȥ���ʸ"
+#~ "������Ƭ���դ���ɬ��ͭ��)"
+
+#~ msgid ""
+#~ "Character code %#lx is not allowed in XML documents or is not a valid "
+#~ "Unicode character"
+#~ msgstr ""
+#~ "ʸ�������� '%#lx' �� XML ʸ��ǤϻȤ��ʤ������⤷���ϴְ�ä� Unicode ʸ��"
+#~ "�Ǥ�"
+
+#, fuzzy
+#~ msgid ""
+#~ "Documented ended just after an '&', '&' should begin an entity or "
+#~ "character reference."
+#~ msgstr ""
+#~ "'&' ��ľ�����ʸ�񤬽�λ���Ƥ��ޤ���'&' �ϥ���ȥ꤫ʸ�����Ȥ���Ƭ���դ���"
+#~ "ɬ�פ�����ޤ���"
+
+#~ 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 "Character '%s' is not valid at the start of an attribute name"
+#~ msgstr "ʸ�� '%s' ��°��̾����Ƭ���դ��뤳�ȤϤǤ��ޤ���"
 
-#~ msgid "/path"
-#~ msgstr "/path ���Խ����Ƥ�������"
+#~ msgid "Document ended just after attribute name"
+#~ msgstr "ʸ��°��̾��ľ������ǽ�λ���Ƥ��ޤ�"
 
-#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgid "Attribute name must be immediately followed by an '=' character"
+#~ msgstr "ʸ�� '=' ��ľ�����°��̾�򵭽Ҥ���ɬ�פ�����ޤ�"
+
+#~ msgid ""
+#~ "'=' character after attribute must be immediately followed by an '\"' "
+#~ "character"
+#~ msgstr "ʸ�� '\"' ��ľ�������ʸ�� '=' �򵭽Ҥ���ɬ�פ�����ޤ�"
+
+#~ msgid ""
+#~ "Character '%c' found inside an attribute value; perhaps your attribute "
+#~ "value is missing the closing quotation mark '\"'"
 #~ msgstr ""
-#~ "�����ʥ� %d ��������ޤ�������������פǤ���GConf �Х��Ȥ�����𤷤Ʋ�������"
+#~ "°���ͤ����ʸ�� '%c' ������ޤ���°���ͤ� ������ '\"' ���Ĥ����Ƥ��ʤ�"
+#~ "�褦�Ǥ���"
+
+#~ 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 ""
-#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ "Element ended just after '/', no '>' seen; empty elements should end with "
+#~ "'/>'"
 #~ msgstr ""
-#~ "�����ʥ� %d ��������ޤ������۾ｪλ�Ǥ���GConf �Х��Ȥ�����𤷤Ʋ�������"
+#~ "'>' ̵���� '/' ��ľ������ǥ���������äƤ��ޤ������Υ����� '/>' �ǽ�λ��"
+#~ "��ɬ�פ�����ޤ�"
+
+#~ msgid "Close tag not found at end of element"
+#~ 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 "Close tag should begin with '</', '/' character is missing"
+#~ msgstr "��λ������ '</' �dz��Ϥ���ɬ�פ�����ޤ���ʸ�� '/' ������ޤ���"
 
-#~ msgid "Failed to get IOR for client: %s"
-#~ msgstr "���饤����Ȥ� IOR �����˼��Ԥ��ޤ���: %s"
+#~ msgid "Close tag ends just after '/' character"
+#~ msgstr "ʸ�� '/' ��ľ������˽�λ����������ޤ�"
 
-#~ msgid "Failed to flush client add to 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 "Close tag '%s' does not match opening tag '%s'"
+#~ msgstr "��λ���� '%s' �����ϥ��� '%s' �˰��פ��ޤ���"
 
 #~ msgid ""
-#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ "Invalid UTF-8 character at byte %d in marked-up text. Some text before "
+#~ "the bad character was '%s'"
 #~ msgstr ""
-#~ "���Ĥ��Υ��饤����Ȥ��ɲä���ʤ��ä��Τǡ�GConf "
-#~ "�����С����鼫ʬ���Ȥ������ޤ�����"
+#~ "�ޡ������å�ʸ�� %d �Х����ܤ������� UTF-8 ʸ��������ޤ���%s �Ϥ�������ʸ"
+#~ "�������ˤ���ޤ���"
+
+#~ msgid "The marked-up text contained nothing but whitespace."
+#~ msgstr "�ޡ������å�ʸ�϶�������Ǥ���"
+
+#~ 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"
+#~ msgid ""
+#~ "Error contacting configuration server: OAF returned nil from "
+#~ "oaf_activate_from_id() and did not set an exception explaining the "
+#~ "problem. Please file an OAF bug report."
+#~ msgstr ""
+#~ "���ꥵ���С�����³���顼: OAF �� oaf_activate_id()���� nil ���֤��Ƥ��ޤ�"
+#~ "�������ˤ�����������������㳰�򥻥åȤ��ޤ���Ǥ����� ���Υե������ OAF "
+#~ "�Х���ݡ��Ȥ����դ��Ʋ�������"
+
+#, fuzzy
+#~ msgid "Received signal %d, shutting down."
+#~ msgstr "�����ʥ� %d ��������ޤ���������åȥ����󤷤ޤ�"
+
+#~ msgid "GConf was built with debugging features enabled"
+#~ msgstr "GConf �ϥǥХå���ǽ��ͭ���Ǥ�"
+
+#, fuzzy
+#~ msgid "Didn't understand line in saved state file: '%s'"
+#~ msgstr "�����ݻ��ե����� �Υ����ץ�˼��Ԥ��ޤ���: %s"
+
+#, fuzzy
+#~ msgid "Failed to parse connection ID in saved state file"
+#~ msgstr "�����ݻ��ե����� �Υ����ץ�˼��Ԥ��ޤ���: %s"
+
+#, fuzzy
+#~ msgid "Failed to unquote config source address from saved state file: %s"
+#~ msgstr "�����ݻ��ե�����ؤ��ɲå��饤����Ȥν񤭹��ߤ˼��Ԥ��ޤ���: %s"
+
+#, fuzzy
+#~ msgid "Failed to unquote listener location from saved state file: %s"
+#~ msgstr "�����ݻ��ե�����ؤ��ɲå��饤����Ȥν񤭹��ߤ˼��Ԥ��ޤ���: %s"
+
+#, fuzzy
+#~ msgid "Failed to unquote IOR from saved state file: %s"
+#~ msgstr "�����ݻ��ե����� �Υ����ץ�˼��Ԥ��ޤ���: %s"
+
+#~ msgid "Can't use --all-pairs with --get or --set\n"
+#~ msgstr "--get �ޤ��� --set �Ȱ��� --all-pairs �ϻȤ��ޤ���\n"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "���� '%s' ���ͤ���¸���뤳�Ȥ�����ޤ���"
diff --git a/po/ko.po b/po/ko.po
index 54c29b80..5eac3374 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf CVS-20000906\n"
-"POT-Creation-Date: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-0400\n"
 "PO-Revision-Date: 2000-09-06 18:05+0900\n"
 "Last-Translator: Chideok Hwang <hwang@mizi.co.kr>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -13,20 +13,43 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:233
-msgid "Unloading XML backend module."
+#: backends/bdb-backend.c:215
+msgid "Unloading BerkeleyDB (BDB) backend module."
 msgstr ""
 
-#: backends/xml-backend.c:286
+#: backends/bdb-backend.c:238
 #, c-format
-msgid "Couldn't find the XML root directory in the address `%s'"
+msgid "Opened BerkeleyDB source at root %s"
 msgstr ""
 
-#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#: backends/bdb-backend.c:578
+msgid "Initializing BDB backend module"
+msgstr ""
+
+#: backends/dir-utils.c:108
+#, fuzzy, c-format
+msgid "Couldn't find the %s root directory in the address `%s'"
+msgstr "������ `%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 ""
+
+#: backends/xml-backend.c:233
+msgid "Unloading XML backend module."
+msgstr ""
+
+#: backends/xml-backend.c:286
+#, c-format
+msgid "Couldn't find the XML root directory in the address `%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'"
@@ -41,7 +64,7 @@ msgstr ""
 msgid "Initializing XML backend module"
 msgstr ""
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr ""
@@ -50,18 +73,18 @@ msgstr ""
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, 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:253
+#: backends/xml-cache.c:256
 #, 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
@@ -74,160 +97,158 @@ msgstr "`%s'�� ������ ������ �����ϴ�: %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML �����̸� `%s`�� ���丮�Դϴ�"
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "`%s'����⸦ �����߽��ϴ�: %s"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "`%s`���� ���Ⱑ �����߽��ϴ�: %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: backends/xml-dir.c:359
+#, fuzzy, c-format
+msgid "Failed to set mode on `%s': %s"
+msgstr "`%s'�� ���µ� �����߽��ϴ�: %s\n"
+
+#: backends/xml-dir.c:373 backends/xml-dir.c:383
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "���� ���� `%s` ����Ⱑ �����߽��ϴ�: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "`%s'�� ������ �������� �����ϴ�: %s"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "��Ʈ�� `%s'�� `%s'���� �ߺ��Ǿ��ֽ��ϴ�. ����"
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:961
+#: backends/xml-dir.c:979
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "`%s'������ �ݴµ� �����߽��ϴ�: %s"
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "`%s'��� �̸��� ���� XML ��带 �����մϴ�: %s"
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr ""
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
-#, c-format
-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 ""
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "`%s'��� �̸��� ���� XML ��带 �����մϴ�: %s"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "��Ű�������� �⺻���� �дµ� �����߽��ϴ�: %s"
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "<%s>��忡 \"type\"�Ӽ����� �����ϴ�"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "��忡 \"value\"�Ӽ����� �����ϴ�"
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -260,28 +281,28 @@ msgstr ""
 msgid "Failed to shut down backend"
 msgstr ""
 
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr ""
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr ""
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr ""
@@ -290,7 +311,7 @@ msgstr ""
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -298,59 +319,59 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr ""
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "`%s'������ ���� ��µ� ���� �߻�: %s"
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "`%s'������ ���� ���ϴµ� ���� �߻�: %s"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "`%s'�� �⺻���� ��µ� �����߻�: %s"
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "`%s'�� ���������� �˻��ϴµ� ������ �߻��߽��ϴ�: %s"
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "`%s'�� �ִ� ��� ��Ʈ���� ��µ� �����߽��ϴ�: %s"
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "`%s'�� ���� ���� ������ ����: %s"
@@ -415,208 +436,29 @@ msgstr ""
 msgid "Failed to get a lock"
 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 "���� '%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 ""
-
-#: 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 "Element�� ������ġ�� '<'�� �����ֽ��ϴ�"
-
-#: gconf/gconf-glib.c:1519
-msgid "Document ended just after '<' character"
-msgstr "'<' �ٷ� �ڿ��� ������ �������Ƚ��ϴ�"
-
-#: gconf/gconf-glib.c:1547
-msgid "No closing '>' found for a <? or <!"
+#: gconf/gconf-error.c:40
+msgid "No database available to save your configuration"
 msgstr ""
 
-#: gconf/gconf-glib.c:1576
-#, c-format
-msgid "Character '%s' is not valid at the start of an element name"
-msgstr "'%s'���ڴ� Element�� ���۹��ڷ� ���������ʽ��ϴ�"
-
-#: gconf/gconf-glib.c: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 "Element�� '%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 ""
-
-#: 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 "'%s'������ ���µ� �����߽��ϴ�: %s"
-
-#: gconf/gconf-glib.c:10683
-#, c-format
-msgid "Error reading file '%s': %s"
-msgstr "`%s' ������ �дµ� ������ �ֽ��ϴ�: %s"
-
-#: gconf/gconf-internals.c:85
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Ű `%s'�� '/'�� �����ϴ�"
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr ""
 
@@ -625,176 +467,194 @@ msgstr ""
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "`%s'������ �дµ� ������ �߻��߽��ϴ�: %s\n"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "����Ǵ� ����Ʈ ��� %s�� ������ϴ�"
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "����Ǵ� %s�� ����Ʈ��� %s�� ����Ʈ�� ������ϴ�"
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "����Ǵ� pair��ſ� %s�� ������ϴ�"
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1499
+#: gconf/gconf-internals.c:1474
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "����Ǵ� (%s, %s)Ÿ���� pair ��ſ� (%s, %s)�� ������ϴ�"
 
-#: gconf/gconf-internals.c:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "�ڹ� ����: %s"
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF �Ľ� ����: %s"
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "�˷��������� OAF������ �߻�"
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "`%s'�ȿ� ior ������ �����ϴ�"
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "�ٸ� ���α׷��� ���(`%s')�� ������ �ֽ��ϴ�"
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "`%s'���丮�� ���� ���� �����ϴ�: %s"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "`%s' ��� ������ ���� ���� �����ϴ�: %s"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "`%s'���Ͽ� ������ �����ϴ�: %s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "��� ����(%s)�� �����־ �����մϴ�"
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, 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:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "source `%s'�� �ҷ����̴µ� �����߽��ϴ�: %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "��Ÿ ������ ã�µ� ������ ������ϴ�: %s"
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "��Ÿ ������ ���µ� ������ ������ϴ�: %s"
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -864,510 +724,581 @@ msgstr ""
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "������ `%s'�ּҸ� �ؼ��Ҽ��� �����ϴ�"
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1597
-#, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+#: gconf/gconf.c:1870
+#, fuzzy, c-format
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "������ �����ϴµ� �����Ͽ����ϴ�. �ڹ� ����: %s"
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConf�� �ʱ�ȭ�ϴµ� �����Ͽ� ����ħ�ϴ�\n"
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr "������(/)�� �����ؾ��մϴ�"
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "���� ������ �����µ� �����߽��ϴ�: %s"
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr "�Ǽ����� �;��ϳ� ��ſ� %s�� ������ϴ�."
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr "�������� �;��ϳ� ��ſ� %s�� ������ϴ�."
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr "���ڿ��� �;��ϳ� ��ſ� %s�� ������ϴ�."
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "bool���� �;��ϳ� ��ſ� %s�� ������ϴ�."
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "��Ű���� �;��ϳ� ��ſ� %s�� ������ϴ�"
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "������� ��û�� �޾ҽ��ϴ�"
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "���� ������ �ҷ����̴µ� ������ �߻��߽��ϴ�: %s"
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:312 gconf/gconfd.c:324
-#, c-format
-msgid "Received signal %d, shutting down."
+#: gconf/gconfd.c:369
+#, fuzzy, c-format
+msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgstr "�ñ׳� %d�� �޾Ƽ� ����ħ�ϴ�"
+
+#: gconf/gconfd.c:385
+#, fuzzy, c-format
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr "�ñ׳� %d�� �޾Ƽ� ����ħ�ϴ�"
 
-#: gconf/gconfd.c:329
+#: gconf/gconfd.c:402
 #, fuzzy, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "�ñ׳� %d�� �޾Ƽ� ����ħ�ϴ�"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr "GConf�� ������� ���� ��ɸ� ������ ����������ϴ�"
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "`%s'������ ���� ��µ� �����߽��ϴ�: %s\n"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
 msgstr ""
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:613
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
 msgstr ""
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:618
+msgid "Unknown error registering existing gconfd with OAF; exiting"
 msgstr ""
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:645
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:649
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:654
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "��������"
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+#, fuzzy
+msgid "GConf server is not in use, shutting down."
+msgstr "�ñ׳� %d�� �޾Ƽ� ����ħ�ϴ�"
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr "���ܰ� �߻��߽��ϴ�: %s"
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, fuzzy, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "`%s'���Ͽ� ������ �����ϴ�: %s"
 
-#: gconf/gconfd.c:989
+#: gconf/gconfd.c:1317
 #, fuzzy, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "`%s'������ �ݴµ� �����߽��ϴ�: %s"
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, fuzzy, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "`%s'�� ������ ������ �����ϴ�: %s"
 
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, fuzzy, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1110
-#, fuzzy, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr "`%s'�� �ؼ��Ҽ��� �����ϴ� (����Ʈ�� '['���� �����ؾ��մϴ�)"
-
-#: gconf/gconfd.c:1125
-msgid "Failed to parse connection ID in saved state file"
-msgstr ""
-
-#: gconf/gconfd.c:1140
-#, c-format
-msgid "Failed to unquote config source address from saved state file: %s"
-msgstr ""
-
-#: gconf/gconfd.c:1160
+#: gconf/gconfd.c:1823
 #, c-format
-msgid "Failed to unquote listener location from saved state file: %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1180
+#: gconf/gconfd.c:1869
 #, fuzzy, c-format
-msgid "Failed to unquote IOR from saved state file: %s"
-msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
+msgid "Error reading saved state file: %s"
+msgstr "`%s' ������ �дµ� ������ �ֽ��ϴ�: %s"
 
-#: gconf/gconfd.c:1204
-msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
+#: gconf/gconfd.c:1922
+#, c-format
+msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1225
+#: gconf/gconfd.c:2039
+#, c-format
 msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
+"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:1346
+#: gconf/gconfd.c:2044
 #, c-format
 msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+"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:1377
-#, c-format
-msgid "Unable to open saved state file '%s': %s"
-msgstr ""
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
+#, fuzzy, c-format
+msgid "Failed to get IOR for client: %s"
+msgstr "`%s'������ ���� ��µ� �����߽��ϴ�: %s\n"
 
-#: 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:2082
+#, fuzzy, c-format
+msgid "Failed to open saved state file: %s"
+msgstr "`%s'������ �ݴµ� �����߽��ϴ�: %s"
 
-#: gconf/gconfd.c:1481
-#, c-format
+#: gconf/gconfd.c:2095
+#, fuzzy, c-format
+msgid "Failed to write client add to saved state file: %s"
+msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
+
+#: gconf/gconfd.c:2103
+#, fuzzy, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
+
+#: gconf/gconfd.c:2193
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 
-#: gconf/gconftool.c:62
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr ""
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr ""
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "���丮�� ������ 0 �ƴϸ� 2�� �����ݴϴ�"
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "gconfd�� ���ư��� ������ 0 �ƴϸ� 2�� �����ݴϴ�"
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 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:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr ""
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 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:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr ""
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 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:198
+#: gconf/gconftool.c:205
 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:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr ""
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr ""
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr ""
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr ""
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr ""
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr ""
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 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:270
+#: gconf/gconftool.c:277
 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:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, 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:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
+#: gconf/gconftool.c:413
+msgid "Can't use --all-entries with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
 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-entries, --"
+"all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf�� �ʱ�ȭ�ϴµ� �����߽��ϴ�: %s\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE ȯ�溯���� ���� �����ϼ���\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1375,319 +1306,374 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "����ġ�µ� ���� �߻�: %s\n"
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
 msgstr "`%s'���� pair���� �����ϴµ� ������ ������ϴ�: %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "���� ����(gconfd)�� �����Ҽ��� �����ϴ�: %s\n"
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr "�� Ű�� Ű���� �����Ͽ����մϴ�\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "Ÿ��: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr "List Ÿ��: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car Ÿ��: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr Ÿ��: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "������: %s\n"
+msgid "Default Value: %s\n"
+msgstr ""
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "������: %s\n"
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "������ ����: %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "���� ����: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "`%s'������ ���� ��µ� �����߽��ϴ�: %s\n"
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "`%s'Ÿ���� �ν��Ҽ��� �����ϴ�\n"
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr "�����μ� ��Ű���� ����Ҽ��� �����ϴ�\n"
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "����: %s\n"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
-#, c-format
-msgid "Error setting value: %s"
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
 msgstr "���� �����ϴµ� ������ �߻�: %s"
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
-#, c-format
-msgid "Error syncing: %s"
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
 msgstr "����ȭ�� �����߽��ϴ�: %s"
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1234
+#, fuzzy
+msgid "Must specify a key or keys on the command line\n"
+msgstr "�� Ű�� Ű���� �����Ͽ����մϴ�\n"
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "`%s'�Ͱ��� ������ �����ϴ�\n"
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "`%s'�� ���� ���� ������ ����: %s"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "`%s'�Ͱ��� ������ �����ϴ�\n"
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr ""
+
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr "���: ��Ű�� `%s'�� Ű `%s'�� �Ҵ��ϴµ� ������ ������ϴ�: %s\n"
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "List Ÿ���� �⺻Ÿ��(���ڿ�, ����, �Ǽ�, ��/����)�̾���մϴ�\n"
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr "Pair car Ÿ���� �⺻Ÿ��(���ڿ�, ����, �Ǽ�, ��/����)�̾���մϴ�\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr "Pair cdr Ÿ���� �⺻Ÿ��(���ڿ�, ����, �Ǽ�, ��/����)�̾���մϴ�\n"
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr "���� �����ϴµ� ������ �߻�: %s"
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr "����ȭ�� �����߽��ϴ�: %s"
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "���丮�鸦 �о���µ� ����: %s\n"
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "���: ��Ű��(%s)�� �������ϰų� ���� Ÿ���� �ֽ��ϴ�\n"
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "���: ��Ű��(%s)�� �������ϰų� ���� list_type�� �ֽ��ϴ�\n"
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "���: ��Ű�������� �⺻���� ������ ���� �����ϴ�\n"
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "���: gconftool ���� ����, �ν��Ҽ����� GConfValueType\n"
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "���: Ÿ�� �̸� `%s'�� �Ľ��ϴµ� �����߽��ϴ�\n"
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"���: list_type�� ����,�Ǽ�, ���ڿ� �Ǵ� bool�ϼ��� �ֽ��ϴ�. `%s'�� "
-"�ȵ˴ϴ�.\n"
+"���: list_type�� ����,�Ǽ�, ���ڿ� �Ǵ� bool�ϼ��� �ֽ��ϴ�. `%s'�� �ȵ˴�"
+"��.\n"
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"���: car_type�� ����,�Ǽ�, ���ڿ� �Ǵ� bool�ϼ��� �ֽ��ϴ�. `%s'�� "
-"�ȵ˴ϴ�.\n"
+"���: car_type�� ����,�Ǽ�, ���ڿ� �Ǵ� bool�ϼ��� �ֽ��ϴ�. `%s'�� �ȵ˴�"
+"��.\n"
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"���: cdr_type�� ����,�Ǽ�, ���ڿ� �Ǵ� bool�ϼ��� �ֽ��ϴ�. `%s'�� "
-"�ȵ˴ϴ�.\n"
+"���: cdr_type�� ����,�Ǽ�, ���ڿ� �Ǵ� bool�ϼ��� �ֽ��ϴ�. `%s'�� �ȵ˴�"
+"��.\n"
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr "���: <applyto>��尡 ���ֽ��ϴ�"
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "���: <schema>�Ʒ����� <%s>���� �������մϴ�\n"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "���: <locale>���ӿ� ���������ʴ� <%s>��尡 �ֽ��ϴ�\n"
 
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "���: ��Ű�� `%s' ������ `%s' ��ġ �����߽��ϴ�: %s\n"
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "`%s' ��Ű���� `%s' �������� ���� ��ġ�߽��ϴ�\n"
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "���: ��Ű�� `%s'�� Ű `%s'�� �Ҵ��ϴµ� ������ ������ϴ�: %s\n"
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "��Ű�� `%s'�� Ű `%s'�� �Ҵ��մϴ�\n"
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "�� <schema>�ȿ��� ���� �Ѱ��� <locale>��Ʈ������ ������ �־���մϴ�\n"
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "���: <schemalist>�Ʒ��� <%s>���� ���������ʽ��ϴ�\n"
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "`%s'�� ���µ� �����߽��ϴ�: %s\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "`%s' ������ ��������ʳ���?\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
-"`%s'������ �������� �ֻ��� ���(<%s>)�� ������ "
-"�ֽ��ϴ�(�ݵ��<gconfschemafile>�̾���մϴ�\n"
+"`%s'������ �������� �ֻ��� ���(<%s>)�� ������ �ֽ��ϴ�(�ݵ��"
+"<gconfschemafile>�̾���մϴ�\n"
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "���� `%s'�� �ֻ��� �ܰ� <gconfschemafile> ��尡 �����ϴ�\n"
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "���: <gconfschemafile>�Ʒ��� �ִ� ��� <%s>�� ���������ʽ��ϴ�\n"
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "���� ����Ÿ�� ����ȭ�ϴµ� ������ �߻��߽��ϴ�: %s"
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr "��ġ�� ��Ű�� ���ϵ��� �����ϼž��մϴ�\n"
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -1696,27 +1682,27 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1724,15 +1710,45 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, fuzzy, c-format
+msgid "GConf Error: %s\n"
+msgstr "����: %s\n"
+
+#: gconf/gconf-client.c:798
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:985
+#: gconf/gconf-client.c:1000
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
 
+#~ msgid "Character '%s' is not valid at the start of an attribute name"
+#~ msgstr "���� '%s'�� �Ӽ� �̸��� ù �ڷδ� ���������ʽ��ϴ�"
+
+#~ msgid "Missing '<' at start of element"
+#~ msgstr "Element�� ������ġ�� '<'�� �����ֽ��ϴ�"
+
+#~ msgid "Document ended just after '<' character"
+#~ msgstr "'<' �ٷ� �ڿ��� ������ �������Ƚ��ϴ�"
+
+#~ msgid "Character '%s' is not valid at the start of an element name"
+#~ msgstr "'%s'���ڴ� Element�� ���۹��ڷ� ���������ʽ��ϴ�"
+
+#~ msgid "Elements should be closed with '>' or '/>', not with '%s'"
+#~ msgstr "Element�� '%s'�� �ƴ϶� '>'�� '/>'�� �������մϴ�"
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "'%s'������ ���µ� �����߽��ϴ�: %s"
+
+#~ msgid "GConf was built with debugging features enabled"
+#~ msgstr "GConf�� ������� ���� ��ɸ� ������ ����������ϴ�"
+
+#, fuzzy
+#~ msgid "Didn't understand line in saved state file: '%s'"
+#~ msgstr "`%s'�� �ؼ��Ҽ��� �����ϴ� (����Ʈ�� '['���� �����ؾ��մϴ�)"
+
 #~ msgid "Received signal %d, ignoring"
 #~ msgstr "�ñ׳� %d�� �޾Ҵµ� �����մϴ�"
diff --git a/po/nl.po b/po/nl.po
index fe9f10d1..52655b53 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-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-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"
@@ -13,20 +13,46 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:233
-msgid "Unloading XML backend module."
+#: backends/bdb-backend.c:215
+#, fuzzy
+msgid "Unloading BerkeleyDB (BDB) backend module."
 msgstr "Bezig met ontladen XML backend module."
 
-#: backends/xml-backend.c:286
+#: backends/bdb-backend.c:238
 #, c-format
-msgid "Couldn't find the XML root directory in the address `%s'"
+msgid "Opened BerkeleyDB source at root %s"
+msgstr ""
+
+#: backends/bdb-backend.c:578
+#, fuzzy
+msgid "Initializing BDB backend module"
+msgstr "Bezig met initializeren XML backend module"
+
+#: backends/dir-utils.c:108
+#, fuzzy, c-format
+msgid "Couldn't find the %s 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:1033
+#: 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 "Kon directory `%s' niet maken: %s"
 
+#: backends/dir-utils.c:212
+#, fuzzy, c-format
+msgid "Can't read from or write to the %s root directory in the address `%s'"
+msgstr ""
+"Kan niet lezen uit of schrijven naar de XML root directory in het adres `%s'"
+
+#: backends/xml-backend.c:233
+msgid "Unloading XML backend module."
+msgstr "Bezig met ontladen XML backend module."
+
+#: backends/xml-backend.c:286
+#, c-format
+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:386
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
@@ -42,7 +68,7 @@ msgstr "Directory/bestand permissies voor XML bron bij root %s zijn: %o/%o"
 msgid "Initializing XML backend module"
 msgstr "Bezig met initializeren XML backend module"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Fout bij het loslaten van de vergrendeling op XML dir `%s': %s"
@@ -53,7 +79,7 @@ msgstr ""
 "Ongesynchronizeerde verwijderde directories tijdens het afsluiten van het "
 "XML backend"
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -63,11 +89,11 @@ msgstr ""
 "synchroniseren\n"
 "naar de schijf niet successvol is verlopen"
 
-#: backends/xml-cache.c:253
+#: backends/xml-cache.c:256
 #, c-format
 msgid ""
-"%u items remain in the cache after cleaning already-synced items older than "
-"%u seconds"
+"%u items remain in the cache after cleaning already-synced items older than %"
+"u seconds"
 msgstr ""
 "%u items achtergebleven in de cache na het schoonmaken van de al "
 "gesynchronizeerde items ouder dan %u seconden"
@@ -82,165 +108,161 @@ msgstr "Kon niet status voor `%s' niet verkrijgen: %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML bestandsnaam `%s' is een directory"
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Fout bij verwijderen `%s': %s"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Fout bij het schrijven naar bestand `%s': %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: backends/xml-dir.c:359
+#, fuzzy, c-format
+msgid "Failed to set mode on `%s': %s"
+msgstr "Fout bij openen `%s': %s\n"
+
+#: backends/xml-dir.c:373 backends/xml-dir.c:383
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Fout bij het wijzigen van de naam van `%s' naar `%s': %s"
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Fout bij het terugzetten `%s' van `%s': %s"
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, c-format
 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:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Fout bij vergaren status van `%s': %s"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Dubbele \"entry\" `%s' in `%s', wordt genegeerd"
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, 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:961
+#: backends/xml-dir.c:979
 #, 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:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Fout bij maken bestand `%s': %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Fout bij sluiten bestand `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "XML node met naam `%s' word genegeerd: %s"
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Schema naam `%s' word genegeerd, ongeldig: %s"
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
-#, c-format
-msgid "Ignoring XML node `%s', except for possible schema name: %s"
-msgstr ""
-"XML node `%s' word genegeerd, met uitzondering van een mogelijke schema "
-"naam: %s"
-
-#: backends/xml-entry.c:699
-msgid "found <local_schema> with no locale setting"
-msgstr "gevonden <local_schema> met geen lokale instelling"
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "XML node met naam `%s' word genegeerd: %s"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Fout bij het lezen van standaardwaarde voor schema: %s"
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Geen \"type\" attribuut voor <%s> node"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Een node heeft een onbekend \"type\" attribuut `%s', word genegeerd"
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "Geen \"value\" attribuut voor node"
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "XML node <%s> niet begrepen binnen een XML lijst node"
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Ongeldig type (lijst, paar, of onbekend) in een lijst node"
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Slechte XML node: %s"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Lijst bevat een slecht-getypeerde node (%s, zou %s moeten zijn)"
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "slechte 'car' van XML paar word genegeerd: %s"
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "ontleden van XML bestand: lijsten en paren mogen niet binnen een paar worden "
 "geplaatst"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "slechte 'cdr' van XML paar word genegeerd: %s"
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "XML node <%s> niet begrepen binnen een XML paar node"
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Kon 'car' en 'cdr' voor XML paar node niet vinden"
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Ontbrekende 'cdr' van waarde paar in XML bestand"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "Ontbrekende 'car' van waarde pair in XML bestand"
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Zowel 'car' als 'cdr' waarden ontbreken van paar in XML bestand"
 
@@ -273,31 +295,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:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr "Ongeldige waarde ontvangen in instel verzoek"
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, 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:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr "Verzoek om alle gecachede gegevens te laten vallen"
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr "Verzoek ontvangen om synchroon te synchronizeren"
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 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:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Fout bij synchronizeren van een of meer bronnen: %s"
@@ -306,7 +328,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:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -317,12 +339,12 @@ msgstr ""
 "hersteld als gconfd word herstart, dit resulteert in onbetrouwbare "
 "notificatie van configuratie wijzingen."
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Luisteraar ID %lu bestaat niet"
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -332,47 +354,47 @@ msgstr ""
 "(waarschijnlijk niet gevaarlijk, kan resulteren in een notificatie die "
 "opnieuw weer verschijnt): %s"
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fout bij het vergaren van waarde voor `%s': %s"
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Fout bij het instellen van waarde voor `%s': %s"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Fout bij het ontzetten `%s': %s"
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, 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:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Fout bij het controleren van bestaan van `%s': %s"
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Fout bij het verwijderen van directory `%s': %s"
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, 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:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Fout bij het vergaren van directorylijst in `%s': %s"
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Fout bij het instellen van schema voor `%s': %s"
@@ -437,239 +459,29 @@ msgstr "Bewerking niet toegestaan zonder configuratie server"
 msgid "Failed to get a lock"
 msgstr "Fout bij verkrijgen van vergrendeling"
 
-#: 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-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: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
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Geen '/' in '%s' sleutel"
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Kon CORBA waarde voor lijst element niet interpreteren"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Ongeldig type voor lijst element in %s"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr "Lijst van gconfd ontvangen met een slecht lijst type"
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr "Converteren van object naar IOR mislukt"
 
@@ -678,94 +490,99 @@ msgstr "Converteren van object naar IOR mislukt"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Kon pad bestand `%s' niet openen: %s\n"
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Bezig met bron `%s'\n"
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Leesfout op bestand `%s': %s\n"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Verwachtte lijst, kreeg %s"
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Verwachtte lijst van %s, kreeg lijst van %s"
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Verwachtte paar, kreeg %s"
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, 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:1499
+#: gconf/gconf-internals.c:1474
 #, 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:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Gequoteerde tekenreeks begint niet met een quotatie teken"
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Gequoteerde tekenreeks eindigt niet met een quotatie teken"
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA fout: %s"
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, fuzzy, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr "OAF probleem omschrijving: '%s'"
+
+#: gconf/gconf-internals.c:2154
 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:2182
+#: gconf/gconf-internals.c:2159
 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:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF ontleed fout: %s"
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "Onbekende OAF fout"
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "geen ior bestand in `%s'"
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd neemt vergrendeling `%s' van een andere proces"
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Een andere programma heeft vergrendeling `%s'"
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 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:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -774,46 +591,46 @@ msgstr ""
 "Overgebleven vergrendelingsbestand verwijdert `%s' omdat IOR niet naar "
 "object referentie geconverteerd kon worden, IOR `%s'"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, 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:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf configuratie daemon (gconfd) heeft vergrendeling `%s'"
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "kon directory `%s' niet maken: %s"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Kon vergrendeling `%s' niet maken: %s"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kon niet schrijven naar bestand `%s': %s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, 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:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Vergrendelingsbestand `%s' beschadigt, word toch verwijdert"
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -822,26 +639,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:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Fout bij het vrijgegeven van vergrendelings directory `%s': %s"
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Fout bij het laden bron `%s': %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, 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:539
+#: gconf/gconf-sources.c:567
 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:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -850,17 +667,30 @@ msgstr ""
 "Waarde voor `%s' ingesteld op een alleen-lezen bron aan de voorkant van je "
 "configuratie pad."
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Fout bij het zoeken van metainfo: %s"
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Fout bij het vergaren van metainfo: %s"
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -932,99 +762,99 @@ msgstr "`%s' niet begrepen (extra ')' gevonden binnen paar)"
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Server kon adres `%s' niet vinden"
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr "Kan notificaties niet toevoegen aan lokale configuratie bron"
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, fuzzy, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 "Toevoegen van client aan de lijst van de server mislukt, CORBA fout: %s"
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
-"Fout bij contact opnemen met de configuratie server: OAF gaf NIL terug van "
-"oaf_activate_from_id() en gaf geen uitzondering met een uitleg van het "
-"probleem. Rapporteer a.u.b. een OAF bug."
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr "Fout bij initialiseren GConf, er word nu gestopt\n"
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr "Moet beginnen met een schuine streep (/)"
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan geen twee schuine strepen (/) achter elkaar hebben"
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan geen punt (.) na een schuine streep (/) hebben"
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, 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:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Sleutel/directory mag niet eindigen op een schuine streep (/)"
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fout bij sluiten configuratie server: %s"
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Verwachte 'float', kreeg %s"
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Verwachte 'int', kreeg %s"
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Verwachte 'string', kreeg %s"
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Verwachte 'bool', kreeg %s"
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Verwachte 'schema', kreeg %s"
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "Afsluitings verzoek ontvangen"
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
-"gconfd gecompileerd met debug informatie; bezig met proberen laden van "
-"gconf.path uit de broncode directory"
+"gconfd gecompileerd met debug informatie; bezig met proberen laden van gconf."
+"path uit de broncode directory"
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1032,7 +862,10 @@ msgstr ""
 "Geen configuratie bestanden gevonden, terugval op standaard configuratie "
 "bron `%s'"
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1041,12 +874,16 @@ msgstr ""
 "opgeslagen;\n"
 "bewerken "
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Fout bij het laden van enkele configuratie bronnen: %s"
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1055,7 +892,7 @@ msgstr ""
 "data niet\n"
 "laden en opslaan"
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1064,65 +901,122 @@ msgstr ""
 "niet\n"
 "in staat om sommige wijzingen op te slaan"
 
-#: 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:369
+#, 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:329
+#: gconf/gconfd.c:385
+#, 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:402
 #, 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:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "(versie %s) gestart, pid %u gebruiker '%s'"
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr "GConf is gebouwd met debug mogelijkheden"
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
+#, fuzzy
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 "Fout bij initializeren Object Activatie Framework: rapporteer een bug aan de "
 "OAF beheerders"
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Fout bij het verkrijgen van object referentie voor ConfigServer"
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "Fout bij maken bestand `%s': %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "Fout bij vergaren van IOR voor client: %s"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
+#, fuzzy
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
 msgstr ""
 "OAF kent onze IID niet; Dit geeft een corrupte installatie aan; Kan niet "
 "registreren; gestopt\n"
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:613
+#, fuzzy
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
 msgstr "Er is al een andere gconfd registreert bij OAF; gestopt\n"
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:618
+#, fuzzy
+msgid "Unknown error registering existing gconfd with OAF; exiting"
 msgstr "Onbekende fout bij het registreren van gconfd bij OAF; gestopt\n"
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:645
+#, fuzzy
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
+msgstr ""
+"OAF kent onze IID niet; Dit geeft een corrupte installatie aan; Kan niet "
+"registreren; gestopt\n"
+
+#: gconf/gconfd.c:649
+#, fuzzy
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
+msgstr "Er is al een andere gconfd registreert bij OAF; gestopt\n"
+
+#: gconf/gconfd.c:654
+#, fuzzy
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
+msgstr "Onbekende fout bij het registreren van gconfd bij OAF; gestopt\n"
+
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "Fout bij het vrijgegeven van vergrendelings directory `%s': %s"
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "Gestopt"
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr "GConf server word niet gebruikt, bezig met afsluiten."
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Uitzondering: %s"
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1131,7 +1025,7 @@ msgstr ""
 "Fout bij het openen van gconfd log bestand; kan luisteraars naar gconfd "
 "afsluiting niet herstarten (%s)"
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1139,34 +1033,34 @@ msgstr ""
 "Fout bij sluiten van gconfd log bestand; gegevens zijn misschien niet goed "
 "opgeslagen (%s)"
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, 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:980
+#: gconf/gconfd.c:1308
 #, 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:989
+#: gconf/gconfd.c:1317
 #, 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:1003
+#: gconf/gconfd.c:1331
 #, 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:1013
+#: gconf/gconfd.c:1341
 #, 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:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1174,48 +1068,7 @@ msgstr ""
 "Fout bij het herstellen van origineel opslag status bestand dat was "
 "verplaatst naar '%s': %s"
 
-#: 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
+#: gconf/gconfd.c:1823
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1223,79 +1076,113 @@ msgstr ""
 "Fout bij het herstellen van luisteraar op adres '%s', kon de databank niet "
 "vinden"
 
-#: gconf/gconfd.c:1377
+#: gconf/gconfd.c:1869
+#, c-format
+msgid "Error reading saved state file: %s"
+msgstr "Fout bij lezen opslag status bestand: %s"
+
+#: gconf/gconfd.c:1922
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Fout bij openen opslag status bestand '%s': %s"
 
-#: gconf/gconfd.c:1476
+#: gconf/gconfd.c:2039
 #, c-format
 msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Failed to log addition of listener to gconfd logfile; won't be able to re-"
+"add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 "Fout bij het loggen van toevoeging van luisteraars aan het gconfd log "
 "bestand; kan luisteraar niet opnieuw toevoegen als gconfd stopt (%s)"
 
-#: gconf/gconfd.c:1481
+#: gconf/gconfd.c:2044
 #, c-format
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Failed to log removal of listener to gconfd logfile; might erroneously re-"
+"add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 "Fout bij het loggen van het verwijderen van de luisteraar naar gconfd log "
 "bestand; misschien word de luisteraar foutief opnieuw toegevoegd als gconfd "
 "stopt (%s)"
 
-#: gconf/gconftool.c:62
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
+#, c-format
+msgid "Failed to get IOR for client: %s"
+msgstr "Fout bij vergaren van IOR voor client: %s"
+
+#: gconf/gconfd.c:2082
+#, fuzzy, c-format
+msgid "Failed to open saved state file: %s"
+msgstr "Fout bij openen opslag status bestand '%s': %s"
+
+#: gconf/gconfd.c:2095
+#, fuzzy, c-format
+msgid "Failed to write client add to saved state file: %s"
+msgstr ""
+"Fout bij spoelen van toevoeging van client aan het opslag status bestand: %s"
+
+#: gconf/gconfd.c:2103
+#, 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:2193
+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:69
 msgid "Help options"
 msgstr "Help opties"
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Stel een sleutel in op een waarde en synchronizeer. Gebruik met --type"
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr "Druk de waarde van een sleutel af op de standaard uitvoer."
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 msgid ""
-"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
-"--type."
+"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
+"type."
 msgstr ""
 "Stel een schema in en synchronizeer. Gebruik met --short-desc, --long-desc, "
 "--owner, en --type."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr "De sleutels op de opdrachtregel uitzetten"
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr "Druk alle sleutel/waarde paren in een directory af."
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr "Druk alle subdirectories in een directory af."
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "Druk alle subdirectories en items in een directory recursief af."
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Geef 0 terug als de directory bestaat, 2 als het niet bestaat."
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Stop gconfs. GEBRUIK DEZE OPTIE NIET ZONDER EEN GOEDE REDEN!."
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Geef 0 terug als gconfd draait, 2 als dit niet het geval is."
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1303,7 +1190,7 @@ msgstr ""
 "Lanceer de configuratie server (gconfd). (Gebeurt normaalgesproken "
 "automatisch als het nodig is)"
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1311,11 +1198,11 @@ msgstr ""
 "Specificeer het type van de waarde die word ingesteld, of het type van de "
 "waarde die een schema omschrijft. Unieke afkortingen zijn toegestaan."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1323,11 +1210,11 @@ msgstr ""
 "Specificeer het type van de in te stellen lijst waarde, of het type van een "
 "waarde die een schema omschrijft. Unieke afkortingen zijn toegestaan."
 
-#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1335,7 +1222,7 @@ msgstr ""
 "Specificeer het type van het car waardepaar dat wordt ingesteld, of het type "
 "van een waarde die een schema omschrijft. Unieke afkortingen zijn toegestaan."
 
-#: gconf/gconftool.c:198
+#: gconf/gconftool.c:205
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1343,48 +1230,48 @@ msgstr ""
 "Specificeer het type cdr waardepaar dat wordt ingesteld, of het type van een "
 "waarde die een schema omschrijft. Unieke afkortingen zijn toegestaan."
 
-#: gconf/gconftool.c:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "Specificeer een korte halve-regel omschrijving die in het schema moet komen."
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr "OMSCHRIJVING"
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 "Specificeer een uit meerdere regels bestaande omschrijving die in het schema "
 "moet komen."
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr "Specificeer de eigenaar van dit schema"
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr "EIGENAAR"
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr "Specificeer een te installeren schema bestand"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr "BESTANDSNAAM"
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Specificeer een te gebruiken configuratie bron in plaats van het standaard "
 "pad"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr "BRON"
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1392,18 +1279,18 @@ msgstr ""
 "Benader de configuratie databank direct, de server omzeilend. Gconfd mag "
 "niet draaien."
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 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 ""
 "Installeert schema bestanden op de opdrachtregel in de databank. De "
-"GCONF_CONFIG_SOURCE omgevingsvariabele moet ingesteld staan op een "
-"niet-standaard configuratie bron of naar een lege tekenreeks om de "
+"GCONF_CONFIG_SOURCE omgevingsvariabele moet ingesteld staan op een niet-"
+"standaard configuratie bron of naar een lege tekenreeks om de "
 "standaardwaarde te gebruiken."
 
-#: gconf/gconftool.c:270
+#: gconf/gconftool.c:277
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1411,7 +1298,7 @@ msgstr ""
 "Martelings-test voor applicaties d.m.v. het instellen en uitzetten van een "
 "groep waarden van verschillende typen voor sleutels op de opdrachtregel."
 
-#: gconf/gconftool.c:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1419,7 +1306,27 @@ msgstr ""
 "Martelings-test voor een applicatie d.m.v. het instellen en uitzetten van "
 "een groep sleutels binnen de directories op de opdrachtregel."
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1429,90 +1336,93 @@ msgstr ""
 "Start '%s --help' om een volledige lijst van beschikbare opdrachtregel "
 "opties te zien.\n"
 
-#: gconf/gconftool.c:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Kan niet vergaren en tegelijkertijd instellen/uitzetten\n"
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Kan niet instellen en tegelijkertijd vergaren/uitzetten\n"
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
-msgstr "Kan --all-pairs niet met --get of --set gebruiken\n"
+#: gconf/gconftool.c:413
+#, fuzzy
+msgid "Can't use --all-entries with --get or --set\n"
+msgstr "Kan --all-dirs niet met --get of --set gebruiken\n"
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Kan --all-dirs niet met --get of --set gebruiken\n"
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
+#, fuzzy
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
-"--recursive-list moet niet gebruikt worden met --get, --set, --unset, "
-"--all-pairs of --all-dirs\n"
+"--recursive-list moet niet gebruikt worden met --get, --set, --unset, --all-"
+"pairs of --all-dirs\n"
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
+#, fuzzy
 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-entries, --"
+"all-dirs\n"
 msgstr ""
-"--set_schema moet niet gebruikt worden met --get, --set, --unset, "
-"--all-pairs of --all-dirs\n"
+"--set_schema moet niet gebruikt worden met --get, --set, --unset, --all-"
+"pairs of --all-dirs\n"
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Waardetype is alleen relevant als een waarde word ingesteld\n"
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr "Moet een type geven als een waarde word ingesteld\n"
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping optie moet gebruikt worden door zichzelf.\n"
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists optie moet gebrukt worden door zichzelf.\n"
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file moet gebruikt worden door zichzelf.\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule moet gebruikt worden door zichzelf.\n"
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key moet gebruikt worden door zichzelf.\n"
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory moet gebruikt worden door zichzelf.\n"
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
-"Je moet een configuratie bron specificeren met --config-source als je "
-"--direct gebruikt\n"
+"Je moet een configuratie bron specificeren met --config-source als je --"
+"direct gebruikt\n"
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Fout bij initializeren GConf: %s\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Moet GCONF_CONFIG_SOURCE omgevings variabele instellen\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:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1524,254 +1434,310 @@ msgstr ""
 "te doen als er geen applicaties draaien\n"
 "(doch het zou theoretisch ook moeten kunnen als applicatie draaien).\n"
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Fout bij benaderen configuratie bron(nen): %s\n"
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Afsluit fout: %s\n"
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "Moet een of meerdere directories specificeren om recursief weer te geven.\n"
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
 msgstr "Fout bij het weergeven van paren in `%s': %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr "(geen waarde ingesteld)"
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Fout bij het starten van de configuratie server (gconfd): %s\n"
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr "Moet een sleutel of meerdere sleutels specificeren om te 'vergaren'\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "Type: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Lijst Type: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car Type: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr Type: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "Eigenaar: %s\n"
+msgid "Default Value: %s\n"
+msgstr ""
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr "Niet ingesteld"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "Eigenaar: %s\n"
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Korte Omschrijving: %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Lange Omschrijving: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Geen waarde ingesteld voor `%s'\n"
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Fout bij het vergaren van waarde voor `%s': %s\n"
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Type `%s' niet begrepen\n"
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Moet afwisselend een aantal sleutels/waarden als argumenten geven\n"
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Geen waarde ingesteld voor sleutel: `%s'\n"
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr "Kan schema niet in stellen als waarde\n"
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 "Als je een lijst instelt moet je een primitief lijst-type specificeren\n"
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Als je paren instelt moet je een primtief car-type en cdr-type specificeren\n"
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fout: %s\n"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
-#, c-format
-msgid "Error setting value: %s"
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
 msgstr "Fout bij instellen waarde: %s"
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
-#, c-format
-msgid "Error syncing: %s"
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
 msgstr "Fout bij synchronizeren: %s"
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1234
+#, fuzzy
+msgid "Must specify a key or keys on the command line\n"
+msgstr "Moet een sleutel of meerdere sleutels specificeren om te 'vergaren'\n"
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "Bestand `%s' bestaat niet\n"
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "Fout bij het instellen van schema voor `%s': %s"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "Bestand `%s' bestaat niet\n"
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+#, fuzzy
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr "Moet een sleutel (schema naam) specificeren als het enige argument\n"
+
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr "WAARSCHUWING: fout bij associeren schema `%s' met sleutel `%s': %s\n"
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Moet een sleutel (schema naam) specificeren als het enige argument\n"
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Lijst type moet een primitief type zijn: string, int, float of bool\n"
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Paar car type moet een primitief type zijn: string, int, float of bool\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Paar cdr type moet een primitief type zijn: string, int, float of bool\n"
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr "Fout bij instellen waarde: %s"
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr "Fout bij synchronizeren: %s"
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Moet een of meer directories specificeren om sleutel/waarde paren van te "
 "laden.\n"
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Moet een of meer sleutels specificeren om uit te zetten.\n"
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Fout bij uitzetten `%s': %s\n"
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Moet specificeren met een of meerdere directories om subdirectories van te "
 "vergaren specificeren.\n"
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Fout bij weergeven directoris: %s\n"
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "WAARSCHUWING: ongeldig of ontbrekend type voor schema (%s)\n"
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "WAARSCHUWING: ongeldig of ontbrekend list_type voor schema (%s)\n"
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "WAARSCHUWING: Fout bij ontleden standaardwaarde voor `%s' voor schema (%s)\n"
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "WAARSCHUWING: ongeldig of ontbrekend car_type of cdr_type voor schema (%s)\n"
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "WAARSCHUWING: Je kunt geen standaardwaarde instellen voor een schema\n"
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "WAARSCHUWING: gconftool interne fout, onbekend GConfValueType\n"
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "WAARSCHUWING: fout bij ontleden type naam `%s'\n"
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"WAARSCHUWING: list_type kan alleen int, float, string of bool zijn en niet "
-"`%s'\n"
+"WAARSCHUWING: list_type kan alleen int, float, string of bool zijn en niet `%"
+"s'\n"
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"WAARSCHUWING: car_type kan alleen int, float, string of bool zijn en niet "
-"`%s'\n"
+"WAARSCHUWING: car_type kan alleen int, float, string of bool zijn en niet `%"
+"s'\n"
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"WAARSCHUWING: cdr_type kan alleen int, float, string of bool zijn en niet "
-"`%s'\n"
+"WAARSCHUWING: cdr_type kan alleen int, float, string of bool zijn en niet `%"
+"s'\n"
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr "WAARSCHUWING: lege <applyto> node"
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "WAARSCHUWING: node <%s> niet begrepen onder <schema>\n"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr "WAARSCHUWING: geen sleutel gespecificeerd voor schema\n"
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "WAARSCHUWING: <locale> node heeft geen `name=\"locale\"' attribuut, wordt "
 "genegeerd\n"
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1779,51 +1745,51 @@ msgstr ""
 "WAARSCHUWING: meerdere <locale> nodes voor locale `%s', alle na de eerste "
 "worden genegeerd\n"
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "WAARSCHUWING: Ongeldige node <%s> in een <locale> node\n"
 
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "WAARSCHUWING: fout bij installeren schema `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Schema `%s' voor locale `%s' geinstalleerd\n"
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "WAARSCHUWING: fout bij associeren schema `%s' met sleutel `%s': %s\n"
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Schema `%s' aan sleutel `%s' bevestigd\n"
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Je moet tenminste een <locale> item hebben in een <schema>\n"
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "WAARSCHUWING: node <%s> niet begrepen onder <schemalist>\n"
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Fout bij openen `%s': %s\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Document `%s' is leeg?\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1832,26 +1798,26 @@ msgstr ""
 "Document `%s' heeft verkeerd root node type (<%s>, zou <gconfschemafile> "
 "moeten zijn\n"
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Document `%s' heeft geen top niveau <gconfschemafile> node\n"
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "WAARSCHUWING: node <%s> onder <gconfschemafile> niet begrepen\n"
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Fout bij synchronizeren configuratie gegevens: %s"
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr "Je moet enkele te installeren schema bestanden specificeren\n"
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -1860,16 +1826,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Fout bij uitzetten breek sleutel %s: %s\n"
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr "Moet enkele te breken sleutels specificeren\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1879,11 +1845,11 @@ msgstr ""
 "voor een sleutel:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr "Moet enkele te breken directories specificeren\n"
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1894,52 +1860,243 @@ msgstr ""
 "voor sleutels in directory:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr "GConf Fout: %s\n"
+
+#: gconf/gconf-client.c:798
 #, 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:985
+#: gconf/gconf-client.c:1000
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Verwachte `%s' kreeg `%s' voor sleutel %s"
 
-#~ msgid "No database available to save your configuration"
-#~ msgstr "Geen databank beschikbaar om configuratie naar op te slaan"
+#~ msgid "Ignoring XML node `%s', except for possible schema name: %s"
+#~ msgstr ""
+#~ "XML node `%s' word genegeerd, met uitzondering van een mogelijke schema "
+#~ "naam: %s"
 
-#~ msgid "OAF problem description: '%s'"
-#~ msgstr "OAF probleem omschrijving: '%s'"
+#~ msgid "found <local_schema> with no locale setting"
+#~ msgstr "gevonden <local_schema> met geen lokale instelling"
 
-#~ msgid "Unable to store a value at key '%s'"
-#~ msgstr "Kon waarde op sleutel '%s' niet opslaan"
+#~ 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 "Received signal %d, dumping core. Please report a GConf bug."
+#, fuzzy
+#~ msgid ""
+#~ "Documented ended just after an '&', '&' should begin an entity or "
+#~ "character reference."
 #~ msgstr ""
-#~ "Signaal %d ontvangen, kern word gedumpt. Rapporteer a.u.b. een GConf bug."
+#~ "Document eindigde net na een '&', '&' moet beginnen met een entiteits of "
+#~ "karakter referentie."
 
 #~ msgid ""
-#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ "'<' 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 ""
-#~ "Signaal %d ontvangen, abnormale afsluiting. Rapporteer a.u.b. een GConf bug."
+#~ "'<' 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 "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 attribute name"
+#~ msgstr "Karakter '%s' is niet geldig aan het begin van een attribuutnaam"
 
-#~ msgid "Error reading saved state file: %s"
-#~ msgstr "Fout bij lezen opslag status bestand: %s"
+#~ msgid "Document ended just after attribute name"
+#~ msgstr "Document eindigde net na attribuut naam"
 
-#~ msgid "Failed to get IOR for client: %s"
-#~ msgstr "Fout bij vergaren van IOR voor client: %s"
+#~ msgid "Attribute name must be immediately followed by an '=' character"
+#~ msgstr "Attribuutnaam moet direct gevolgd worden door een '=' karakter"
 
-#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgid ""
+#~ "'=' character after attribute must be immediately followed by an '\"' "
+#~ "character"
+#~ msgstr ""
+#~ "'=' karakter na attribuut moet direct gevolgd worden door een '\"' "
+#~ "karakter"
+
+#~ 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 ""
+#~ "Ran out of text before a quote mark ('\"') was seen at the end of an "
+#~ "attribute value"
 #~ msgstr ""
-#~ "Fout bij spoelen van toevoeging van client aan het opslag status bestand: %s"
+#~ "Einde van tekst alvorens een quotatie teken ('\"') gezien werd op het "
+#~ "einde van een attribuut waarde"
 
 #~ msgid ""
-#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ "Text ends immediately after an attribute value, before the element was "
+#~ "closed"
 #~ msgstr ""
-#~ "Enkele clienten verwijderden zichzelf van de GConf server terwijl ze niet "
-#~ "waren toegevoegd."
+#~ "Tekst eindigt direct na een attribuut waarde, voor het element werd "
+#~ "gesloten"
 
-#~ msgid "GConf Error: %s\n"
-#~ msgstr "GConf Fout: %s\n"
+#~ 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"
+
+#~ msgid "No closing '>' found for a <? or <!"
+#~ msgstr "Geen sluitende '>' gevonden voor een <? of <!"
+
+#~ 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 "Document ended just after element name, no '>' seen"
+#~ msgstr "Document eindigde net na een elementnaam, geen '>' gezien"
+
+#~ 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 "
+#~ "'/>'"
+#~ 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'"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "Fout bij lezen bestand '%s': %s"
+
+#~ 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 ""
+#~ "Fout bij contact opnemen met de configuratie server: OAF gaf NIL terug "
+#~ "van oaf_activate_from_id() en gaf geen uitzondering met een uitleg van "
+#~ "het probleem. Rapporteer a.u.b. een OAF bug."
+
+#, fuzzy
+#~ msgid "Received signal %d, shutting down."
+#~ msgstr "Signaal %d ontvangen, normale afsluiting"
+
+#~ msgid "GConf was built with debugging features enabled"
+#~ msgstr "GConf is gebouwd met debug mogelijkheden"
+
+#, fuzzy
+#~ msgid "Didn't understand line in saved state file: '%s'"
+#~ msgstr "Fout bij het openen van opslag status bestand: %s"
+
+#, fuzzy
+#~ msgid "Failed to parse connection ID in saved state file"
+#~ msgstr "Fout bij het openen van opslag status bestand: %s"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Failed to unquote IOR from saved state file: %s"
+#~ msgstr "Fout bij het openen van opslag status bestand: %s"
+
+#~ msgid "Can't use --all-pairs with --get or --set\n"
+#~ msgstr "Kan --all-pairs niet met --get of --set gebruiken\n"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Kon waarde op sleutel '%s' niet opslaan"
diff --git a/po/nn.po b/po/nn.po
index 9e2fa6ee..d8db430e 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oaf 0.6.5\n"
-"POT-Creation-Date: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-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"
@@ -13,22 +13,47 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/xml-backend.c:233
-msgid "Unloading XML backend module."
+#: backends/bdb-backend.c:215
+#, fuzzy
+msgid "Unloading BerkeleyDB (BDB) backend module."
+msgstr "Initialiserer modem"
+
+#: backends/bdb-backend.c:238
+#, c-format
+msgid "Opened BerkeleyDB source at root %s"
 msgstr ""
 
-#: backends/xml-backend.c:286
+#: backends/bdb-backend.c:578
+#, fuzzy
+msgid "Initializing BDB backend module"
+msgstr "Initialiserer modem"
+
+#: backends/dir-utils.c:108
 #, fuzzy, c-format
-msgid "Couldn't find the XML root directory in the address `%s'"
+msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "Fann ikkje heimekatalogen til brukaren"
 
-#: backends/xml-backend.c:301 backends/xml-dir.c:1033
+#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
 #, fuzzy, c-format
 msgid "Could not make directory `%s': %s"
 msgstr ""
 "Kunne ikkje laga katalog\n"
 "%1"
 
+#: backends/dir-utils.c:212
+#, fuzzy, c-format
+msgid "Can't read from or write to the %s root directory in the address `%s'"
+msgstr "Fann ikkje heimekatalogen til brukaren"
+
+#: 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'"
@@ -44,7 +69,7 @@ msgstr ""
 msgid "Initializing XML backend module"
 msgstr "Initialiserer modem"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr ""
@@ -53,18 +78,18 @@ msgstr ""
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, 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:253
+#: backends/xml-cache.c:256
 #, 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
@@ -77,55 +102,60 @@ msgstr "Kunne ikkje starta %1."
 msgid "XML filename `%s' is a directory"
 msgstr "Finst alt som katalog"
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, fuzzy, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Kunne ikkje fjerna temaet '%1'"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, fuzzy, c-format
 msgid "Failed to write file `%s': %s"
 msgstr ""
 "Kunne ikkje skriva til fil:\n"
 "%s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: 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
 #, fuzzy, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Kunne ikkje fjerna temaet '%1'"
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, fuzzy, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Kunne ikkje fjerna temaet '%1'"
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, 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:788
+#: backends/xml-dir.c:806
 #, fuzzy, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Kunne ikkje lagra %1."
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:961
+#: backends/xml-dir.c:979
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1049
+#: backends/xml-dir.c:1067
 #, fuzzy, c-format
 msgid "Failed to create file `%s': %s"
 msgstr ""
@@ -133,110 +163,103 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, fuzzy, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Kunne ikkje lasta biletefil."
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, fuzzy, c-format
 msgid "%s"
 msgstr "%1 s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr ""
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
-#, c-format
-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 ""
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "Feil ved opning av fila '%1': %2"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr ""
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 #, fuzzy
 msgid "No \"value\" attribute for node"
 msgstr "Ulike filattributt"
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -270,28 +293,28 @@ msgstr "Kan ikkje laga reservekopifil for %1"
 msgid "Failed to shut down backend"
 msgstr "Kunne ikkje akseptera innkommande klient"
 
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr ""
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr ""
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr ""
@@ -300,7 +323,7 @@ msgstr ""
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -308,63 +331,63 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, fuzzy, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Fila %1 finst ikkje"
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, fuzzy, c-format
 msgid "Error getting value for `%s': %s"
 msgstr ""
 "Feil ved henting av fil for overf�ring:\n"
 "%1"
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, fuzzy, c-format
 msgid "Error setting value for `%s': %s"
 msgstr ""
 "Feil ved henting av fil for overf�ring:\n"
 "%1"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, fuzzy, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "koplar til tenar"
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, fuzzy, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "koplar til tenar"
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, fuzzy, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Feil ved fjerning av oppsett"
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, fuzzy, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Feil ved lagring av oppsett"
@@ -438,208 +461,30 @@ msgstr "&Gi �tvaring dersom oppsettet ikkje kan skrivast"
 msgid "Failed to get a lock"
 msgstr "Kunne ikkje lagra %1."
 
-#: 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 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-error.c:40
+#, fuzzy
+msgid "No database available to save your configuration"
+msgstr "Comment=Oppsett av databasemilj�et ODBC"
 
-#: gconf/gconf-internals.c:85
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, fuzzy, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Feil portnummer."
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 #, fuzzy
 msgid "Failed to convert object to IOR"
 msgstr "Kunne ikkje kopla til."
@@ -651,181 +496,199 @@ msgstr ""
 "Kunne ikkje opna fil:\n"
 "%s"
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, fuzzy, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Feil ved opning av fila '%1': %2"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, fuzzy, c-format
 msgid "Expected list, got %s"
 msgstr "Forventar %1"
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, fuzzy, c-format
 msgid "Expected pair, got %s"
 msgstr "Standard alarmtid:"
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1499
+#: gconf/gconf-internals.c:1474
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, fuzzy, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr "Problemskildring"
+
+#: gconf/gconf-internals.c:2154
 #, fuzzy
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "Hugs � fjerna 'spool'-katalogen\n"
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 #, fuzzy
 msgid "attempt to add already-listed OAF directory"
 msgstr "Kunne ikkje laga katalog"
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, fuzzy, c-format
 msgid "OAF parse error: %s"
 msgstr "Kprocess-feil:%1"
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 #, fuzzy
 msgid "Unknown OAF error"
 msgstr "Ukjend feil."
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, fuzzy, c-format
 msgid "No ior file in `%s'"
 msgstr "Tal p� filer i bruk:"
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr ""
 
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, fuzzy, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, fuzzy, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Kan ikkje laga %1: %2"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, fuzzy, c-format
 msgid "Can't write to file `%s': %s"
 msgstr ""
 "Kunne ikkje skriva til fil:\n"
 "%s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr ""
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, 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:2543
+#: gconf/gconf-internals.c:2519
 #, fuzzy, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Kunne ikkje laga katalog"
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, fuzzy, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Kunne ikkje lasta %1."
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, fuzzy, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Feil ved lesing av filinfo."
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, fuzzy, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Feil ved lesing av filinfo."
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -895,525 +758,600 @@ msgstr ""
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, fuzzy, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Kunne ikkje henta lokal adresse!"
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, fuzzy, c-format
 msgid "Expected int, got %s"
 msgstr "Forventar %1"
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, fuzzy, c-format
 msgid "Expected string, got %s"
 msgstr "Erstatt denne teksten?"
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 #, fuzzy
 msgid "Shutdown request received"
 msgstr "Skru av maskina og starta p� nytt?"
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+#, fuzzy
+msgid "/path"
+msgstr "Empath"
+
+#: gconf/gconfd.c:314
 #, fuzzy, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Feil ved lasting av biletefil."
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#: gconf/gconfd.c:369
+#, c-format
+msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgstr ""
+
+#: gconf/gconfd.c:385
 #, c-format
-msgid "Received signal %d, shutting down."
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 
-#: gconf/gconfd.c:329
+#: gconf/gconfd.c:402
 #, 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:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr ""
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%1:\n"
+"%2"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "Kunne ikkje akseptera innkommande klient"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
+msgstr ""
+
+#: gconf/gconfd.c:613
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
 msgstr ""
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:618
+msgid "Unknown error registering existing gconfd with OAF; exiting"
 msgstr ""
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:645
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:649
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:654
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "Kunne ikkje laga katalog"
+
+#: gconf/gconfd.c:706
 #, fuzzy
 msgid "Exiting"
 msgstr "Avsluttar ..."
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr ""
+
+#: gconf/gconfd.c:1090
 #, fuzzy, c-format
 msgid "Returning exception: %s"
 msgstr "Val for oppkopling p� nytt"
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, 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:980
+#: gconf/gconfd.c:1308
 #, 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:989
+#: gconf/gconfd.c:1317
 #, fuzzy, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Kunne ikkje lasta biletefil."
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, fuzzy, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Kunne ikkje sletta fila %1"
 
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1110
-#, fuzzy, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr "Kunne ikkje lasta biletefil."
-
-#: 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 "Failed to unquote config source address from saved state file: %s"
-msgstr "Kunne ikkje lasta biletefil."
+#: gconf/gconfd.c:1823
+#, c-format
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
 
-#: gconf/gconfd.c:1160
+#: gconf/gconfd.c:1869
 #, fuzzy, c-format
-msgid "Failed to unquote listener location from saved state file: %s"
-msgstr "Kunne ikkje lasta biletefil."
+msgid "Error reading saved state file: %s"
+msgstr ""
+"Feil ved lesing a fil:\n"
+"%1"
 
-#: gconf/gconfd.c:1180
+#: gconf/gconfd.c:1922
 #, fuzzy, c-format
-msgid "Failed to unquote IOR from saved state file: %s"
-msgstr "Kunne ikkje lasta biletefil."
-
-#: gconf/gconfd.c:1204
-msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
-msgstr ""
+msgid "Unable to open saved state file '%s': %s"
+msgstr "Kan ikkje lagra til fila."
 
-#: gconf/gconfd.c:1225
+#: gconf/gconfd.c:2039
+#, c-format
 msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
+"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:1346
+#: gconf/gconfd.c:2044
 #, c-format
 msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+"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:1377
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
 #, fuzzy, c-format
-msgid "Unable to open saved state file '%s': %s"
+msgid "Failed to get IOR for client: %s"
+msgstr "Kunne ikkje akseptera innkommande klient"
+
+#: gconf/gconfd.c:2082
+#, fuzzy, c-format
+msgid "Failed to open saved state file: %s"
 msgstr "Kan ikkje lagra til fila."
 
-#: 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:2095
+#, fuzzy, c-format
+msgid "Failed to write client add to saved state file: %s"
+msgstr "Kunne ikkje lasta biletefil."
 
-#: gconf/gconfd.c:1481
-#, c-format
+#: gconf/gconfd.c:2103
+#, fuzzy, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr "Kunne ikkje lasta biletefil."
+
+#: gconf/gconfd.c:2193
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 
-#: gconf/gconftool.c:62
+#: gconf/gconftool.c:69
 #, fuzzy
 msgid "Help options"
 msgstr "Tekstval"
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr ""
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 #, fuzzy
 msgid "Print all key/value pairs in a directory."
 msgstr "Dette vil laga ein ny 'spool'-katalog."
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 #, fuzzy
 msgid "Print all subdirectories in a directory."
 msgstr "Skriv arbeidskatalogen"
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr ""
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr ""
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 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:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr ""
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 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:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr ""
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 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:198
+#: gconf/gconftool.c:205
 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:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr ""
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 #, fuzzy
 msgid "Specify the owner of a schema"
 msgstr "Vel prosessnummeret det skal knytast til:"
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 #, fuzzy
 msgid "OWNER"
 msgstr "ANNA"
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr ""
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 #, fuzzy
 msgid "FILENAME"
 msgstr "FIL OPNA"
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 #, fuzzy
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "Spesifiser ein annan tenar enn standardtenaren (AOL)"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 #, fuzzy
 msgid "SOURCE"
 msgstr "POENG"
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 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:270
+#: gconf/gconftool.c:277
 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:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, 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:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
+#: gconf/gconftool.c:413
+msgid "Can't use --all-entries with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
 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-entries, --"
+"all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, fuzzy, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Kunne ikkje lagra %1."
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 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:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1421,321 +1359,379 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, fuzzy, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "filene for systemoppsettet.\n"
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, fuzzy, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Vis sidekantar"
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
 msgstr ""
+"Kunne ikkje skriva til fil:\n"
+"%s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 #, fuzzy
 msgid "(no value set)"
 msgstr "(ingen verdi)"
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, fuzzy, c-format
 msgid "Type: %s\n"
 msgstr " Type: %1 "
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, fuzzy, c-format
 msgid "List Type: %s\n"
 msgstr " Type: %1 "
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, fuzzy, c-format
 msgid "Car Type: %s\n"
 msgstr " Type: %1 "
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, fuzzy, c-format
 msgid "Cdr Type: %s\n"
 msgstr " Type: %1 "
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, fuzzy, c-format
-msgid "Owner: %s\n"
-msgstr "Eigar: %1"
+msgid "Default Value: %s\n"
+msgstr "Standardlydstyrkar"
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 #, fuzzy
 msgid "Unset"
 msgstr "Fjern merking"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, fuzzy, c-format
+msgid "Owner: %s\n"
+msgstr "Eigar: %1"
+
+#: gconf/gconftool.c:1012
 #, fuzzy, c-format
 msgid "Short Desc: %s\n"
 msgstr "Breidd: %1"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 #, fuzzy
 msgid "Cannot set schema as value\n"
 msgstr ""
 "Kan ikkje lagra fila\n"
 "'"
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, fuzzy, c-format
 msgid "Error: %s\n"
 msgstr "Feil: %1"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
+#: gconf/gconftool.c:1193
 #, fuzzy, c-format
-msgid "Error setting value: %s"
+msgid "Error setting value: %s\n"
 msgstr ""
 "Feil ved skriving av fil:\n"
 "%s"
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
+#: gconf/gconftool.c:1211
 #, fuzzy, c-format
-msgid "Error syncing: %s"
+msgid "Error syncing: %s\n"
 msgstr "Feil ved synkronisering av database"
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1234
+msgid "Must specify a key or keys on the command line\n"
+msgstr ""
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "Inga slik fil \"%s\"!"
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "Feil ved lagring av oppsett"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "Inga slik fil \"%s\"!"
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr ""
+
+#: gconf/gconftool.c:1365
+#, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, fuzzy, c-format
+msgid "Error setting value: %s"
+msgstr ""
+"Feil ved skriving av fil:\n"
+"%s"
+
+#: gconf/gconftool.c:1496
+#, fuzzy, c-format
+msgid "Error syncing: %s"
+msgstr "Feil ved synkronisering av database"
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, fuzzy, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "koplar til tenar"
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, fuzzy, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 "Feil ved skriving av fil:\n"
 "%s"
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 #, 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:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Fil opna: %s"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, fuzzy, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "&Dokumentsti:"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, fuzzy, c-format
 msgid "Error syncing config data: %s"
 msgstr "Feil ved synkronisering av database"
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1744,28 +1740,28 @@ msgstr ""
 "\n"
 "%1:\n"
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 #, fuzzy
 msgid "Must specify some directories to break\n"
 msgstr "Base for heimekatalogar"
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1773,58 +1769,41 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, fuzzy, c-format
+msgid "GConf Error: %s\n"
+msgstr "Feil: %1"
+
+#: gconf/gconf-client.c:798
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:985
+#: gconf/gconf-client.c:1000
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Initializing BDB backend module"
-#~ msgstr "Initialiserer modem"
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Kunne ikkje lasta biletefil."
 
 #, fuzzy
-#~ msgid "Couldn't find the %s root directory in the address `%s'"
-#~ msgstr "Fann ikkje heimekatalogen til brukaren"
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "Feil ved fjerning av oppsett"
 
 #, fuzzy
-#~ msgid "Failed to set mode on `%s': %s"
-#~ msgstr "Kunne ikkje fjerna temaet '%1'"
+#~ msgid "Didn't understand line in saved state file: '%s'"
+#~ msgstr "Kunne ikkje lasta biletefil."
 
 #, fuzzy
-#~ msgid "No database available to save your configuration"
-#~ msgstr "Comment=Oppsett av databasemilj�et ODBC"
+#~ msgid "Failed to parse connection ID in saved state file"
+#~ msgstr "Kunne ikkje lasta biletefil."
 
 #, fuzzy
-#~ msgid "OAF problem description: '%s'"
-#~ msgstr "Problemskildring"
+#~ msgid "Failed to unquote config source address from saved state file: %s"
+#~ msgstr "Kunne ikkje lasta biletefil."
 
 #, 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 70b4dce3..fad84cb4 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-09-19 16:41+0200\n"
+"POT-Creation-Date: 2001-09-14 12:44-0400\n"
 "PO-Revision-Date: 2001-09-19 16:42+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 433d9909..ff86308d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 1.1.1\n"
-"POT-Creation-Date: 2001-09-18 20:14-0300\n"
+"POT-Creation-Date: 2001-09-14 12:44-0400\n"
 "PO-Revision-Date: 2001-09-18 20:22-03:00\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -87,8 +87,8 @@ msgstr ""
 #: backends/xml-cache.c:256
 #, 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 itens continuam no cache ap�s a limpeza dos itens j� sincronizados mais "
 "antigos que %u segundos"
@@ -664,10 +664,20 @@ msgid ""
 "configuration path file doesn't contain any databases or wasn't found or 2) "
 "bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing "
-"bonobo-activation-server and gconfd, and logging back in may help. As "
-"always, check the user.* syslog for details on problems gconfd encountered."
-msgstr "N�o � poss�vel armazenar um valor na chave '%s', pois o servidor de configura��o n�o possui bases de dados com possibilidade de escrita. Existem duas causas comuns para este problema: 1) o seu caminho de configura��o n�o cont�m nenhuma base de dados ou n�o foi encontrado ou 2) bonobo-activation criou por engano dois processos gconfd. Se voc� possui dois processos gconfd (ou tinha dois quando o segundo foi lan�ado), ent�o este � um erro do bonobo-activation, n�o um problema no GConf. Sair do sistema, matar bonobo-activation-server e gconfd e entrar no sistema de novo pode ajudar. Como sempre, verifique no syslog user.* detalhes sobre os problemas que o gconfd encontrou."
+"an bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+"N�o � poss�vel armazenar um valor na chave '%s', pois o servidor de "
+"configura��o n�o possui bases de dados com possibilidade de escrita. Existem "
+"duas causas comuns para este problema: 1) o seu caminho de configura��o n�o "
+"cont�m nenhuma base de dados ou n�o foi encontrado ou 2) bonobo-activation "
+"criou por engano dois processos gconfd. Se voc� possui dois processos gconfd "
+"(ou tinha dois quando o segundo foi lan�ado), ent�o este � um erro do bonobo-"
+"activation, n�o um problema no GConf. Sair do sistema, matar bonobo-"
+"activation-server e gconfd e entrar no sistema de novo pode ajudar. Como "
+"sempre, verifique no syslog user.* detalhes sobre os problemas que o gconfd "
+"encontrou."
 
 #: gconf/gconf-sources.c:1164
 #, c-format
@@ -773,7 +783,14 @@ msgid ""
 "wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
-msgstr "Erro ao contatar o servidor de configura��o: bonobo-activation retornou nil para bonobo-activation_activate_from_id() e n�o configurou uma exce��o para explicar o problema. Este � um erro do pacote bonobo-activation; algo errado aconteceu com o bonobo-activation e n�o foi relatado um erro. Este n�o � um erro do pacote GConf. N�o relate um erro do GConf a n�o ser que voc� possua informa��o indicando o que aconteceu de errado com o bonobo-activation que foi causado pelo GConf."
+msgstr ""
+"Erro ao contatar o servidor de configura��o: bonobo-activation retornou nil "
+"para bonobo-activation_activate_from_id() e n�o configurou uma exce��o para "
+"explicar o problema. Este � um erro do pacote bonobo-activation; algo errado "
+"aconteceu com o bonobo-activation e n�o foi relatado um erro. Este n�o � um "
+"erro do pacote GConf. N�o relate um erro do GConf a n�o ser que voc� possua "
+"informa��o indicando o que aconteceu de errado com o bonobo-activation que "
+"foi causado pelo GConf."
 
 #: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
@@ -861,6 +878,10 @@ msgstr ""
 "Nenhuma fonte de configura��o no caminho de fontes, configura��o n�o ser� "
 "salva; edite "
 
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
 #: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
@@ -910,9 +931,11 @@ msgstr "iniciando (vers�o %s), pid %u usu�rio '%s'"
 
 #: gconf/gconfd.c:546
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to "
-"bonobo-activation maintainers"
-msgstr "Falha ao iniciar Object Activation Framework: por favor, envie relat�rio de erros para os respos�veis pelo bonobo-activation"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
+msgstr ""
+"Falha ao iniciar Object Activation Framework: por favor, envie relat�rio de "
+"erros para os respos�veis pelo bonobo-activation"
 
 #: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
@@ -935,7 +958,9 @@ msgstr "Falha ao obter bloqueio para daemon: %s"
 msgid ""
 "Registering existing server with bonobo-activation-server, since we seem to "
 "have been leaked"
-msgstr "Registrando servidor existente com bonobo-activation-server uma vez que aparentamos t�-lo perdido"
+msgstr ""
+"Registrando servidor existente com bonobo-activation-server uma vez que "
+"aparentamos t�-lo perdido"
 
 #: gconf/gconfd.c:609
 msgid ""
@@ -961,7 +986,9 @@ msgstr "Erro desconhecido registrado gconfd com o OAF; terminando"
 msgid ""
 "bonobo-activation doesn't know about our IID; indicates broken installation; "
 "can't register; exiting\n"
-msgstr "bonobo-activation n�o conhece nosso IID; indica uma instala��o defeituosa; n�o � poss�vel registrar; terminando\n"
+msgstr ""
+"bonobo-activation n�o conhece nosso IID; indica uma instala��o defeituosa; "
+"n�o � poss�vel registrar; terminando\n"
 
 #: gconf/gconfd.c:649
 msgid "Another gconfd already registered with bonobo-activation; exiting\n"
@@ -969,7 +996,8 @@ msgstr "Outro gconfd j� registrado com o bonobo-activation; terminando\n"
 
 #: gconf/gconfd.c:654
 msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
-msgstr "Erro desconhecido registrado gconfd com o bonobo-activation; terminando\n"
+msgstr ""
+"Erro desconhecido registrado gconfd com o bonobo-activation; terminando\n"
 
 #: gconf/gconfd.c:698
 #, c-format
@@ -1059,8 +1087,8 @@ msgstr "N�o � poss�vel abrir arquivo de estado '%s': %s"
 #: gconf/gconfd.c:2039
 #, 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 ""
 "Falha ao registrar inclus�o de listener ao arquivo de registro do gconfd; "
 "n�o ser� poss�vel re-incluir o listener se o gconfd for desligado (%s)"
@@ -1068,12 +1096,12 @@ msgstr ""
 #: gconf/gconfd.c:2044
 #, 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 ""
 "Falha ao registrar remo��o de listener do arquivo de registro do gconfd; "
-"pode ocorrer uma re-inclus�o errada do listener se o gconfd for desligado "
-"(%s)"
+"pode ocorrer uma re-inclus�o errada do listener se o gconfd for desligado (%"
+"s)"
 
 #: gconf/gconfd.c:2067 gconf/gconfd.c:2232
 #, c-format
@@ -1114,8 +1142,8 @@ msgstr "Imprime o valor de uma chave para a sa�da padr�o."
 
 #: gconf/gconftool.c:96
 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 ""
 "Atribui um schema e sincroniza. Use com --short-desc, --long-desc, --owner e "
 "--type."
@@ -1317,16 +1345,16 @@ msgstr "N�o � poss�vel usar --all-dirs com --get ou --set\n"
 
 #: gconf/gconftool.c:431
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, "
-"--all-entries, or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
 "--recursive-list n�o deve ser usado com --get, --set, --unset, --all-entries "
 "ou --all-dirs\n"
 
 #: gconf/gconftool.c:441
 msgid ""
-"--set_schema should not be used with --get, --set, --unset, --all-entries, "
-"--all-dirs\n"
+"--set_schema should not be used with --get, --set, --unset, --all-entries, --"
+"all-dirs\n"
 msgstr ""
 "--set_schema n�o deve ser usado com --get, --set, --unset, --all-entries ou "
 "--all-dirs\n"
@@ -1598,8 +1626,8 @@ msgstr "Erro ao sincronizar: %s"
 #: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
-"Devem ser especificados um ou mais diret�rios de onde obter pares "
-"chave/valor.\n"
+"Devem ser especificados um ou mais diret�rios de onde obter pares chave/"
+"valor.\n"
 
 #: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
diff --git a/po/ro.po b/po/ro.po
index 6e42c556..d247c252 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-0400\n"
 "PO-Revision-Date: 2001-02-24 13:06+0100\n"
 "Last-Translator: Robert Claudiu Gheorghe <rgheorghe@writeme.com>\n"
 "Language-Team: Rom�n� <ro@li.org>\n"
@@ -13,6 +13,34 @@ 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 "Descarc modulul BerkeleyDB (BDB)"
+
+#: backends/bdb-backend.c:238
+#, c-format
+msgid "Opened BerkeleyDB source at root %s"
+msgstr "Am deschis sursa BerkeleyDB la r�d�cina %s"
+
+#: backends/bdb-backend.c:578
+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�sit directorul r�d�cin� %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�d�cin� %s la adresa `%s'"
+
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Descarc modulul XML."
@@ -22,11 +50,6 @@ msgstr "Descarc modulul XML."
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nu pot g�si directorul r�d�cin� 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'"
@@ -42,7 +65,7 @@ msgstr ""
 msgid "Initializing XML backend module"
 msgstr "Ini�ializez modulul XML"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "�ncercarea de a ridica blocarea directorului XML `%s': %s a e�uat"
@@ -52,7 +75,7 @@ msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 "�tergere de directoare invalide(nesincronizate) la oprirea modulului XML"
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -61,11 +84,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:253
+#: backends/xml-cache.c:256
 #, 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�mas �n memoria tampon dup� eliminarea obiectelor deja "
 "actualizate mai vechi de %u secunde"
@@ -80,164 +103,162 @@ msgstr ""
 msgid "XML filename `%s' is a directory"
 msgstr "Fi�ierul XML `%s' este un director"
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "�tergere e�uata pentru `%s': %s"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Nu am reu�it s� scriu �n fi�ierul `%s': %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: backends/xml-dir.c:359
+#, fuzzy, c-format
+msgid "Failed to set mode on `%s': %s"
+msgstr "�tergere e�uata pentru `%s': %s"
+
+#: backends/xml-dir.c:373 backends/xml-dir.c:383
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Nu am reu�it s� redenumesc `%s' �n `%s': %s"
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Nu am reu�it s� refac `%s' din `%s': %s"
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Nu am reu�it s� �terg vechiul fi�ierul `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Intrare duplicat `%s' �n `%s', o ignor"
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Intrare f�r� nume �n fi�ierul `%s', o ignor"
 
-#: backends/xml-dir.c:961
+#: backends/xml-dir.c:979
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr ""
 "Nodul de pe nivelul superior �n fi�ierul XML `%s' nu este un '<entry>', il "
 "ignor"
 
-#: backends/xml-dir.c:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Nu am reu�it s� creez fi�ierul `%s': %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Nu am reu�it s� inchid fi�ierul `%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignor nodul XML cu numele `%s': %s"
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 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: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:699
-msgid "found <local_schema> with no locale setting"
-msgstr ""
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "Ignor nodul XML cu numele `%s': %s"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Nu am reu�it s� citesc valoarea implicit� pentru schema: %s"
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Nu exist� atributul de \"tip\" pentru nodul <%s>"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, 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:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "Nu exist� atributul \"valoare\" pentru nodul"
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Nu am �n�eles nodul XML <%s> �n interiorul unei liste de noduri XML"
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Tip invalid (list�, pereche, sau necunoscut) �ntr-o list� de noduri"
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Nod XML gresit: %s"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, 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:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "procesez fi�ierul XML: listele �i perechile pot s� nu fie plasate �n "
 "interiorul unei perechi"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Nu am �nteles nodul XML <%s> �n interiorul unui nod pereche "
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -270,33 +291,33 @@ msgstr "Nu am putut localiza modulul pentru `%s'"
 msgid "Failed to shut down backend"
 msgstr "Oprire modul(e) esuat�"
 
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr "Informa�ie(valoare) invalid� recep�ionat� la 'set request'"
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, 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:416
+#: gconf/gconf-database.c:518
 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:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr "Am primit solicitarea de actualizare(sync) sincron�"
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "Eroare fatala: am e�uat �n ob�inerea unei referin�e c�tre un obiect "
 "ConfigDatabase"
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Nu am reu�it s� actualizez una sau mai multe surse: %s"
@@ -305,7 +326,7 @@ msgstr "Nu am reu�it 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:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -316,12 +337,12 @@ msgstr ""
 "refac acest proces la repornirea lui gconfd, fapt care va conduce la "
 "notific�ri gresite ale schimb�rilor de configura�ie."
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "ID-ul de proces 'listener' %lu nu exista"
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -331,47 +352,47 @@ msgstr ""
 "(aproape sigur f�r� consecin�e , poate conduce la reapari�ia unor "
 "notific�ri: %s"
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Eroare la ob�inerea valorii pentru `%s': %s"
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Eroare la stabilirea valorii pentru `%s': %s"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Eroare la resetarea `%s': %s"
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Eroare la ob�inerea valorii implicite pentru `%s': %s"
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Eroare la verificarea existen�ei lui `%s': %s"
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Eroare la eliminarea directorului `%s': %s"
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Nu am reu�it sa ob�in toate intr�rile(elementele) din `%s': %s"
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Eroare la listarea directorelor �n `%s': %s"
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Eroare la stabilirea schemei pentru `%s': %s"
@@ -437,209 +458,30 @@ msgstr "Opera�ia nu este permis� far� un server de configura�ii"
 msgid "Failed to get a lock"
 msgstr "Nu am reu�it s� blochez"
 
-#: 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-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: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 "Nu am reu�it s� inchid fi�ierul `%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
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Nici un '/' �n cheia `%s'"
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 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:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Tip incorect pentru elementul list� �n %s"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 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:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr "Nu am reusit s� convertesc obiectul in IOR"
 
@@ -648,136 +490,141 @@ 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�ierul `%s': %s\n"
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Adaug sursa `%s'\n"
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Eroare de citire la fi�ierul `%s': %s\n"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "A�teptam o list�, am primit %s"
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "A�temptam o list� de %s, am primit o list� de %s"
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "A�teptam o pereche, am primit %s"
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "A�teptam o pereche (%s,%s), am primit o pereche cu una sau am�ndoua valorile "
 "lipsa"
 
-#: gconf/gconf-internals.c:1499
+#: gconf/gconf-internals.c:1474
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "A�teptam o pereche de tipul (%s, %s), am primit tipul (%s, %s)"
 
-#: gconf/gconf-internals.c:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "�irul de caractere se termin� dar nu �ncepe cu ghilimele"
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "�irul de caractere �ncepe dar nu se �i termin� cu ghilimele"
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Eroare CORBA: %s"
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, fuzzy, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr "Descriere problem� OAF: '%s'"
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "�ncercare de a elimina directoarele de obiecte OAF nelistate"
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr "�ncercare de a adauga directoarele OAF deja listate"
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Eroare de prelucrare(parcurgere): %s"
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "Eroare OAF necunoscut�"
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Nu exist� nici un fi�ier ior in `%s'"
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, 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:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Un alt program de�ine blocarea `%s'"
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 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:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "nu a putut crea directorul `%s': %s"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "Nu pot bloca `%s': %s"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Nu pot scrie �n fi�ier `%s': %s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 "Nu pot deschide fi�ierul de blocaj `%s'; presupun c� nu este al nostru: %s"
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Fi�ier de blocaj corupt `%s', il elimin oricum"
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -786,44 +633,57 @@ msgstr ""
 "Nu am create fi�ierul de blocare `%s' (pid creator %u, pid-ul nostru %u; "
 "consider ca altcinevaa preluat blocajul nostru"
 
-#: gconf/gconf-internals.c:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Nu am reu�it s� eliberez directorul de blocaj `%s': %s"
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Nu am reu�it s� �ncarc sursa  `%s': %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, 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:539
+#: gconf/gconf-sources.c:567
 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:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -894,510 +754,580 @@ msgstr "Nu am �n�eles `%s' (�n interiorul listei am g�sit un ')' unescaped)"
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Serverul nu a putut rezolva adresa `%s'"
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, fuzzy, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "A e�uat ad�ugarea de client la lista serverului, eroare CORBA: %s"
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr "Ini�ializarea GConf a e�uat, ies\n"
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr "Trebuie s� inceap� cu un slash (/)"
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr "Nu pot avea dou� shash-uri (/) pe un r�nd"
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Nu pot avea punct (.) imediat dup� un slash (/)"
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#: gconf/gconfd.c:369
 #, c-format
-msgid "Received signal %d, shutting down."
+msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 
-#: gconf/gconfd.c:329
+#: gconf/gconfd.c:385
+#, c-format
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgstr ""
+
+#: gconf/gconfd.c:402
 #, 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:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr ""
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "Nu am reu�it s� creez fi�ierul `%s': %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "�tergere e�uata pentru `%s': %s"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
+msgstr ""
+
+#: gconf/gconfd.c:613
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
 msgstr ""
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:618
+msgid "Unknown error registering existing gconfd with OAF; exiting"
 msgstr ""
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:645
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:649
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:654
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
 msgstr ""
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "Nu am reu�it s� eliberez directorul de blocaj `%s': %s"
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr ""
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr ""
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 
-#: gconf/gconfd.c:989
+#: gconf/gconfd.c:1317
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1110
-#, fuzzy, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr "Nu am �n�eles `%s' (lista trebuie s� �nceap� cu un '[')"
-
-#: gconf/gconfd.c:1125
-msgid "Failed to parse connection ID in saved state file"
-msgstr ""
-
-#: gconf/gconfd.c:1140
+#: gconf/gconfd.c:1823
 #, c-format
-msgid "Failed to unquote config source address from saved state file: %s"
-msgstr ""
-
-#: gconf/gconfd.c:1160
-#, c-format
-msgid "Failed to unquote listener location from saved state file: %s"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1180
+#: gconf/gconfd.c:1869
 #, fuzzy, c-format
-msgid "Failed to unquote IOR from saved state file: %s"
-msgstr "Nu am reu�it s� creez fi�ierul `%s': %s"
+msgid "Error reading saved state file: %s"
+msgstr "Eroare la eliminarea directorului `%s': %s"
 
-#: gconf/gconfd.c:1204
-msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
+#: gconf/gconfd.c:1922
+#, c-format
+msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1225
+#: gconf/gconfd.c:2039
+#, c-format
 msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
+"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:1346
+#: gconf/gconfd.c:2044
 #, c-format
 msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+"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:1377
-#, c-format
-msgid "Unable to open saved state file '%s': %s"
-msgstr ""
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
+#, fuzzy, c-format
+msgid "Failed to get IOR for client: %s"
+msgstr "Nu am reu�it sa ob�in toate intr�rile(elementele) din `%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:2082
+#, fuzzy, c-format
+msgid "Failed to open saved state file: %s"
+msgstr "Nu am reu�it s� creez fi�ierul `%s': %s"
 
-#: gconf/gconfd.c:1481
-#, c-format
+#: gconf/gconfd.c:2095
+#, fuzzy, c-format
+msgid "Failed to write client add to saved state file: %s"
+msgstr "Nu am reu�it s� creez fi�ierul `%s': %s"
+
+#: gconf/gconfd.c:2103
+#, fuzzy, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr "Nu am reu�it s� creez fi�ierul `%s': %s"
+
+#: gconf/gconfd.c:2193
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 
-#: gconf/gconftool.c:62
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr ""
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr ""
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr ""
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr ""
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr ""
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 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:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr ""
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 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:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr ""
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 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:198
+#: gconf/gconftool.c:205
 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:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr ""
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr ""
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr ""
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr ""
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr ""
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr ""
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 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:270
+#: gconf/gconftool.c:277
 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:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, 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:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
+#: gconf/gconftool.c:413
+msgid "Can't use --all-entries with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr ""
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
 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-entries, --"
+"all-dirs\n"
 msgstr ""
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr ""
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 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:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1405,338 +1335,392 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
-msgstr ""
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
+msgstr "Nu am reu�it sa ob�in toate intr�rile(elementele) din `%s': %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
+msgid "Default Value: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
+msgstr "Eroare la stabilirea valorii pentru `%s': %s"
+
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
+msgstr "Eroare la resetarea `%s': %s"
+
+#: gconf/gconftool.c:1234
+msgid "Must specify a key or keys on the command line\n"
+msgstr ""
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "Nu exist� fi�ierul `%s'\n"
+
+#: gconf/gconftool.c:1287
 #, c-format
-msgid "Error setting value: %s"
+msgid "No doc string stored in schema at '%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "Eroare la stabilirea schemei pentru `%s': %s"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "Nu exist� fi�ierul `%s'\n"
+
+#: gconf/gconftool.c:1302
 #, c-format
-msgid "Error syncing: %s"
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr "Ignor schema cu numele `%s', invalid�: %s"
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr ""
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr ""
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr ""
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1744,42 +1728,31 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, fuzzy, c-format
+msgid "GConf Error: %s\n"
+msgstr "Eroare CORBA: %s"
+
+#: gconf/gconf-client.c:798
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr ""
 
-#: wrappers/gtk/gconf-client.c:985
+#: gconf/gconf-client.c:1000
 #, 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�d�cina %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�sit directorul r�d�cin� %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�d�cin� %s la adresa `%s'"
+#~ msgid "Ignoring XML node `%s', except for possible schema name: %s"
+#~ msgstr "Ignor nodul XML `%s', cu exceptia schemei cu numele: %s"
 
 #, fuzzy
-#~ msgid "Failed to set mode on `%s': %s"
-#~ msgstr "�tergere e�uata pentru `%s': %s"
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Nu am reu�it s� inchid fi�ierul `%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'"
+#, fuzzy
+#~ msgid "Didn't understand line in saved state file: '%s'"
+#~ msgstr "Nu am �n�eles `%s' (lista trebuie s� �nceap� cu un '[')"
 
 #~ msgid "Unable to store a value at key '%s'"
 #~ msgstr "Nu am reu�it s� stochez o valoare la cheia '%s'"
diff --git a/po/ru.po b/po/ru.po
index 8c9b0779..d69b3e33 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf\n"
-"POT-Creation-Date: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-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,6 +12,35 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: backends/bdb-backend.c:215
+msgid "Unloading BerkeleyDB (BDB) backend module."
+msgstr "�������� ���������� ������ BerkeleyDB (BDB)."
+
+#: backends/bdb-backend.c:238
+#, c-format
+msgid "Opened BerkeleyDB source at root %s"
+msgstr ""
+
+#: backends/bdb-backend.c:578
+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."
@@ -21,11 +50,6 @@ 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'"
@@ -41,7 +65,7 @@ msgstr ""
 msgid "Initializing XML backend module"
 msgstr "������������� ���������� ������ XML"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "�� ������� ������������� XML ������� \"%s\": %s"
@@ -50,18 +74,18 @@ msgstr "�� ������� ������������� XML ������� \"%s\": %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, 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:253
+#: backends/xml-cache.c:256
 #, 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
@@ -74,160 +98,158 @@ msgstr "���������� ��������� stat ��� \"%s\": %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML ���� \"%s\" �������� ���������"
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "�� ������� ������� \"%s\": %s"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "�� ������� �������� ���� \"%s\": %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: 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
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "�� ������� ������������� \"%s\" � \"%s\": %s"
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "�� ������� �������� \"%s\" �� \"%s\": %s"
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "�� ������� ������� ������ ���� \"%s\": %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "�� ������� ��������� stat ��� \"%s\": %s"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "��������� ������ \"%s\" � \"%s\", ������������"
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "������ ��� ����� � XML-����� \"%s\", ������������"
 
-#: backends/xml-dir.c:961
+#: backends/xml-dir.c:979
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "���� �������� ������ � XML-����� \"%s\" �� <entry>, ������������"
 
-#: backends/xml-dir.c:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "�� ������� ������� ���� \"%s\": %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "�� ������� ������� ���� '%s': %s"
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "������������� XML-���� � ��������� \"%s\": %s"
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "������������ ��� schema \"%s\", �����������: %s"
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
-#, c-format
-msgid "Ignoring XML node `%s', except for possible schema name: %s"
-msgstr "������������� XML-���� \"%s\", �������� ��������� ����� schema: %s"
-
-#: backends/xml-entry.c:699
-msgid "found <local_schema> with no locale setting"
-msgstr ""
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "������������� XML-���� � ��������� \"%s\": %s"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "�� ������� �������� �������� �� ��������� ��� schema: %s"
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "��� ��������� \"type\" ��� ���� <%s>"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "���� ����� ����������� �������� \"type\" \"%s\", ������������"
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "��� ��������� \"value\" ��� ����"
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "�� ������� ������ XML ���� <%s> ������ XML ���� ������"
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "������������ ��� (������, ���� ��� �����������) � ���� ������"
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "������������ ���� XML: %s"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "������ �������� ������ ���� (%s, ������ ���� %s)"
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "������ XML-�����: ������ � ���� �� ����� ���� �������� ������ ����"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "�� ��� ����� XML ���� <%s> ������ XML ���� ����"
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -260,29 +282,29 @@ msgstr "�� ������� ����� ��������� ������ ��� '%s'"
 msgid "Failed to shut down backend"
 msgstr "�� ������� ��������� ������"
 
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr ""
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr "������� ������ �� ����� ���� ������������ ������"
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "��������� ������: �� ������� �������� ������ �� ������ ��� ConfigDatabase"
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "�� ������� ���������������� ���� ��� ����� ����������: %s"
@@ -291,7 +313,7 @@ msgstr "�� ������� ���������������� ���� ��� ����� ����������: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -299,59 +321,59 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr ""
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "������ ��������� �������� ��� \"%s\": %s"
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "������ ��������� �������� ��� \"%s\": %s"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr ""
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "������ ��������� �������� �� ��������� ��� \"%s\": %s"
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "������ �������� ������������� ��� \"%s\": %s"
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "������ �������� �������� \"%s\": %s"
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "�� ������� �������� ��� ������ � \"%s\": %s"
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "������ ������������ ��������� � \"%s\": %s"
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "������ ��������� ����� ��� \"%s\": %s"
@@ -418,208 +440,29 @@ msgstr "�������� �� ��������� ��� ������� ������������"
 msgid "Failed to get a lock"
 msgstr "�� ������� ������� lock"
 
-#: 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-error.c:40
+msgid "No database available to save your configuration"
+msgstr "���� ������ ��� ���������� ����� ������������ �� ��������"
 
-#: gconf/gconf-glib.c:10683
-#, fuzzy, c-format
-msgid "Error reading file '%s': %s"
-msgstr "������ �������� �������� \"%s\": %s"
-
-#: gconf/gconf-internals.c:85
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "��� '/' � ����� '%s'"
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "�� ������� ���������������� CORBA-�������� ��� �������� ������"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "������������ ��� ��� �������� ������ � %s"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr "�� gconfd ������� ������ � ������ ����� ������"
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr "�� ������� ������������� ������ � IOR"
 
@@ -628,92 +471,97 @@ msgstr "�� ������� ������������� ������ � IOR"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "�� ������� ������� ���� ���� '%s': %s\n"
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "���������� ��������� '%s'\n"
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "������ ������ ����� '%s': %s\n"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "�������� ������, ������� %s"
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "�������� ������ %s, ������� ������ %s"
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "��������� ����, ������� %s"
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "��������� ���� (%s,%s), �������� ���� � ��������� ����� ��� ������ ����������"
 
-#: gconf/gconf-internals.c:1499
+#: gconf/gconf-internals.c:1474
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "��������� ���� ���� (%s,%s) �������� ���� (%s,%s)"
 
-#: gconf/gconf-internals.c:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "������ � �������� �� ���������� � �������"
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "������ � �������� �� ������������� ��������"
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "������ CORBA: %s"
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, fuzzy, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr "�������� �������� OAF: \"%s\""
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "������� ������� �� ��������� � ������ ������� �������� OAF"
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr "������� �������� ��� ��������� � ������ ������� OAF"
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "������ ������� OAF: %s"
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "����������� ������ OAF"
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "��� ior-����� � '%s'"
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd ������������ '%s' �� ��������� ������ ���������"
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "������ ��������� ������������� '%s'"
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "���������� ������������ � ORB, ����� ��������� ������������ gconfd"
 
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -722,86 +570,99 @@ msgstr ""
 "�������� ����������� lock \"%s\", ��� ��� IOR �� ����� ���� ������������ � "
 "������ �� ������, IOR \"%s\""
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "�������� ����������� lock \"%s\", � ����� � ��������� ping �������: %s "
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "����� ������������ GConf (gconfd) ������������ '%s'"
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "�� ������� ������� ������� '%s': %s"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "���������� ������� ���������� '%s': %s"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "���������� �������� � ���� '%s': %s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "���������� ������� ���� ���������� \"%s\"; �������� �� �� ���: %s"
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "������������ lock-���� \"%s\", ���������"
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, 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:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "�� ������� ���������� ��������������� ������� \"%s\": %s"
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "�� ������� ������� �������� \"%s\": %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "����� \"%s\" ��������� ��� \"%s\" ������ �������� �� ���������� ������"
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 msgid "The '/' name can only be a directory, not a key"
 msgstr "��� \"/\" ����� ���� ������ ���������, � �� ������"
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "������ ������ ��������������: %s"
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "������ ��������� ��������������: %s"
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -873,90 +734,90 @@ msgstr "�� ������ \"%s\" (������ \")\" ������� ������ ����)"
 msgid "`%s': %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "������ �� ���� ���������� ����� '%s'"
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr "���������� �������� ��������� � ���������� ��������� ������������"
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, fuzzy, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "���� ���������� ������� � ������ ��������, ������ CORBA: %s"
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
-"������ ����������� � ������� ��������: OAF ������ nil � "
-"oaf_activate_from_id() � �� ��������� ���������� ������������ ��������. "
-"����������, ��������� ��������� �� ������ OAF."
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr "�� ������� ���������������� GConf, �����\n"
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr "������ ���������� � '/'"
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr "�� ������ ���� ��� '/' � ������"
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "�������� ���� ����� ����� '/'"
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' ������������ ������ � �������� �����/��������"
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr "����/������� �� ����� ������������� �� '/'"
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "���� ���������� ����������������� �������: %s"
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr "��������� � ����.������, �������� %s"
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr "��������� �����, �������� %s"
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr "��������� ������, �������� %s"
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "��������� ������, �������� %s"
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "��������� schema, �������� %s"
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "������� ������ �� ����������"
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -964,7 +825,7 @@ msgstr ""
 "gconfd ������������� � ��������; ���������� ��������� gconf.path �� "
 "��������� ��������"
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -972,7 +833,10 @@ msgstr ""
 "����� �������� �� �������, ���������� ������������ �������� �������� �� "
 "��������� \"%s\""
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -980,12 +844,16 @@ msgstr ""
 "��� ���������� ������������ � ���� ����������, ������������ �� ���� "
 "���������; ��������������� "
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "������ �������� ��������� ���������� ��������: %s"
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -993,7 +861,7 @@ msgstr ""
 "����� ������������ �� ��� ������� ���������, ���������� ��������� ��� "
 "��������� ���������������� ������"
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1001,101 +869,155 @@ msgstr ""
 "�� ���� ������� ���������� ������������ ���������� ������������, �������� "
 "��������� ��������� ������������ �� ������� ���������"
 
-#: gconf/gconfd.c:312 gconf/gconfd.c:324
-#, fuzzy, c-format
-msgid "Received signal %d, shutting down."
-msgstr "������� ������ %d, ������ ����������."
+#: 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:329
+#: gconf/gconfd.c:402
 #, 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:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "������ (������ %s), pid %u ������������ \"%s\""
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr "GConf ��� ������ � ���������� ���������� �������"
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
+#, fuzzy
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 "�� ������� ���������������� Object Activation Framework: ����������, "
 "��������� ��������� �� ������ ������������� OAF"
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr "�� ������� �������� ������ �� ������ ��� ConfigServer"
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "�� ������� ������� ���� \"%s\": %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "�� ������� �������� IOR ��� �������: %s"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
 msgstr ""
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:613
+#, fuzzy
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
 msgstr "������ gconfd ��� ��������������� � OAF; �����\n"
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:618
+#, fuzzy
+msgid "Unknown error registering existing gconfd with OAF; exiting"
 msgstr "����������� ������ ��� ����������� gconfd c OAF; �����\n"
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:645
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:649
+#, fuzzy
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
+msgstr "������ gconfd ��� ��������������� � OAF; �����\n"
+
+#: gconf/gconfd.c:654
+#, fuzzy
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
+msgstr "����������� ������ ��� ����������� gconfd c OAF; �����\n"
+
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "�� ������� ���������� ��������������� ������� \"%s\": %s"
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "����������"
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr "������ GConf �� ������������, ����������."
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr "������� ����������: %s"
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "�� ������� ������� ����������� ���� ��������� \"%s\" ��� ������: %s"
 
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "�� ������� �������� � ���� ������������ ��������� \"%s\" fd: %d: %s"
 
-#: gconf/gconfd.c:989
+#: gconf/gconfd.c:1317
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "�� ������� ������� ����� ���� ������������ ��������� \"%s\": %s"
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "�� ������� ����������� ����� ����������� ���� ��������� �: %s"
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1103,117 +1025,110 @@ msgstr ""
 "�� ������� ������������ �������� ����������� ���� ���������, ������� ��� "
 "��������� � \"%s\": %s"
 
-#: gconf/gconfd.c:1110
-#, fuzzy, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr "�� ������� ������� ����������� ���� ���������: %s"
-
-#: gconf/gconfd.c: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 ""
-"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
+#: gconf/gconfd.c:1823
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1377
+#: gconf/gconfd.c:1869
+#, c-format
+msgid "Error reading saved state file: %s"
+msgstr "������ ��� ������ ������������ ����� ���������: %s"
+
+#: gconf/gconfd.c:1922
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "�� ������� ������� ����������� ���� ��������� \"%s\": %s"
 
-#: gconf/gconfd.c:1476
+#: gconf/gconfd.c:2039
 #, 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 ""
 
-#: gconf/gconfd.c:1481
+#: gconf/gconfd.c:2044
 #, 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 ""
 
-#: gconf/gconftool.c:62
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
+#, c-format
+msgid "Failed to get IOR for client: %s"
+msgstr "�� ������� �������� IOR ��� �������: %s"
+
+#: gconf/gconfd.c:2082
+#, fuzzy, c-format
+msgid "Failed to open saved state file: %s"
+msgstr "�� ������� ������� ����������� ���� ��������� \"%s\": %s"
+
+#: gconf/gconfd.c:2095
+#, fuzzy, c-format
+msgid "Failed to write client add to saved state file: %s"
+msgstr "�� ������� ������� ����������� ���� ���������: %s"
+
+#: gconf/gconfd.c:2103
+#, fuzzy, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr "�� ������� ������� ����������� ���� ���������: %s"
+
+#: gconf/gconfd.c:2193
+msgid ""
+"Some client removed itself from the GConf server when it hadn't been added."
+msgstr ""
+
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr "��������� �������"
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "���������� �������� ��� ����� � ��������������. ������������ � --type."
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr "�������� �������� ����� �� ����������� �����."
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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 ""
 "���������� ����� � ��������������. ������������ � --short-desc, --long-desc, "
 "--owner � --type."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr ""
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr "���������� ��� ���� ����/�������� � ��������."
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr "���������� ��� ����������� � ��������."
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "���������� ��� ����������� � ������ �������� ����������."
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "���������� 0 ���� ������� ���������� � 2 ���� ���."
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "��������� gconfd. �� ����������� ���� �������� ��� ������ ������."
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "���������� 0 ���� gconfd ������� � 2 ���� ���."
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1221,7 +1136,7 @@ msgstr ""
 "��������� ���������������� ������ (gconfd). (������ ��������� ������������� "
 "����� ����.)"
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1229,69 +1144,69 @@ msgstr ""
 "������� ��� ���������������� �������� ��� ��� �������� ����������� ������. "
 "������� ���������� ������������."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr "�����|������|����.|������|������|����"
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 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:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr "�����|������|����.|������"
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 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:198
+#: gconf/gconftool.c:205
 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:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr "������� ������� (���������) �������� ��� schema."
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr "��������"
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr "������� �������� � ��������� ����� ��� schema."
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr "������� ��������� �����"
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr "��������"
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr "������� ��������������� ���� �����"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr "��� �����"
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr "��������"
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1299,26 +1214,46 @@ msgstr ""
 "������ � ���� ������ ������������ ��������, ����� ������. �������, ����� "
 "gconfd �� ��� �������."
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 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:270
+#: gconf/gconftool.c:277
 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:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1328,90 +1263,93 @@ msgstr ""
 "��������� '%s --help' ����� ������� ������ ������ ��������� ���������� "
 "���������� ������.\n"
 
-#: gconf/gconftool.c:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr ""
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
-msgstr "���������� ������������ --all-pairs ������ � --get ��� --set\n"
+#: gconf/gconftool.c:413
+#, fuzzy
+msgid "Can't use --all-entries with --get or --set\n"
+msgstr "���������� ������������ --all-dirs ������ � --get ��� --set\n"
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "���������� ������������ --all-dirs ������ � --get ��� --set\n"
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
+#, fuzzy
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
-"--recursive-list �� ������ �������������� � --get, --set, --unset, "
-"--all-pairs, ��� --all-dirs\n"
+"--recursive-list �� ������ �������������� � --get, --set, --unset, --all-"
+"pairs, ��� --all-dirs\n"
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
+#, fuzzy
 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-entries, --"
+"all-dirs\n"
 msgstr ""
 "--set_schema �� ������ �������������� � --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr "��� �������� ����� ����� ������ ��� ��������� ��������\n"
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr "���� ��������� ��� ��� ��������� ��������\n"
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr ""
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "�������� --dir-exists ������ �������������� ���.\n"
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "�������� --install-schema-file ������ �������������� ���.\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "�������� --makefile-install-rule ������ �������������� ���.\n"
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr "�������� --break-key ������ ���� ����������� ���.\n"
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr "�������� --break-directory ������ ���� ����������� ���.\n"
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "�� ������ ������� �������� ������������ � ������� ��������� --config-source, "
 "���� ����������� �������� --direct\n"
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "�� ������� ���������������� GConf: %s\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "���������� ���������� ���������� ��������� GCONF_CONFIG_SOURCE\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1419,317 +1357,372 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "���� ������� � ���������� ������������: %s\n"
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "������ ����������: %s\n"
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "��������� ������� ���� ��� ����� ��������� ��� ������������ ������.\n"
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
 msgstr "������ ������������ ��� � \"%s\": %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr "(�� ����������� ��������)"
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "���: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr "��� ������: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "��� Car: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "��� Cdr: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "��������: %s\n"
+msgid "Default Value: %s\n"
+msgstr "�������� �� ���������: %s\n"
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "��������: %s\n"
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "������� ��������: %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "������ ��������: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "�� ����������� �������� ��� '%s'\n"
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "�� ������� �������� �������� ��� '%s': %s\n"
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "���������� ��� '%s'\n"
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "����� ������� ������������� �����/�������� � �������� ����������\n"
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "�� ����������� �������� ��� �����: '%s'\n"
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr "���������� ���������� schema ��� ��������\n"
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "������: %s\n"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
-#, c-format
-msgid "Error setting value: %s"
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
 msgstr "������ ��������� ��������: %s"
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
-#, c-format
-msgid "Error syncing: %s"
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
 msgstr "������ �������������: %s"
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1234
+#, fuzzy
+msgid "Must specify a key or keys on the command line\n"
+msgstr "���������� ������� ��������� ����� ��� ����������\n"
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "��� ������ ����� '%s'\n"
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "������ ��������� ����� ��� \"%s\": %s"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "��� ������ ����� '%s'\n"
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr ""
+
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr "������������ ��� schema \"%s\", �����������: %s"
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr "������ ��������� ��������: %s"
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr "������ �������������: %s"
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "��������� ������� ���� ��� ����� ��������� ��� ��������� �� ��� "
 "������������.\n"
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "������ ������������ ���������: %s\n"
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "��������������: ������������ ��� ��������� ��� ��� ����� (%s)\n"
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "��������������: ������������ ��� ��������� ��� ������ ��� ����� (%s)\n"
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "��������������: �� ������� ��������� �������� �������� '%s' ��� ����� (%s)\n"
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "��������������: ������������ ��� ��������� ��� CAR ��� CDR ��� ����� (%s)\n"
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 "��������������: �� �� ������ ���������� �������� �� ��������� ��� �����\n"
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 "��������������: ���������� ������ gconftool, ����������� GConfValueType\n"
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr "��������: ������ ���� <applyto>"
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "��������: ���� <%s> �� ����� ��� <schema>\n"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "��������: ������������ ���� <%s> � ���� <locale>\n"
 
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "����������� ����� \"%s\" ��� locale \"%s\"\n"
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "������������ ����� \"%s\" � ����� \"%s\"\n"
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "� ��� ������ ���� ���� �� ���� ������ <locale> � <schema>\n"
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "�� ������� ������� `%s': %s\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "�������� `%s' ����?\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "�������� `%s' �� ����� �������� ������ ���� <gconfschemafile>\n"
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "��������������: ���� <%s> ���� <gconfschemafile> �� ��� �����\n"
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "������ ������������� ���������������� ������: %s"
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr "���������� ������� ��������� ������ ����� ��� ���������\n"
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -1738,16 +1731,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr "���������� ������� ��������� ����� ��� ����������\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1756,11 +1749,11 @@ msgstr ""
 "������� �������� ���� ���������� ���������� ������ �������� ��� �����:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr "���������� ������� ��������� �������� ��� ����������\n"
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1771,63 +1764,62 @@ msgstr ""
 "��������:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr "������ GConf: %s\n"
+
+#: gconf/gconf-client.c:798
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "�������������� GConf: ������ ������������ ��� � \"%s\": %s"
 
-#: wrappers/gtk/gconf-client.c:985
+#: gconf/gconf-client.c:1000
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "��������� \"%s\" �������� \"%s\" ��� ����� %s"
 
-#~ msgid "Unloading BerkeleyDB (BDB) backend module."
-#~ msgstr "�������� ���������� ������ BerkeleyDB (BDB)."
+#~ msgid "Ignoring XML node `%s', except for possible schema name: %s"
+#~ msgstr "������������� XML-���� \"%s\", �������� ��������� ����� schema: %s"
 
-#~ msgid "Initializing BDB backend module"
-#~ msgstr "������������� ���������� ������ BDB"
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "�� ������� ������� ���� '%s': %s"
 
-#~ msgid "Couldn't find the %s root directory in the address `%s'"
-#~ msgstr "�� ������� ����� �������� ������� %s �� ������ '%s'"
+#, fuzzy
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "������ �������� �������� \"%s\": %s"
 
 #~ msgid ""
-#~ "Can't read from or write to the %s root directory in the address `%s'"
+#~ "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 ""
-#~ "���������� ��������� �� ��� �������� � �������� ������� %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\""
+#~ "������ ����������� � ������� ��������: OAF ������ nil � "
+#~ "oaf_activate_from_id() � �� ��������� ���������� ������������ ��������. "
+#~ "����������, ��������� ��������� �� ������ OAF."
 
-#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
-#~ msgstr ""
-#~ "������� ������ %d, ���� ��������. ���������� �������� �� ������ � GConf."
+#, fuzzy
+#~ msgid "Received signal %d, shutting down."
+#~ msgstr "������� ������ %d, ������ ����������."
 
-#~ msgid ""
-#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
-#~ msgstr ""
-#~ "������� ������ %d, ������������ ����������. ���������� �������� �� ������ � "
-#~ "GConf."
+#~ msgid "GConf was built with debugging features enabled"
+#~ msgstr "GConf ��� ������ � ���������� ���������� �������"
 
-#~ msgid "GConf server is not in use, shutting down."
-#~ msgstr "������ GConf �� ������������, ����������."
+#, fuzzy
+#~ msgid "Didn't understand line in saved state file: '%s'"
+#~ msgstr "�� ������� ������� ����������� ���� ���������: %s"
 
-#~ msgid "Error reading saved state file: %s"
-#~ msgstr "������ ��� ������ ������������ ����� ���������: %s"
+#, fuzzy
+#~ msgid "Failed to parse connection ID in saved state file"
+#~ msgstr "�� ������� ������� ����������� ���� ���������: %s"
 
-#~ msgid "Failed to get IOR for client: %s"
-#~ msgstr "�� ������� �������� IOR ��� �������: %s"
+#, fuzzy
+#~ msgid "Failed to unquote config source address from saved state file: %s"
+#~ msgstr "�� ������� ������� ����������� ���� ���������: %s"
 
-#~ msgid "Default Value: %s\n"
-#~ msgstr "�������� �� ���������: %s\n"
+#~ msgid "Can't use --all-pairs with --get or --set\n"
+#~ msgstr "���������� ������������ --all-pairs ������ � --get ��� --set\n"
 
-#~ msgid "GConf Error: %s\n"
-#~ msgstr "������ GConf: %s\n"
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "�� ������� ��������� �������� �� ����� \"%s\""
diff --git a/po/sk.po b/po/sk.po
index c4b45d6a..81b085a3 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-09-03 15:23+0200\n"
+"POT-Creation-Date: 2001-09-14 12:44-0400\n"
 "PO-Revision-Date: 2001-09-03 15:45CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -509,7 +509,8 @@ msgstr "O�ak�van� p�r, prijat� %s"
 #: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
-msgstr "O�ak�van� (%s,%s) p�r, prijat� p�r s jednou alebo obomi ch�baj�cimi hodnotami"
+msgstr ""
+"O�ak�van� (%s,%s) p�r, prijat� p�r s jednou alebo obomi ch�baj�cimi hodnotami"
 
 #: gconf/gconf-internals.c:1474
 #, c-format
@@ -607,7 +608,8 @@ msgstr "Nie je mo�n� zapisova� do s�boru `%s': %s"
 #: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
-msgstr "Nie je mo�n� otvori� s�bor so z�mkom `%s', predpoklad�m, �e n�m nepatr�: %s"
+msgstr ""
+"Nie je mo�n� otvori� s�bor so z�mkom `%s', predpoklad�m, �e n�m nepatr�: %s"
 
 #: gconf/gconf-internals.c:2492
 #, c-format
@@ -665,12 +667,12 @@ msgid ""
 msgstr ""
 "Nepodarilo sa ulo�i� k��� '%s', preto�e konfigura�n� server nem� �iadne "
 "datab�ze pre z�pis. Typick� d�vody s� dva: 1) cesta v konfigura�nom s�bore "
-"neobsahuje �iadne datab�ze, alebo neexistuje; 2) bonobo-activation "
-"nespr�vne vytvoril dva procesy gconfd. Ak v�m be�ia dva procesy (alebo "
-"ste u� dva mali v momente �tartu druh�ho), je to chyba bonobo-activation a "
-"nie GConf. Mo�no pom��e odhl�si� sa, zabi� bonobo-activation-server a gconfd, "
-"a znovu sa prihl�si�. Nezabudnite sa pozrie� do s�boru so z�znamom user.*, "
-"�i gconfd nenarazil na nejak� probl�my."
+"neobsahuje �iadne datab�ze, alebo neexistuje; 2) bonobo-activation nespr�vne "
+"vytvoril dva procesy gconfd. Ak v�m be�ia dva procesy (alebo ste u� dva mali "
+"v momente �tartu druh�ho), je to chyba bonobo-activation a nie GConf. Mo�no "
+"pom��e odhl�si� sa, zabi� bonobo-activation-server a gconfd, a znovu sa "
+"prihl�si�. Nezabudnite sa pozrie� do s�boru so z�znamom user.*, �i gconfd "
+"nenarazil na nejak� probl�my."
 
 #: gconf/gconf-sources.c:1164
 #, c-format
@@ -777,12 +779,12 @@ msgid ""
 "the GConf package. Do not report a GConf bug unless you have information "
 "indicating what went wrong with bonobo-activation that was caused by GConf."
 msgstr ""
-"Chyba pri spojen� s konfigura�n�m serverom: bonobo-activation vr�til nil z volania "
-"bonobo_activation_activate_from_id() a nenastavil v�nimku, ktor� by to "
-"vysvetlila. Je to chyba bal�ka bonobo-activation, nie�o sa v "
-"bonobo-activation pokazilo a chyba nebola ozn�men�. Chyba teda nie je v "
-"GConf. Neoznamujte to ako chybu GConf, ak nemat� inform�cie ukazuj�ce aj na "
-"chybu v bonobo-activation sp�soben� GConf."
+"Chyba pri spojen� s konfigura�n�m serverom: bonobo-activation vr�til nil z "
+"volania bonobo_activation_activate_from_id() a nenastavil v�nimku, ktor� by "
+"to vysvetlila. Je to chyba bal�ka bonobo-activation, nie�o sa v bonobo-"
+"activation pokazilo a chyba nebola ozn�men�. Chyba teda nie je v GConf. "
+"Neoznamujte to ako chybu GConf, ak nemat� inform�cie ukazuj�ce aj na chybu v "
+"bonobo-activation sp�soben� GConf."
 
 #: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
@@ -853,7 +855,8 @@ msgstr ""
 
 #: gconf/gconfd.c:293
 #, c-format
-msgid "No configuration files found, trying to use the default config source `%s'"
+msgid ""
+"No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 "Nen�jden� �iadne konfigura�n� s�bory, pok�sim sa pou�i� �tandardn� "
 "konfigura�n� zdroj `%s'"
@@ -897,11 +900,13 @@ msgstr ""
 #: gconf/gconfd.c:369
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr "Zachyten� sign�l %d, zapisujem s�bor core. Pros�m, ozn�mte chybu GConfu."
+msgstr ""
+"Zachyten� sign�l %d, zapisujem s�bor core. Pros�m, ozn�mte chybu GConfu."
 
 #: gconf/gconfd.c:385
 #, c-format
-msgid "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 "Zachyten� sign�l %d, kon��m abnorm�lne. Pros�m, vypl�te spr�vu o chybe v "
 "GConf."
@@ -923,8 +928,8 @@ msgid ""
 "Failed to init Object Activation Framework: please mail bug report to bonobo-"
 "activation maintainers"
 msgstr ""
-"Nepodarilo sa inicializova� Object Activation Framework: pros�m, po�lite spr�vu o "
-"chybe spr�vcom bonobo-activation"
+"Nepodarilo sa inicializova� Object Activation Framework: pros�m, po�lite "
+"spr�vu o chybe spr�vcom bonobo-activation"
 
 #: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
@@ -948,8 +953,8 @@ msgid ""
 "Registering existing server with bonobo-activation-server, since we seem to "
 "have been leaked"
 msgstr ""
-"Registrujem existuj�ci server pomocou bonobo-activation-server, vyzer� to toti� "
-"na straten� referenciu"
+"Registrujem existuj�ci server pomocou bonobo-activation-server, vyzer� to "
+"toti� na straten� referenciu"
 
 #: gconf/gconfd.c:609
 msgid ""
@@ -976,8 +981,8 @@ msgid ""
 "bonobo-activation doesn't know about our IID; indicates broken installation; "
 "can't register; exiting\n"
 msgstr ""
-"bonobo-activation nevie o na�om IID; to vyzer� ako nespr�vna in�tal�cia; nem��e sa "
-"zaregistrova�; kon��m\n"
+"bonobo-activation nevie o na�om IID; to vyzer� ako nespr�vna in�tal�cia; "
+"nem��e sa zaregistrova�; kon��m\n"
 
 #: gconf/gconfd.c:649
 msgid "Another gconfd already registered with bonobo-activation; exiting\n"
@@ -1016,7 +1021,8 @@ msgstr ""
 
 #: gconf/gconfd.c:1225
 #, c-format
-msgid "Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 "Nepodarilo sa zavrie� s�bor so z�znamom pre gconfd, d�ta mo�no nie s� "
 "spr�vne ulo�en� (%s)"
@@ -1048,14 +1054,16 @@ msgstr "Nepodarilo sa presun�� nov� s�bor s ulo�en�m stavom na miesto: %s"
 
 #: gconf/gconfd.c:1350
 #, c-format
-msgid "Failed to restore original saved state file that had been moved to '%s': %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 "Nepodarilo sa obnovi� p�vodn� s�bor s ulo�en�m stavom, ktor� bol presunut� "
 "do '%s': %s"
 
 #: gconf/gconfd.c:1823
 #, c-format
-msgid "Unable to restore a listener on address '%s', couldn't resolve the database"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 "Nepodarilo sa obnovi� listenera na adrese '%s', nie je mo�n� zisti� adresu "
 "datab�ze"
@@ -1110,7 +1118,8 @@ msgid "Failed to flush client add to saved state file: %s"
 msgstr "Nepodarilo sa prida� d�ta od klienta do s�boru s ulo�en�m stavom: %s"
 
 #: gconf/gconfd.c:2193
-msgid "Some client removed itself from the GConf server when it hadn't been added."
+msgid ""
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr "Niektor� klient sa odstr�nil z GConf serveru ke� tam nebol pridan�."
 
 #: gconf/gconftool.c:69
@@ -1293,7 +1302,8 @@ msgstr "Z�ska� meno sch�my pou�itej pre tento k���"
 
 #: gconf/gconftool.c:322
 msgid "Specify the schema name followed by the key to apply the schema name to"
-msgstr "Zadajte meno sch�my nasledovan� k���om, na ktor� sa m� t�to sch�ma pou�i�"
+msgstr ""
+"Zadajte meno sch�my nasledovan� k���om, na ktor� sa m� t�to sch�ma pou�i�"
 
 #: gconf/gconftool.c:331
 msgid "Get the name of the default source"
@@ -1337,8 +1347,8 @@ msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
 msgstr ""
-"--set_schema nesmie by� pou�it� spolu s --get, --set, --unset, --all-entries, "
-"--all-dirs\n"
+"--set_schema nesmie by� pou�it� spolu s --get, --set, --unset, --all-"
+"entries, --all-dirs\n"
 
 #: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
@@ -1373,7 +1383,8 @@ msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory mus� by� pou�it� iba samostatne.\n"
 
 #: gconf/gconftool.c:523
-msgid "You must specify a config source with --config-source when using --direct\n"
+msgid ""
+"You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "Ke� pou��vate --direct, mus�te zada� konfigura�n� zdroj pomocou --config-"
 "source\n"
@@ -1414,7 +1425,8 @@ msgstr "Chyba pri ukon�ovan�: %s\n"
 
 #: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
-msgstr "Mus�te zada� jeden alebo viac prie�inkov, ktor� chcete rekurz�vne vyp�sa�.\n"
+msgstr ""
+"Mus�te zada� jeden alebo viac prie�inkov, ktor� chcete rekurz�vne vyp�sa�.\n"
 
 #: gconf/gconftool.c:879
 #, c-format
@@ -1512,7 +1524,8 @@ msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Pri nastavovan� zoznamu mus�te zada� primit�vny typ zoznamu.\n"
 
 #: gconf/gconftool.c:1165
-msgid "When setting a pair you must specify a primitive car-type and cdr-type\n"
+msgid ""
+"When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "Pri nastavovan� p�ru mus�te zada� primit�vny typ car alebo typ cdr.\n"
 
 #: gconf/gconftool.c:1180
@@ -1611,7 +1624,8 @@ msgstr "Chyba mazania `%s': %s\n"
 
 #: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
-msgstr "Mus�te zada� jeden alebo viac prie�inkov, z ktor�ch chcete podprie�inky.\n"
+msgstr ""
+"Mus�te zada� jeden alebo viac prie�inkov, z ktor�ch chcete podprie�inky.\n"
 
 #: gconf/gconftool.c:1593
 #, c-format
@@ -1631,12 +1645,14 @@ msgstr "VAROVANIE: neplatn� alebo ch�baj�ci list_type pre sch�mu (%s)\n"
 #: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
-msgstr "VAROVANIE: Neporadilo sa spracova� �tandardn� hodnotu `%s' pre sch�mu (%s)\n"
+msgstr ""
+"VAROVANIE: Neporadilo sa spracova� �tandardn� hodnotu `%s' pre sch�mu (%s)\n"
 
 #: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
-msgstr "VAROVANIE: neplatn� alebo ch�baj�ci car_type alebo cdr_type pre sch�mu (%s)\n"
+msgstr ""
+"VAROVANIE: neplatn� alebo ch�baj�ci car_type alebo cdr_type pre sch�mu (%s)\n"
 
 #: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
@@ -1654,7 +1670,8 @@ msgstr "VAROVANIE: nepodarilo sa spracova� meno typu `%s'\n"
 
 #: gconf/gconftool.c:1791
 #, 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"
@@ -1688,11 +1705,13 @@ msgstr "VAROVANIE: neuveden� �iadny k��� pre sch�mu\n"
 
 #: gconf/gconftool.c:1907
 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:1913
 #, c-format
-msgid "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
+msgid ""
+"WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 "VAROVANIE: viacn�sobn� uzol <locale> pre locale `%s', ignorujem v�etky okrem "
 "prv�ho\n"
@@ -1825,4 +1844,3 @@ msgstr "Varovanie GConf: zlyhanie v zozname p�rov v `%s': %s"
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "O�ak�van� `%s' prijat� `%s' pre k��� %s"
-
diff --git a/po/sl.po b/po/sl.po
index 5fa6a5e6..d1c9e3f2 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2001-08-17 18:18+0200\n"
+"POT-Creation-Date: 2001-09-14 12:44-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"
@@ -179,6 +179,7 @@ msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignoriram ime sheme `%s', neveljavno: %s"
 
 #: backends/xml-entry.c:376
+#, c-format
 msgid "Ignoring XML node `%s': %s"
 msgstr "Ignoriram vozli��e XML `%s': %s"
 
@@ -529,6 +530,7 @@ msgid "CORBA error: %s"
 msgstr "Napaka CORBA: %s"
 
 #: gconf/gconf-internals.c:2148
+#, c-format
 msgid "bonobo-activation problem description: '%s'"
 msgstr "opis problema pri aktivaciji bonobo: '%s'"
 
@@ -653,6 +655,7 @@ msgstr ""
 "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 "
@@ -663,13 +666,15 @@ msgid ""
 "activation-server 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 pod klju�em '%s', saj stre�nik nastavitev nima "
-"nobene pisljive zbirke podatkov. Ta problem ima dva pogosta vzroka: 1) va�a "
-"pot nastavitev ne vsebuje nobene zbirke podatkov ali ni bila najdena ali 2) "
-"je bonobo-activation je pomotoma ustvaril dva procesa gconfd. �e imate dva procesa gconfd "
-"(ali ste imeli dva, ko se je pognal drugi), potem je to hro�� v bonobo-activation in ne v "
-"GConf. �e se odjavite, ubijete bonobo-activation-server in gconfd in znova prijavite, lahko "
-"problem izgine. Kot vedno, za podrobnosti o problemu na katerega je naletel gconfd preverite sistemski dnevnik user.* ."
+"Nisem mogel shraniti vrednosti pod klju�em '%s', saj stre�nik nastavitev "
+"nima nobene pisljive zbirke podatkov. Ta problem ima dva pogosta vzroka: 1) "
+"va�a pot nastavitev ne vsebuje nobene zbirke podatkov ali ni bila najdena "
+"ali 2) je bonobo-activation je pomotoma ustvaril dva procesa gconfd. �e "
+"imate dva procesa gconfd (ali ste imeli dva, ko se je pognal drugi), potem "
+"je to hro�� v bonobo-activation in ne v GConf. �e se odjavite, ubijete "
+"bonobo-activation-server in gconfd in znova prijavite, lahko problem izgine. "
+"Kot vedno, za podrobnosti o problemu na katerega je naletel gconfd preverite "
+"sistemski dnevnik user.* ."
 
 #: gconf/gconf-sources.c:1164
 #, c-format
@@ -775,11 +780,13 @@ msgid ""
 "the GConf package. Do not report a GConf bug unless you have information "
 "indicating what went wrong with bonobo-activation that was caused by GConf."
 msgstr ""
-"Napaka ob vzpostavljanju povezave z nastavitvenim stre�nikom: bonobo-activation je vrnil "
-"nil iz bonobo_activation_activate_from_id() in ni nastavil izjeme, ki bi razlo�ila "
-"problem. To je hro�� v paketu bonobo-activation; v bonobo-activation je �lo nekaj narobe, a ni bila "
-"sporo�ena nobena napaka. To ni hro�� v paketu GConf. Ne oddajte poro�ila o "
-"hro��u v GConf v kolikor nimate podatkov, da je GConf povzro�il napako v bonobo-activation."
+"Napaka ob vzpostavljanju povezave z nastavitvenim stre�nikom: bonobo-"
+"activation je vrnil nil iz bonobo_activation_activate_from_id() in ni "
+"nastavil izjeme, ki bi razlo�ila problem. To je hro�� v paketu bonobo-"
+"activation; v bonobo-activation je �lo nekaj narobe, a ni bila sporo�ena "
+"nobena napaka. To ni hro�� v paketu GConf. Ne oddajte poro�ila o hro��u v "
+"GConf v kolikor nimate podatkov, da je GConf povzro�il napako v bonobo-"
+"activation."
 
 #: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
@@ -947,7 +954,8 @@ msgid ""
 "Registering existing server with bonobo-activation-server, since we seem to "
 "have been leaked"
 msgstr ""
-"Registriram obstoje� stre�nik pri bonobo-activation-server, ker izgleda, da nam pu��a"
+"Registriram obstoje� stre�nik pri bonobo-activation-server, ker izgleda, da "
+"nam pu��a"
 
 #: gconf/gconfd.c:609
 msgid ""
@@ -975,8 +983,8 @@ msgid ""
 "bonobo-activation doesn't know about our IID; indicates broken installation; "
 "can't register; exiting\n"
 msgstr ""
-"bonobo-activation ne ve za na� IID; kar ka�e na po�kodovano namestitev; ne morem se "
-"registrirati; kon�ujem\n"
+"bonobo-activation ne ve za na� IID; kar ka�e na po�kodovano namestitev; ne "
+"morem se registrirati; kon�ujem\n"
 
 #: gconf/gconfd.c:649
 msgid "Another gconfd already registered with bonobo-activation; exiting\n"
@@ -984,7 +992,8 @@ msgstr "Drug gconfd je �e registrian pri bonobo-activation; kon�ujem\n"
 
 #: gconf/gconfd.c:654
 msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
-msgstr "Neznana napaka ob registriranju gconfd-ja pri bonobo-activation; kon�ujem\n"
+msgstr ""
+"Neznana napaka ob registriranju gconfd-ja pri bonobo-activation; kon�ujem\n"
 
 #: gconf/gconfd.c:698
 #, c-format
@@ -1336,14 +1345,16 @@ msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-"
 "entries, or --all-dirs\n"
 msgstr ""
-"--recursive-list ne bi smela biti uporabljena z --get, --set, --unset, --all-pairs, ali --all-dirs\n"
+"--recursive-list ne bi smela biti uporabljena z --get, --set, --unset, --all-"
+"pairs, ali --all-dirs\n"
 
 #: gconf/gconftool.c:441
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
 msgstr ""
-"--set_schema ne bi smela biti uporabljena z --get, --set, --unset, --all-entries ali --all-dirs\n"
+"--set_schema ne bi smela biti uporabljena z --get, --set, --unset, --all-"
+"entries ali --all-dirs\n"
 
 #: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
diff --git a/po/sv.po b/po/sv.po
index fa3e0848..7bbe4aa1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf\n"
-"POT-Creation-Date: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-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,6 +15,34 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: backends/bdb-backend.c:215
+msgid "Unloading BerkeleyDB (BDB) backend module."
+msgstr "Gl�mmer BerkeleyDB-backendmodulen (BDB)."
+
+#: backends/bdb-backend.c:238
+#, c-format
+msgid "Opened BerkeleyDB source at root %s"
+msgstr "�ppnade BerkeleyDB-k�lla vid rot %s"
+
+#: backends/bdb-backend.c:578
+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�sa eller skriva till %s-rotkatalogen i adressen \"%s\""
+
 #: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Kopplar bort XML-backendmodulen."
@@ -24,11 +52,6 @@ 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'"
@@ -43,7 +66,7 @@ msgstr "Katalog- och filr�ttigheterna f�r XML-koden vid roten %s �r: %o/%o"
 msgid "Initializing XML backend module"
 msgstr "Initierar XML-backendmodulen"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Kunde inte ge upp l�s p� XML-katalogen \"%s\": %s"
@@ -52,7 +75,7 @@ msgstr "Kunde inte ge upp l�s p� XML-katalogen \"%s\": %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr "Osynkroniserade katalogborttagningar vid avst�ngning av XML-backenden"
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -61,11 +84,11 @@ msgstr ""
 "Kunde inte ta bort katalogen \"%s\" fr�n XML-backenden eftersom den inte har "
 "synkroniserats korrekt till disk"
 
-#: backends/xml-cache.c:253
+#: backends/xml-cache.c:256
 #, 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 objekt �terst�r i cachen efter st�dning av objekt som redan synkats och "
 "som �r �ldre �n %u sekunder"
@@ -80,160 +103,158 @@ msgstr "Kunde inte ta status p� \"%s\": %s"
 msgid "XML filename `%s' is a directory"
 msgstr "XML-filnamnet \"%s\" �r en katalog"
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Misslyckades med att ta bort \"%s\": %s"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Misslyckades med att skriva filen \"%s\": %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: backends/xml-dir.c:359
+#, c-format
+msgid "Failed to set mode on `%s': %s"
+msgstr "Misslyckades med att s�tta l�ge p� \"%s\": %s"
+
+#: backends/xml-dir.c:373 backends/xml-dir.c:383
 #, 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:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Misslyckades med att �terskapa \"%s\" fr�n \"%s\": %s"
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, 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:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Misslyckades med att ta status p� \"%s\": %s"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Dubbla \"%s\"-poster i \"%s\", ignorerar"
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, 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:961
+#: backends/xml-dir.c:979
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "�versta noden i XML-filen \"%s\" �r inte ett <entry>, ignorerar"
 
-#: backends/xml-dir.c:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Misslyckades med att skapa filen \"%s\": %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Misslyckades med att st�nga filen \"%s\": %s"
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorerar XML-noden med namnet \"%s\": %s"
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignorerar schemanamnet \"%s\", ogiltigt: %s"
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
-#, c-format
-msgid "Ignoring XML node `%s', except for possible schema name: %s"
-msgstr "Ignorerar XML-noden \"%s\", utom f�r m�jliga schemanamnet: %s"
-
-#: backends/xml-entry.c:699
-msgid "found <local_schema> with no locale setting"
-msgstr "hittade <local_schema> utan n�gon lokalinst�llning"
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "Ignorerar XML-noden med namnet \"%s\": %s"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "Misslyckades med att l�sa standardv�rdet f�r schema: %s"
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Inget \"type\"-attribut f�r noden <%s>"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "En nod har ok�nt \"type\"-attribut \"%s\", ignorerar"
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "Inget \"value\"-attribut f�r nod"
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "F�rstod inte XML-noden <%s> inuti en XML-listnod"
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Ogiltig typ (lista, par eller ok�nd) i en listnod"
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Felaktig XML-nod: %s"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Listan inneh�ller en felaktigt skriven nod (%s, borde varit %s)"
 
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Ignorerar felaktig car i XML-par: %s"
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr "tolkar XML-fil: listor och par f�r inte placeras inuti par"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Ignorerar felaktig cdr i XML-par: %s"
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "F�rstod inte XML-noden <%s> inuti en XML-parnod"
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Hittade inte car och cdr f�r XML-parnoden"
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Cdr saknas i ett par med v�rden i XML-filen"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "Car saknas i ett par med v�rden i XML-filen"
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "B�de car- och cdr-v�rden saknas i ett par med v�rden i XML-filen"
 
@@ -266,31 +287,31 @@ msgstr "Kunde inte hitta backendmodulen f�r \"%s\""
 msgid "Failed to shut down backend"
 msgstr "Fel vid avst�ngning av backend"
 
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr "Mottog ogiltigt v�rde i s�ttbeg�ran"
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Kunde inte f� ut n�got vettigt av CORBA-v�rdet som mottogs i s�ttbeg�ran f�r "
 "nyckeln \"%s\""
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr "Mottog beg�ran att sl�ppa all cachad data"
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr "Mottog beg�ran att synkronisera synkront"
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 "Allvarligt fel: misslyckades med att f� objektreferens f�r konfig-databasen"
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "Misslyckades med att synkronisera med en eller flera k�llor: %s"
@@ -299,7 +320,7 @@ msgstr "Misslyckades med att synkronisera med en eller flera k�llor: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -310,12 +331,12 @@ msgstr ""
 "kunna �terst�lla den h�r lyssnaren vid omstart av gconfd, vilket kommer att "
 "resultera i otillf�rlitliga meddelanden om konfigurations�ndringar."
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "Lyssnar-ID %lu finns inte"
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -324,47 +345,47 @@ msgstr ""
 "Misslyckades med att logga borttagningen av lyssnare i loggfilen (troligtvis "
 "ofarligt, men kan resultera i att ett meddelande pl�tsligt �terkommer): %s"
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fel vid h�mtning av v�rde f�r \"%s\": %s"
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "Fel n�r v�rde f�r \"%s\" sattes: %s"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "Fel vid �terst�llning av \"%s\": %s"
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "Fel vid h�mtning av standardv�rde f�r \"%s\": %s"
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "Fel vid existenskontroll av \"%s\": %s"
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "Fel vid borttagning av katalog \"%s\": %s"
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Misslyckades med att h�mta alla poster i \"%s\": %s"
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "Fel vid listning av kataloger i \"%s\": %s"
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "Fel n�r schema f�r \"%s\" sattes: %s"
@@ -429,244 +450,29 @@ msgstr "Operationen inte till�ten utan en konfigurationsserver"
 msgid "Failed to get a lock"
 msgstr "Misslyckades med att f� ett l�s"
 
-#: 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� �r entitetsnamnet f�r l�ngt f�r "
-"att vara giltigt (\"&\" m�ste finnas i b�rjan 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�nd entitet \"%s\" (\"&\" m�ste finnas i b�rjan 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�rkestexten 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�ll tecknet \"%s\" som inte �r en siffra (\"&#\" m�ste "
-"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�ste 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�ste 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 �r inte till�ten i XML eller �r 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 \">\" �r inte till�tna h�r; de �r endast till�tna runt "
-"taggar, exempelvis <bold> eller <paragraph>. P� andra st�llen b�r 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\" �r 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�ste omedelbart �tf�ljas 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�ste omedelbart �tf�ljas 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�rde. Ditt attributv�rde 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�rde"
-
-#: 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�rde, innan elementet var st�ngt"
-
-#: gconf/gconf-glib.c:1508
-msgid "Missing '<' at start of element"
-msgstr "Ett \"<\" saknas i b�rjan 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\" �r 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-error.c:40
+msgid "No database available to save your configuration"
+msgstr "Ingen databas tillg�nglig f�r sparande av din konfiguration"
 
-#: gconf/gconf-glib.c:1638
-#, c-format
-msgid "Elements should be closed with '>' or '/>', not with '%s'"
-msgstr "Element m�ste 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�r 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 �ppningstaggen \"%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�rkta texten. Texten n�rmast innan "
-"det felaktiga tecknet var \"%s\""
-
-#: gconf/gconf-glib.c:2202
-msgid "The marked-up text contained nothing but whitespace."
-msgstr "Den m�rkta texten inneh�ll inget annat �n blanksteg."
-
-#: gconf/gconf-glib.c:10666
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Misslyckades med att �ppna filen \"%s\": %s"
-
-#: gconf/gconf-glib.c:10683
-#, c-format
-msgid "Error reading file '%s': %s"
-msgstr "Fel vid l�sning av filen \"%s\": %s"
-
-#: gconf/gconf-internals.c:85
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Inget \"/\" i nyckeln \"%s\""
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Kunde inte tolka CORBA-v�rde f�r listelement"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Fel typ f�r listelement i %s"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr "Mottog lista fr�n gconfd med en felaktig listtyp"
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr "Misslyckades med att konvertera objekt till IOR"
 
@@ -675,92 +481,97 @@ msgstr "Misslyckades med att konvertera objekt till IOR"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Kunde inte �ppna s�kv�gsfilen \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "L�gger till k�llan \"%s\"\n"
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Fel vid l�sning av fil \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "F�rv�ntade lista, fick %s"
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "F�rv�ntade lista med %s, fick lista med %s"
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "F�rv�ntade par, fick %s"
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "F�rv�ntade ett (%s,%s)-par, fick ett par d�r ett eller b�da v�rdena saknades"
 
-#: gconf/gconf-internals.c:1499
+#: gconf/gconf-internals.c:1474
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "F�rv�ntade par av typen (%s,%s), men fick typen (%s,%s)"
 
-#: gconf/gconf-internals.c:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Citerad str�ng b�rjar inte med ett citationstecken"
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Citerad str�ng slutar inte med ett citationstecken"
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA-fel: %s"
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, fuzzy, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr "OAF-problembeskrivning: \"%s\""
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "f�rs�ker att ta bort icke-listad OAF-objektkatalog"
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr "f�rs�ker att l�gga till en redan listad OAF-katalog"
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF-tolkningsfel: %s"
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "Ok�nt OAF-fel"
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "Ingen ior-fil i \"%s\""
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd tar l�set \"%s\" fr�n en annan process"
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "Ett annat program har l�set \"%s\""
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "kunde inte kontakta ORB f�r att pinga existerande gconfd"
 
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
@@ -769,43 +580,43 @@ msgstr ""
 "Tar bort det gamla l�set \"%s\" p� grund av att IOR inte kunde konverteras "
 "till objektreferensen, IOR \"%s\""
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 "Tar bort det gamla l�set \"%s\" p� grund av fel vid pingande av server: %s"
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf-konfigurationsdemonen (gconfd) har l�set \"%s\""
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "kunde inte skapa katalog \"%s\": %s"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "kunde inte skapa l�set \"%s\": %s"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Kan inte skriva till filen \"%s\": %s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr "Kan inte �ppna l�sfil \"%s\"; antar att den inte �r v�r: %s"
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Korrupt l�sfil \"%s\", tar bort den �nd�"
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
@@ -814,26 +625,26 @@ msgstr ""
 "Skapade inte l�sfilen \"%s\" (skapare pid %u, v�rt pid %u; antar att n�gon "
 "tog v�rt l�s"
 
-#: gconf/gconf-internals.c:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "Misslyckades med att sl�ppa l�set p� katalogen \"%s\": %s"
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Misslyckades med att l�sa k�llkoden \"%s\": %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Schemat \"%s\" som �r angivet f�r \"%s\" lagrar ett icke-schema-v�rde"
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 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:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -842,17 +653,30 @@ msgstr ""
 "V�rdet f�r \"%s\" �r satt i en skrivskyddad k�lla i b�rjan p� din "
 "konfigurationss�kv�g."
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Fel vid s�kning av metainformation: %s"
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Fel vid h�mtning av metainformation: %s"
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -924,90 +748,90 @@ msgstr "F�rstod inte \"%s\" (ett extra \")\" utan escape hittades inuti par)"
 msgid "`%s': %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Servern kunde inte l�sa adressen \"%s\""
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr "Kan inte l�gga till notifikationer till lokal konfigurationsk�lla"
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, fuzzy, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Till�gg av klient till serverns lista misslyckades, CORBA-fel: %s"
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
-"Fel vid kontaktning av konfigurationsservern: OAF returnerade nil fr�n "
-"oaf_activate_from_id() och satte inte ett undantag som f�rklarade problemet. "
-"Var v�nlig och skicka en OAF-buggrapport."
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr "Misslyckades med att initiera GConf, avslutar\n"
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr "M�ste b�rja med ett snedstreck (/)"
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr "Kan inte ha tv� snedstreck (/) i rad"
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kan inte ha en punkt (.) precis efter ett snedstreck (/)"
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "\"%c\" �r ett ogiligt tecken i nyckel/katalognamnen"
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Nyckel/katalog kan inte avslutas med ett snedstreck (/)"
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Misslyckades med att st�nga ner konfigurationsservern: %s"
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr "F�rv�ntade flyttal, fick %s"
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr "F�rv�ntade heltal, fick %s"
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr "F�rv�ntade str�ng, fick %s"
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "F�rv�ntade boolean, fick %s"
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "F�rv�ntade schema, fick %s"
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "Avst�ngningsbeg�ran mottagen"
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -1015,7 +839,7 @@ msgstr ""
 "gconfd kompilerades med avbuggning; f�rs�k att ladda gconf.path fr�n "
 "k�llkatalogen"
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -1023,7 +847,10 @@ msgstr ""
 "Kunde inte hitta n�gra konfigurationsfiler, f�rs�ker anv�nda standard "
 "konfigurationsk�llan \"%s\""
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1031,12 +858,16 @@ msgstr ""
 "Inga konfigurationsk�llor i k�lls�kv�gen, konfigurationen kommer ej sparas; "
 "redigera "
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Fel vid laddning av vissa konfigurationsk�llor: %s"
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -1044,7 +875,7 @@ msgstr ""
 "Inga konfigurationsk�llor kunde l�sas, kan inte ladda eller spara "
 "konfigurationsdata"
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1052,65 +883,122 @@ msgstr ""
 "Inga skrivbara konfigurationsk�llor l�stes lyckat, kommer kanske inte att "
 "kunna spara vissa konfigurations�ndringar"
 
-#: gconf/gconfd.c:312 gconf/gconfd.c:324
+#: gconf/gconfd.c:369
+#, c-format
+msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgstr ""
+"Mottog signal %d, l�mnar en core-fil. Rapportera v�nligen en bugg i GConf."
+
+#: gconf/gconfd.c:385
 #, c-format
-msgid "Received signal %d, shutting down."
-msgstr "Mottog signal %d, st�nger ner."
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgstr ""
+"Mottog signal %d, st�nger ner onormalt. Rapportera v�nligen en bugg i GConf."
 
-#: gconf/gconfd.c:329
+#: gconf/gconfd.c:402
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Mottog signal %d, st�nger ner snyggt"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "startar (version %s), pid %u anv�ndare \"%s\""
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr "GConf byggdes med fels�kningsalternativ p�slagna"
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
+#, fuzzy
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 "Misslyckades med att initiera Object Activation Framework: var god och "
 "skicka en buggrapport till OAF:s underh�llare"
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Misslyckades med att f� objektreferensen f�r konfigurationsservern"
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "Misslyckades med att skapa filen \"%s\": %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "Misslyckades med att f� IOR f�r klienten: %s"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
+#, fuzzy
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
+msgstr ""
+"OAF vet inget om v�r IID; verkar som en trasig installation; kan inte "
+"registrera; avslutar\n"
+
+#: gconf/gconfd.c:613
+#, fuzzy
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
+msgstr "En annan gconfd �r redan registrerad hos OAF; avslutar\n"
+
+#: gconf/gconfd.c:618
+#, fuzzy
+msgid "Unknown error registering existing gconfd with OAF; exiting"
+msgstr "Ok�nt fel vid registrering av gconfd hos OAF; avslutar\n"
+
+#: gconf/gconfd.c:645
+#, fuzzy
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
 msgstr ""
 "OAF vet inget om v�r IID; verkar som en trasig installation; kan inte "
 "registrera; avslutar\n"
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:649
+#, fuzzy
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
 msgstr "En annan gconfd �r redan registrerad hos OAF; avslutar\n"
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:654
+#, fuzzy
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
 msgstr "Ok�nt fel vid registrering av gconfd hos OAF; avslutar\n"
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "Misslyckades med att sl�ppa l�set p� katalogen \"%s\": %s"
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "Avslutar"
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr "GConf-servern anv�nds inte, st�nger ner."
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Returnerar undantag: %s"
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1119,7 +1007,7 @@ msgstr ""
 "Misslyckades med att �ppna gconfd-loggfilen; kommer inte att kunna "
 "�terst�lla lyssnare efter avslutning av gconfd (%s)"
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1127,32 +1015,32 @@ msgstr ""
 "Misslyckades med att st�nga gconfd-loggfilen; data kanske inte har sparats "
 "korrekt (%s)"
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Kunde inte �ppna tillst�ndsfilen \"%s\" f�r skrivning: %s"
 
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Kunde inte skriva fildeskriptorn f�r tillst�ndsfilen \"%s\": %d: %s"
 
-#: gconf/gconfd.c:989
+#: gconf/gconfd.c:1317
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Misslyckades med att st�nga den nya tillst�ndsfilen \"%s\": %s"
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Kunde inte flytta undan den gamla tillst�ndsfilen \"%s\": %s"
 
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Misslyckades med att flytta den nya tillst�ndsfilen p� plats: %s"
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1160,131 +1048,120 @@ msgstr ""
 "Misslyckades med att �terskapa den ursprungliga tillst�ndsfilen som hade "
 "flyttats till \"%s\": %s"
 
-#: gconf/gconfd.c:1110
-#, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr "F�rstod inte rad i tillst�ndsfilen: \"%s\""
-
-#: gconf/gconfd.c:1125
-msgid "Failed to parse connection ID in saved state file"
-msgstr "Misslyckades med att tolka anslutnings-ID i tillst�ndsfilen"
-
-#: gconf/gconfd.c:1140
-#, c-format
-msgid "Failed to unquote config source address from saved state file: %s"
-msgstr ""
-"Misslyckades med att avcitera k�lladressen f�r konfigurationen ifr�n "
-"tillst�ndsfilen: %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�n tillst�ndsfilen: %s"
-
-#: gconf/gconfd.c:1180
-#, c-format
-msgid "Failed to unquote IOR from saved state file: %s"
-msgstr "Misslyckades med att avcitera IOR fr�n tillst�ndsfilen: %s"
-
-#: gconf/gconfd.c:1204
-msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
-msgstr ""
-"Tillst�ndsfilen har hittat att samma lyssnare har lagts till tv� g�nger; "
-"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�ndsfilen hade en borttagning av en lyssnare som inte hade lagts till; "
-"ignorerar borttagningen."
-
-#: gconf/gconfd.c:1346
+#: gconf/gconfd.c:1823
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 "Kunde inte �terst�lla lyssnaren p� adress \"%s\", kunde inte tolka databasen"
 
-#: gconf/gconfd.c:1377
+#: gconf/gconfd.c:1869
+#, c-format
+msgid "Error reading saved state file: %s"
+msgstr "Fel vid l�sning av tillst�ndsfilen: %s"
+
+#: gconf/gconfd.c:1922
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Misslyckades med att �ppna tillst�ndsfilen \"%s\": %s"
 
-#: gconf/gconfd.c:1476
+#: gconf/gconfd.c:2039
 #, 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 ""
 "Misslyckades med att logga inl�ggningen av en lyssnare i gconfd-loggfilen; "
 "kommer inte att kunna l�gga in lyssnaren igen om gconfd avslutar eller "
 "st�ngs av (%s)"
 
-#: gconf/gconfd.c:1481
+#: gconf/gconfd.c:2044
 #, 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 ""
 "Misslyckades med att logga borttagningen av en lyssnare i gconfd-loggfilen; "
 "kan komma att felaktigt l�gga in lyssnaren igen om gconfd avslutar eller "
 "st�ngs ner (%s)"
 
-#: gconf/gconftool.c:62
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
+#, c-format
+msgid "Failed to get IOR for client: %s"
+msgstr "Misslyckades med att f� IOR f�r klienten: %s"
+
+#: gconf/gconfd.c:2082
+#, c-format
+msgid "Failed to open saved state file: %s"
+msgstr "Misslyckades med att �ppna tillst�ndsfilen: %s"
+
+#: gconf/gconfd.c:2095
+#, c-format
+msgid "Failed to write client add to saved state file: %s"
+msgstr "Misslyckades med att skriva klienttill�gg till tillst�ndsfilen: %s"
+
+#: gconf/gconfd.c:2103
+#, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr "Misslyckades med att t�mma klienttill�gg till tillst�ndsfilen: %s"
+
+#: gconf/gconfd.c:2193
+msgid ""
+"Some client removed itself from the GConf server when it hadn't been added."
+msgstr ""
+"N�gon klient tog bort sig sj�lv fr�n GConf-servern n�r den inte var tillagd."
+
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr "Alternativ f�r hj�lp"
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "S�tt en nyckel till ett v�rde och synkronisera. Anv�nds med --type."
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr "Skriv ut v�rdet av en nyckel till standard ut."
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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 ""
 "S�tter ett schema och synkroniserar. Anv�nds med --short-desc, --long-desc, "
 "--owner, och --type."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr "Nollst�ller nycklarna p� kommandoraden"
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr "Skriv ut alla nyckel/v�rde par i en katalog."
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr "Skriv ut alla underkataloger i en katalog."
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "Skriv ut alla underkataloger och poster under en katalog, rekursivt."
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Retunera 0 om katalogen finns, 2 om den inte finns."
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 "St�nger ner gconfd. ANV�ND INTE DETTA ALTERNATIV S�VIDA DU INTE HAR EN BRA "
 "ANLEDNING."
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Retunera 0 om gconfd �r ig�ng, 2 om den inte �r ig�ng."
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1292,7 +1169,7 @@ msgstr ""
 "Startar konfigurationsservern (gconfd). (H�nder normalt automatiskt n�r det "
 "beh�vs.)"
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1300,11 +1177,11 @@ msgstr ""
 "Ange typen av v�rde som ska s�ttas, eller typen av v�rde som ett schema "
 "beskriver. Unika f�rkortningar �r ok."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1312,11 +1189,11 @@ msgstr ""
 "Ange typen av listv�rde som ska s�ttas, eller typen av v�rde som ett schema "
 "beskriver. Unika f�rkortningar �r ok."
 
-#: gconf/gconftool.c:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1324,7 +1201,7 @@ msgstr ""
 "Ange typen av car-parv�rde som ska s�ttas, eller typen av v�rde som ett "
 "schema beskriver. Unika f�rkortningar �r ok."
 
-#: gconf/gconftool.c:198
+#: gconf/gconftool.c:205
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1332,44 +1209,44 @@ msgstr ""
 "Ange typen av cdr-parv�rde som ska s�ttas, eller typen av v�rde som ett "
 "schema beskriver. Unika f�rkortningar �r ok."
 
-#: gconf/gconftool.c:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Ange en kort halvradsbeskrivning som ska ing� i ett schema."
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr "BESKRIVNING"
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr "Ange en m�ngradsbeskrivning som ska ing� i ett schema."
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr "Ange �garen av ett schema"
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr "�GARE"
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr "Ange en schemafil som ska installeras"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr "FILNAMN"
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Ange en konfigurationsk�lla som ska anv�ndas ist�llet f�r standards�kv�gen"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr "K�LLA"
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1377,7 +1254,7 @@ msgstr ""
 "Anv�nder konfigurationsdatabasen direkt och g�r f�rbi servern. Kr�ver att "
 "gconfd inte �r ig�ng."
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1388,7 +1265,7 @@ msgstr ""
 "som inte �r standard eller satt till en tom str�ng f�r att anv�nda "
 "standardv�rdet."
 
-#: gconf/gconftool.c:270
+#: gconf/gconftool.c:277
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1396,7 +1273,7 @@ msgstr ""
 "Tortyrtestar en applikation genom att s�tta och nollst�lla en massa v�rden "
 "av olika typer f�r nycklar p� kommandoraden."
 
-#: gconf/gconftool.c:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1404,7 +1281,27 @@ msgstr ""
 "Tortyrtestar en applikation genom att s�tta och nollst�lla en massa nycklar "
 "inuti katalogerna p� kommandoraden."
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1414,90 +1311,93 @@ msgstr ""
 "K�r \"%s --help\" f�r att sen en fullst�ndig lista med tillg�ngliga "
 "kommandoradsalternativ.\n"
 
-#: gconf/gconftool.c:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Kan inte s�tta/nollst�lla samtidigt\n"
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Kan inte s�tta/nollst�lla samtidigt\n"
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
-msgstr "Kan inte anv�nda --all-pairs med --get eller --set\n"
+#: gconf/gconftool.c:413
+#, fuzzy
+msgid "Can't use --all-entries with --get or --set\n"
+msgstr "Kan inte anv�nda --all-dirs med --get eller --set\n"
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Kan inte anv�nda --all-dirs med --get eller --set\n"
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
+#, fuzzy
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
 "--recursive-list kan inte anv�ndas med --get, --set, --unset, --all-pairs, "
 "eller --all-dirs\n"
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
+#, fuzzy
 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-entries, --"
+"all-dirs\n"
 msgstr ""
-"--set_schema kan inte anv�ndas med --get, --set, --unset, --all-pairs, "
-"--all-dirs\n"
+"--set_schema kan inte anv�ndas med --get, --set, --unset, --all-pairs, --all-"
+"dirs\n"
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr "V�rdetyp �r bara relevant n�r ett v�rde s�tts\n"
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr "M�ste ange en typ n�r v�rde s�tts\n"
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr "Pingalternativet m�ste anv�ndas f�r sig sj�lvt.\n"
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists-alternativet m�ste anv�ndas f�r sig sj�lvt.\n"
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file m�ste anv�ndas f�r sig sj�lv.\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule m�ste anv�ndas f�r sig sj�lv.\n"
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key m�ste anv�ndas f�r sig sj�lv.\n"
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory m�ste anv�ndas f�r sig sj�lv.\n"
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
-"Du m�ste ange en konfigurationsk�lla med --config-source vid anv�ndning av "
-"--direct\n"
+"Du m�ste ange en konfigurationsk�lla med --config-source vid anv�ndning av --"
+"direct\n"
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Misslyckades med att initiera GConf: %s\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "M�ste s�tta milj�variabeln GCONF_CONFIG_SOURCE\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1509,246 +1409,303 @@ msgstr ""
 "inga applikationer k�rs\n"
 "(fast teoretiskt fungerar saker om applikationerna k�rs).\n"
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Misslyckades med att f� tillg�ng till konfigurationsk�llorna: %s\n"
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Avst�ngningsfel: %s\n"
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "M�ste ange en eller flera kataloger att rekursivt lista.\n"
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
 msgstr "Misslyckades med att lista par i \"%s\": %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr "(inget v�rde satt)"
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Misslyckades med att starta konfigurationsservern (gconfd): %s\n"
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr "M�ste ange en nyckel eller flera att f�\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listtyp: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car-typ: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr-typ: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "�gare: %s\n"
+msgid "Default Value: %s\n"
+msgstr "Standardv�rde: %s\n"
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr "Nollst�ll"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "�gare: %s\n"
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kort beskrivning: %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "L�ng beskrivning: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Inget v�rde satt f�r \"%s\"\n"
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Misslyckades med att f� v�rdet f�r \"%s\": %s\n"
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "F�rst�r inte typen \"%s\"\n"
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Du m�ste ange alternativa nycklar/v�rden som argument\n"
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Inget v�rde satt f�r nyckel: \"%s\"\n"
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr "Kan inte s�tta schema som v�rde\n"
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "N�r du anger en lista m�ste du ange en primitiv listtyp\n"
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "N�r du anger ett par m�ste du ange en primitiv car-typ och cdr-typ\n"
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "Fel: %s\n"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
-#, c-format
-msgid "Error setting value: %s"
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
 msgstr "Fel n�r v�rde sattes: %s"
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
-#, c-format
-msgid "Error syncing: %s"
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
 msgstr "Fel vid synkronisering: %s"
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1234
+#, fuzzy
+msgid "Must specify a key or keys on the command line\n"
+msgstr "M�ste ange en nyckel eller flera att f�\n"
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "Filen \"%s\" finns inte\n"
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "Fel n�r schema f�r \"%s\" sattes: %s"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "Filen \"%s\" finns inte\n"
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+#, fuzzy
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr "M�ste ange nyckel (schemanamn) som det enda argumentet\n"
+
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr ""
+"VARNING: misslyckades med att associera schemat `%s' med nyckeln `%s': %s\n"
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "M�ste ange nyckel (schemanamn) som det enda argumentet\n"
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Listtypen m�ste vara en primitiv typ: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Car-partypen m�ste vara en primitiv typ: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Cdr-partypen m�ste vara en primitiv typ: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr "Fel n�r v�rde sattes: %s"
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr "Fel vid synkronisering: %s"
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr "M�ste ange en eller flera kataloger att f� nyckel/v�rde par fr�n.\n"
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr "M�ste ange en eller flera nycklar att nollst�lla.\n"
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Fel vid nollst�llning av \"%s\": %s\n"
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr "M�ste ange en eller flera kataloger att f� underkataloger fr�n.\n"
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Fel vid listning av kataloger: %s\n"
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "VARNING: ogiltig eller saknad typ f�r schema (%s)\n"
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "VARNING: ogiltig eller saknad list_type f�r schema (%s)\n"
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "VARNING: Misslyckades med att tolka standardv�rde \"%s\" f�r schema (%s)\n"
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "VARNING: ogiltig eller saknad car_type eller cdr_type f�r schema (%s)\n"
 
-#: gconf/gconftool.c:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "VARNING: Du kan inte s�tta ett standardv�rde f�r ett schema\n"
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "VARNING: internt fel i gconftool, ok�nd GConfValueType\n"
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "VARNING: misslyckades med att tolka typnamnet \"%s\"\n"
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"VARNING: list_type kan bara vara int, float, string eller bool och inte "
-"\"%s\"\n"
+"VARNING: list_type kan bara vara int, float, string eller bool och inte \"%s"
+"\"\n"
 
-#: gconf/gconftool.c:1535
+#: gconf/gconftool.c:1812
 #, 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"
+"VARNING: car_type kan bara vara int, float, string eller bool och inte \"%s"
+"\"\n"
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, 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"
+"VARNING: cdr_type kan bara vara int, float, string eller bool och inte \"%s"
+"\"\n"
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr "VARNING: tom <applyto>-nod"
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "VARNING: noden <%s> kan inte f�rst�s under <schema>\n"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr "VARNING: ingen nyckel angiven f�r schema\n"
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 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:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1756,53 +1713,53 @@ msgstr ""
 "VARNING: flera <locale>-noder f�r platsen \"%s\", ignorerar allt f�reg�ende "
 "f�rst\n"
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, 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:1745
+#: gconf/gconftool.c:2023
 #, 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:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Installerade schemat \"%s\" f�r lokalen \"%s\"\n"
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, 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:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Kopplade ihop schemat \"%s\" med nyckeln \"%s\"\n"
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Du m�ste ha minst en <locale>-post i ett <schema>\n"
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "VARNING: noden <%s> kan inte f�rst�s under <schemalist>\n"
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Misslyckades med att �ppna \"%s\": %s\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument \"%s\" tomt?\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1811,26 +1768,26 @@ msgstr ""
 "Dokumentet \"%s\" har fel typ av rotnod (<%s>, borde vara "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokumentet \"%s\" har ingen toppniv� <gconfschemafil> nod\n"
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "VARNING: nod <%s> nedan <gconfschemafile> kan inte f�rst�s\n"
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Fel vid synkronisering av konfigurationsdata: %s"
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr "M�ste ange n�gon schemafil att installera\n"
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -1839,16 +1796,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Misslyckades med att nollst�lla kn�cknyckeln %s: %s\n"
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr "M�ste ange n�gra nycklar att kn�cka\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1858,11 +1815,11 @@ msgstr ""
 "nyckeln:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr "M�ste ange n�gra kataloger att kn�cka\n"
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1873,95 +1830,268 @@ msgstr ""
 "nyckeln i katalogen:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr "GConf-fel: %s\n"
+
+#: gconf/gconf-client.c:798
 #, 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:985
+#: gconf/gconf-client.c:1000
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "F�rv�ntade \"%s\", fick \"%s\" f�r nyckeln \"%s\""
 
-#~ msgid "Unloading BerkeleyDB (BDB) backend module."
-#~ msgstr "Gl�mmer BerkeleyDB-backendmodulen (BDB)."
+#~ msgid "Ignoring XML node `%s', except for possible schema name: %s"
+#~ msgstr "Ignorerar XML-noden \"%s\", utom f�r m�jliga schemanamnet: %s"
 
-#~ msgid "Opened BerkeleyDB source at root %s"
-#~ msgstr "�ppnade BerkeleyDB-k�lla vid rot %s"
+#~ msgid "found <local_schema> with no locale setting"
+#~ msgstr "hittade <local_schema> utan n�gon lokalinst�llning"
 
-#~ msgid "Initializing BDB backend module"
-#~ msgstr "Initierar BDB-backendmodulen"
+#~ 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 "Couldn't find the %s root directory in the address `%s'"
-#~ msgstr "Kunde inte hitta %s-rotkatalogen i adressen \"%s\""
+#~ 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� �r entitetsnamnet f�r l�ngt "
+#~ "f�r att vara giltigt (\"&\" m�ste finnas i b�rjan p� en enhet, exempelvis "
+#~ "\"&quot;\")"
 
 #~ msgid ""
-#~ "Can't read from or write to the %s root directory in the address `%s'"
-#~ msgstr "Kan inte l�sa eller skriva till %s-rotkatalogen i adressen \"%s\""
+#~ "Unknown entity '%s' ('&' must begin entities &amp; &quot; &lt; &gt; "
+#~ "&apos;)"
+#~ msgstr ""
+#~ "Ok�nd entitet \"%s\" (\"&\" m�ste finnas i b�rjan p� entitet, exempelvis "
+#~ "&amp; &quot; &lt; &gt; &apos;)"
 
-#~ msgid "Failed to set mode on `%s': %s"
-#~ msgstr "Misslyckades med att s�tta l�ge p� \"%s\": %s"
+#~ msgid ""
+#~ "Markup text ended in the middle of a character reference, just after '&#'"
+#~ msgstr ""
+#~ "M�rkestexten slutade i mitten av en teckenreferens, precis efter \"&#\""
 
-#~ msgid "No database available to save your configuration"
-#~ msgstr "Ingen databas tillg�nglig f�r sparande av din konfiguration"
+#~ msgid ""
+#~ "Character reference contained non-digit '%s' ('&#' should begin a "
+#~ "reference to a unicode character, such as '&#2342;')"
+#~ msgstr ""
+#~ "Teckenreferensen inneh�ll tecknet \"%s\" som inte �r en siffra (\"&#\" "
+#~ "m�ste inleda en referens till ett Unicode-tecken, exempelvis \"&#2342;\")"
 
-#~ msgid "OAF problem description: '%s'"
-#~ msgstr "OAF-problembeskrivning: \"%s\""
+#~ 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�ste inleda en "
+#~ "teckenreferens, exempelvis \"&#2342;\")"
 
-#~ msgid "Unable to store a value at key '%s'"
-#~ msgstr "Kan inte lagra ett v�rde vid nyckeln \"%s\""
+#~ msgid ""
+#~ "Couldn't parse character reference '%s' ('&#' must begin a character "
+#~ "reference such as '&#2343;')"
+#~ msgstr ""
+#~ "Kunde inte tolka teckenreferensen \"%s\" (\"&#\" m�ste inleda en "
+#~ "teckenreferens, exempelvis \"&#2342;\")"
 
-#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
+#~ msgid ""
+#~ "Character code %#lx is not allowed in XML documents or is not a valid "
+#~ "Unicode character"
+#~ msgstr ""
+#~ "Teckenkoden %#lx �r inte till�ten i XML eller �r inte ett giltigt Unicode-"
+#~ "tecken"
+
+#, fuzzy
+#~ msgid ""
+#~ "Documented ended just after an '&', '&' should begin an entity or "
+#~ "character reference."
 #~ msgstr ""
-#~ "Mottog signal %d, l�mnar en core-fil. Rapportera v�nligen en bugg i GConf."
+#~ "Dokumentet slutade direkt efter ett \"&\", \"&\" ska inleda en entitets- "
+#~ "eller teckenreferens."
 
 #~ msgid ""
-#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+#~ "'<' 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 ""
-#~ "Mottog signal %d, st�nger ner onormalt. Rapportera v�nligen en bugg i GConf."
+#~ "Tecknen \"<\" eller \">\" �r inte till�tna h�r; de �r endast till�tna "
+#~ "runt taggar, exempelvis <bold> eller <paragraph>. P� andra st�llen b�r du "
+#~ "koda dessa tecken som entiteterna &lt; och &gt;"
 
-#~ msgid "GConf server is not in use, shutting down."
-#~ msgstr "GConf-servern anv�nds inte, st�nger ner."
+#~ msgid "Character '%s' is not valid at the start of an attribute name"
+#~ msgstr "Tecknet \"%s\" �r inte giltigt som inledning p� ett attributnamn"
 
-#~ msgid "Error reading saved state file: %s"
-#~ msgstr "Fel vid l�sning av tillst�ndsfilen: %s"
+#~ msgid "Document ended just after attribute name"
+#~ msgstr "Dokumentet slutade direkt ett attributnamn"
 
-#~ msgid "Failed to get IOR for client: %s"
-#~ msgstr "Misslyckades med att f� IOR f�r klienten: %s"
+#~ msgid "Attribute name must be immediately followed by an '=' character"
+#~ msgstr "Attributnamn m�ste omedelbart �tf�ljas av ett \"=\"-tecken"
 
-#~ msgid "Failed to open saved state file: %s"
-#~ msgstr "Misslyckades med att �ppna tillst�ndsfilen: %s"
+#~ msgid ""
+#~ "'=' character after attribute must be immediately followed by an '\"' "
+#~ "character"
+#~ msgstr ""
+#~ "\"=\"-tecknet efter ett attribut m�ste omedelbart �tf�ljas av ett \"-"
+#~ "tecken"
 
-#~ msgid "Failed to write client add to saved state file: %s"
-#~ msgstr "Misslyckades med att skriva klienttill�gg till tillst�ndsfilen: %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�rde. Ditt attributv�rde "
+#~ "kanske saknar det avslutande citationstecknet \""
 
-#~ msgid "Failed to flush client add to saved state file: %s"
-#~ msgstr "Misslyckades med att t�mma klienttill�gg till tillst�ndsfilen: %s"
+#~ 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�rde"
 
 #~ msgid ""
-#~ "Some client removed itself from the GConf server when it hadn't been added."
+#~ "Text ends immediately after an attribute value, before the element was "
+#~ "closed"
 #~ msgstr ""
-#~ "N�gon klient tog bort sig sj�lv fr�n GConf-servern n�r den inte var tillagd."
+#~ "Texten slutar omedelbart efter ett attributv�rde, innan elementet var "
+#~ "st�ngt"
+
+#~ msgid "Missing '<' at start of element"
+#~ msgstr "Ett \"<\" saknas i b�rjan 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\" �r inte giltigt som inledning p� ett elementnamn"
 
-#~ msgid "Default Value: %s\n"
-#~ msgstr "Standardv�rde: %s\n"
+#~ msgid "Document ended just after element name, no '>' seen"
+#~ msgstr "Dokumentet slutade direkt efter elementnamn, inget \">\" hittades"
 
-#~ msgid "GConf Error: %s\n"
-#~ msgstr "GConf-fel: %s\n"
+#~ msgid "Elements should be closed with '>' or '/>', not with '%s'"
+#~ msgstr "Element m�ste avslutas med \">\" eller \"/>\", inte med \"%s\""
+
+#~ msgid ""
+#~ "Element ended just after '/', no '>' seen; empty elements should end with "
+#~ "'/>'"
+#~ msgstr ""
+#~ "Elementet slutade direkt efter ett \"/\"; inget \">\" hittades. Tomma "
+#~ "element b�r avslutas med \"/>\""
+
+#~ msgid "Close tag not found at end of element"
+#~ msgstr "Avslutande tagg hittades inte i slutet av element"
+
+#~ msgid "Close tag ends just after '<' character"
+#~ msgstr "Avslutande tagg direkt efter \"<\"-tecken"
+
+#~ msgid "Close tag should begin with '</', '/' character is missing"
+#~ msgstr "Avslutande tagg ska inledas med \"</\", \"/\"-tecknet saknas"
+
+#~ msgid "Close tag ends just after '/' character"
+#~ msgstr "Avslutande tagg slutar direkt efter \"/\"-tecknet"
+
+#~ 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 "Close tag '%s' does not match opening tag '%s'"
+#~ msgstr "Avslutningstaggen \"%s\" passar inte med �ppningstaggen \"%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�rkta texten. Texten n�rmast "
+#~ "innan det felaktiga tecknet var \"%s\""
+
+#~ msgid "The marked-up text contained nothing but whitespace."
+#~ msgstr "Den m�rkta texten inneh�ll inget annat �n blanksteg."
+
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Misslyckades med att �ppna filen \"%s\": %s"
+
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "Fel vid l�sning av filen \"%s\": %s"
+
+#~ 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 ""
+#~ "Fel vid kontaktning av konfigurationsservern: OAF returnerade nil fr�n "
+#~ "oaf_activate_from_id() och satte inte ett undantag som f�rklarade "
+#~ "problemet. Var v�nlig och skicka en OAF-buggrapport."
+
+#~ msgid "Received signal %d, shutting down."
+#~ msgstr "Mottog signal %d, st�nger ner."
+
+#~ msgid "GConf was built with debugging features enabled"
+#~ msgstr "GConf byggdes med fels�kningsalternativ p�slagna"
+
+#~ msgid "Didn't understand line in saved state file: '%s'"
+#~ msgstr "F�rstod inte rad i tillst�ndsfilen: \"%s\""
+
+#~ msgid "Failed to parse connection ID in saved state file"
+#~ msgstr "Misslyckades med att tolka anslutnings-ID i tillst�ndsfilen"
+
+#~ msgid "Failed to unquote config source address from saved state file: %s"
+#~ msgstr ""
+#~ "Misslyckades med att avcitera k�lladressen f�r konfigurationen ifr�n "
+#~ "tillst�ndsfilen: %s"
+
+#~ msgid "Failed to unquote listener location from saved state file: %s"
+#~ msgstr ""
+#~ "Misslyckades med att avcitera lyssnarplatsen fr�n tillst�ndsfilen: %s"
+
+#~ msgid "Failed to unquote IOR from saved state file: %s"
+#~ msgstr "Misslyckades med att avcitera IOR fr�n tillst�ndsfilen: %s"
+
+#~ msgid ""
+#~ "Saved state file records the same listener added twice; ignoring the "
+#~ "second instance"
+#~ msgstr ""
+#~ "Tillst�ndsfilen har hittat att samma lyssnare har lagts till tv� g�nger; "
+#~ "ignorerar den andra instansen"
+
+#~ msgid ""
+#~ "Saved state file had a removal of a listener that wasn't added; ignoring "
+#~ "the removal."
+#~ msgstr ""
+#~ "Tillst�ndsfilen hade en borttagning av en lyssnare som inte hade lagts "
+#~ "till; ignorerar borttagningen."
+
+#~ msgid "Can't use --all-pairs with --get or --set\n"
+#~ msgstr "Kan inte anv�nda --all-pairs med --get eller --set\n"
+
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "Kan inte lagra ett v�rde vid nyckeln \"%s\""
 
 #~ msgid ""
 #~ "Saved state file records the same client added twice; ignoring the second "
 #~ "instance"
 #~ msgstr ""
-#~ "Tillst�ndsfilen har registrerat samma klient tv� g�nger; ignorerar den andra "
-#~ "instansen"
+#~ "Tillst�ndsfilen har registrerat samma klient tv� g�nger; ignorerar den "
+#~ "andra instansen"
 
 #~ msgid ""
-#~ "Saved state file had a removal of a client that wasn't added; ignoring the "
-#~ "removal."
+#~ "Saved state file had a removal of a client that wasn't added; ignoring "
+#~ "the removal."
 #~ msgstr ""
-#~ "Tillst�ndsfilen hade en borttagning av en klient som inte hade lagts till; "
-#~ "ignorerar borttagningen."
+#~ "Tillst�ndsfilen hade en borttagning av en klient som inte hade lagts "
+#~ "till; ignorerar borttagningen."
 
 #~ msgid "Some client added itself to the GConf server twice."
 #~ msgstr "N�gon klient la till sig sj�lv till GConf-servern tv� g�nger."
diff --git a/po/tr.po b/po/tr.po
index 9e365ec0..7fcbfefd 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.0.3\n"
-"POT-Creation-Date: 2001-08-15 18:01-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-0400\n"
 "PO-Revision-Date: 2001-09-10 12:04+300\n"
 "Last-Translator: Nilg�n Belma Bug�ner <nilgun@fide.org>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -14,16 +14,16 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:211
+#: backends/bdb-backend.c:215
 msgid "Unloading BerkeleyDB (BDB) backend module."
 msgstr "BerkeleyDB (BDB) mod�l� kald�r�l�yor."
 
-#: backends/bdb-backend.c:234
+#: backends/bdb-backend.c:238
 #, c-format
 msgid "Opened BerkeleyDB source at root %s"
 msgstr "BerkeleyDB kayna�� k�k %s'de a��ld�"
 
-#: backends/bdb-backend.c:574
+#: backends/bdb-backend.c:578
 msgid "Initializing BDB backend module"
 msgstr "BDB mod�l� ba�lat�l�yor"
 
@@ -65,7 +65,7 @@ msgstr "%s k�k�ndeki XML kaynak dizin/dosya eri�im izinleri: %o/%o"
 msgid "Initializing XML backend module"
 msgstr "XML mod�l� ba�lat�l�yor"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "`%s' XML dizininde kilitleme yap�lamad�: %s"
@@ -80,8 +80,8 @@ msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
-"Diskle e�zamanl� olmad���ndan, XML mod�l�n�n arabelle�indeki "
-"`%s' dizini silinemiyor"
+"Diskle e�zamanl� olmad���ndan, XML mod�l�n�n arabelle�indeki `%s' dizini "
+"silinemiyor"
 
 #: backends/xml-cache.c:256
 #, c-format
@@ -158,106 +158,105 @@ msgstr "`%s' XML dosyas�ndaki ilk d���m bir <entry> de�il, yoksay�l�yor"
 msgid "Failed to create file `%s': %s"
 msgstr "`%s' dosyas� olu�turulamad�: %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2494
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, 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:150
 #, 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:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:327
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "`%s' �ema ismi yoksay�l�yor, ge�ersiz: %s"
 
-#: backends/xml-entry.c:375
+#: backends/xml-entry.c:376
 #, c-format
 msgid "Ignoring XML node `%s': %s"
 msgstr "XML d���m� `%s' yoksay�l�yor: %s"
 
-#: backends/xml-entry.c:726
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "�ema i�in verilen �ntan�ml� de�er okunamad�: %s"
 
-#: backends/xml-entry.c:940
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "<%s> d���m� i�in \"type\" de�eri belirtilmemi�"
 
-#: backends/xml-entry.c:954
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "Bilinmeyen `%s' \"type\" de�erine sahip d���m yoksay�ld�"
 
-#: backends/xml-entry.c:969
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "D���mde \"value\" i�in bir �ey verilmemi�"
 
-#: backends/xml-entry.c:1017 backends/xml-entry.c:1093
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Bir XML liste d���m� i�indeki <%s> XML d���m� anla��lamad�"
 
-#: backends/xml-entry.c:1051
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
-"Bir liste d���m� i�indeki t�r (liste, de�er �ifti ya da  her neyse) "
-"ge�ersiz"
+"Bir liste d���m� i�indeki t�r (liste, de�er �ifti ya da  her neyse) ge�ersiz"
 
-#: backends/xml-entry.c:1074
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "K�t� bi�imlendirilmi� XML d���m�: %s"
 
-#: backends/xml-entry.c:1082
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Liste yanl�� t�rde d���m i�eriyor ( %s, %s olmal�yd�)"
 
-#: backends/xml-entry.c:1134
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "XML �iftindeki hatal� `car' yoksay�l�yor: %s"
 
-#: backends/xml-entry.c:1143 backends/xml-entry.c:1166
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "XML dosyas� okunurken hata: listeler ve �iftler bir ba�ka �iftin i�ine "
 "yerle�tirilemez"
 
-#: backends/xml-entry.c:1156
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "XML �iftinde hatal� `cdr' yoksay�ld�: %s"
 
-#: backends/xml-entry.c:1175
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Bir XML �iftindeki <%s> XML d���m� anla��lamad�"
 
-#: backends/xml-entry.c:1193
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "XML �ifti d���m� i�in `car' ve `cdr' bulunamad�"
 
-#: backends/xml-entry.c:1199
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "XML dosyas�ndaki de�er �iftlerinden `cdr' eksik"
 
-#: backends/xml-entry.c:1206
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "XML dosyas�ndaki de�er �iftlerinden `car' eksik"
 
-#: backends/xml-entry.c:1211
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "XML dosyas�ndaki de�er �iftlerinde `car' ve `cdr'  ikisi de eksik"
 
@@ -327,9 +326,9 @@ msgid ""
 "listener on gconfd restart, resulting in unreliable notification of "
 "configuration changes."
 msgstr ""
-"Dinleyicinin (%s) ek g�nl�k kayd� yap�lamad�; yap�land�rma "
-"de�i�ikliklerinin g�venilir olmayan bildirimlerinin sonucu olarak "
-"bu dinleyici gconfd tekrar ba�lat�l�rken etkinle�tirilemeyecek."
+"Dinleyicinin (%s) ek g�nl�k kayd� yap�lamad�; yap�land�rma de�i�ikliklerinin "
+"g�venilir olmayan bildirimlerinin sonucu olarak bu dinleyici gconfd tekrar "
+"ba�lat�l�rken etkinle�tirilemeyecek."
 
 #: gconf/gconf-database.c:1042
 #, c-format
@@ -342,9 +341,8 @@ msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
-"Dinleyicinin kald�r�lmas� g�nl�k dosyas�na kaydedilemedi "
-"(genelde zarars�z, ara s�ra ortaya ��kan bir sistem bildiriminin "
-"sonucu): %s"
+"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:1169 gconf/gconf-sources.c:1294
 #, c-format
@@ -455,21 +453,21 @@ msgstr "Kilit olu�turulamad�"
 msgid "No database available to save your configuration"
 msgstr "Yap�land�rman�z�n kaydedilebilece�i bir veritaban� yok"
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "`%s' anahtar�nda '/' yok"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Liste eleman�n�n CORBA de�eri yorumlanamad�"
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "%s'deki liste eleman�n�n t�r� yanl��"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr "gconfd'den hatal� bir liste t�r� al�nd�"
 
@@ -477,156 +475,153 @@ msgstr "gconfd'den hatal� bir liste t�r� al�nd�"
 msgid "Failed to convert object to IOR"
 msgstr "Nesne IOR'a d�n��t�r�lemedi"
 
-#: gconf/gconf-internals.c:813
+#: 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:873
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "`%s' kayna��n�n eklenmesi\n"
 
-#: gconf/gconf-internals.c:885
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "`%s' dosyas�nda okuma hatas�: %s\n"
 
-#: gconf/gconf-internals.c:1327
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Liste beklerken, %s al�nd�"
 
-#: gconf/gconf-internals.c:1337
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "%s listesi beklenirken, %s listesi al�nd�"
 
-#: gconf/gconf-internals.c:1476
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "�ift beklenirken, %s al�nd�"
 
-#: gconf/gconf-internals.c:1490
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
-msgstr ""
-"(%s,%s) �ifti beklenirken , bir ya da iki de�eri eksik bir "
-"�ift al�nd�"
+msgstr "(%s,%s) �ifti beklenirken , bir ya da iki de�eri eksik bir �ift al�nd�"
 
-#: gconf/gconf-internals.c:1506
+#: gconf/gconf-internals.c:1474
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "(%s,%s) �ifti beklenirken, (%s,%s) �ifti al�nd�"
 
-#: gconf/gconf-internals.c:1622
+#: gconf/gconf-internals.c:1590
 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:1684
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "T�rnaklarla belirlenen bir dizge ? i�areti ile bitmez"
 
-#: gconf/gconf-internals.c:2164 gconf/gconf.c:3092
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA hatas�: %s"
 
-#: gconf/gconf-internals.c:2180
-#, c-format
-msgid "OAF problem description: '%s'"
+#: gconf/gconf-internals.c:2148
+#, fuzzy, c-format
+msgid "bonobo-activation problem description: '%s'"
 msgstr "OAF sorun tan�m�: %s"
 
-#: gconf/gconf-internals.c:2186
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "listelenmemi� OAF nesne dizini silinmeye �al���l�yor"
 
-#: gconf/gconf-internals.c:2191
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr "zaten listede olan OAF dizini eklenmeye �al���l�yor"
 
-#: gconf/gconf-internals.c:2198
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF ayr��t�rma hatas�: %s"
 
-#: gconf/gconf-internals.c:2203
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "Bilinmeyen OAF hatas�"
 
-#: gconf/gconf-internals.c:2290
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "`%s' i�inde IOR dosyas� yok"
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd `%s' kilidini di�er s�re�lerden al�yor"
 
-#: gconf/gconf-internals.c:2332
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "`%s' kilidi ba�ka bir uygulamaya ait"
 
-#: gconf/gconf-internals.c:2351
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "var olan gconfd'yi do�rulamak i�in ORB'ye ba�lan�lamad�"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
-"IOR nesne ba�vurusuna d�n��t�r�lemedi�inden kilit `%s' "
-"kald�r�l�yor, IOR `%s'"
+"IOR nesne ba�vurusuna d�n��t�r�lemedi�inden kilit `%s' kald�r�l�yor, IOR `%s'"
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2314
 #, 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:2383
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "GConf ardalan uygulamas� ( gconfd ) `%s' kilidine sahip"
 
-#: gconf/gconf-internals.c:2397
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "`%s' dizini olu�turulamad�: %s"
 
-#: gconf/gconf-internals.c:2446
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "`%s' kilidi olu�turulamad�: %s"
 
-#: gconf/gconf-internals.c:2482
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "`%s' dosyas�na yaz�lamad�: %s"
 
-#: gconf/gconf-internals.c:2532
+#: gconf/gconf-internals.c:2475
 #, 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:2549
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "Bozuk kilit dosyas� `%s' siliniyor"
 
-#: gconf/gconf-internals.c:2559
+#: gconf/gconf-internals.c:2502
 #, c-format
 msgid ""
 "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
 "took our lock"
 msgstr ""
-"`%s' kilit dosyas� olu�turulamad� ( \"yarat�c�\" pid %u, "
-"bizim pid %u; birisi bizim kilidi ald� galiba"
+"`%s' kilit dosyas� olu�turulamad� ( \"yarat�c�\" pid %u, bizim pid %u; "
+"birisi bizim kilidi ald� galiba"
 
-#: gconf/gconf-internals.c:2576
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "`%s' kilit dizini b�rak�lamad�: %s"
@@ -651,20 +646,20 @@ msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
-"`%s'in de�eri yap�land�rma dizinlerinden birindeki bir "
-"salt-okunur kaynak i�inde belirtiliyor"
+"`%s'in de�eri yap�land�rma dizinlerinden birindeki bir salt-okunur kaynak "
+"i�inde belirtiliyor"
 
 #: gconf/gconf-sources.c:608
-#, c-format
+#, fuzzy, 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."
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
 msgstr ""
 "Yap�land�rma sunucusu yaz�labilir veritabanlar�na sahip olmad���ndan '%s'de "
 "bir de�er saklanam�yor. Bu sorun iki sebepten ortaya ��kabilir: 1) "
@@ -691,8 +686,8 @@ msgstr "Meta bilgileri al�rken hata: %s"
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
-"`%s' anahtar�, `%s' anahtar� i�in �ema olarak belirtilmi�, ama "
-"asl�nda `%s' t�r�n� i�eriyor"
+"`%s' anahtar�, `%s' anahtar� i�in �ema olarak belirtilmi�, ama asl�nda `%s' "
+"t�r�n� i�eriyor"
 
 #: gconf/gconf-value.c:82
 #, c-format
@@ -774,13 +769,14 @@ msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "�stemci, sunucular listesine eklenemedi, CORBA hatas�: %s"
 
 #: gconf/gconf.c:1887
+#, fuzzy
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
 "Yap�land�rma sunucusuna ba�lan�rken hata: bonobo-etkinle�tirme "
 "bonobo_activation_activate_from_id() i�levinden bo� d�nd� ve sorunu "
@@ -846,26 +842,30 @@ msgstr "\"mant�ksal\" beklenirken %s al�nd�"
 msgid "Expected schema, got %s"
 msgstr "�ema beklenirken %s al�nd�"
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "Kapatma iste�i al�nd�"
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
-"gconfd hata ay�klama se�ene�i ile derlenmi�; gconf.path "
-"kaynak dizininden y�klenmeye �al���l�yor"
+"gconfd hata ay�klama se�ene�i ile derlenmi�; gconf.path kaynak dizininden "
+"y�klenmeye �al���l�yor"
 
-#: gconf/gconfd.c:298
+#: gconf/gconfd.c:293
 #, 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 ""
 "Yap�land�rma dosyalar� bulunamad�, �ntan�ml� yap�land�rma kayna�� `%s' "
 "deneniyor"
 
-#: gconf/gconfd.c:307
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -873,16 +873,16 @@ msgstr ""
 "Kaynak dizininde yap�land�rma kaynaklar� yok, yap�land�rma kaydedilmeyecek "
 "d�zeltin "
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:301
 msgid "/path"
 msgstr "/dosyaYolu"
 
-#: gconf/gconfd.c:321
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Baz� yap�land�rma kaynaklar� y�klenirken hata: %s"
 
-#: gconf/gconfd.c:333
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -890,7 +890,7 @@ msgstr ""
 "��z�mlenebilen bir yap�land�rma kayna�� adresi yok, yap�land�rma bilgisi "
 "y�klenemez ve kaydedilemez"
 
-#: gconf/gconfd.c:350
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -898,60 +898,66 @@ msgstr ""
 "��z�mlenebilen bir yaz�labilir ayarlama kayna�� adresi yok, baz� "
 "yap�land�rma de�i�ikliklerini kaydetmek m�mk�n olmayabilir"
 
-#: gconf/gconfd.c:376
+#: 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�nderin."
+"%d sinyali al�nd�, core kaydedildi (GConf ��kt�). L�tfen bir hata raporu "
+"g�nderin."
 
-#: gconf/gconfd.c:392
+#: gconf/gconfd.c:385
 #, c-format
-msgid "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
-"%d sinyali al�nd�, ola�and��� kapanma (GConf ��kt�). L�tfen bir hata "
-"raporu g�nderin"
+"%d sinyali al�nd�, ola�and��� kapanma (GConf ��kt�). L�tfen bir hata raporu "
+"g�nderin"
 
-#: gconf/gconfd.c:409
+#: gconf/gconfd.c:402
 #, 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:513
+#: gconf/gconfd.c:519
 #, 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:540
+#: gconf/gconfd.c:546
+#, fuzzy
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr "OAF ba�lat�lamad�; l�tfen OAF yazarlar�na bir hata raporu g�nderin"
 
-#: gconf/gconfd.c:560
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr "ConfigServer i�in nesne ba�vurusu al�namad�"
 
-#: gconf/gconfd.c:573
+#: gconf/gconfd.c:579
 #, c-format
 msgid "Failed to create %s: %s"
 msgstr "%s olu�turulamad�: %s"
 
-#. Bad hack alert - register the current lockholder with oafd,
-#. * since oafd seems to have forgotten about us.
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
 #.
-#: gconf/gconfd.c:588
+#: gconf/gconfd.c:594
 #, c-format
 msgid "Failed to get lock for daemon: %s"
 msgstr "Artalan uygulama i�in kilit al�namad�: %s"
 
-#: gconf/gconfd.c:594
-msgid "Registering existing server with oafd, since OAF appears to have leaked it"
-msgstr "Ka�ak g�r�nd��� i�in mevcut sunucu bonobo-etkinle�tirme ile kaydediliyor"
+#: gconf/gconfd.c:600
+#, fuzzy
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+"Ka�ak g�r�nd��� i�in mevcut sunucu bonobo-etkinle�tirme ile kaydediliyor"
 
-#: gconf/gconfd.c:603
+#: gconf/gconfd.c:609
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
 "register existing server."
@@ -959,51 +965,55 @@ msgstr ""
 "OAF, GConf IID'sini tan�m�yor; bu hatal� bir yap�land�rma gibi g�r�n�yor; "
 "mevcut sunucu kaydedilemiyor."
 
-#: gconf/gconfd.c:607
+#: gconf/gconfd.c:613
 msgid ""
 "Another gconfd already registered with OAF, so we can't register the "
 "existing server"
-msgstr "Ba�ka bir gconfd OAF'ta zaten kay�tl�; bu durumda mevcut sunucu kaydedilemez"
+msgstr ""
+"Ba�ka bir gconfd OAF'ta zaten kay�tl�; bu durumda mevcut sunucu kaydedilemez"
 
-#: gconf/gconfd.c:612
+#: gconf/gconfd.c:618
 msgid "Unknown error registering existing gconfd with OAF; exiting"
 msgstr "Mevcut gconfd OAF ile kaydedilirken bilinmeyen hata; ��k�l�yor"
 
-#: gconf/gconfd.c:639
+#: gconf/gconfd.c:645
+#, fuzzy
 msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
 msgstr ""
-"OAF, GConf IID'sini tan�m�yor; bu hatal� bir y�kleme gibi g�r�n�yor; "
-"sisteme kay�tl� giri� yap�lamad�; GConf kapan�yor\n"
+"OAF, GConf IID'sini tan�m�yor; bu hatal� bir y�kleme gibi g�r�n�yor; sisteme "
+"kay�tl� giri� yap�lamad�; GConf kapan�yor\n"
 
-#: gconf/gconfd.c:643
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:649
+#, fuzzy
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
 msgstr "Ba�ka bir gconfd OAF'ta zaten kay�tl�; GConf kapan�yor\n"
 
-#: gconf/gconfd.c:648
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:654
+#, fuzzy
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
 msgstr "gconfd OAF'a kaydedilirken bilinmeyen hata; GConf kapan�yor\n"
 
-#: gconf/gconfd.c:692
+#: gconf/gconfd.c:698
 #, c-format
 msgid "Failed to release lockfile: %s"
 msgstr "kilit dosyas� b�rak�lamad�: %s"
 
-#: gconf/gconfd.c:700
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "Kapan�yor"
 
-#: gconf/gconfd.c:725
+#: gconf/gconfd.c:731
 msgid "GConf server is not in use, shutting down."
 msgstr "GConf sunucusu kullan�mda de�il, kapan�yor."
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr "D�nen ola�and���l�k: %s"
 
-#: gconf/gconfd.c:1184
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1012,159 +1022,166 @@ msgstr ""
 "gconfd g�nl�k dosyas� a��lamad�; gconfd kapand�ktan sonra dinleyiciler "
 "etkinle�tirilemeyecek (%s)"
 
-#: gconf/gconfd.c:1219
+#: gconf/gconfd.c:1225
 #, 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�i gibi kaydedilemeyecek (%s)"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgstr ""
+"gconfd g�nl�k dosyas� kapat�lamad�; veri gere�i gibi kaydedilemeyecek (%s)"
 
-#: gconf/gconfd.c:1288
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Durum kay�t dosyas� '%s' yazmak i�in a��lamad�: %s"
 
-#: gconf/gconfd.c:1302
+#: gconf/gconfd.c:1308
 #, 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:1311
+#: gconf/gconfd.c:1317
 #, 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:1325
+#: gconf/gconfd.c:1331
 #, 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:1335
+#: gconf/gconfd.c:1341
 #, 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:1344
+#: gconf/gconfd.c:1350
 #, 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 "'%s' e ta��nm�� olan durum kay�t dosyas� �zg�n haline getirilemedi: %s"
 
-#: gconf/gconfd.c:1819
+#: gconf/gconfd.c:1823
 #, 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 ""
 "'%s' adresindeki bir dinleyici eski haline getirilemedi, veritaban� "
 "��z�mlenemedi"
 
-#: gconf/gconfd.c:1865
+#: gconf/gconfd.c:1869
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Durum kay�t dosyas� okunurken hata: %s"
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1922
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Durum kay�t dosyas� '%s' a��lamad�: %s"
 
-#: gconf/gconfd.c:2035
+#: gconf/gconfd.c:2039
 #, 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 ""
-"gconfd g�nl�k dosyas�na dinleyicilerin eklenmesine ili�kin kay�tlar eklenemedi; "
-"gconf'dan ��k�ld���nda ya da bir kapanmadan sonra dinleyicilerin yeniden "
-"eklenmesi m�mk�n olmayabilecek. (%s)"
+"gconfd g�nl�k dosyas�na dinleyicilerin eklenmesine ili�kin kay�tlar "
+"eklenemedi; gconf'dan ��k�ld���nda ya da bir kapanmadan sonra dinleyicilerin "
+"yeniden eklenmesi m�mk�n olmayabilecek. (%s)"
 
-#: gconf/gconfd.c:2040
+#: gconf/gconfd.c:2044
 #, 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 ""
 "gconfd g�nl�k dosyas�na dinleyicilerin kald�r�lmas�na ili�kin kay�tlar "
-"eklenemedi; gconf'dan ��k�ld���nda ya da bir kapanmadan sonra bu dinleyiciler "
-"yeniden eklenebilir. (%s)"
+"eklenemedi; gconf'dan ��k�ld���nda ya da bir kapanmadan sonra bu "
+"dinleyiciler yeniden eklenebilir. (%s)"
 
-#: gconf/gconfd.c:2063 gconf/gconfd.c:2228
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "�stemci i�in IOR al�namad�: %s"
 
-#: gconf/gconfd.c:2078
+#: gconf/gconfd.c:2082
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Durum kay�t dosyas� a��lamad�: %s"
 
-#: gconf/gconfd.c:2091
+#: gconf/gconfd.c:2095
 #, 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:2099
+#: gconf/gconfd.c:2103
 #, 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"
+msgstr ""
+"Durum kay�t dosyas�ndan istemci eklenmesinin temizlenmesi ba�ar�s�z: %s"
 
-#: gconf/gconfd.c:2189
-msgid "Some client removed itself from the GConf server when it hadn't been added."
+#: gconf/gconfd.c:2193
+msgid ""
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr "GConf sunucusu eklemedi�i s�rada tek bir istemci sunucudan silindi."
 
-#: gconf/gconftool.c:68
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr "Yard�m se�enekleri"
 
-#: gconf/gconftool.c:77
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
-msgstr "Bir anahtara bir de�er ve e�zamanlama belirtilir. --type ile kullan�l�r."
+msgstr ""
+"Bir anahtara bir de�er ve e�zamanlama belirtilir. --type ile kullan�l�r."
 
-#: gconf/gconftool.c:86
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr "Bir anahtar�n de�erini standart ��kt�ya yazar."
 
-#: gconf/gconftool.c:95
+#: gconf/gconftool.c:96
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
 msgstr ""
-"Bir �ema ve e�zamanlama belirler. --short-desc, --long-desc, --owner, ve --type "
-"ile kullan�n."
+"Bir �ema ve e�zamanlama belirler. --short-desc, --long-desc, --owner, ve --"
+"type ile kullan�n."
 
-#: gconf/gconftool.c:105
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr "komut sat�r�nda anahtarlar� kald�r�r"
 
-#: gconf/gconftool.c:114
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr "Dizindeki t�m anahtar/de�er �iftlerini g�sterir."
 
-#: gconf/gconftool.c:123
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr "Dizindeki t�m alt dizinleri g�sterir."
 
-#: gconf/gconftool.c:132
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "Bir dizinin alt�ndaki t�m alt dizinleri ard���k olarak g�sterir."
 
-#: gconf/gconftool.c:141
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Dizin varsa 0, yoksa 2 de�erini al�r."
 
-#: gconf/gconftool.c:150
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "gconfd kapat�l�r. �Y� B�R SEBEB�N�Z OLMADIK�A BU SE�ENE�� KULLANMAYIN."
 
-#: gconf/gconftool.c:159
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "gconfd etkinse 0 de�ilse 2 de�erini al�r."
 
-#: gconf/gconftool.c:168
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
 msgstr ""
-"Yap�land�rma sunucusunu (gconfd) ba�lat�r. (Normalde ihtiya� varsa "
-"otomatik olarak ba�lat�l�r)"
+"Yap�land�rma sunucusunu (gconfd) ba�lat�r. (Normalde ihtiya� varsa otomatik "
+"olarak ba�lat�l�r)"
 
-#: gconf/gconftool.c:177
+#: gconf/gconftool.c:178
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1172,11 +1189,11 @@ msgstr ""
 "De�er t�r� bir ayarlama ya da bir �ema a��klamas� olarak belirtilir. "
 "K�saltmalar e�sizse kabul edilir."
 
-#: gconf/gconftool.c:178
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr "tam|mant�k|ger�ek|dizge|liste|�ift"
 
-#: gconf/gconftool.c:186
+#: gconf/gconftool.c:187
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1184,11 +1201,11 @@ msgstr ""
 "Liste t�r� bir ayarlama ya da bir �ema a��klamas� olarak belirtilir. "
 "K�saltmalar e�sizse kabul edilir."
 
-#: gconf/gconftool.c:187 gconf/gconftool.c:196 gconf/gconftool.c:205
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr "tam|mant�k|ger�ek|dizge"
 
-#: gconf/gconftool.c:195
+#: gconf/gconftool.c:196
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1196,7 +1213,7 @@ msgstr ""
 "car �iftinin t�r� bir ayarlama ya da bir �ema a��klamas� olarak belirtilir. "
 "K�saltmalar e�sizse kabul edilir."
 
-#: gconf/gconftool.c:204
+#: gconf/gconftool.c:205
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1204,43 +1221,43 @@ msgstr ""
 "cdr �iftinin t�r� bir ayarlama ya da bir �ema a��klamas� olarak belirtilir. "
 "K�saltmalar e�sizse kabul edilir."
 
-#: gconf/gconftool.c:213
+#: gconf/gconftool.c:214
 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:214 gconf/gconftool.c:223
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr "A�IKLAMA"
 
-#: gconf/gconftool.c:222
+#: gconf/gconftool.c:223
 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:231
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr "�ema sahibi belirtilir"
 
-#: gconf/gconftool.c:232
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr "SAH�B�"
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr "Y�kl� olan bir �ema dosyas� belirtilir"
 
-#: gconf/gconftool.c:241
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr "DOSYA�SM�"
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "�ntan�ml� dosya yolu d���nda bir yap�land�rma kayna�� belirtilir"
 
-#: gconf/gconftool.c:250
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr "KAYNAK"
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1248,7 +1265,7 @@ msgstr ""
 "Sunucuyu a�arak yap�land�rma veritaban�na do�rudan eri�ir. gconfd etkin "
 "olmad���nda gereklidir."
 
-#: gconf/gconftool.c:267
+#: gconf/gconftool.c:268
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1259,7 +1276,7 @@ msgstr ""
 "yap�land�rma kayna��na ya da �ntan�ml� kullan�lmak �zere bir bo� dizgeye "
 "ayarlanm�� olmal�d�r."
 
-#: gconf/gconftool.c:276
+#: gconf/gconftool.c:277
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1268,70 +1285,71 @@ msgstr ""
 "uygulayarak ve kald�rarak bir uygulaman�n deneme yan�lma usul� testleri "
 "yap�l�r."
 
-#: gconf/gconftool.c:285
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
-"Komut sat�r�ndan kullan�larak, dizinlerin i�indeki anahtarlar�n bir "
-"k�mesini uygulayarak ve kald�rarak bir uygulaman�n deneme yan�lma "
-"usul� testleri yap�l�r."
+"Komut sat�r�ndan kullan�larak, dizinlerin i�indeki anahtarlar�n bir k�mesini "
+"uygulayarak ve kald�rarak bir uygulaman�n deneme yan�lma usul� testleri "
+"yap�l�r."
 
-#: gconf/gconftool.c:294
+#: gconf/gconftool.c:295
 msgid "Get the short doc string for a key"
 msgstr "Bir anahtar i�in k�sa a��klama dizgesi al�n�r"
 
-#: gconf/gconftool.c:303
+#: gconf/gconftool.c:304
 msgid "Get the long doc string for a key"
 msgstr "Bir anahtar i�in uzun a��klama dizgesi al�n�r"
 
-#: gconf/gconftool.c:312
+#: gconf/gconftool.c:313
 msgid "Get the name of the schema applied to this key"
 msgstr "Bu anahtara uygulanan �eman�n ismi al�n�r"
 
-#: gconf/gconftool.c:321
+#: gconf/gconftool.c:322
 msgid "Specify the schema name followed by the key to apply the schema name to"
-msgstr "�ema ismine uygulanacak anahtar taraf�ndan izlenen �ema ismi belirtilir"
+msgstr ""
+"�ema ismine uygulanacak anahtar taraf�ndan izlenen �ema ismi belirtilir"
 
-#: gconf/gconftool.c:330
+#: gconf/gconftool.c:331
 msgid "Get the name of the default source"
 msgstr "�ntan�ml� kayna��n ismi al�n�r"
 
-#: gconf/gconftool.c:382
+#: gconf/gconftool.c:386
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "%s se�ene�inde hata: %s\n"
-"Kullan�labilecek komut sat�r� se�eneklerinin tam listesini almak i�in "
-"'%s --help' �al��t�r�n.\n"
+"Kullan�labilecek komut sat�r� se�eneklerinin tam listesini almak i�in '%s --"
+"help' �al��t�r�n.\n"
 
-#: gconf/gconftool.c:394
+#: gconf/gconftool.c:398
 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:401
+#: gconf/gconftool.c:405
 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:409
+#: gconf/gconftool.c:413
 msgid "Can't use --all-entries with --get or --set\n"
 msgstr "--all-entries se�ene�i ile --get veya --set birlikte kullan�lamaz.\n"
 
-#: gconf/gconftool.c:417
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "--all-dirs se�ene�i ile --get veya --set birlikte kullan�lamaz.\n"
 
-#: gconf/gconftool.c:427
+#: gconf/gconftool.c:431
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-"
 "entries, or --all-dirs\n"
 msgstr ""
-"--recursive-list se�ene�i ile --get, --set, --unset, --all-entries ya da --all-dirs "
-"birlikte kullan�lamaz.\n"
+"--recursive-list se�ene�i ile --get, --set, --unset, --all-entries ya da --"
+"all-dirs birlikte kullan�lamaz.\n"
 
-#: gconf/gconftool.c:437
+#: gconf/gconftool.c:441
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
@@ -1339,57 +1357,58 @@ msgstr ""
 "--set_schema se�ene�i ile --get, --set, --unset, --all-entries, --all-dirs "
 "birlikte kullan�lamaz.\n"
 
-#: gconf/gconftool.c:443
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr "De�er t�r� sadece bir de�er belirtildi�inde amaca uygundur\n"
 
-#: gconf/gconftool.c:449
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr "Bir de�er ile bir de t�r belirtilmelidir.\n"
 
-#: gconf/gconftool.c:459
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping se�ene�i tek ba��na kullan�labilir.\n"
 
-#: gconf/gconftool.c:469
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists se�ene�i tek ba��na kullan�labilir.\n"
 
-#: gconf/gconftool.c:479
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file se�ene�i tek ba��na kullan�labilir.\n"
 
-#: gconf/gconftool.c:490
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule se�ene�i tek ba��na kullan�labilir.\n"
 
-#: gconf/gconftool.c:501
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key se�ene�i tek ba��na kullan�labilir.\n"
 
-#: gconf/gconftool.c:512
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory se�ene�i tek ba��na kullan�labilir.\n"
 
-#: gconf/gconftool.c:519
-msgid "You must specify a config source with --config-source when using --direct\n"
+#: gconf/gconftool.c:523
+msgid ""
+"You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "--direct se�ene�ini kullan�rken --config-source se�ene�i ile bir "
 "yap�land�rma kayna�� belirtmelisiniz\n"
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf ba�lat�lamad�: %s\n"
 
-#: gconf/gconftool.c:550
+#: gconf/gconftool.c:554
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE �evre de�i�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:565
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1401,380 +1420,385 @@ msgstr ""
 "�al��mazken daha g�venlidir.\n"
 "(teorik olarak uygulamalar �al���rken baz� ba�ka �eyler de �al���r).\n"
 
-#: gconf/gconftool.c:587
+#: gconf/gconftool.c:591
 #, 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:798
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Kapanma hatas�: %s\n"
 
-#: gconf/gconftool.c:841
+#: gconf/gconftool.c:845
 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:875
+#: gconf/gconftool.c:879
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "`%s' i�inde girdiler listelenemedi: %s\n"
 
-#: gconf/gconftool.c:893
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr "(belirtilmi� de�er yok)"
 
-#: gconf/gconftool.c:948
+#: gconf/gconftool.c:952
 #, 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:962
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr "Al�nacak anahtar ya da anahtarlar belirtilmelidir.\n"
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "T�r: %s\n"
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Liste T�r�: %s\n"
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car T�r�: %s\n"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr T�r�: %s\n"
 
-#: gconf/gconftool.c:1005
+#: gconf/gconftool.c:1009
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "�ntan�ml� De�er: %s\n"
 
-#: gconf/gconftool.c:1005 gconf/gconftool.c:1007 gconf/gconftool.c:1008
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr "Tan�ms�z"
 
-#: gconf/gconftool.c:1007
+#: gconf/gconftool.c:1011
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Sahibi: %s\n"
 
-#: gconf/gconftool.c:1008
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "�zet: %s\n"
 
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "A��klama: %s\n"
 
-#: gconf/gconftool.c:1018 gconf/gconftool.c:1312
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "%s i�in belirtilmi� bir de�er yok\n"
 
-#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "`%s' i�in de�er al�namad�: %s\n"
 
-#: gconf/gconftool.c:1065 gconf/gconftool.c:1077
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "`%s' t�r� anla��lamad�\n"
 
-#: gconf/gconftool.c:1089
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Arg�man olarak de�i�ik anahtarlar/de�erler belirtilmelidir\n"
 
-#: gconf/gconftool.c:1109
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Anahtar i�in belirtilmi� bir de�er yok: %s\n"
 
-#: gconf/gconftool.c:1137
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr "Bir de�er olarak �ema belirtilemez\n"
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1151
 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:1161
-msgid "When setting a pair you must specify a primitive car-type and cdr-type\n"
+#: gconf/gconftool.c:1165
+msgid ""
+"When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "Bir �ifti ayarlarken bir temel car t�r� ve cdr t�r� belirtmelisiniz\n"
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "Hata: %s\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1193
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "De�er belirlenirken hata: %s\n"
 
-#: gconf/gconftool.c:1207
+#: gconf/gconftool.c:1211
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "E�zamanlamada hata: %s\n"
 
-#: gconf/gconftool.c:1230
+#: gconf/gconftool.c:1234
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Komut sat�r�nda anahtar ya da anahtarlar belirtilmelidir.\n"
 
-#: gconf/gconftool.c:1250
+#: gconf/gconftool.c:1254
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "`%s' i�in bilinen bir �ema yok\n"
 
-#: gconf/gconftool.c:1283
+#: gconf/gconftool.c:1287
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "'%s' de �ema i�inde a��klama dizgesi yok\n"
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1292
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "`%s' de �ema al�n�rken hata: %s\n"
 
-#: gconf/gconftool.c:1295
+#: gconf/gconftool.c:1299
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "`%s' de kay�tl� �ema yok\n"
 
-#: gconf/gconftool.c:1298
+#: gconf/gconftool.c:1302
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "'%s' deki de�er bir �ema de�il\n"
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1358
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr "Uygulanacak anahtar ismiyle izlenen bir �ema ismi belirtilmelidir\n"
 
-#: gconf/gconftool.c:1361
+#: gconf/gconftool.c:1365
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "UYARI: `%s' �emas� `%s' anahtar� ile ili�kilendirilirken hata: %s\n"
 
-#: gconf/gconftool.c:1381
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Tek arg�man olarak anahtar (�ema ismi) belirtilmelidir\n"
 
-#: gconf/gconftool.c:1423
+#: gconf/gconftool.c:1427
 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�ek say� ya da "
 "mant�ksal\n"
 
-#: gconf/gconftool.c:1443
+#: gconf/gconftool.c:1447
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Car �ifti t�r� bir temel t�r olmal�d�r: dizge, tamsay�, ger�ek say� ya da "
 "mant�ksal\n"
 
-#: gconf/gconftool.c:1463
+#: gconf/gconftool.c:1467
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Cdr �ifti t�r� bir temel t�r olmal�d�r: dizge, tamsay�, ger�ek say� ya da "
 "mant�ksal\n"
 
-#: gconf/gconftool.c:1478
+#: gconf/gconftool.c:1482
 #, c-format
 msgid "Error setting value: %s"
 msgstr "De�er belirlenirken hata: %s"
 
-#: gconf/gconftool.c:1492
+#: gconf/gconftool.c:1496
 #, c-format
 msgid "Error syncing: %s"
 msgstr "E�zamanlamada hata: %s"
 
-#: gconf/gconftool.c:1507
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "anahtar/de�er �iftinin al�naca�� bir ya da daha fazla dizin "
 "belirtilmelidir.\n"
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Kald�r�lacak anahtarlar belirtilmelidir.\n"
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "`%s' kald�r�l�rken hata: %s\n"
 
-#: gconf/gconftool.c:1555
+#: gconf/gconftool.c:1559
 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:1589
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Dizinler listelenirken hata: %s\n"
 
-#: gconf/gconftool.c:1631
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "UYARI: �ema (%s) i�in type ge�ersiz ya da verilmemi�\n"
 
-#: gconf/gconftool.c:1640
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "UYARI: �ema (%s) i�in list_type ge�ersiz ya da verilmemi�\n"
 
-#: gconf/gconftool.c:1651 gconf/gconftool.c:1681 gconf/gconftool.c:1710
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "UYARI: �ntan�ml� `%s' de�eri �ema (%s) i�in ayr��t�r�lamad�\n"
 
-#: gconf/gconftool.c:1669
+#: gconf/gconftool.c:1673
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
-msgstr "UYARI: �ema (%s) i�in car_type ya da cdr_type ge�ersiz ya da verilmemi�\n"
+msgstr ""
+"UYARI: �ema (%s) i�in car_type ya da cdr_type ge�ersiz ya da verilmemi�\n"
 
-#: gconf/gconftool.c:1694
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "UYARI: Bir �ntan�ml� de�er bir �ema i�in belirtilemez\n"
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "UYARI: gconftoool hatas� GConfValueType bilinmiyor\n"
 
-#: gconf/gconftool.c:1770 gconf/gconftool.c:1791 gconf/gconftool.c:1812
-#: gconf/gconftool.c:1833
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, 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:1787
+#: gconf/gconftool.c:1791
 #, 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 ""
 "UYARI: list_type sadece tamsay�, ger�ek say�, dizge ya da mant�ksal de�er "
 "olabilir, %s de�il\n"
 
-#: gconf/gconftool.c:1808
+#: gconf/gconftool.c:1812
 #, 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�ek say�, dizge ya da mant�ksal de�er "
 "olabilir, %s de�il\n"
 
-#: gconf/gconftool.c:1829
+#: gconf/gconftool.c:1833
 #, 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�ek say�, dizge ya da mant�ksal de�er "
 "olabilir, %s de�il\n"
 
-#: gconf/gconftool.c:1857
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr "UYARI: bo� <applyto> d���m�"
 
-#: gconf/gconftool.c:1860 gconf/gconftool.c:2123
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, 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:1870
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr "UYARI: �ema i�in belirtilmi� bir anahtar yok\n"
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "UYARI: <locale> d���m� `name=\"konum\"' diye bir niteleyiciye sahip de�il, "
 "yoksay�ld�\n"
 
-#: gconf/gconftool.c:1909
+#: gconf/gconftool.c:1913
 #, 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 ""
 "UYARI: `%s' konumu i�in �ok say�da <locale> d���m�, ilkinden sonrakiler "
 "yoksay�ld�\n"
 
-#: gconf/gconftool.c:1990
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "UYARI: Bir <locale> d���m�nde ge�ersiz <%s> d���m� var\n"
 
-#: gconf/gconftool.c:2019
+#: gconf/gconftool.c:2023
 #, 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:2027
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "`%s' konumu i�in `%s' �emas� y�klendi\n"
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2053
 #, 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:2057
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "`%s' �emas� `%s' anahtar�na ili�tirildi\n"
 
-#: gconf/gconftool.c:2136
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Bir <schema> i�inde en az bir <locale> girdisi olmal�d�r\n"
 
-#: gconf/gconftool.c:2165
+#: gconf/gconftool.c:2169
 #, 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:2187
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "`%s' a��lamad�: %s\n"
 
-#: gconf/gconftool.c:2194
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Belge %s bo� mu?\n"
 
-#: gconf/gconftool.c:2206
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
-msgstr "Belge %s k�k d���mde yanl�� t�r i�eriyor (<%s>, <gconfschemafile> olmal�)\n"
+msgstr ""
+"Belge %s k�k d���mde yanl�� t�r i�eriyor (<%s>, <gconfschemafile> olmal�)\n"
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Belge `%s' bir �st d�zey <gconfschemafile> d���m� i�ermiyor\n"
 
-#: gconf/gconftool.c:2233
+#: gconf/gconftool.c:2237
 #, 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:2244 gconf/gconftool.c:2276
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Yap�land�rma verisini e�zamanlarken hata: %s"
 
-#: gconf/gconftool.c:2260
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr "Y�klenecek �ema dosyalar� belirtilmeli\n"
 
-#: gconf/gconftool.c:2297
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -1783,16 +1807,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2317
+#: gconf/gconftool.c:2321
 #, 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:2443
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr "K�r�lacak anahtarlar belirtilmeli\n"
 
-#: gconf/gconftool.c:2449
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1801,11 +1825,11 @@ msgstr ""
 "Uygulaman�z anahtara hatal� de�erler atayarak k�rmaya �al���yor:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2467
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr "K�r�lacak dizinler belirtilmeli\n"
 
-#: gconf/gconftool.c:2486
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1816,18 +1840,17 @@ msgstr ""
 "�al���yor:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
 #, c-format
 msgid "GConf Error: %s\n"
 msgstr "GConf Hatas�: %s\n"
 
-#: wrappers/gtk/gconf-client.c:795
+#: gconf/gconf-client.c:798
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf uyar�s�: `%s' i�indeki �iftlerin listelenmesi ba�ar�s�z oldu: %s"
 
-#: wrappers/gtk/gconf-client.c:997
+#: gconf/gconf-client.c:1000
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "`%s' olmal�yd�, `%s' al�nd� (%s anahtar� i�in)"
-
diff --git a/po/uk.po b/po/uk.po
index c96967b8..22754614 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2000-09-14 22:20-0400\n"
+"POT-Creation-Date: 2001-09-14 12:44-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,6 +13,35 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: backends/bdb-backend.c:215
+msgid "Unloading BerkeleyDB (BDB) backend module."
+msgstr "������������ ���������� ������ BerkeleyDB (BDB)."
+
+#: backends/bdb-backend.c:238
+#, c-format
+msgid "Opened BerkeleyDB source at root %s"
+msgstr ""
+
+#: backends/bdb-backend.c:578
+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."
@@ -22,11 +51,6 @@ 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'"
@@ -42,7 +66,7 @@ msgstr ""
 msgid "Initializing XML backend module"
 msgstr "�Φæ�̦��æ� ���������� ������ XML"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:748
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "�� ������� ����� ���������� � �������� XML \"%s\": %s"
@@ -51,18 +75,18 @@ msgstr "�� ������� ����� ���������� � �������� XML \"%s\": %s"
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 
-#: backends/xml-cache.c:228
+#: backends/xml-cache.c:229
 #, 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:253
+#: backends/xml-cache.c:256
 #, 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
@@ -75,163 +99,161 @@ msgstr "�� ������� �������� ���������Ԧ \"%s\": %s"
 msgid "XML filename `%s' is a directory"
 msgstr "����� ����� XML \"%s\" - �������"
 
-#: backends/xml-dir.c:293 backends/xml-dir.c:300
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "�� ������� ������ \"%s\": %s"
 
-#: backends/xml-dir.c:341
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "�� ������� �������� ���� \"%s\": %s"
 
-#: backends/xml-dir.c:357 backends/xml-dir.c:367
+#: backends/xml-dir.c:359
+#, fuzzy, c-format
+msgid "Failed to set mode on `%s': %s"
+msgstr "�� ������� צ������ \"%s\": %s\n"
+
+#: backends/xml-dir.c:373 backends/xml-dir.c:383
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "�� ������� ������������� \"%s\" � \"%s\": %s"
 
-#: backends/xml-dir.c:373
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "�� ������� צ������� \"%s\" � \"%s\": %s"
 
-#: backends/xml-dir.c:385
+#: backends/xml-dir.c:401
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "�� ������� ������ ������ ���� \"%s\": %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:788
+#: backends/xml-dir.c:806
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "�� ������� �������� ���������Ԧ \"%s\": %s"
 
-#: backends/xml-dir.c:932
+#: backends/xml-dir.c:950
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "���������� ��������� \"%s\" � \"%s\", ��Ϧ���������"
 
-#: backends/xml-dir.c:954
+#: backends/xml-dir.c:972
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "��������� ��� ����� � ���̦ XML \"%s\", ��Ϧ���������"
 
-#: backends/xml-dir.c:961
+#: backends/xml-dir.c:979
 #, c-format
 msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
 msgstr "����� ��������� Ҧ��� � ���̦ XML \"%s\" �� <entry>, ��Ϧ���������"
 
-#: backends/xml-dir.c:1049
+#: backends/xml-dir.c:1067
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "�� ������� �������� ���� \"%s\": %s"
 
-#: backends/xml-dir.c:1057 gconf/gconf-internals.c:2468
+#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2437
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "�� ������� ������� ���� \"%s\": %s"
 
 #. There was an error
-#: backends/xml-entry.c:148
+#: backends/xml-entry.c:150
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "��Ϧ��������� ����� XML � ������ \"%s\": %s"
 
-#: backends/xml-entry.c:199 gconf/gconf-internals.c:2172
+#: backends/xml-entry.c:201
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: backends/xml-entry.c:326
+#: backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "����������� ����� ����� \"%s\", �������: %s"
 
-#. FIXME for nodes with no value stored, but containing a schema name,
-#. * we improperly log an error here
-#.
-#: backends/xml-entry.c:372
-#, c-format
-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 ""
+#: backends/xml-entry.c:376
+#, fuzzy, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "��Ϧ��������� ����� XML � ������ \"%s\": %s"
 
-#: backends/xml-entry.c:721
+#: backends/xml-entry.c:727
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "������� ��������� �������� �������� �����: %s"
 
-#: backends/xml-entry.c:930
+#: backends/xml-entry.c:941
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "����� �������� \"type\" � ���̦ <%s>"
 
-#: backends/xml-entry.c:944
+#: backends/xml-entry.c:955
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "����� ��� ��צ����� ������� \"type\" - \"%s\", ��Ϧ���������"
 
-#: backends/xml-entry.c:959
+#: backends/xml-entry.c:970
 msgid "No \"value\" attribute for node"
 msgstr "����� �������� \"value\" � ���̦"
 
-#: backends/xml-entry.c:1007 backends/xml-entry.c:1083
+#: backends/xml-entry.c:1018 backends/xml-entry.c:1094
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "�������ͦ��� ����� XML <%s> � ���̦ ������ XML"
 
-#: backends/xml-entry.c:1041
+#: backends/xml-entry.c:1052
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "��צ���� ��� (������, ���� �� ��צ�����) � ���̦ ������"
 
-#: backends/xml-entry.c:1064
+#: backends/xml-entry.c:1075
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "��צ���� ����� XML: %s"
 
-#: backends/xml-entry.c:1072
+#: backends/xml-entry.c:1083
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "������ ͦ����� ������ �������� ����� (%s ��ͦ��� %s)"
 
 # car - ������ ������� ������
 # cdr - ������ ��� ������� ��������
-#: backends/xml-entry.c:1124
+#: backends/xml-entry.c:1135
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "����������� ��צ����� CAR � ���� XML: %s"
 
-#: backends/xml-entry.c:1133 backends/xml-entry.c:1156
+#: backends/xml-entry.c:1144 backends/xml-entry.c:1167
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "���̦� ����� XML: ������ � ���� �� ������ ���� ���ͦ��Φ �������Φ ����"
 
-#: backends/xml-entry.c:1146
+#: backends/xml-entry.c:1157
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "����������� ��צ����� CDR � ���� XML: %s"
 
-#: backends/xml-entry.c:1165
+#: backends/xml-entry.c:1176
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "�������ͦ��� ����� XML <%s> � ���̦ ���� XML"
 
-#: backends/xml-entry.c:1183
+#: backends/xml-entry.c:1194
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "�� �������� CAR � CDR ��� ����� ���� XML"
 
-#: backends/xml-entry.c:1189
+#: backends/xml-entry.c:1200
 msgid "Missing cdr from pair of values in XML file"
 msgstr "������Τ �������� CDR � ���� � ���̦ XML"
 
-#: backends/xml-entry.c:1196
+#: backends/xml-entry.c:1207
 msgid "Missing car from pair of values in XML file"
 msgstr "������Τ �������� CAR � ��Ҧ � ���̦ XML"
 
-#: backends/xml-entry.c:1201
+#: backends/xml-entry.c:1212
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "������Φ �������� CAR � CDR � ��Ҧ � ���̦ XML"
 
@@ -264,28 +286,28 @@ msgstr "�� ������� ������ ��������� ������ ��� \"%s\""
 msgid "Failed to shut down backend"
 msgstr "�� ������� צ�������� ������"
 
-#: gconf/gconf-database.c:193
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr "�������� ��צ��� �������� � ����Ԧ"
 
-#: gconf/gconf-database.c:201
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 
-#: gconf/gconf-database.c:416
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr "�������� ����� �� �������� �Ӧ� ��������� �����"
 
-#: gconf/gconf-database.c:430
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr ""
 
-#: gconf/gconf-database.c:495
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr ""
 
-#: gconf/gconf-database.c:617
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "�� ������� ������Φ������ ���� �� ¦���� ������: %s"
@@ -294,7 +316,7 @@ msgstr "�� ������� ������Φ������ ���� �� ¦���� ������: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:699
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -302,59 +324,59 @@ msgid ""
 "configuration changes."
 msgstr ""
 
-#: gconf/gconf-database.c:724
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "������� � ������Ʀ������� %lu �� ���դ"
 
-#: gconf/gconf-database.c:733
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:838 gconf/gconf-sources.c:1189
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "������� ��������� �������� \"%s\": %s"
 
-#: gconf/gconf-database.c:875
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "������� ������������ �������� ��� \"%s\": %s"
 
-#: gconf/gconf-database.c:910
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "������� ������ �������� \"%s\": %s"
 
-#: gconf/gconf-database.c:931
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "������� ��������� �������� �������� \"%s\": %s"
 
-#: gconf/gconf-database.c:969
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "������� ����צ���� �������Ԧ \"%s\": %s"
 
-#: gconf/gconf-database.c:993
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "������� ��������� �������� \"%s\": %s"
 
-#: gconf/gconf-database.c:1019
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "��������� �������� �Ӧ �������� � \"%s\": %s"
 
-#: gconf/gconf-database.c:1045
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "������� ��������� ������ �������� � \"%s\": %s"
 
-#: gconf/gconf-database.c:1066
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "������ ��������� ����� ��� \"%s\": %s"
@@ -419,208 +441,29 @@ msgstr "�����æ� �� �������� ��� ���Ʀ����æ����� �������"
 msgid "Failed to get a lock"
 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-error.c:40
+msgid "No database available to save your configuration"
+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
+#: gconf/gconf-internals.c:86
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "����� \"/\" � ���ަ \"%s\""
 
-#: gconf/gconf-internals.c:249
+#: gconf/gconf-internals.c:250
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "�� ������� �������������� CORBA-�������� �������� ������"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:252
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "����������� ��� �������� ������ � %s"
 
-#: gconf/gconf-internals.c:264
+#: gconf/gconf-internals.c:265
 msgid "Received list from gconfd with a bad list type"
 msgstr "��� gconfd �������� ������ � ������� ����� ������"
 
-#: gconf/gconf-internals.c:445
+#: gconf/gconf-internals.c:447
 msgid "Failed to convert object to IOR"
 msgstr "�� ������� ����������� ��'��� � IOR"
 
@@ -629,178 +472,196 @@ msgstr "�� ������� ����������� ��'��� � IOR"
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "�� ������� צ������ ���� ����� \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:866
+#: gconf/gconf-internals.c:860
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "��������� ������� \"%s\"\n"
 
-#: gconf/gconf-internals.c:878
+#: gconf/gconf-internals.c:872
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "������� ���������� � ����� \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:1320
+#: gconf/gconf-internals.c:1295
 #, c-format
 msgid "Expected list, got %s"
 msgstr "�ަ������� ������, �������� %s"
 
-#: gconf/gconf-internals.c:1330
+#: gconf/gconf-internals.c:1305
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "���������� ������ %s, �������� ������ %s"
 
-#: gconf/gconf-internals.c:1469
+#: gconf/gconf-internals.c:1444
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "�ަ�������� ����, �������� %s"
 
-#: gconf/gconf-internals.c:1483
+#: gconf/gconf-internals.c:1458
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "�ަ�������� ���� (%s,%s), �������� ���� � ��צ����� ����� ��� ����� "
 "����������"
 
-#: gconf/gconf-internals.c:1499
+#: gconf/gconf-internals.c:1474
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "�ަ�������� ���� ���� (%s,%s) �������� ���� (%s,%s)"
 
-#: gconf/gconf-internals.c:1615
+#: gconf/gconf-internals.c:1590
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "����� � ������ �� ����������� � �����"
 
-#: gconf/gconf-internals.c:1677
+#: gconf/gconf-internals.c:1652
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "����� � ������ �� ˦�������� ������"
 
-#: gconf/gconf-internals.c:2157 gconf/gconf.c:2751
+#: gconf/gconf-internals.c:2132 gconf/gconf.c:3092
 #, c-format
 msgid "CORBA error: %s"
 msgstr "������� CORBA: %s"
 
-#: gconf/gconf-internals.c:2177
+#: gconf/gconf-internals.c:2148
+#, fuzzy, c-format
+msgid "bonobo-activation problem description: '%s'"
+msgstr "���� �������� OAF: \"%s\""
+
+#: gconf/gconf-internals.c:2154
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "������ �������� ���������� � ������ ������� ��'��Ԧ� OAF"
 
-#: gconf/gconf-internals.c:2182
+#: gconf/gconf-internals.c:2159
 msgid "attempt to add already-listed OAF directory"
 msgstr "������ ������ ��� �������� � ������ ������� OAF"
 
-#: gconf/gconf-internals.c:2189
+#: gconf/gconf-internals.c:2166
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "������� ���̦�� OAF: %s"
 
-#: gconf/gconf-internals.c:2194
+#: gconf/gconf-internals.c:2171
 msgid "Unknown OAF error"
 msgstr "��צ���� ������� OAF"
 
-#: gconf/gconf-internals.c:2277
+#: gconf/gconf-internals.c:2233
 #, c-format
 msgid "No ior file in `%s'"
 msgstr "��צ���� ���� ior � \"%s\""
 
-#: gconf/gconf-internals.c:2308
+#: gconf/gconf-internals.c:2264
 #, c-format
 msgid "gconfd taking lock `%s' from some other process"
 msgstr "gconfd ���������� \"%s\" צ� ������ ����� �����Ӧ�"
 
-#: gconf/gconf-internals.c:2319
+#: gconf/gconf-internals.c:2275
 #, c-format
 msgid "Another program has lock `%s'"
 msgstr "���� �������� ����������� \"%s\""
 
-#: gconf/gconf-internals.c:2339
+#: gconf/gconf-internals.c:2294
 msgid "couldn't contact ORB to ping existing gconfd"
 msgstr "�� ������� �'�������� � ORB ��� ���������� gconfd"
 
-#: gconf/gconf-internals.c:2347
+#: gconf/gconf-internals.c:2302
 #, c-format
 msgid ""
 "Removing stale lock `%s' because IOR couldn't be converted to object "
 "reference, IOR `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2314
 #, c-format
 msgid "Removing stale lock `%s' because of error pinging server: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2326
 #, c-format
 msgid "GConf configuration daemon (gconfd) has lock `%s'"
 msgstr "����� ���Ʀ����æ� GConf (gconfd) ���������� \"%s\""
 
-#: gconf/gconf-internals.c:2385
+#: gconf/gconf-internals.c:2340
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "�� ������� �������� ������� \"%s\": %s"
 
-#: gconf/gconf-internals.c:2420
+#: gconf/gconf-internals.c:2389
 #, c-format
 msgid "Can't create lock `%s': %s"
 msgstr "��������� �������� ���������� \"%s\": %s"
 
-#: gconf/gconf-internals.c:2456
+#: gconf/gconf-internals.c:2425
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "��������� �������� � ���� \"%s\": %s"
 
-#: gconf/gconf-internals.c:2499
+#: gconf/gconf-internals.c:2475
 #, c-format
 msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2516
+#: gconf/gconf-internals.c:2492
 #, c-format
 msgid "Corrupt lock file `%s', removing anyway"
 msgstr "���������� ���� ���������� \"%s\", ��������� ���������"
 
-#: gconf/gconf-internals.c:2526
+#: gconf/gconf-internals.c:2502
 #, 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:2543
+#: gconf/gconf-internals.c:2519
 #, c-format
 msgid "Failed to release lock directory `%s': %s"
 msgstr "�� ������� �צ������ ������������ ������� \"%s\": %s"
 
-#: gconf/gconf-sources.c:318
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "������� ������������ ������� \"%s\": %s"
 
-#: gconf/gconf-sources.c:490
+#: gconf/gconf-sources.c:510
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "����� \"%s\" ������� ��� \"%s\" ���Ҧ��� ��������, �� �� � ������"
 
-#: gconf/gconf-sources.c:539
+#: gconf/gconf-sources.c:567
 msgid "The '/' name can only be a directory, not a key"
 msgstr "����� \"/\" ���� ���� ���� ���������, � �� ������"
 
-#: gconf/gconf-sources.c:568
+#: gconf/gconf-sources.c:596
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path."
 msgstr ""
 
-#: gconf/gconf-sources.c:1063
+#: 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) "
+"bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
+msgstr ""
+
+#: gconf/gconf-sources.c:1164
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "������� ������ ������������æ�: %s"
 
-#: gconf/gconf-sources.c:1128
+#: gconf/gconf-sources.c:1233
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "������� ��������� �����������æ�: %s"
 
-#: gconf/gconf-sources.c:1152
+#: gconf/gconf-sources.c:1257
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -871,87 +732,90 @@ msgstr ""
 msgid "`%s': %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:288
+#: gconf/gconf.c:289
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "������ �� �ͦ� ���Ц����� ������ \"%s\""
 
-#: gconf/gconf.c:542
+#: gconf/gconf.c:574
 msgid "Can't add notifications to a local configuration source"
 msgstr "��������� �������� �צ���� �� ���������� ������� ���Ʀ����æ�"
 
-#: gconf/gconf.c:1597
+#: gconf/gconf.c:1870
 #, fuzzy, c-format
-msgid "Pinging the server failed, CORBA error: %s"
+msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "�� ������� ������ �̦�������� ������ �� ����������, ������� CORBA: %s"
 
-#: gconf/gconf.c:1613
+#: gconf/gconf.c:1887
 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."
+"Error contacting configuration server: bonobo-activation returned nil from "
+"bonobo_activation_activate_from_id() and did not set an exception explaining "
+"the problem. This is a bug in the bonobo-activation package; something went "
+"wrong in bonobo-activation, 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 bonobo-activation that was caused by GConf."
 msgstr ""
 
-#: gconf/gconf.c:1880
+#: gconf/gconf.c:2198
 msgid "Failed to init GConf, exiting\n"
 msgstr "�� ������� �Φæ�̦������ GConf: %s, ��Ȧ�\n"
 
-#: gconf/gconf.c:1917
+#: gconf/gconf.c:2235
 msgid "Must begin with a slash (/)"
 msgstr "������ ���������� � \"/\""
 
-#: gconf/gconf.c:1939
+#: gconf/gconf.c:2257
 msgid "Can't have two slashes (/) in a row"
 msgstr "�� ���� ���� ��� \"/\" � �����"
 
-#: gconf/gconf.c:1941
+#: gconf/gconf.c:2259
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "�� ���� ���� ������ ��� \"/\""
 
-#: gconf/gconf.c:1962
+#: gconf/gconf.c:2280
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "\"%c\" - ��צ���� ������ � ���צ ���ަ�/������Ǧ�"
 
-#: gconf/gconf.c:1976
+#: gconf/gconf.c:2294
 msgid "Key/directory may not end with a slash (/)"
 msgstr "����/������� �� ���� ��˦��������� ������ (/)"
 
-#: gconf/gconf.c:2223
+#: gconf/gconf.c:2547
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "��������� צ�������� ������ ���Ʀ����æ�: %s"
 
-#: gconf/gconf.c:2284
+#: gconf/gconf.c:2608
 #, c-format
 msgid "Expected float, got %s"
 msgstr "�ަ�������� ����� � ��������� ������, �������� %s"
 
-#: gconf/gconf.c:2319
+#: gconf/gconf.c:2643
 #, c-format
 msgid "Expected int, got %s"
 msgstr "�ަ�������� æ��, �������� %s"
 
-#: gconf/gconf.c:2354
+#: gconf/gconf.c:2678
 #, c-format
 msgid "Expected string, got %s"
 msgstr "�ަ������� �����, �������� %s"
 
-#: gconf/gconf.c:2391
+#: gconf/gconf.c:2715
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "�ަ�������� ��Ǧ���, �������� %s"
 
-#: gconf/gconf.c:2424
+#: gconf/gconf.c:2748
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "�ަ�������� �����, �������� %s"
 
-#: gconf/gconfd.c:185
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "�������� ����� �� ���������� ������"
 
-#: gconf/gconfd.c:217
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -959,24 +823,31 @@ msgstr ""
 "gconfd ����������� � �������������; ������ ������������ gconf.path � "
 "�������� ��Ȧ���� ����Ԧ�"
 
-#: gconf/gconfd.c:235
+#: gconf/gconfd.c:293
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:244
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:301
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:258
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
+#: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "������� ������������ ������ ������ ���Ʀ����æ�: %s"
 
-#: gconf/gconfd.c:270
+#: gconf/gconfd.c:326
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -984,7 +855,7 @@ msgstr ""
 "������ ���������æ� �� ���� ��Ц��� ���Ц�����, ��������� ����������� �� "
 "�������� ���Ʀ����æ�Φ ��Φ"
 
-#: gconf/gconfd.c:287
+#: gconf/gconfd.c:343
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -992,99 +863,153 @@ msgstr ""
 "�� ���� ��Ц��� ���Ц����� ������ ���Ʀ����æ�, � �˦ ����� ����������, "
 "������� ���˦ �ͦ�� ���Ʀ����æ� �� �������� ��������"
 
-#: gconf/gconfd.c:312 gconf/gconfd.c:324
-#, fuzzy, c-format
-msgid "Received signal %d, shutting down."
-msgstr "�������� �ɭ��� %d, ��������� ���������� ������."
+#: gconf/gconfd.c:369
+#, c-format
+msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgstr ""
+"�������� �ɭ��� %d, ������� ����. ���� �����, ��צ����� ��� �� ������� � "
+"GConf."
 
-#: gconf/gconfd.c:329
+#: gconf/gconfd.c:385
+#, c-format
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgstr ""
+"�������� �ɭ��� %d, ����������� ���������� ������. ���� �����, ��צ����� ��� "
+"�� �������."
+
+#: gconf/gconfd.c:402
 #, 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:376
+#: gconf/gconfd.c:519
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "������ (���Ӧ� %s), ������ %u ����������� \"%s\""
 
-#: gconf/gconfd.c:380
-msgid "GConf was built with debugging features enabled"
-msgstr ""
-
-#: gconf/gconfd.c:403
+#: gconf/gconfd.c:546
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 
-#: gconf/gconfd.c:423
+#: gconf/gconfd.c:566
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:443
+#: gconf/gconfd.c:579
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "�� ������� �������� ���� \"%s\": %s"
+
+#. Bad hack alert - register the current lockholder with bonobo-activation-server,
+#. * since bonobo-activation-server seems to have forgotten about us.
+#.
+#: gconf/gconfd.c:594
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon: %s"
+msgstr "�� ������� �������� IOR ��� �̦����: %s"
+
+#: gconf/gconfd.c:600
+msgid ""
+"Registering existing server with bonobo-activation-server, since we seem to "
+"have been leaked"
+msgstr ""
+
+#: gconf/gconfd.c:609
 msgid ""
 "OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
+"register existing server."
 msgstr ""
 
-#: gconf/gconfd.c:447
-msgid "Another gconfd already registered with OAF; exiting\n"
+#: gconf/gconfd.c:613
+#, fuzzy
+msgid ""
+"Another gconfd already registered with OAF, so we can't register the "
+"existing server"
 msgstr "����� gconf ��� ���Ť�������� � OAF; ��Ȧ�\n"
 
-#: gconf/gconfd.c:452
-msgid "Unknown error registering gconfd with OAF; exiting\n"
+#: gconf/gconfd.c:618
+#, fuzzy
+msgid "Unknown error registering existing gconfd with OAF; exiting"
 msgstr "��צ���� ������� �Ť����æ� gconfd �� OAF; ��Ȧ�\n"
 
-#: gconf/gconfd.c:476
+#: gconf/gconfd.c:645
+msgid ""
+"bonobo-activation doesn't know about our IID; indicates broken installation; "
+"can't register; exiting\n"
+msgstr ""
+
+#: gconf/gconfd.c:649
+#, fuzzy
+msgid "Another gconfd already registered with bonobo-activation; exiting\n"
+msgstr "����� gconf ��� ���Ť�������� � OAF; ��Ȧ�\n"
+
+#: gconf/gconfd.c:654
+#, fuzzy
+msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
+msgstr "��צ���� ������� �Ť����æ� gconfd �� OAF; ��Ȧ�\n"
+
+#: gconf/gconfd.c:698
+#, fuzzy, c-format
+msgid "Failed to release lockfile: %s"
+msgstr "�� ������� �צ������ ������������ ������� \"%s\": %s"
+
+#: gconf/gconfd.c:706
 msgid "Exiting"
 msgstr "����������"
 
-#: gconf/gconfd.c:818
+#: gconf/gconfd.c:731
+msgid "GConf server is not in use, shutting down."
+msgstr "������ GConf �� ����������դ����, ���������� ������."
+
+#: gconf/gconfd.c:1090
 #, c-format
 msgid "Returning exception: %s"
 msgstr "���������� ����������: %s"
 
-#: gconf/gconfd.c:885
+#: gconf/gconfd.c:1190
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:908
+#: gconf/gconfd.c:1225
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:966
+#: gconf/gconfd.c:1294
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "�� ������� צ������ ���� ����������� ����� \"%s\" ��� ������: %s"
 
-#: gconf/gconfd.c:980
+#: gconf/gconfd.c:1308
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "�� ������� �������� ���� ����������� ����� \"%s\", ����������: %d: %s"
 
-#: gconf/gconfd.c:989
+#: gconf/gconfd.c:1317
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "�� ������� ������� ����� ���� ����������� ����� \"%s\": %s"
 
-#: gconf/gconfd.c:1003
+#: gconf/gconfd.c:1331
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "�� ������� צ������� ������ ���� ����������� ����� \"%s\": %s"
 
-#: gconf/gconfd.c:1013
+#: gconf/gconfd.c:1341
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "�� ������� ��������� ����� ���� ����������� ����� �� ͦ���: %s"
 
-#: gconf/gconfd.c:1022
+#: gconf/gconfd.c:1350
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1092,115 +1017,108 @@ msgstr ""
 "�� ������� צ������� ��ɭ�������� ���� ����������� �����, ���� ���� "
 "���������� � \"%s\": %s"
 
-#: gconf/gconfd.c:1110
-#, fuzzy, c-format
-msgid "Didn't understand line in saved state file: '%s'"
-msgstr "�� ������� צ������ ���� ����������� �����: %s"
-
-#: gconf/gconfd.c: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
+#: gconf/gconfd.c:1823
+#, c-format
 msgid ""
-"Saved state file records the same listener added twice; ignoring the second "
-"instance"
+"Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1225
+#: gconf/gconfd.c:1869
+#, c-format
+msgid "Error reading saved state file: %s"
+msgstr "������� ���������� ����� ����������� �����: %s"
+
+#: gconf/gconfd.c:1922
+#, c-format
+msgid "Unable to open saved state file '%s': %s"
+msgstr "�� ������� צ������ ���� ����������� ����� \"%s\": %s"
+
+#: gconf/gconfd.c:2039
+#, c-format
 msgid ""
-"Saved state file had a removal of a listener that wasn't added; ignoring the "
-"removal."
+"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:1346
+#: gconf/gconfd.c:2044
 #, c-format
 msgid ""
-"Unable to restore a listener on address '%s', couldn't resolve the database"
+"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:1377
+#: gconf/gconfd.c:2067 gconf/gconfd.c:2232
 #, c-format
-msgid "Unable to open saved state file '%s': %s"
+msgid "Failed to get IOR for client: %s"
+msgstr "�� ������� �������� IOR ��� �̦����: %s"
+
+#: gconf/gconfd.c:2082
+#, fuzzy, c-format
+msgid "Failed to open saved state file: %s"
 msgstr "�� ������� צ������ ���� ����������� ����� \"%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:2095
+#, fuzzy, c-format
+msgid "Failed to write client add to saved state file: %s"
+msgstr "�� ������� ������� �̦���� � ���� ���������� �����: %s"
 
-#: gconf/gconfd.c:1481
+#: gconf/gconfd.c:2103
 #, c-format
+msgid "Failed to flush client add to saved state file: %s"
+msgstr "�� ������� ������� �̦���� � ���� ���������� �����: %s"
+
+#: gconf/gconfd.c:2193
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
 
-#: gconf/gconftool.c:62
+#: gconf/gconftool.c:69
 msgid "Help options"
 msgstr "��������� ��צ���"
 
-#: gconf/gconftool.c:71
+#: gconf/gconftool.c:78
 msgid "Set a key to a value and sync. Use with --type."
 msgstr ""
 
-#: gconf/gconftool.c:80
+#: gconf/gconftool.c:87
 msgid "Print the value of a key to standard output."
 msgstr "����������� �������� ����� � ����������� ��צ�."
 
-#: gconf/gconftool.c:89
+#: gconf/gconftool.c:96
 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:99
+#: gconf/gconftool.c:106
 msgid "Unset the keys on the command line"
 msgstr "����� �������� ���ަ� � ���������� �����"
 
-#: gconf/gconftool.c:108
+#: gconf/gconftool.c:115
 msgid "Print all key/value pairs in a directory."
 msgstr "����������� �Ӧ ���� ���ަ/�������� � ������ڦ."
 
-#: gconf/gconftool.c:117
+#: gconf/gconftool.c:124
 msgid "Print all subdirectories in a directory."
 msgstr "����������� �Ӧ Ц��������� � ������ڦ."
 
-#: gconf/gconftool.c:126
+#: gconf/gconftool.c:133
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr "����������� �Ӧ Ц��������� �� ����� �������� ����������."
 
-#: gconf/gconftool.c:135
+#: gconf/gconftool.c:142
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "��������� 0, ���� ������� ���դ -- 2, ���� Φ."
 
-#: gconf/gconftool.c:144
+#: gconf/gconftool.c:151
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "�������� gconfd. �� �������������� ��� �������� ��� ������ �������."
 
-#: gconf/gconftool.c:153
+#: gconf/gconftool.c:160
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "��������� 0, ���� gconfd �����դ���� -- 2, ���� Φ"
 
-#: gconf/gconftool.c:162
+#: gconf/gconftool.c:169
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1208,100 +1126,120 @@ msgstr ""
 "��������� ���Ʀ����æ���� ������ (gconfd). (�������� ������������ "
 "�����������, ���� ���Ҧ���.)"
 
-#: gconf/gconftool.c:171
+#: gconf/gconftool.c:178
 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:172
+#: gconf/gconftool.c:179
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:180
+#: gconf/gconftool.c:187
 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:181 gconf/gconftool.c:190 gconf/gconftool.c:199
+#: gconf/gconftool.c:188 gconf/gconftool.c:197 gconf/gconftool.c:206
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:189
+#: gconf/gconftool.c:196
 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:198
+#: gconf/gconftool.c:205
 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:207
+#: gconf/gconftool.c:214
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 
-#: gconf/gconftool.c:208 gconf/gconftool.c:217
+#: gconf/gconftool.c:215 gconf/gconftool.c:224
 msgid "DESCRIPTION"
 msgstr "����"
 
-#: gconf/gconftool.c:216
+#: gconf/gconftool.c:223
 msgid "Specify a several-line description to go in a schema."
 msgstr "������� ˦������������ ���� �� �����."
 
-#: gconf/gconftool.c:225
+#: gconf/gconftool.c:232
 msgid "Specify the owner of a schema"
 msgstr "������� �������� �����"
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:233
 msgid "OWNER"
 msgstr "�������"
 
-#: gconf/gconftool.c:234
+#: gconf/gconftool.c:241
 msgid "Specify a schema file to be installed"
 msgstr "������� ���� ����� ��� ������������"
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:242
 msgid "FILENAME"
 msgstr "����������"
 
-#: gconf/gconftool.c:243
+#: gconf/gconftool.c:250
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "������� ������� ���Ʀ����æ�, �� ��� �������� ��� ������� ������"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:251
 msgid "SOURCE"
 msgstr "�������"
 
-#: gconf/gconftool.c:252
+#: gconf/gconftool.c:259
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
 
-#: gconf/gconftool.c:261
+#: gconf/gconftool.c:268
 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:270
+#: gconf/gconftool.c:277
 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:279
+#: gconf/gconftool.c:286
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
 
-#: gconf/gconftool.c:326
+#: gconf/gconftool.c:295
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:304
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:313
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:322
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:331
+msgid "Get the name of the default source"
+msgstr ""
+
+#: gconf/gconftool.c:386
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1310,88 +1248,91 @@ msgstr ""
 "������� � �������Ҧ %s: %s.\n"
 "��������� \"%s --help\" ��� �������� ������ ������ ������� �������Ҧ�.\n"
 
-#: gconf/gconftool.c:338
+#: gconf/gconftool.c:398
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "������� ��������� �� ������������� �� ����� �������� ���������\n"
 
-#: gconf/gconftool.c:345
+#: gconf/gconftool.c:405
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "������� ������������� �� ��������� �� ����� �������� ���������\n"
 
-#: gconf/gconftool.c:353
-msgid "Can't use --all-pairs with --get or --set\n"
-msgstr "�� ����� ����������� --all-pairs � --get �� --set\n"
+#: gconf/gconftool.c:413
+#, fuzzy
+msgid "Can't use --all-entries with --get or --set\n"
+msgstr "�� ����� ����������� --all-dirs � --get �� --set\n"
 
-#: gconf/gconftool.c:361
+#: gconf/gconftool.c:421
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "�� ����� ����������� --all-dirs � --get �� --set\n"
 
-#: gconf/gconftool.c:371
+#: gconf/gconftool.c:431
+#, fuzzy
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, --all-pairs, "
-"or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
-"--recursive-list �� ����� ���� ����������� � --get, --set, --unset, "
-"--all-pairs, or --all-dirs\n"
+"--recursive-list �� ����� ���� ����������� � --get, --set, --unset, --all-"
+"pairs, or --all-dirs\n"
 
-#: gconf/gconftool.c:381
+#: gconf/gconftool.c:441
+#, fuzzy
 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-entries, --"
+"all-dirs\n"
 msgstr ""
 "--set_schema �� ����� ���� ����������� � --get, --set, --unset, --all-pairs, "
 "--all-dirs\n"
 
-#: gconf/gconftool.c:387
+#: gconf/gconftool.c:447
 msgid "Value type is only relevant when setting a value\n"
 msgstr "��� �������� ��� �ͦ�� ���� ��� ����������Φ ��������\n"
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:453
 msgid "Must specify a type when setting a value\n"
 msgstr "���Ҧ��� ��������� ��� � ����������Φ ��������\n"
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:463
 msgid "Ping option must be used by itself.\n"
 msgstr "�������� ���������� ��� ����������������� ���.\n"
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:473
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists ��� ����������������� ���.\n"
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:483
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file ��� ����������������� ���.\n"
 
-#: gconf/gconftool.c:430
+#: gconf/gconftool.c:494
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule ��� ����������������� ���.\n"
 
-#: gconf/gconftool.c:440
+#: gconf/gconftool.c:505
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key ��� ����������������� ���.\n"
 
-#: gconf/gconftool.c:450
+#: gconf/gconftool.c:516
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory ��� ����������������� ���.\n"
 
-#: gconf/gconftool.c:457
+#: gconf/gconftool.c:523
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:529
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "�� ������� �Φæ�̦������ GConf: %s\n"
 
-#: gconf/gconftool.c:488
+#: gconf/gconftool.c:554
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "����Ȧ��� ���������� �ͦ�� ���������� GCONF_CONFIG_SOURCE\n"
 
 #. Eventually you should be able to run gconfd as long as
 #. you're installing to a different database from the one
 #. it's using, but I don't trust the locking right now.
-#: gconf/gconftool.c:503
+#: gconf/gconftool.c:569
 msgid ""
 "Shouldn't run gconfd while installing new schema files.\n"
 "Use gconftool --shutdown to shut down the daemon, most safely while no "
@@ -1399,293 +1340,349 @@ msgid ""
 "(though things theoretically work if apps are running).\n"
 msgstr ""
 
-#: gconf/gconftool.c:525
+#: gconf/gconftool.c:591
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "�¦� ������� �� ������� ���Ʀ����æ�(�): %s\n"
 
-#: gconf/gconftool.c:685
+#: gconf/gconftool.c:802
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "������� ���������: %s\n"
 
-#: gconf/gconftool.c:730
+#: gconf/gconftool.c:845
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:764
-#, c-format
-msgid "Failure listing pairs in `%s': %s"
+#: gconf/gconftool.c:879
+#, fuzzy, c-format
+msgid "Failure listing entries in `%s': %s\n"
 msgstr "��������� �������� ������ ��� � \"%s\": %s"
 
-#: gconf/gconftool.c:782
+#: gconf/gconftool.c:897
 msgid "(no value set)"
 msgstr "(�� ����������� ��������)"
 
-#: gconf/gconftool.c:837
+#: gconf/gconftool.c:952
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "��������� ����������� ������ ���Ʀ����æ� (gconfd): %s\n"
 
-#: gconf/gconftool.c:851
+#: gconf/gconftool.c:966
 msgid "Must specify a key or keys to get\n"
 msgstr "���Ҧ��� ������� ���� ��� ���ަ ��� ���������\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:1001
 #, c-format
 msgid "Type: %s\n"
 msgstr "���: %s\n"
 
-#: gconf/gconftool.c:886
+#: gconf/gconftool.c:1002
 #, c-format
 msgid "List Type: %s\n"
 msgstr "��� ������: %s\n"
 
-#: gconf/gconftool.c:887
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "��� CAR: %s\n"
 
-#: gconf/gconftool.c:888
+#: gconf/gconftool.c:1004
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "��� CDR: %s\n"
 
-#: gconf/gconftool.c:889
+#: gconf/gconftool.c:1009
 #, c-format
-msgid "Owner: %s\n"
-msgstr "�������: %s\n"
+msgid "Default Value: %s\n"
+msgstr "������ ��������: %s\n"
 
-#: gconf/gconftool.c:889 gconf/gconftool.c:890 gconf/gconftool.c:891
+#: gconf/gconftool.c:1009 gconf/gconftool.c:1011 gconf/gconftool.c:1012
+#: gconf/gconftool.c:1013
 msgid "Unset"
 msgstr "����� ��������"
 
-#: gconf/gconftool.c:890
+#: gconf/gconftool.c:1011
+#, c-format
+msgid "Owner: %s\n"
+msgstr "�������: %s\n"
+
+#: gconf/gconftool.c:1012
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "�������� ����: %s\n"
 
-#: gconf/gconftool.c:891
+#: gconf/gconftool.c:1013
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "������ ����: %s\n"
 
-#: gconf/gconftool.c:900
+#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "�� ����������� �������� ��� \"%s\"\n"
 
-#: gconf/gconftool.c:904
+#: gconf/gconftool.c:1026 gconf/gconftool.c:1320
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "�� ������� �������� �������� ��� \"%s\": %s\n"
 
-#: gconf/gconftool.c:947 gconf/gconftool.c:959
+#: gconf/gconftool.c:1069 gconf/gconftool.c:1081
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "�������ͦ��� ��� \"%s\"\n"
 
-#: gconf/gconftool.c:971
+#: gconf/gconftool.c:1093
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "���Ҧ��� ������� �ͦ����Φ ���ަ � �������� �� �ҭ������\n"
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:1113
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "���ɤ �������� ��� ������������ ���� �����: \"%s\"\n"
 
-#: gconf/gconftool.c:1019
+#: gconf/gconftool.c:1141
 msgid "Cannot set schema as value\n"
 msgstr "��������� ���������� ����� �� ��������\n"
 
-#: gconf/gconftool.c:1029
+#: gconf/gconftool.c:1151
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "���Ҧ��� ��������� ���ͦ������ ��� ������\n"
 
-#: gconf/gconftool.c:1043
+#: gconf/gconftool.c:1165
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "���Ҧ��� ��������� ���ͦ���Φ ���� CAR �� CDR\n"
 
-#: gconf/gconftool.c:1058
+#: gconf/gconftool.c:1180
 #, c-format
 msgid "Error: %s\n"
 msgstr "�������: %s\n"
 
-#: gconf/gconftool.c:1071 gconf/gconftool.c:1204
-#, c-format
-msgid "Error setting value: %s"
+#: gconf/gconftool.c:1193
+#, fuzzy, c-format
+msgid "Error setting value: %s\n"
 msgstr "������� ������������ ��������: %s"
 
-#: gconf/gconftool.c:1089 gconf/gconftool.c:1218
-#, c-format
-msgid "Error syncing: %s"
+#: gconf/gconftool.c:1211
+#, fuzzy, c-format
+msgid "Error syncing: %s\n"
 msgstr "������� ������Φ��æ�: %s"
 
-#: gconf/gconftool.c:1107
+#: gconf/gconftool.c:1234
+#, fuzzy
+msgid "Must specify a key or keys on the command line\n"
+msgstr "���Ҧ��� ������� ���� ��� ���ަ ��� ���������\n"
+
+#: gconf/gconftool.c:1254
+#, fuzzy, c-format
+msgid "No schema known for `%s'\n"
+msgstr "����� ����� \"%s\"\n"
+
+#: gconf/gconftool.c:1287
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1292
+#, fuzzy, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "������ ��������� ����� ��� \"%s\": %s"
+
+#: gconf/gconftool.c:1299
+#, fuzzy, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "����� ����� \"%s\"\n"
+
+#: gconf/gconftool.c:1302
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:1358
+#, fuzzy
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr "���Ҧ��� ������� ���� (����� �����) �� ������ �ҭ�����\n"
+
+#: gconf/gconftool.c:1365
+#, fuzzy, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr "�����: �� ������� ��'����� ����� \"%s\" � ������ \"%s\": %s\n"
+
+#: gconf/gconftool.c:1385
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "���Ҧ��� ������� ���� (����� �����) �� ������ �ҭ�����\n"
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1427
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "������ ��� ���� ���ͦ������ ���: string, int, float �� bool\n"
 
-#: gconf/gconftool.c:1169
+#: gconf/gconftool.c:1447
 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:1189
+#: gconf/gconftool.c:1467
 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:1233
+#: gconf/gconftool.c:1482
+#, c-format
+msgid "Error setting value: %s"
+msgstr "������� ������������ ��������: %s"
+
+#: gconf/gconftool.c:1496
+#, c-format
+msgid "Error syncing: %s"
+msgstr "������� ������Φ��æ�: %s"
+
+#: gconf/gconftool.c:1511
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
-"���Ҧ��� ������� ���� �� ¦���� ������Ǧ� ��� ��������� � ��� ��� "
-"\"����-��������\".\n"
+"���Ҧ��� ������� ���� �� ¦���� ������Ǧ� ��� ��������� � ��� ��� \"����-"
+"��������\".\n"
 
-#: gconf/gconftool.c:1247
+#: gconf/gconftool.c:1525
 msgid "Must specify one or more keys to unset.\n"
 msgstr "���Ҧ��� ������� ���� ��� ¦���� ���ަ� ��� ������ ��������.\n"
 
-#: gconf/gconftool.c:1258
+#: gconf/gconftool.c:1536
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "������� ������ �������� \"%s\": %s\n"
 
-#: gconf/gconftool.c:1281
+#: gconf/gconftool.c:1559
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "���Ҧ��� ������� ���� �� ¦���� ������Ǧ� ��� ��������� � ��� Ц�������Ǧ�.\n"
 
-#: gconf/gconftool.c:1315
+#: gconf/gconftool.c:1593
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "������� ��������� ������ ������Ǧ�: %s\n"
 
-#: gconf/gconftool.c:1357
+#: gconf/gconftool.c:1635
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "�����: ��צ���� �� צ����Φ� ��� ��� ����� (%s)\n"
 
-#: gconf/gconftool.c:1366
+#: gconf/gconftool.c:1644
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "�����: ��צ���� �� צ����Φ� ��� list_type ��� ����� (%s)\n"
 
-#: gconf/gconftool.c:1377 gconf/gconftool.c:1407 gconf/gconftool.c:1436
+#: gconf/gconftool.c:1655 gconf/gconftool.c:1685 gconf/gconftool.c:1714
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "�����: �� ������� ������̦������ ������ �������� \"%s\" ��� ����� (%s)\n"
 
-#: gconf/gconftool.c:1395
+#: gconf/gconftool.c:1673
 #, 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:1420
+#: gconf/gconftool.c:1698
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "�����: �� ������� �������� �������� ���� ��� �����\n"
 
-#: gconf/gconftool.c:1449
+#: gconf/gconftool.c:1727
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "�����: ����Ҧ��� ������� gconftool, ��צ����� GConfValueType\n"
 
-#: gconf/gconftool.c:1497 gconf/gconftool.c:1518 gconf/gconftool.c:1539
-#: gconf/gconftool.c:1560
+#: gconf/gconftool.c:1774 gconf/gconftool.c:1795 gconf/gconftool.c:1816
+#: gconf/gconftool.c:1837
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "�����: �� ������� ������̦������ ����� ���� \"%s\"\n"
 
-#: gconf/gconftool.c:1514
+#: gconf/gconftool.c:1791
 #, 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:1535
+#: gconf/gconftool.c:1812
 #, 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"
 
-#: gconf/gconftool.c:1556
+#: gconf/gconftool.c:1833
 #, 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"
 
-#: gconf/gconftool.c:1583
+#: gconf/gconftool.c:1861
 msgid "WARNING: empty <applyto> node"
 msgstr "�����: ������ ����� <applyto>"
 
-#: gconf/gconftool.c:1586 gconf/gconftool.c:1849
+#: gconf/gconftool.c:1864 gconf/gconftool.c:2127
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "�����: ����� <%s> �������ͦ��� Ц��� <schema>\n"
 
-#: gconf/gconftool.c:1596
+#: gconf/gconftool.c:1874
 msgid "WARNING: no key specified for schema\n"
 msgstr "�����: �� ������� ���� ��� �����\n"
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1907
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "�����: ����� <locale> �� ��� �������� \"name=\"locale\"\", ��Ϧ���������\n"
 
-#: gconf/gconftool.c:1635
+#: gconf/gconftool.c:1913
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1994
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "�����: ��צ���� ����� <%s> � ���̦ <locale>\n"
 
-#: gconf/gconftool.c:1745
+#: gconf/gconftool.c:2023
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1753
+#: gconf/gconftool.c:2031
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1775
+#: gconf/gconftool.c:2053
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "�����: �� ������� ��'����� ����� \"%s\" � ������ \"%s\": %s\n"
 
-#: gconf/gconftool.c:1783
+#: gconf/gconftool.c:2061
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "�������� ����� \"%s\" �� ����� \"%s\"\n"
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:2140
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "����Ȧ��� ��� ���� ���� � ���� ��������� <locale> � <schema>\n"
 
-#: gconf/gconftool.c:1891
+#: gconf/gconftool.c:2169
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "�����: ����� <%s> ����� <schemalist> - �������ͦ���\n"
 
-#: gconf/gconftool.c:1913
+#: gconf/gconftool.c:2191
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "�� ������� צ������ \"%s\": %s\n"
 
-#: gconf/gconftool.c:1920
+#: gconf/gconftool.c:2198
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "�������� \"%s\" ������?\n"
 
-#: gconf/gconftool.c:1932
+#: gconf/gconftool.c:2210
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1694,26 +1691,26 @@ msgstr ""
 "�������� \"%s\" ��� ��צ���� ��� ��Ҧ����� ����� (<%s>, ��� ���� "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1945
+#: gconf/gconftool.c:2223
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "�������� \"%s\" ����� ����� ��������� Ҧ��� <gconfschemafile>\n"
 
-#: gconf/gconftool.c:1959
+#: gconf/gconftool.c:2237
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "�����: ����� <%s> ����� <gconfschemafile> - �������ͦ���\n"
 
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2002
+#: gconf/gconftool.c:2248 gconf/gconftool.c:2280
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "������� ������Φ��æ� ����� ���Ʀ����æ�: %s"
 
-#: gconf/gconftool.c:1986
+#: gconf/gconftool.c:2264
 msgid "Must specify some schema files to install\n"
 msgstr "���Ҧ��� ������� ��˦���� ���̦� ����� ��� �������æ�\n"
 
-#: gconf/gconftool.c:2023
+#: gconf/gconftool.c:2301
 #, c-format
 msgid ""
 "\n"
@@ -1722,16 +1719,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2043
+#: gconf/gconftool.c:2321
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2447
 msgid "Must specify some keys to break\n"
 msgstr "���Ҧ��� ������� ���˦ ���ަ ��� �����������\n"
 
-#: gconf/gconftool.c:2175
+#: gconf/gconftool.c:2453
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1740,11 +1737,11 @@ msgstr ""
 "������ ��������� ���� �������� ������������� ������� ������� ��� �����:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2193
+#: gconf/gconftool.c:2471
 msgid "Must specify some directories to break\n"
 msgstr "����Ȧ��� ������� ���˦ �������� ��� ��� �����������\n"
 
-#: gconf/gconftool.c:2212
+#: gconf/gconftool.c:2490
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1755,64 +1752,55 @@ msgstr ""
 "������ڦ:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:812
+#: gconf/gconf-client.c:298 gconf/gconf-client.c:315
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr "������� GConf: %s\n"
+
+#: gconf/gconf-client.c:798
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "������������ GConf: �� ������� �������� ������ ��� � \"%s\": %s"
 
-#: wrappers/gtk/gconf-client.c:985
+#: gconf/gconf-client.c:1000
 #, 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\""
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "�� ������� ������� ���� \"%s\": %s"
 
-#~ msgid "Unable to store a value at key '%s'"
-#~ msgstr "�� ������� �������� �������� �� ������ \"%s\""
+#, fuzzy
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "������� ��������� �������� \"%s\": %s"
 
-#~ msgid "Received signal %d, dumping core. Please report a GConf bug."
-#~ msgstr ""
-#~ "�������� �ɭ��� %d, ������� ����. ���� �����, ��צ����� ��� �� ������� � "
-#~ "GConf."
+#, fuzzy
+#~ msgid "Received signal %d, shutting down."
+#~ msgstr "�������� �ɭ��� %d, ��������� ���������� ������."
 
-#~ msgid ""
-#~ "Received signal %d, shutting down abnormally. Please file a GConf bug report."
-#~ msgstr ""
-#~ "�������� �ɭ��� %d, ����������� ���������� ������. ���� �����, ��צ����� ��� "
-#~ "�� �������."
+#, fuzzy
+#~ msgid "Didn't understand line in saved state file: '%s'"
+#~ msgstr "�� ������� צ������ ���� ����������� �����: %s"
 
-#~ msgid "GConf server is not in use, shutting down."
-#~ msgstr "������ GConf �� ����������դ����, ���������� ������."
+#, fuzzy
+#~ msgid "Failed to parse connection ID in saved state file"
+#~ msgstr "�� ������� צ������ ���� ����������� �����: %s"
 
-#~ msgid "Error reading saved state file: %s"
-#~ msgstr "������� ���������� ����� ����������� �����: %s"
+#, fuzzy
+#~ msgid "Failed to unquote config source address from saved state file: %s"
+#~ msgstr "�� ������� �������� �̦���� �� ����� ����������� �����: %s"
 
-#~ msgid "Failed to get IOR for client: %s"
-#~ msgstr "�� ������� �������� IOR ��� �̦����: %s"
+#, fuzzy
+#~ msgid "Failed to unquote listener location from saved state file: %s"
+#~ msgstr "�� ������� �������� �̦���� �� ����� ����������� �����: %s"
 
-#~ msgid "Failed to flush client add to saved state file: %s"
-#~ msgstr "�� ������� ������� �̦���� � ���� ���������� �����: %s"
+#, fuzzy
+#~ msgid "Failed to unquote IOR from saved state file: %s"
+#~ msgstr "�� ������� צ������ ���� ����������� �����: %s"
 
-#~ msgid "Default Value: %s\n"
-#~ msgstr "������ ��������: %s\n"
+#~ msgid "Can't use --all-pairs with --get or --set\n"
+#~ msgstr "�� ����� ����������� --all-pairs � --get �� --set\n"
 
-#~ msgid "GConf Error: %s\n"
-#~ msgstr "������� GConf: %s\n"
+#~ msgid "Unable to store a value at key '%s'"
+#~ msgstr "�� ������� �������� �������� �� ������ \"%s\""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a7091c50..76567760 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2001-09-19 19:06+0000\n"
+"POT-Creation-Date: 2001-09-14 12:44-0400\n"
 "PO-Revision-Date: 2001-03-14 20:40+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -84,8 +84,8 @@ msgstr ""
 #: backends/xml-cache.c:256
 #, 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
@@ -640,9 +640,9 @@ msgid ""
 "configuration path file doesn't contain any databases or wasn't found or 2) "
 "bonobo-activation 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 bonobo-activation bug, not a GConf issue. Logging out, killing "
-"bonobo-activation-server and gconfd, and logging back in may help. As "
-"always, check the user.* syslog for details on problems gconfd encountered."
+"an bonobo-activation bug, not a GConf issue. Logging out, killing bonobo-"
+"activation-server and gconfd, and logging back in may help. As always, check "
+"the user.* syslog for details on problems gconfd encountered."
 msgstr ""
 
 #: gconf/gconf-sources.c:1164
@@ -829,6 +829,10 @@ msgid ""
 "edit "
 msgstr ""
 
+#: gconf/gconfd.c:301
+msgid "/path"
+msgstr ""
+
 #: gconf/gconfd.c:314
 #, c-format
 msgid "Error loading some config sources: %s"
@@ -871,8 +875,8 @@ msgstr ""
 
 #: gconf/gconfd.c:546
 msgid ""
-"Failed to init Object Activation Framework: please mail bug report to "
-"bonobo-activation maintainers"
+"Failed to init Object Activation Framework: please mail bug report to bonobo-"
+"activation maintainers"
 msgstr ""
 
 #: gconf/gconfd.c:566
@@ -1009,15 +1013,15 @@ msgstr ""
 #: gconf/gconfd.c:2039
 #, 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 ""
 
 #: gconf/gconfd.c:2044
 #, 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 ""
 
 #: gconf/gconfd.c:2067 gconf/gconfd.c:2232
@@ -1059,8 +1063,8 @@ msgstr ""
 
 #: gconf/gconftool.c:96
 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:106
@@ -1235,14 +1239,14 @@ msgstr ""
 
 #: gconf/gconftool.c:431
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, "
-"--all-entries, or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
 
 #: gconf/gconftool.c:441
 msgid ""
-"--set_schema should not be used with --get, --set, --unset, --all-entries, "
-"--all-dirs\n"
+"--set_schema should not be used with --get, --set, --unset, --all-entries, --"
+"all-dirs\n"
 msgstr ""
 
 #: gconf/gconftool.c:447
@@ -1588,8 +1592,7 @@ msgstr "���棺<locale> �ڵ�û�С�name=\"locale\"�����ԣ�����\n"
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
-msgstr ""
-"���棺�������á�%s���ж�� <locale> �ڵ㣬���Ե�һ��������нڵ�\n"
+msgstr "���棺�������á�%s���ж�� <locale> �ڵ㣬���Ե�һ��������нڵ�\n"
 
 #: gconf/gconftool.c:1994
 #, c-format
@@ -1640,8 +1643,7 @@ msgstr "�ĵ���%s���ǿյģ�\n"
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
-msgstr ""
-"�ĵ���%s���ĸ��ڵ����ʹ���(<%s>��Ӧ���� <gconfschemafile>)\n"
+msgstr "�ĵ���%s���ĸ��ڵ����ʹ���(<%s>��Ӧ���� <gconfschemafile>)\n"
 
 #: gconf/gconftool.c:2223
 #, c-format